diff options
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 5 | ||||
| -rw-r--r-- | lib-src/emacsclient.c | 27 |
2 files changed, 30 insertions, 2 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index d4a05722a3c..14b668d2d24 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -8,6 +8,11 @@ (set_local_socket, set_socket, main): Use egetenv, not getenv. (w32_get_resource, w32_getenv) [WINDOWSNT]: New functions. +2007-10-25 Jason Rumney <jasonr@gnu.org> + + * emacsclient.c (sock_err_message): New function. + (set_tcp_socket): Use it. + 2007-10-09 Juanma Barranquero <lekktu@gmail.com> * emacsclient.c (print_help_and_exit): Fix space to improve diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index a48a33f68b8..99e0dc3ce3d 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -666,6 +666,29 @@ int sblen = 0; /* Fill pointer for the send buffer. */ /* Socket used to communicate with the Emacs server process. */ HSOCKET emacs_socket = 0; +/* On Windows, the socket library was historically separate from the standard + C library, so errors are handled differently. */ +void +sock_err_message (function_name) + char *function_name; +{ +#ifdef WINDOWSNT + char* msg = NULL; + + FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM + | FORMAT_MESSAGE_ALLOCATE_BUFFER + | FORMAT_MESSAGE_ARGUMENT_ARRAY, + NULL, WSAGetLastError (), 0, (LPTSTR)&msg, 0, NULL); + + message (TRUE, "%s: %s: %s\n", progname, function_name, msg); + + LocalFree (msg); +#else + message (TRUE, "%s: %s: %s\n", progname, function_name, strerror (errno)); +#endif +} + + /* Let's send the data to Emacs when either - the data ends in "\n", or - the buffer is full (but this shouldn't happen) @@ -957,7 +980,7 @@ set_tcp_socket () */ if ((s = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) { - message (TRUE, "%s: socket: %s\n", progname, strerror (errno)); + sock_err_message ("socket"); return INVALID_SOCKET; } @@ -966,7 +989,7 @@ set_tcp_socket () */ if (connect (s, (struct sockaddr *) &server, sizeof server) < 0) { - message (TRUE, "%s: connect: %s\n", progname, strerror (errno)); + sock_err_message ("connect"); return INVALID_SOCKET; } |