diff options
Diffstat (limited to 'lib-src/emacsclient.c')
| -rw-r--r-- | lib-src/emacsclient.c | 1341 |
1 files changed, 722 insertions, 619 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 702fa40d604..ba2721e8bc9 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -27,146 +27,134 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ # undef _WINSOCK_H # include <malloc.h> -# include <stdlib.h> # include <windows.h> # include <commctrl.h> # include <io.h> # include <winsock2.h> -# define NO_SOCKETS_IN_FILE_SYSTEM - # define HSOCKET SOCKET # define CLOSE_SOCKET closesocket -# define INITIALIZE() (initialize_sockets ()) +# define INITIALIZE() initialize_sockets () char *w32_getenv (const char *); -#define egetenv(VAR) w32_getenv(VAR) +# define egetenv(VAR) w32_getenv (VAR) + +# undef signal #else /* !WINDOWSNT */ # ifdef HAVE_NTGUI -# include <windows.h> -# endif /* HAVE_NTGUI */ +# include <windows.h> +# endif # include "syswait.h" -# ifdef HAVE_INET_SOCKETS -# include <netinet/in.h> -# ifdef HAVE_SOCKETS -# include <sys/types.h> -# include <sys/socket.h> -# include <sys/un.h> -# endif /* HAVE_SOCKETS */ -# endif # include <arpa/inet.h> +# include <fcntl.h> +# include <netinet/in.h> +# include <sys/socket.h> +# include <sys/un.h> -# define INVALID_SOCKET -1 +# define SOCKETS_IN_FILE_SYSTEM + +# define INVALID_SOCKET (-1) # define HSOCKET int # define CLOSE_SOCKET close # define INITIALIZE() -#define egetenv(VAR) getenv(VAR) +# define egetenv(VAR) getenv (VAR) #endif /* !WINDOWSNT */ -#undef signal - -#include <stdarg.h> #include <ctype.h> -#include <stdlib.h> -#include <string.h> +#include <errno.h> #include <getopt.h> -#include <unistd.h> - +#include <inttypes.h> #include <pwd.h> -#include <sys/stat.h> #include <signal.h> -#include <errno.h> +#include <stdarg.h> +#include <stddef.h> +#include <stdint.h> +#include <stdlib.h> +#include <string.h> +#include <sys/stat.h> +#include <unistd.h> +#include <dosname.h> +#include <intprops.h> +#include <min-max.h> +#include <pathmax.h> #include <unlocked-io.h> -#ifndef VERSION -#define VERSION "unspecified" +/* Work around GCC bug 88251. */ +#if GNUC_PREREQ (7, 0, 0) +# pragma GCC diagnostic ignored "-Wformat-truncation=2" #endif - - -#ifndef EXIT_SUCCESS -#define EXIT_SUCCESS 0 -#endif - -#ifndef EXIT_FAILURE -#define EXIT_FAILURE 1 -#endif - -/* Additional space when allocating buffers for filenames, etc. */ -#define EXTRA_SPACE 100 - -#ifdef min -#undef min -#endif -#define min(x, y) (((x) < (y)) ? (x) : (y)) /* Name used to invoke this program. */ -const char *progname; +static char const *progname; /* The first argument to main. */ -int main_argc; +static int main_argc; /* The second argument to main. */ -char **main_argv; +static char *const *main_argv; -/* Nonzero means don't wait for a response from Emacs. --no-wait. */ -int nowait = 0; +/* True means don't wait for a response from Emacs. --no-wait. */ +static bool nowait; -/* Nonzero means don't print messages for successful operations. --quiet. */ -int quiet = 0; +/* True means don't print messages for successful operations. --quiet. */ +static bool quiet; -/* Nonzero means don't print values returned from emacs. --suppress-output. */ -int suppress_output = 0; +/* True means don't print values returned from emacs. --suppress-output. */ +static bool suppress_output; -/* Nonzero means args are expressions to be evaluated. --eval. */ -int eval = 0; +/* True means args are expressions to be evaluated. --eval. */ +static bool eval; -/* Nonzero means don't open a new frame. Inverse of --create-frame. */ -int current_frame = 1; +/* True means open a new frame. --create-frame etc. */ +static bool create_frame; /* The display on which Emacs should work. --display. */ -const char *display = NULL; +static char const *display; /* The alternate display we should try if Emacs does not support display. */ -const char *alt_display = NULL; +static char const *alt_display; /* The parent window ID, if we are opening a frame via XEmbed. */ -char *parent_id = NULL; +static char *parent_id; -/* Nonzero means open a new Emacs frame on the current terminal. */ -int tty = 0; +/* True means open a new Emacs frame on the current terminal. */ +static bool tty; /* If non-NULL, the name of an editor to fallback to if the server is not running. --alternate-editor. */ -const char *alternate_editor = NULL; +static char *alternate_editor; +#ifdef SOCKETS_IN_FILE_SYSTEM /* If non-NULL, the filename of the UNIX socket. */ -const char *socket_name = NULL; +static char const *socket_name; +#endif /* If non-NULL, the filename of the authentication file. */ -const char *server_file = NULL; +static char const *server_file; /* If non-NULL, the tramp prefix emacs must use to find the files. */ -const char *tramp_prefix = NULL; +static char const *tramp_prefix; -/* PID of the Emacs server process. */ -int emacs_pid = 0; +/* If nonzero, PID of the Emacs server process. */ +static pid_t emacs_pid; /* If non-NULL, a string that should form a frame parameter alist to be used for the new frame. */ -const char *frame_parameters = NULL; +static char const *frame_parameters; static _Noreturn void print_help_and_exit (void); +/* Long command-line options. */ -struct option longopts[] = +static struct option const longopts[] = { { "no-wait", no_argument, NULL, 'n' }, { "quiet", no_argument, NULL, 'q' }, @@ -179,7 +167,7 @@ struct option longopts[] = { "create-frame", no_argument, NULL, 'c' }, { "alternate-editor", required_argument, NULL, 'a' }, { "frame-parameters", required_argument, NULL, 'F' }, -#ifndef NO_SOCKETS_IN_FILE_SYSTEM +#ifdef SOCKETS_IN_FILE_SYSTEM { "socket-name", required_argument, NULL, 's' }, #endif { "server-file", required_argument, NULL, 'f' }, @@ -189,10 +177,19 @@ struct option longopts[] = { 0, 0, 0, 0 } }; +/* Short options, in the same order as the corresponding long options. + There is no '-p' short option. */ +static char const shortopts[] = + "nqueHVtca:F:" +#ifdef SOCKETS_IN_FILE_SYSTEM + "s:" +#endif + "f:d:T:"; + /* Like malloc but get fatal error if memory is exhausted. */ -static void * +static void * ATTRIBUTE_MALLOC xmalloc (size_t size) { void *result = malloc (size); @@ -219,9 +216,8 @@ xrealloc (void *ptr, size_t size) } /* Like strdup but get a fatal error if memory is exhausted. */ -char *xstrdup (const char *); -char * +static char * ATTRIBUTE_MALLOC xstrdup (const char *s) { char *result = strdup (s); @@ -234,7 +230,7 @@ xstrdup (const char *s) } /* From sysdep.c */ -#if !defined (HAVE_GET_CURRENT_DIR_NAME) || defined (BROKEN_GET_CURRENT_DIR_NAME) +#if !defined HAVE_GET_CURRENT_DIR_NAME || defined BROKEN_GET_CURRENT_DIR_NAME char *get_current_dir_name (void); @@ -244,24 +240,33 @@ char *get_current_dir_name (void); char * get_current_dir_name (void) { + /* The maximum size of a directory name, including the terminating NUL. + Leave room so that the caller can append a trailing slash. */ + ptrdiff_t dirsize_max = min (PTRDIFF_MAX, SIZE_MAX) - 1; + + /* The maximum size of a buffer for a file name, including the + terminating NUL. This is bounded by PATH_MAX, if available. */ + ptrdiff_t bufsize_max = dirsize_max; +#ifdef PATH_MAX + bufsize_max = min (bufsize_max, PATH_MAX); +#endif + char *buf; - const char *pwd; struct stat dotstat, pwdstat; + size_t pwdlen; /* If PWD is accurate, use it instead of calling getcwd. PWD is sometimes a nicer name, and using it may avoid a fatal error if a parent directory is searchable but not readable. */ - if ((pwd = egetenv ("PWD")) != 0 - && (IS_DIRECTORY_SEP (*pwd) || (*pwd && IS_DEVICE_SEP (pwd[1]))) + char const *pwd = egetenv ("PWD"); + if (pwd + && (pwdlen = strnlen (pwd, bufsize_max)) < bufsize_max + && IS_DIRECTORY_SEP (pwd[pwdlen && IS_DEVICE_SEP (pwd[1]) ? 2 : 0]) && stat (pwd, &pwdstat) == 0 && stat (".", &dotstat) == 0 && dotstat.st_ino == pwdstat.st_ino - && dotstat.st_dev == pwdstat.st_dev -#ifdef MAXPATHLEN - && strlen (pwd) < MAXPATHLEN -#endif - ) + && dotstat.st_dev == pwdstat.st_dev) { - buf = (char *) xmalloc (strlen (pwd) + 1); + buf = xmalloc (strlen (pwd) + 1); strcpy (buf, pwd); } else @@ -296,7 +301,7 @@ get_current_dir_name (void) #ifdef WINDOWSNT -#define REG_ROOT "SOFTWARE\\GNU\\Emacs" +# define REG_ROOT "SOFTWARE\\GNU\\Emacs" char *w32_get_resource (HKEY, const char *, LPDWORD); @@ -310,14 +315,18 @@ w32_get_resource (HKEY predefined, const char *key, LPDWORD type) char *result = NULL; DWORD cbData; - if (RegOpenKeyEx (predefined, REG_ROOT, 0, KEY_READ, &hrootkey) == ERROR_SUCCESS) + if (RegOpenKeyEx (predefined, REG_ROOT, 0, KEY_READ, &hrootkey) + == ERROR_SUCCESS) { - if (RegQueryValueEx (hrootkey, key, NULL, NULL, NULL, &cbData) == ERROR_SUCCESS) + if (RegQueryValueEx (hrootkey, key, NULL, NULL, NULL, &cbData) + == ERROR_SUCCESS) { - result = (char *) xmalloc (cbData); + result = xmalloc (cbData); - if ((RegQueryValueEx (hrootkey, key, NULL, type, (LPBYTE)result, &cbData) != ERROR_SUCCESS) - || (*result == 0)) + if ((RegQueryValueEx (hrootkey, key, NULL, type, (LPBYTE) result, + &cbData) + != ERROR_SUCCESS) + || *result == 0) { free (result); result = NULL; @@ -369,7 +378,7 @@ w32_getenv (const char *envvar) if ((size = ExpandEnvironmentStrings (value, NULL, 0))) { - char *buffer = (char *) xmalloc (size); + char *buffer = xmalloc (size); if (ExpandEnvironmentStrings (value, buffer, size)) { /* Found and expanded. */ @@ -436,8 +445,8 @@ w32_execvp (const char *path, char **argv) return execvp (path, argv); } -#undef execvp -#define execvp w32_execvp +# undef execvp +# define execvp w32_execvp /* Emulation of ttyname for Windows. */ const char *ttyname (int); @@ -484,7 +493,7 @@ message (bool is_error, const char *format, ...) } /* Decode the options from argv and argc. - The global variable `optind' will say how many arguments we used up. */ + The global variable 'optind' will say how many arguments we used up. */ static void decode_options (int argc, char **argv) @@ -492,17 +501,10 @@ decode_options (int argc, char **argv) alternate_editor = egetenv ("ALTERNATE_EDITOR"); tramp_prefix = egetenv ("EMACSCLIENT_TRAMP"); - while (1) + while (true) { - int opt = getopt_long_only (argc, argv, -#ifndef NO_SOCKETS_IN_FILE_SYSTEM - "VHnequa:s:f:d:F:tcT:", -#else - "VHnequa:f:d:F:tcT:", -#endif - longopts, 0); - - if (opt == EOF) + int opt = getopt_long_only (argc, argv, shortopts, longopts, NULL); + if (opt < 0) break; switch (opt) @@ -516,7 +518,7 @@ decode_options (int argc, char **argv) alternate_editor = optarg; break; -#ifndef NO_SOCKETS_IN_FILE_SYSTEM +#ifdef SOCKETS_IN_FILE_SYSTEM case 's': socket_name = optarg; break; @@ -535,38 +537,38 @@ decode_options (int argc, char **argv) break; case 'n': - nowait = 1; + nowait = true; break; case 'e': - eval = 1; + eval = true; break; case 'q': - quiet = 1; + quiet = true; break; case 'u': - suppress_output = 1; + suppress_output = true; break; case 'V': - message (false, "emacsclient %s\n", VERSION); + message (false, "emacsclient %s\n", PACKAGE_VERSION); exit (EXIT_SUCCESS); break; case 't': - tty = 1; - current_frame = 0; + tty = true; + create_frame = true; break; case 'c': - current_frame = 0; + create_frame = true; break; case 'p': parent_id = optarg; - current_frame = 0; + create_frame = true; break; case 'H': @@ -590,7 +592,7 @@ decode_options (int argc, char **argv) /* If the -c option is used (without -t) and no --display argument is provided, try $DISPLAY. - Without the -c option, we used to set `display' to $DISPLAY by + Without the -c option, we used to set 'display' to $DISPLAY by default, but this changed the default behavior and is sometimes inconvenient. So we force users to use "--display $DISPLAY" if they want Emacs to connect to their current display. @@ -599,7 +601,7 @@ decode_options (int argc, char **argv) reflected in the DISPLAY variable. If the user didn't give us an explicit display, try this platform-specific after trying the display in DISPLAY (if any). */ - if (!current_frame && !tty && !display) + if (create_frame && !tty && !display) { /* Set these here so we use a default_display only when the user didn't give us an explicit display. */ @@ -619,24 +621,24 @@ decode_options (int argc, char **argv) } /* A null-string display is invalid. */ - if (display && strlen (display) == 0) + if (display && !display[0]) display = NULL; /* If no display is available, new frames are tty frames. */ - if (!current_frame && !display) - tty = 1; + if (create_frame && !display) + tty = true; #ifdef WINDOWSNT /* Emacs on Windows does not support graphical and text terminal frames in the same instance. So, treat the -t and -c options as equivalent, and open a new frame on the server's terminal. - Ideally, we would only set tty = 1 when the serve is running in a + Ideally, we would set tty = true only if the server is running in a console, but alas we don't know that. As a workaround, always ask for a tty frame, and let server.el figure it out. */ - if (!current_frame) + if (create_frame) { display = NULL; - tty = 1; + tty = true; } #endif /* WINDOWSNT */ } @@ -671,7 +673,7 @@ The following OPTIONS are accepted:\n\ Visit the file in the given display\n\ ", "\ --parent-id=ID Open in parent window ID, via XEmbed\n" -#ifndef NO_SOCKETS_IN_FILE_SYSTEM +#ifdef SOCKETS_IN_FILE_SYSTEM "-s SOCKET, --socket-name=SOCKET\n\ Set filename of the UNIX socket for communication\n" #endif @@ -698,18 +700,23 @@ fail (void) { if (alternate_editor) { - size_t extra_args_size = (main_argc - optind + 1) * sizeof (char *); + /* If the user has said --eval, then those aren't file name + parameters, so don't put them on the alternate_editor command + line. */ + size_t extra_args_size = + (eval? 0: (main_argc - optind + 1) * sizeof (char *)); size_t new_argv_size = extra_args_size; char **new_argv = xmalloc (new_argv_size); char *s = xstrdup (alternate_editor); - unsigned toks = 0; + ptrdiff_t toks = 0; /* Unpack alternate_editor's space-separated tokens into new_argv. */ for (char *tok = s; tok != NULL && *tok != '\0';) { /* Allocate new token. */ ++toks; - new_argv = xrealloc (new_argv, new_argv_size + toks * sizeof (char *)); + new_argv = xrealloc (new_argv, + new_argv_size + toks * sizeof (char *)); /* Skip leading delimiters, and set separator, skipping any opening quote. */ @@ -737,39 +744,26 @@ fail (void) } -#if !defined (HAVE_SOCKETS) || !defined (HAVE_INET_SOCKETS) - -int -main (int argc, char **argv) -{ - main_argc = argc; - main_argv = argv; - progname = argv[0]; - message (true, "%s: Sorry, the Emacs server is supported only\n" - "on systems with Berkeley sockets.\n", - argv[0]); - fail (); -} - -#else /* HAVE_SOCKETS && HAVE_INET_SOCKETS */ - -#define AUTH_KEY_LENGTH 64 -#define SEND_BUFFER_SIZE 4096 - -/* Buffer to accumulate data to send in TCP connections. */ -char send_buffer[SEND_BUFFER_SIZE + 1]; -int sblen = 0; /* Fill pointer for the send buffer. */ -/* Socket used to communicate with the Emacs server process. */ -HSOCKET emacs_socket = 0; +#ifdef SOCKETS_IN_FILE_SYSTEM +static void act_on_signals (HSOCKET); +#else +static void act_on_signals (HSOCKET s) {} +static void init_signals (void) {} +#endif -/* On Windows, the socket library was historically separate from the - standard C library, so errors are handled differently. */ +enum { AUTH_KEY_LENGTH = 64 }; static void sock_err_message (const char *function_name) { #ifdef WINDOWSNT - char* msg = NULL; + /* On Windows, the socket library was historically separate from the + standard C library, so errors are handled differently. */ + + if (w32_window_app () && alternate_editor) + return; + + char *msg = NULL; FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER @@ -785,39 +779,47 @@ sock_err_message (const char *function_name) } -/* Let's send the data to Emacs when either - - the data ends in "\n", or +/* Send to S the data in *DATA when either + - the data's last byte is '\n', or - the buffer is full (but this shouldn't happen) - Otherwise, we just accumulate it. */ + Otherwise, just accumulate the data. */ static void send_to_emacs (HSOCKET s, const char *data) { - size_t dlen; + enum { SEND_BUFFER_SIZE = 4096 }; - if (!data) - return; + /* Buffer to accumulate data to send in TCP connections. */ + static char send_buffer[SEND_BUFFER_SIZE + 1]; + + /* Fill pointer for the send buffer. */ + static int sblen; - dlen = strlen (data); - while (*data) + for (ptrdiff_t dlen = strlen (data); dlen != 0; ) { - size_t part = min (dlen, SEND_BUFFER_SIZE - sblen); + int part = min (dlen, SEND_BUFFER_SIZE - sblen); memcpy (&send_buffer[sblen], data, part); data += part; sblen += part; if (sblen == SEND_BUFFER_SIZE - || (sblen > 0 && send_buffer[sblen-1] == '\n')) + || (0 < sblen && send_buffer[sblen - 1] == '\n')) { - int sent = send (s, send_buffer, sblen, 0); - if (sent < 0) + int sent; + while ((sent = send (s, send_buffer, sblen, 0)) < 0) { - message (true, "%s: failed to send %d bytes to socket: %s\n", - progname, sblen, strerror (errno)); - fail (); + if (errno != EINTR) + { + message (true, "%s: failed to send %d bytes to socket: %s\n", + progname, sblen, strerror (errno)); + fail (); + } + /* Act on signals not requiring communication to Emacs, + but defer action on the others to avoid confusing the + communication currently in progress. */ + act_on_signals (INVALID_SOCKET); } - if (sent != sblen) - memmove (send_buffer, &send_buffer[sent], sblen - sent); sblen -= sent; + memmove (send_buffer, &send_buffer[sent], sblen); } dlen -= part; @@ -833,34 +835,22 @@ send_to_emacs (HSOCKET s, const char *data) static void quote_argument (HSOCKET s, const char *str) { - char *copy = (char *) xmalloc (strlen (str) * 2 + 1); - const char *p; - char *q; - - p = str; - q = copy; - while (*p) + char *copy = xmalloc (strlen (str) * 2 + 1); + char *q = copy; + if (*str == '-') + *q++ = '&', *q++ = *str++; + for (; *str; str++) { - if (*p == ' ') - { - *q++ = '&'; - *q++ = '_'; - p++; - } - else if (*p == '\n') - { - *q++ = '&'; - *q++ = 'n'; - p++; - } - else - { - if (*p == '&' || (*p == '-' && p == str)) - *q++ = '&'; - *q++ = *p++; - } + char c = *str; + if (c == ' ') + *q++ = '&', c = '_'; + else if (c == '\n') + *q++ = '&', c = 'n'; + else if (c == '&') + *q++ = '&'; + *q++ = c; } - *q++ = 0; + *q = 0; send_to_emacs (s, copy); @@ -868,65 +858,35 @@ quote_argument (HSOCKET s, const char *str) } -/* The inverse of quote_argument. Removes quoting in string STR by - modifying the string in place. Returns STR. */ +/* The inverse of quote_argument. Remove quoting in string STR by + modifying the addressed string in place. Return STR. */ static char * unquote_argument (char *str) { - char *p, *q; - - if (! str) - return str; + char const *p = str; + char *q = str; + char c; - p = str; - q = str; - while (*p) + do { - if (*p == '&') - { - p++; - if (*p == '&') - *p = '&'; - else if (*p == '_') - *p = ' '; - else if (*p == 'n') - *p = '\n'; - else if (*p == '-') - *p = '-'; - } - *q++ = *p++; + c = *p++; + if (c == '&') + { + c = *p++; + if (c == '_') + c = ' '; + else if (c == 'n') + c = '\n'; + } + *q++ = c; } - *q = 0; + while (c); + return str; } -static int -file_name_absolute_p (const char *filename) -{ - /* Sanity check, it shouldn't happen. */ - if (! filename) return false; - - /* /xxx is always an absolute path. */ - if (filename[0] == '/') return true; - - /* Empty filenames (which shouldn't happen) are relative. */ - if (filename[0] == '\0') return false; - -#ifdef WINDOWSNT - /* X:\xxx is always absolute. */ - if (isalpha ((unsigned char) filename[0]) - && filename[1] == ':' && (filename[2] == '\\' || filename[2] == '/')) - return true; - - /* Both \xxx and \\xxx\yyy are absolute. */ - if (filename[0] == '\\') return true; -#endif - - return false; -} - #ifdef WINDOWSNT /* Wrapper to make WSACleanup a cdecl, as required by atexit. */ void __cdecl close_winsock (void); @@ -954,44 +914,45 @@ initialize_sockets (void) #endif /* WINDOWSNT */ +/* If the home directory is HOME, return the configuration file with + basename CONFIG_FILE. Fail if there is no home directory or if the + configuration file could not be opened. */ + +static FILE * +open_config (char const *home, char const *config_file) +{ + if (!home) + return NULL; + ptrdiff_t homelen = strlen (home); + static char const emacs_d_server[] = "/.emacs.d/server/"; + ptrdiff_t suffixsize = sizeof emacs_d_server + strlen (config_file); + char *configname = xmalloc (homelen + suffixsize); + strcpy (stpcpy (stpcpy (configname, home), emacs_d_server), config_file); + + FILE *config = fopen (configname, "rb"); + free (configname); + return config; +} + /* Read the information needed to set up a TCP comm channel with the Emacs server: host, port, and authentication string. */ -static int +static bool get_server_config (const char *config_file, struct sockaddr_in *server, char *authentication) { char dotted[32]; char *port; - FILE *config = NULL; + FILE *config; - if (file_name_absolute_p (config_file)) + if (IS_ABSOLUTE_FILE_NAME (config_file)) config = fopen (config_file, "rb"); else { - const char *home = egetenv ("HOME"); - - if (home) - { - char *path = xmalloc (strlen (home) + strlen (config_file) - + EXTRA_SPACE); - char *z = stpcpy (path, home); - z = stpcpy (z, "/.emacs.d/server/"); - strcpy (z, config_file); - config = fopen (path, "rb"); - free (path); - } + config = open_config (egetenv ("HOME"), config_file); #ifdef WINDOWSNT - if (!config && (home = egetenv ("APPDATA"))) - { - char *path = xmalloc (strlen (home) + strlen (config_file) - + EXTRA_SPACE); - char *z = stpcpy (path, home); - z = stpcpy (z, "/.emacs.d/server/"); - strcpy (z, config_file); - config = fopen (path, "rb"); - free (path); - } + if (!config) + config = open_config (egetenv ("APPDATA"), config_file); #endif } @@ -1007,6 +968,7 @@ get_server_config (const char *config_file, struct sockaddr_in *server, exit (EXIT_FAILURE); } + memset (server, 0, sizeof *server); server->sin_family = AF_INET; server->sin_addr.s_addr = inet_addr (dotted); server->sin_port = htons (atoi (port)); @@ -1022,46 +984,64 @@ get_server_config (const char *config_file, struct sockaddr_in *server, return true; } +/* Like socket (DOMAIN, TYPE, PROTOCOL), except arrange for the + resulting file descriptor to be close-on-exec. */ + +static HSOCKET +cloexec_socket (int domain, int type, int protocol) +{ +#ifdef SOCK_CLOEXEC + return socket (domain, type | SOCK_CLOEXEC, protocol); +#else + HSOCKET s = socket (domain, type, protocol); +# ifndef WINDOWSNT + if (0 <= s) + fcntl (s, F_SETFD, FD_CLOEXEC); +# endif + return s; +#endif +} + static HSOCKET set_tcp_socket (const char *local_server_file) { - HSOCKET s; - struct sockaddr_in server; - struct linger l_arg = {1, 1}; + union { + struct sockaddr_in in; + struct sockaddr sa; + } server; + struct linger l_arg = { .l_onoff = 1, .l_linger = 1 }; char auth_string[AUTH_KEY_LENGTH + 1]; - if (! get_server_config (local_server_file, &server, auth_string)) + if (! get_server_config (local_server_file, &server.in, auth_string)) return INVALID_SOCKET; - if (server.sin_addr.s_addr != inet_addr ("127.0.0.1") && !quiet) + if (server.in.sin_addr.s_addr != inet_addr ("127.0.0.1") && !quiet) message (false, "%s: connected to remote socket at %s\n", - progname, inet_ntoa (server.sin_addr)); + progname, inet_ntoa (server.in.sin_addr)); /* Open up an AF_INET socket. */ - if ((s = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) + HSOCKET s = cloexec_socket (AF_INET, SOCK_STREAM, IPPROTO_TCP); + if (s < 0) { /* Since we have an alternate to try out, this is not an error yet; popping out a modal dialog at this stage would make -a option totally useless for emacsclientw -- the user will still get an error message if the alternate editor fails. */ -#ifdef WINDOWSNT - if(!(w32_window_app () && alternate_editor)) -#endif sock_err_message ("socket"); return INVALID_SOCKET; } /* Set up the socket. */ - if (connect (s, (struct sockaddr *) &server, sizeof server) < 0) + if (connect (s, &server.sa, sizeof server.in) != 0) { -#ifdef WINDOWSNT - if(!(w32_window_app () && alternate_editor)) -#endif sock_err_message ("connect"); + CLOSE_SOCKET (s); return INVALID_SOCKET; } - setsockopt (s, SOL_SOCKET, SO_LINGER, (char *) &l_arg, sizeof l_arg); + /* The cast to 'const char *' is to avoid a compiler warning when + compiling for MS-Windows sockets. */ + setsockopt (s, SOL_SOCKET, SO_LINGER, (const char *) &l_arg, sizeof l_arg); /* Send the authentication. */ auth_string[AUTH_KEY_LENGTH] = '\0'; @@ -1074,44 +1054,38 @@ set_tcp_socket (const char *local_server_file) } -/* Returns 1 if PREFIX is a prefix of STRING. */ -static int +/* Return true if PREFIX is a prefix of STRING. */ +static bool strprefix (const char *prefix, const char *string) { return !strncmp (prefix, string, strlen (prefix)); } -/* Get tty name and type. If successful, return the type in TTY_TYPE - and the name in TTY_NAME, and return 1. Otherwise, fail if NOABORT - is zero, or return 0 if NOABORT is non-zero. */ +/* Get tty name and type. If successful, store the type into + *TTY_TYPE and the name into *TTY_NAME, and return true. + Otherwise, fail if NOABORT is zero, or return false if NOABORT. */ -static int -find_tty (const char **tty_type, const char **tty_name, int noabort) +static bool +find_tty (const char **tty_type, const char **tty_name, bool noabort) { const char *type = egetenv ("TERM"); - const char *name = ttyname (fileno (stdout)); + const char *name = ttyname (STDOUT_FILENO); if (!name) { if (noabort) - return 0; - else - { - message (true, "%s: could not get terminal name\n", progname); - fail (); - } + return false; + message (true, "%s: could not get terminal name\n", progname); + fail (); } if (!type) { if (noabort) - return 0; - else - { - message (true, "%s: please set the TERM variable to your terminal type\n", - progname); - fail (); - } + return false; + message (true, "%s: please set the TERM variable to your terminal type\n", + progname); + fail (); } const char *inside_emacs = egetenv ("INSIDE_EMACS"); @@ -1119,297 +1093,434 @@ find_tty (const char **tty_type, const char **tty_name, int noabort) && strprefix ("eterm", type)) { if (noabort) - return 0; - else - { - /* This causes nasty, MULTI_KBOARD-related input lockouts. */ - message (true, "%s: opening a frame in an Emacs term buffer" - " is not supported\n", progname); - fail (); - } + return false; + /* This causes nasty, MULTI_KBOARD-related input lockouts. */ + message (true, ("%s: opening a frame in an Emacs term buffer" + " is not supported\n"), + progname); + fail (); } *tty_name = name; *tty_type = type; - return 1; + return true; } +/* Return the process group if in the foreground, the negative of the + process group if in the background, and zero if there is no + foreground process group for the controlling terminal. + Unfortunately, use of this function introduces an unavoidable race, + since whether the process is in the foreground or background can + change at any time. */ -#if !defined (NO_SOCKETS_IN_FILE_SYSTEM) +static pid_t +process_grouping (void) +{ +#ifdef SOCKETS_IN_FILE_SYSTEM + pid_t tcpgrp = tcgetpgrp (STDOUT_FILENO); + if (0 <= tcpgrp) + { + pid_t pgrp = getpgrp (); + return tcpgrp == pgrp ? pgrp : -pgrp; + } +#endif + return 0; +} + +#ifdef SOCKETS_IN_FILE_SYSTEM -/* Three possibilities: - 2 - can't be `stat'ed (sets errno) - 1 - isn't owned by us +/* Return the file status of NAME, ordinarily a socket. + It should be owned by UID. Return one of the following: + >0 - 'stat' failed with this errno value + -1 - isn't owned by us 0 - success: none of the above */ static int -socket_status (const char *name) +socket_status (const char *name, uid_t uid) { struct stat statbfr; - if (stat (name, &statbfr) == -1) - return 2; + if (stat (name, &statbfr) != 0) + return errno; - if (statbfr.st_uid != geteuid ()) - return 1; + if (statbfr.st_uid != uid) + return -1; return 0; } -/* A signal handler that passes the signal to the Emacs process. - Useful for SIGWINCH. */ - +/* Signal handlers merely set a flag, to avoid race conditions on + POSIXish systems. Non-POSIX platforms lacking sigaction make do + with traditional calls to 'signal'; races are rare so this usually + works. Although this approach may treat multiple deliveries of SIG + as a single delivery and may act on signals in a different order + than received, that is OK for emacsclient. Also, this approach may + omit output if a printf call is interrupted by a signal, but printf + output is not that important (emacsclient does not check for printf + errors, after all) so this is also OK for emacsclient. */ + +/* Reinstall for SIG the signal handler HANDLER if needed. It is + needed on a non-POSIX or traditional platform where an interrupt + resets the signal handler to SIG_DFL. */ static void -pass_signal_to_emacs (int signalnum) +reinstall_handler_if_needed (int sig, void (*handler) (int)) { - int old_errno = errno; +# ifndef SA_RESETHAND + /* This is a platform without POSIX's sigaction. */ + signal (sig, handler); +# endif +} + +/* Flags for each signal, and handlers that set the flags. */ - if (emacs_pid) - kill (emacs_pid, signalnum); +static sig_atomic_t volatile + got_sigcont, got_sigtstp, got_sigttou, got_sigwinch; - signal (signalnum, pass_signal_to_emacs); - errno = old_errno; +static void +handle_sigcont (int sig) +{ + got_sigcont = 1; + reinstall_handler_if_needed (sig, handle_sigcont); +} +static void +handle_sigtstp (int sig) +{ + got_sigtstp = 1; + reinstall_handler_if_needed (sig, handle_sigtstp); +} +static void +handle_sigttou (int sig) +{ + got_sigttou = 1; + reinstall_handler_if_needed (sig, handle_sigttou); +} +static void +handle_sigwinch (int sig) +{ + got_sigwinch = 1; + reinstall_handler_if_needed (sig, handle_sigwinch); } -/* Signal handler for SIGCONT; notify the Emacs process that it can - now resume our tty frame. */ +/* Install for signal SIG the handler HANDLER. However, if FLAG is + non-null and if the signal is currently being ignored, do not + install the handler and keep *FLAG zero. */ static void -handle_sigcont (int signalnum) +install_handler (int sig, void (*handler) (int), sig_atomic_t volatile *flag) { - int old_errno = errno; - pid_t pgrp = getpgrp (); - pid_t tcpgrp = tcgetpgrp (1); - - if (tcpgrp == pgrp) +# ifdef SA_RESETHAND + if (flag) { - /* We are in the foreground. */ - send_to_emacs (emacs_socket, "-resume \n"); + struct sigaction oact; + if (sigaction (sig, NULL, &oact) == 0 && oact.sa_handler == SIG_IGN) + return; } - else if (0 <= tcpgrp && tty) + struct sigaction act = { .sa_handler = handler }; + sigemptyset (&act.sa_mask); + sigaction (sig, &act, NULL); +# else + void (*ohandler) (int) = signal (sig, handler); + if (flag) { - /* We are in the background; cancel the continue. */ - kill (-pgrp, SIGTTIN); + if (ohandler == SIG_IGN) + { + signal (sig, SIG_IGN); + /* While HANDLER was mistakenly installed a signal may have + arrived and set *FLAG, so clear *FLAG now. */ + *flag = 0; + } } - - signal (signalnum, handle_sigcont); - errno = old_errno; +# endif } -/* Signal handler for SIGTSTP; notify the Emacs process that we are - going to sleep. Normally the suspend is initiated by Emacs via - server-handle-suspend-tty, but if the server gets out of sync with - reality, we may get a SIGTSTP on C-z. Handling this signal and - notifying Emacs about it should get things under control again. */ +/* Initial installation of signal handlers. */ static void -handle_sigtstp (int signalnum) +init_signals (void) { - int old_errno = errno; - sigset_t set; - - if (emacs_socket) - send_to_emacs (emacs_socket, "-suspend \n"); - - /* Unblock this signal and call the default handler by temporarily - changing the handler and resignaling. */ - sigprocmask (SIG_BLOCK, NULL, &set); - sigdelset (&set, signalnum); - signal (signalnum, SIG_DFL); - raise (signalnum); - sigprocmask (SIG_SETMASK, &set, NULL); /* Let's the above signal through. */ - signal (signalnum, handle_sigtstp); - - errno = old_errno; + install_handler (SIGCONT, handle_sigcont, &got_sigcont); + install_handler (SIGTSTP, handle_sigtstp, &got_sigtstp); + install_handler (SIGTTOU, handle_sigttou, &got_sigttou); + install_handler (SIGWINCH, handle_sigwinch, &got_sigwinch); + /* Don't mess with SIGINT and SIGQUIT, as Emacs has no way to + determine which terminal the signal came from. C-g is a normal + input event on secondary terminals. */ } +/* Act on delivered tty-related signal SIG that normally has handler + HANDLER. EMACS_SOCKET connects to Emacs. */ -/* Set up signal handlers before opening a frame on the current tty. */ +static void +act_on_tty_signal (int sig, void (*handler) (int), HSOCKET emacs_socket) +{ + /* Notify Emacs that we are going to sleep. Normally the suspend is + initiated by Emacs via server-handle-suspend-tty, but if the + server gets out of sync with reality, we may get a SIGTSTP on + C-z. Handling this signal and notifying Emacs about it should + get things under control again. */ + send_to_emacs (emacs_socket, "-suspend \n"); + + /* Execute the default action by temporarily changing handling to + the default and resignaling. */ + install_handler (sig, SIG_DFL, NULL); + raise (sig); + install_handler (sig, handler, NULL); +} + +/* Act on delivered signals if possible. If EMACS_SOCKET is valid, + use it to communicate to Emacs. */ static void -init_signals (void) +act_on_signals (HSOCKET emacs_socket) { - /* Set up signal handlers. */ - signal (SIGWINCH, pass_signal_to_emacs); - - /* Don't pass SIGINT and SIGQUIT to Emacs, because it has no way of - deciding which terminal the signal came from. C-g is now a - normal input event on secondary terminals. */ -#if 0 - signal (SIGINT, pass_signal_to_emacs); - signal (SIGQUIT, pass_signal_to_emacs); -#endif + while (true) + { + bool took_action = false; + + if (emacs_socket != INVALID_SOCKET) + { + if (got_sigcont) + { + got_sigcont = 0; + took_action = true; + pid_t grouping = process_grouping (); + if (grouping < 0) + { + if (tty) + { + /* Cancel the continue. */ + kill (grouping, SIGTTIN); + } + } + else + send_to_emacs (emacs_socket, "-resume \n"); + } + + if (got_sigtstp) + { + got_sigtstp = 0; + took_action = true; + act_on_tty_signal (SIGTSTP, handle_sigtstp, emacs_socket); + } + if (got_sigttou) + { + got_sigttou = 0; + took_action = true; + act_on_tty_signal (SIGTTOU, handle_sigttou, emacs_socket); + } + } - signal (SIGCONT, handle_sigcont); - signal (SIGTSTP, handle_sigtstp); - signal (SIGTTOU, handle_sigtstp); + if (emacs_pid && got_sigwinch) + { + got_sigwinch = 0; + took_action = true; + kill (emacs_pid, SIGWINCH); + } + + if (!took_action) + break; + } +} + +/* Create in SOCKNAME (of size SOCKNAMESIZE) a name for a local socket. + The first TMPDIRLEN bytes of SOCKNAME are already initialized to be + the name of a temporary directory. Use UID and SERVER_NAME to + concoct the name. Return the total length of the name if successful, + -1 if it does not fit (and store a truncated name in that case). + Fail if TMPDIRLEN is out of range. */ + +static int +local_sockname (char *sockname, int socknamesize, int tmpdirlen, + uintmax_t uid, char const *server_name) +{ + /* If ! (0 <= TMPDIRLEN && TMPDIRLEN < SOCKNAMESIZE) the truncated + temporary directory name is already in SOCKNAME, so nothing more + need be stored. */ + if (0 <= tmpdirlen) + { + int remaining = socknamesize - tmpdirlen; + if (0 < remaining) + { + int suffixlen = snprintf (&sockname[tmpdirlen], remaining, + "/emacs%"PRIuMAX"/%s", uid, server_name); + if (0 <= suffixlen && suffixlen < remaining) + return tmpdirlen + suffixlen; + } + } + return -1; } +/* Create a local socket for SERVER_NAME and connect it to Emacs. If + SERVER_NAME is a file name component, the local socket name + relative to a well-known location in a temporary directory. + Otherwise, the local socket name is SERVER_NAME. */ static HSOCKET -set_local_socket (const char *local_socket_name) +set_local_socket (char const *server_name) { - HSOCKET s; - struct sockaddr_un server; + union { + struct sockaddr_un un; + struct sockaddr sa; + } server = {{ .sun_family = AF_UNIX }}; + char *sockname = server.un.sun_path; + enum { socknamesize = sizeof server.un.sun_path }; + int tmpdirlen = -1; + int socknamelen = -1; + uid_t uid = geteuid (); + bool tmpdir_used = false; + + if (strchr (server_name, '/') + || (ISSLASH ('\\') && strchr (server_name, '\\'))) + socknamelen = snprintf (sockname, socknamesize, "%s", server_name); + else + { + /* socket_name is a file name component. */ + char const *xdg_runtime_dir = egetenv ("XDG_RUNTIME_DIR"); + if (xdg_runtime_dir) + socknamelen = snprintf (sockname, socknamesize, "%s/emacs/%s", + xdg_runtime_dir, server_name); + else + { + char const *tmpdir = egetenv ("TMPDIR"); + if (tmpdir) + tmpdirlen = snprintf (sockname, socknamesize, "%s", tmpdir); + else + { +# ifdef DARWIN_OS +# ifndef _CS_DARWIN_USER_TEMP_DIR +# define _CS_DARWIN_USER_TEMP_DIR 65537 +# endif + size_t n = confstr (_CS_DARWIN_USER_TEMP_DIR, + sockname, socknamesize); + if (0 < n && n < (size_t) -1) + tmpdirlen = min (n - 1, socknamesize); +# endif + if (tmpdirlen < 0) + tmpdirlen = snprintf (sockname, socknamesize, "/tmp"); + } + socknamelen = local_sockname (sockname, socknamesize, tmpdirlen, + uid, server_name); + tmpdir_used = true; + } + } - /* Open up an AF_UNIX socket in this person's home directory. */ - if ((s = socket (AF_UNIX, SOCK_STREAM, 0)) < 0) + if (! (0 <= socknamelen && socknamelen < socknamesize)) { - message (true, "%s: socket: %s\n", progname, strerror (errno)); - return INVALID_SOCKET; + message (true, "%s: socket-name %s... too long\n", progname, sockname); + fail (); } - server.sun_family = AF_UNIX; + /* See if the socket exists, and if it's owned by us. */ + int sock_status = socket_status (sockname, uid); + if (sock_status) + { + /* Failing that, see if LOGNAME or USER exist and differ from + our euid. If so, look for a socket based on the UID + associated with the name. This is reminiscent of the logic + that init_editfns uses to set the global Vuser_full_name. */ - { - int sock_status; - int saved_errno; - const char *server_name = local_socket_name; - const char *tmpdir = NULL; - char *tmpdir_storage = NULL; - char *socket_name_storage = NULL; + char const *user_name = egetenv ("LOGNAME"); - if (!strchr (local_socket_name, '/') && !strchr (local_socket_name, '\\')) - { - /* socket_name is a file name component. */ - long uid = geteuid (); - tmpdir = egetenv ("TMPDIR"); - if (!tmpdir) - { -#ifdef DARWIN_OS -#ifndef _CS_DARWIN_USER_TEMP_DIR -#define _CS_DARWIN_USER_TEMP_DIR 65537 -#endif - size_t n = confstr (_CS_DARWIN_USER_TEMP_DIR, NULL, (size_t) 0); - if (n > 0) - { - tmpdir = tmpdir_storage = xmalloc (n); - confstr (_CS_DARWIN_USER_TEMP_DIR, tmpdir_storage, n); - } - else -#endif - tmpdir = "/tmp"; - } - socket_name_storage = - xmalloc (strlen (tmpdir) + strlen (server_name) + EXTRA_SPACE); - char *z = stpcpy (socket_name_storage, tmpdir); - z += sprintf (z, "/emacs%ld/", uid); - strcpy (z, server_name); - local_socket_name = socket_name_storage; - } + if (!user_name) + user_name = egetenv ("USER"); - if (strlen (local_socket_name) < sizeof (server.sun_path)) - strcpy (server.sun_path, local_socket_name); - else - { - message (true, "%s: socket-name %s too long\n", - progname, local_socket_name); - fail (); - } + if (user_name) + { + struct passwd *pw = getpwnam (user_name); - /* 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 && tmpdir) - { - /* Failing that, see if LOGNAME or USER exist and differ from - our euid. If so, look for a socket based on the UID - associated with the name. This is reminiscent of the logic - that init_editfns uses to set the global Vuser_full_name. */ - - const char *user_name = egetenv ("LOGNAME"); - - if (!user_name) - user_name = egetenv ("USER"); - - if (user_name) - { - struct passwd *pw = getpwnam (user_name); - - if (pw && (pw->pw_uid != geteuid ())) - { - /* We're running under su, apparently. */ - long uid = pw->pw_uid; - char *user_socket_name - = xmalloc (strlen (tmpdir) + strlen (server_name) - + EXTRA_SPACE); - char *z = stpcpy (user_socket_name, tmpdir); - z += sprintf (z, "/emacs%ld/", uid); - strcpy (z, server_name); - - if (strlen (user_socket_name) < sizeof (server.sun_path)) - strcpy (server.sun_path, user_socket_name); - else - { - message (true, "%s: socket-name %s too long\n", - progname, user_socket_name); - exit (EXIT_FAILURE); - } - free (user_socket_name); - - sock_status = socket_status (server.sun_path); - saved_errno = errno; - } - else - errno = saved_errno; - } - } + if (pw && pw->pw_uid != uid) + { + /* We're running under su, apparently. */ + socknamelen = local_sockname (sockname, socknamesize, tmpdirlen, + pw->pw_uid, server_name); + if (socknamelen < 0) + { + message (true, "%s: socket-name %s... too long\n", + progname, sockname); + exit (EXIT_FAILURE); + } - free (socket_name_storage); - free (tmpdir_storage); + sock_status = socket_status (sockname, uid); + } + } + } - switch (sock_status) - { - case 1: - /* There's a socket, but it isn't owned by us. This is OK if - we are root. */ - if (0 != geteuid ()) - { - message (true, "%s: Invalid socket owner\n", progname); - return INVALID_SOCKET; - } - break; + if (sock_status == 0) + { + HSOCKET s = cloexec_socket (AF_UNIX, SOCK_STREAM, 0); + if (s < 0) + { + message (true, "%s: socket: %s\n", progname, strerror (errno)); + return INVALID_SOCKET; + } + if (connect (s, &server.sa, sizeof server.un) != 0) + { + message (true, "%s: connect: %s\n", progname, strerror (errno)); + CLOSE_SOCKET (s); + return INVALID_SOCKET; + } - case 2: - /* `stat' failed */ - if (saved_errno == ENOENT) - message (true, - "%s: can't find socket; have you started the server?\n\ -To start the server in Emacs, type \"M-x server-start\".\n", - progname); - else - message (true, "%s: can't stat %s: %s\n", - progname, server.sun_path, strerror (saved_errno)); - return INVALID_SOCKET; - } - } + struct stat connect_stat; + if (fstat (s, &connect_stat) != 0) + sock_status = errno; + else if (connect_stat.st_uid == uid) + return s; + else + sock_status = -1; - if (connect (s, (struct sockaddr *) &server, strlen (server.sun_path) + 2) - < 0) + CLOSE_SOCKET (s); + } + + if (sock_status < 0) + message (true, "%s: Invalid socket owner\n", progname); + else if (sock_status == ENOENT) { - message (true, "%s: connect: %s\n", progname, strerror (errno)); - return INVALID_SOCKET; + if (tmpdir_used) + { + uintmax_t id = uid; + char sockdirname[socknamesize]; + int sockdirnamelen = snprintf (sockdirname, sizeof sockdirname, + "/run/user/%"PRIuMAX, id); + if (0 <= sockdirnamelen && sockdirnamelen < sizeof sockdirname + && faccessat (AT_FDCWD, sockdirname, X_OK, AT_EACCESS) == 0) + message + (true, + ("%s: Should XDG_RUNTIME_DIR='%s' be in the environment?\n" + "%s: (Be careful: XDG_RUNTIME_DIR is security-related.)\n"), + progname, sockdirname, progname); + } + message (true, + ("%s: can't find socket; have you started the server?\n" + "%s: To start the server in Emacs," + " type \"M-x server-start\".\n"), + progname, progname); } + else + message (true, "%s: can't stat %s: %s\n", + progname, sockname, strerror (sock_status)); - return s; + return INVALID_SOCKET; } -#endif /* ! NO_SOCKETS_IN_FILE_SYSTEM */ +#endif /* SOCKETS_IN_FILE_SYSTEM */ static HSOCKET -set_socket (int no_exit_if_error) +set_socket (bool no_exit_if_error) { HSOCKET s; const char *local_server_file = server_file; INITIALIZE (); -#ifndef NO_SOCKETS_IN_FILE_SYSTEM - /* Explicit --socket-name argument. */ +#ifdef SOCKETS_IN_FILE_SYSTEM + if (!socket_name) + socket_name = egetenv ("EMACS_SOCKET_NAME"); + if (socket_name) { + /* Explicit --socket-name argument, or environment variable. */ s = set_local_socket (socket_name); - if ((s != INVALID_SOCKET) || no_exit_if_error) + if (s != INVALID_SOCKET || no_exit_if_error) return s; message (true, "%s: error accessing socket \"%s\"\n", progname, socket_name); @@ -1424,7 +1535,7 @@ set_socket (int no_exit_if_error) if (local_server_file) { s = set_tcp_socket (local_server_file); - if ((s != INVALID_SOCKET) || no_exit_if_error) + if (s != INVALID_SOCKET || no_exit_if_error) return s; message (true, "%s: error accessing server file \"%s\"\n", @@ -1432,7 +1543,7 @@ set_socket (int no_exit_if_error) exit (EXIT_FAILURE); } -#ifndef NO_SOCKETS_IN_FILE_SYSTEM +#ifdef SOCKETS_IN_FILE_SYSTEM /* Implicit local socket. */ s = set_local_socket ("server"); if (s != INVALID_SOCKET) @@ -1441,12 +1552,12 @@ set_socket (int no_exit_if_error) /* Implicit server file. */ s = set_tcp_socket ("server"); - if ((s != INVALID_SOCKET) || no_exit_if_error) + if (s != INVALID_SOCKET || no_exit_if_error) return s; /* No implicit or explicit socket, and no alternate editor. */ message (true, "%s: No socket or alternate editor. Please use:\n\n" -#ifndef NO_SOCKETS_IN_FILE_SYSTEM +#ifdef SOCKETS_IN_FILE_SYSTEM "\t--socket-name\n" #endif "\t--server-file (or environment variable EMACS_SERVER_FILE)\n\ @@ -1543,7 +1654,7 @@ w32_give_focus (void) /* Start the emacs daemon and try to connect to it. */ -static void +static HSOCKET start_daemon_and_retry_set_socket (void) { #ifndef WINDOWSNT @@ -1554,22 +1665,17 @@ start_daemon_and_retry_set_socket (void) if (dpid > 0) { - pid_t w; - w = waitpid (dpid, &status, WUNTRACED | WCONTINUED); + pid_t w = waitpid (dpid, &status, WUNTRACED | WCONTINUED); - if ((w == -1) || !WIFEXITED (status) || WEXITSTATUS (status)) + if (w < 0 || !WIFEXITED (status) || WEXITSTATUS (status)) { message (true, "Error: Could not start the Emacs daemon\n"); exit (EXIT_FAILURE); } /* Try connecting, the daemon should have started by now. */ - message (true, "Emacs daemon should have started, trying to connect again\n"); - if ((emacs_socket = set_socket (1)) == INVALID_SOCKET) - { - message (true, "Error: Cannot connect even after starting the Emacs daemon\n"); - exit (EXIT_FAILURE); - } + message (true, + "Emacs daemon should have started, trying to connect again\n"); } else if (dpid < 0) { @@ -1584,6 +1690,7 @@ start_daemon_and_retry_set_socket (void) d_argv[0] = emacs; d_argv[1] = daemon_option; d_argv[2] = 0; +# ifdef SOCKETS_IN_FILE_SYSTEM if (socket_name != NULL) { /* Pass --daemon=socket_name as argument. */ @@ -1593,8 +1700,10 @@ start_daemon_and_retry_set_socket (void) strcpy (stpcpy (daemon_arg, deq), socket_name); d_argv[1] = daemon_arg; } +# endif execvp ("emacs", d_argv); message (true, "%s: error starting emacs daemon\n", progname); + exit (EXIT_FAILURE); } #else /* WINDOWSNT */ DWORD wait_result; @@ -1660,27 +1769,29 @@ start_daemon_and_retry_set_socket (void) if (!w32_window_app ()) message (true, "Emacs daemon should have started, trying to connect again\n"); - if ((emacs_socket = set_socket (1)) == INVALID_SOCKET) +#endif /* WINDOWSNT */ + + HSOCKET emacs_socket = set_socket (true); + if (emacs_socket == INVALID_SOCKET) { message (true, "Error: Cannot connect even after starting the Emacs daemon\n"); exit (EXIT_FAILURE); } -#endif /* WINDOWSNT */ + return emacs_socket; } int main (int argc, char **argv) { - int rl = 0, needlf = 0; - char *cwd, *str; - char string[BUFSIZ+1]; - int start_daemon_if_needed; - int exit_status = EXIT_SUCCESS; - main_argc = argc; main_argv = argv; - progname = argv[0]; + progname = argv[0] ? argv[0] : "emacsclient"; + + int rl = 0; + bool skiplf = true; + char string[BUFSIZ + 1]; + int exit_status = EXIT_SUCCESS; #ifdef HAVE_NTGUI /* On Windows 7 and later, we need to explicitly associate @@ -1688,44 +1799,43 @@ main (int argc, char **argv) association does no harm if we're not actually connecting to an Emacs using a window display. */ w32_set_user_model_id (); -#endif /* HAVE_NTGUI */ +#endif /* Process options. */ decode_options (argc, argv); - if ((argc - optind < 1) && !eval && current_frame) + if (! (optind < argc || eval || create_frame)) { - message (true, "%s: file name or argument required\n" - "Try '%s --help' for more information\n", + message (true, ("%s: file name or argument required\n" + "Try '%s --help' for more information\n"), progname, progname); exit (EXIT_FAILURE); } -#ifndef WINDOWSNT +#ifdef SOCKETS_IN_FILE_SYSTEM if (tty) { - pid_t pgrp = getpgrp (); - pid_t tcpgrp = tcgetpgrp (1); - if (0 <= tcpgrp && tcpgrp != pgrp) - kill (-pgrp, SIGTTIN); + pid_t grouping = process_grouping (); + if (grouping < 0) + kill (grouping, SIGTTIN); } -#endif /* !WINDOWSNT */ +#endif /* If alternate_editor is the empty string, start the emacs daemon in case of failure to connect. */ - start_daemon_if_needed = (alternate_editor - && (alternate_editor[0] == '\0')); + bool start_daemon_if_needed = alternate_editor && !alternate_editor[0]; - emacs_socket = set_socket (alternate_editor || start_daemon_if_needed); + HSOCKET emacs_socket = set_socket (alternate_editor + || start_daemon_if_needed); if (emacs_socket == INVALID_SOCKET) { if (! start_daemon_if_needed) fail (); - start_daemon_and_retry_set_socket (); + emacs_socket = start_daemon_and_retry_set_socket (); } - cwd = get_current_dir_name (); + char *cwd = get_current_dir_name (); if (cwd == 0) { message (true, "%s: %s\n", progname, @@ -1736,16 +1846,15 @@ main (int argc, char **argv) #ifdef HAVE_NTGUI if (display && !strcmp (display, "w32")) w32_give_focus (); -#endif /* HAVE_NTGUI */ +#endif /* Send over our environment and current directory. */ - if (!current_frame) + if (create_frame) { - int i; - for (i = 0; environ[i]; i++) + for (char *const *e = environ; *e; e++) { send_to_emacs (emacs_socket, "-env "); - quote_argument (emacs_socket, environ[i]); + quote_argument (emacs_socket, *e); send_to_emacs (emacs_socket, " "); } } @@ -1761,7 +1870,7 @@ main (int argc, char **argv) if (nowait) send_to_emacs (emacs_socket, "-nowait "); - if (current_frame) + if (!create_frame) send_to_emacs (emacs_socket, "-current-frame "); if (display) @@ -1778,7 +1887,7 @@ main (int argc, char **argv) send_to_emacs (emacs_socket, " "); } - if (frame_parameters && !current_frame) + if (frame_parameters && create_frame) { send_to_emacs (emacs_socket, "-frame-parameters "); quote_argument (emacs_socket, frame_parameters); @@ -1788,15 +1897,16 @@ main (int argc, char **argv) /* Unless we are certain we don't want to occupy the tty, send our tty information to Emacs. For example, in daemon mode Emacs may need to occupy this tty if no other frame is available. */ - if (!current_frame || !eval) + if (create_frame || !eval) { const char *tty_type, *tty_name; if (find_tty (&tty_type, &tty_name, !tty)) { -#if !defined (NO_SOCKETS_IN_FILE_SYSTEM) + /* Install signal handlers before opening a frame on the + current tty. */ init_signals (); -#endif + send_to_emacs (emacs_socket, "-tty "); quote_argument (emacs_socket, tty_name); send_to_emacs (emacs_socket, " "); @@ -1805,13 +1915,12 @@ main (int argc, char **argv) } } - if (!current_frame && !tty) + if (create_frame && !tty) send_to_emacs (emacs_socket, "-window-system "); - if ((argc - optind > 0)) + if (optind < argc) { - int i; - for (i = optind; i < argc; i++) + for (int i = optind; i < argc; i++) { if (eval) @@ -1823,11 +1932,15 @@ main (int argc, char **argv) continue; } - if (*argv[i] == '+') + char *p = argv[i]; + if (*p == '+') { - char *p = argv[i] + 1; - while (isdigit ((unsigned char) *p) || *p == ':') p++; - if (*p == 0) + unsigned char c; + do + c = *++p; + while (isdigit (c) || c == ':'); + + if (c == 0) { send_to_emacs (emacs_socket, "-position "); quote_argument (emacs_socket, argv[i]); @@ -1836,7 +1949,7 @@ main (int argc, char **argv) } } #ifdef WINDOWSNT - else if (! file_name_absolute_p (argv[i]) + else if (! IS_ABSOLUTE_FILE_NAME (argv[i]) && (isalpha (argv[i][0]) && argv[i][1] == ':')) /* Windows can have a different default directory for each drive, so the cwd passed via "-dir" is not sufficient @@ -1845,7 +1958,7 @@ main (int argc, char **argv) careful to expand <relpath> with the default directory corresponding to <drive>. */ { - char *filename = (char *) xmalloc (MAX_PATH); + char *filename = xmalloc (MAX_PATH); DWORD size; size = GetFullPathName (argv[i], MAX_PATH, filename, NULL); @@ -1857,7 +1970,7 @@ main (int argc, char **argv) #endif send_to_emacs (emacs_socket, "-file "); - if (tramp_prefix && file_name_absolute_p (argv[i])) + if (tramp_prefix && IS_ABSOLUTE_FILE_NAME (argv[i])) quote_argument (emacs_socket, tramp_prefix); quote_argument (emacs_socket, argv[i]); send_to_emacs (emacs_socket, " "); @@ -1866,10 +1979,10 @@ main (int argc, char **argv) else if (eval) { /* Read expressions interactively. */ - while ((str = fgets (string, BUFSIZ, stdin))) + while (fgets (string, BUFSIZ, stdin)) { send_to_emacs (emacs_socket, "-eval "); - quote_argument (emacs_socket, str); + quote_argument (emacs_socket, string); } send_to_emacs (emacs_socket, " "); } @@ -1877,26 +1990,21 @@ main (int argc, char **argv) send_to_emacs (emacs_socket, "\n"); /* Wait for an answer. */ - if (!eval && !tty && !nowait && !quiet) + if (!eval && !tty && !nowait && !quiet && 0 <= process_grouping ()) { printf ("Waiting for Emacs..."); - needlf = 2; + skiplf = false; } fflush (stdout); - while (fdatasync (1) != 0 && errno == EINTR) - continue; /* Now, wait for an answer and print any messages. */ while (exit_status == EXIT_SUCCESS) { - char *p, *end_p; do - { - errno = 0; - rl = recv (emacs_socket, string, BUFSIZ, 0); - } - /* If we receive a signal (e.g. SIGWINCH, which we pass - through to Emacs), on some OSes we get EINTR and must retry. */ + { + act_on_signals (emacs_socket); + rl = recv (emacs_socket, string, BUFSIZ, 0); + } while (rl < 0 && errno == EINTR); if (rl <= 0) @@ -1905,7 +2013,8 @@ main (int argc, char **argv) string[rl] = '\0'; /* Loop over all NL-terminated messages. */ - for (end_p = p = string; end_p != NULL && *end_p != '\0'; p = end_p) + char *p = string; + for (char *end_p = p; end_p && *end_p != '\0'; p = end_p) { end_p = strchr (p, '\n'); if (end_p != NULL) @@ -1914,7 +2023,7 @@ main (int argc, char **argv) if (strprefix ("-emacs-pid ", p)) { /* -emacs-pid PID: The process id of the Emacs process. */ - emacs_pid = strtol (p + strlen ("-emacs-pid"), NULL, 10); + emacs_pid = strtoumax (p + strlen ("-emacs-pid"), NULL, 10); } else if (strprefix ("-window-system-unsupported ", p)) { @@ -1928,8 +2037,8 @@ main (int argc, char **argv) } else { - nowait = 0; - tty = 1; + nowait = false; + tty = true; } goto retry; @@ -1939,11 +2048,10 @@ main (int argc, char **argv) /* -print STRING: Print STRING on the terminal. */ if (!suppress_output) { - str = unquote_argument (p + strlen ("-print ")); - if (needlf) - printf ("\n"); - printf ("%s", str); - needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n'; + char *str = unquote_argument (p + strlen ("-print ")); + printf (&"\n%s"[skiplf], str); + if (str[0]) + skiplf = str[strlen (str) - 1] == '\n'; } } else if (strprefix ("-print-nonl ", p)) @@ -1952,47 +2060,44 @@ main (int argc, char **argv) Used to continue a preceding -print command. */ if (!suppress_output) { - str = unquote_argument (p + strlen ("-print-nonl ")); + char *str = unquote_argument (p + strlen ("-print-nonl ")); printf ("%s", str); - needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n'; + if (str[0]) + skiplf = str[strlen (str) - 1] == '\n'; } } else if (strprefix ("-error ", p)) { /* -error DESCRIPTION: Signal an error on the terminal. */ - str = unquote_argument (p + strlen ("-error ")); - if (needlf) + char *str = unquote_argument (p + strlen ("-error ")); + if (!skiplf) printf ("\n"); fprintf (stderr, "*ERROR*: %s", str); - needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n'; + if (str[0]) + skiplf = str[strlen (str) - 1] == '\n'; exit_status = EXIT_FAILURE; } -#ifdef SIGSTOP +#ifndef WINDOWSNT else if (strprefix ("-suspend ", p)) { /* -suspend: Suspend this terminal, i.e., stop the process. */ - if (needlf) + if (!skiplf) printf ("\n"); - needlf = 0; + skiplf = true; kill (0, SIGSTOP); } #endif else { /* Unknown command. */ - if (needlf) - printf ("\n"); - needlf = 0; - printf ("*ERROR*: Unknown message: %s\n", p); + printf (&"\n*ERROR*: Unknown message: %s\n"[skiplf], p); + skiplf = true; } } } - if (needlf) + if (!skiplf && 0 <= process_grouping ()) printf ("\n"); - fflush (stdout); - while (fdatasync (1) != 0 && errno == EINTR) - continue; if (rl < 0) exit_status = EXIT_FAILURE; @@ -2000,5 +2105,3 @@ main (int argc, char **argv) CLOSE_SOCKET (emacs_socket); return exit_status; } - -#endif /* HAVE_SOCKETS && HAVE_INET_SOCKETS */ |