procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(main): Save errno from socket_status.

Browse source
This commit is contained in:
Andreas Schwab 2004-01-08 12:20:43 +00:00
parent 3a9f36e634
commit 152b6e830f
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib-src/ChangeLog
View file

@ -1,3 +1,7 @@
2004-01-08 Andreas Schwab <schwab@suse.de>
* emacsclient.c (main): Save errno from socket_status.
2004-01-04 Andreas Schwab <schwab@suse.de>
* emacsclient.c (main): Fix socket name when using another user.

7
lib-src/emacsclient.c
View file

@ -358,6 +358,7 @@ main (argc, argv)
{
int sock_status = 0;
int saved_errno;
if (! socket_name)
{
@ -374,6 +375,7 @@ main (argc, argv)
/* See if the socket exists, and if it's owned by us. */
sock_status = socket_status (server.sun_path);
saved_errno = errno;
if (sock_status)
{
/* Failing that, see if LOGNAME or USER exist and differ from
@ -394,6 +396,7 @@ main (argc, argv)
sprintf (server.sun_path, "/tmp/emacs%d-%s/server",
(int) pw->pw_uid, system_name);
sock_status = socket_status (server.sun_path);
saved_errno = errno;
}
}
}
@ -412,14 +415,14 @@ main (argc, argv)
case 2:
/* `stat' failed */
if (errno == ENOENT)
if (saved_errno == ENOENT)
fprintf (stderr,
"%s: can't find socket; have you started the server?\n\
To start the server in Emacs, type \"M-x server-start\".\n",
argv[0]);
else
fprintf (stderr, "%s: can't stat %s: %s\n",
argv[0], server.sun_path, strerror (errno));
argv[0], server.sun_path, strerror (saved_errno));
fail (argc, argv);
break;
}