diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2004-01-10 13:27:38 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2004-01-10 13:27:38 +0000 |
| commit | b80bf66eabbf9e132e767b1421b2307e8c50afc1 (patch) | |
| tree | b1e16830b38f9749c0d339eafa007b7758f364a9 /lib-src | |
| parent | 114a8b8cab80753211f009e4950fa32b798b1125 (diff) | |
| parent | fdce4c6d9c25b335c9fbe515869d1ed6c1a34d25 (diff) | |
| download | emacs-b80bf66eabbf9e132e767b1421b2307e8c50afc1.tar.gz | |
Merged in changes from CVS HEAD
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-22
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-23
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-24
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-25
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-26
Fix permission bogosities
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-27
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-28
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-29
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-30
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-50
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 4 | ||||
| -rw-r--r-- | lib-src/emacsclient.c | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 0e6a568db49..6aa96d2cc91 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -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. diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index d737b2a11eb..356784ae45c 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -432,7 +432,7 @@ main (argc, argv) { int sock_status = 0; - int oerrno = 0; + int saved_errno = 0; if (! socket_name) { @@ -452,7 +452,7 @@ main (argc, argv) /* See if the socket exists, and if it's owned by us. */ sock_status = socket_status (server.sun_path); - oerrno = errno; + saved_errno = errno; if (sock_status) { /* Failing that, see if LOGNAME or USER exist and differ from @@ -473,7 +473,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); - oerrno = errno; + saved_errno = errno; } } } @@ -492,14 +492,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 (oerrno)); + argv[0], server.sun_path, strerror (saved_errno)); fail (); break; } |