X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/f6271f1b584e5e3dcc9e29650575b802ae879b06..caf49fb0438e9493456b59cf9eab845e0e568e2a:/lib-src/emacsclient.c diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index b6d33c9c2c..8e8cb9b379 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -1,6 +1,6 @@ /* Client process that communicates with GNU Emacs acting as server. Copyright (C) 1986, 1987, 1994, 1999, 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006, 2007 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -26,24 +26,80 @@ Boston, MA 02110-1301, USA. */ #include #endif +#ifdef WINDOWSNT + +/* config.h defines these, which disables sockets altogether! */ +# undef _WINSOCKAPI_ +# undef _WINSOCK_H + +# include +# include +# include + +# define NO_SOCKETS_IN_FILE_SYSTEM + +# define HSOCKET SOCKET +# define CLOSE_SOCKET closesocket +# define INITIALIZE() (initialize_sockets ()) + +#else /* !WINDOWSNT */ + +# include + +# ifdef HAVE_INET_SOCKETS +# include +# endif + +# define INVALID_SOCKET -1 +# define HSOCKET int +# define CLOSE_SOCKET close +# define INITIALIZE() + +#endif /* !WINDOWSNT */ + #undef signal +#include #include #include -#include +#include "getopt.h" #ifdef HAVE_UNISTD_H #include #endif #ifdef VMS # include "vms-pwd.h" -#else +#else /* not VMS */ +#ifdef WINDOWSNT +# include +#else /* not WINDOWSNT */ # include +#endif /* not WINDOWSNT */ #endif /* not VMS */ +#include #include #include +/* From lisp.h */ +#ifndef DIRECTORY_SEP +#define DIRECTORY_SEP '/' +#endif +#ifndef IS_DIRECTORY_SEP +#define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP) +#endif +#ifndef IS_DEVICE_SEP +#ifndef DEVICE_SEP +#define IS_DEVICE_SEP(_c_) 0 +#else +#define IS_DEVICE_SEP(_c_) ((_c_) == DEVICE_SEP) +#endif +#endif +#ifndef IS_ANY_SEP +#define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_)) +#endif + + char *getenv (), *getwd (); char *(getcwd) (); @@ -52,6 +108,27 @@ char *(getcwd) (); #define VERSION "unspecified" #endif + +#ifndef EXIT_SUCCESS +#define EXIT_SUCCESS 0 +#endif + +#ifndef EXIT_FAILURE +#define EXIT_FAILURE 1 +#endif + +#ifndef FALSE +#define FALSE 0 +#endif + +#ifndef TRUE +#define TRUE 1 +#endif + +#ifndef NO_RETURN +#define NO_RETURN +#endif + /* Name used to invoke this program. */ char *progname; @@ -81,12 +158,18 @@ int tty = 0; /* If non-NULL, the name of an editor to fallback to if the server is not running. --alternate-editor. */ -const char * alternate_editor = NULL; +const char *alternate_editor = NULL; /* If non-NULL, the filename of the UNIX socket. */ char *socket_name = NULL; -void print_help_and_exit (); +/* If non-NULL, the filename of the authentication file. */ +char *server_file = NULL; + +/* PID of the Emacs server process. */ +int emacs_pid = 0; + +void print_help_and_exit () NO_RETURN; struct option longopts[] = { @@ -97,11 +180,199 @@ struct option longopts[] = { "tty", no_argument, NULL, 't' }, { "current-frame", no_argument, NULL, 'c' }, { "alternate-editor", required_argument, NULL, 'a' }, +#ifndef NO_SOCKETS_IN_FILE_SYSTEM { "socket-name", required_argument, NULL, 's' }, +#endif + { "server-file", required_argument, NULL, 'f' }, { "display", required_argument, NULL, 'd' }, { 0, 0, 0, 0 } }; + +/* Like malloc but get fatal error if memory is exhausted. */ + +long * +xmalloc (size) + unsigned int size; +{ + long *result = (long *) malloc (size); + if (result == NULL) + { + perror ("malloc"); + exit (EXIT_FAILURE); + } + return result; +} + +/* Like strdup but get a fatal error if memory is exhausted. */ + +char * +xstrdup (const char *s) +{ + char *result = strdup (s); + if (result == NULL) + { + perror ("strdup"); + exit (EXIT_FAILURE); + } + return result; +} + +/* From sysdep.c */ +#if !defined (HAVE_GET_CURRENT_DIR_NAME) || defined (BROKEN_GET_CURRENT_DIR_NAME) + +/* Return the current working directory. Returns NULL on errors. + Any other returned value must be freed with free. This is used + only when get_current_dir_name is not defined on the system. */ +char* +get_current_dir_name () +{ + char *buf; + char *pwd; + struct stat dotstat, pwdstat; + /* If PWD is accurate, use it instead of calling getwd. 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 = getenv ("PWD")) != 0 + && (IS_DIRECTORY_SEP (*pwd) || (*pwd && IS_DEVICE_SEP (pwd[1]))) + && 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 + ) + { + buf = (char *) xmalloc (strlen (pwd) + 1); + if (!buf) + return NULL; + strcpy (buf, pwd); + } +#ifdef HAVE_GETCWD + else + { + size_t buf_size = 1024; + buf = (char *) xmalloc (buf_size); + if (!buf) + return NULL; + for (;;) + { + if (getcwd (buf, buf_size) == buf) + break; + if (errno != ERANGE) + { + int tmp_errno = errno; + free (buf); + errno = tmp_errno; + return NULL; + } + buf_size *= 2; + buf = (char *) realloc (buf, buf_size); + if (!buf) + return NULL; + } + } +#else + else + { + /* We need MAXPATHLEN here. */ + buf = (char *) xmalloc (MAXPATHLEN + 1); + if (!buf) + return NULL; + if (getwd (buf) == NULL) + { + int tmp_errno = errno; + free (buf); + errno = tmp_errno; + return NULL; + } + } +#endif + return buf; +} +#endif + +/* Message functions. */ + +#ifdef WINDOWSNT +int +w32_window_app () +{ + static int window_app = -1; + char szTitle[MAX_PATH]; + + if (window_app < 0) + /* Checking for STDOUT does not work; it's a valid handle also in + nonconsole apps. Testing for the console title seems to work. */ + window_app = (GetConsoleTitleA (szTitle, MAX_PATH) == 0); + + return window_app; +} + +/* + execvp wrapper for Windows. Quotes arguments with embedded spaces. + + This is necessary due to the broken implementation of exec* routines in + the Microsoft libraries: they concatenate the arguments together without + quoting special characters, and pass the result to CreateProcess, with + predictably bad results. By contrast, Posix execvp passes the arguments + directly into the argv array of the child process. +*/ +int +w32_execvp (path, argv) + char *path; + char **argv; +{ + int i; + + /* Required to allow a .BAT script as alternate editor. */ + argv[0] = (char *) alternate_editor; + + for (i = 0; argv[i]; i++) + if (strchr (argv[i], ' ')) + { + char *quoted = alloca (strlen (argv[i]) + 3); + sprintf (quoted, "\"%s\"", argv[i]); + argv[i] = quoted; + } + + return execvp (path, argv); +} + +#undef execvp +#define execvp w32_execvp + +#endif /* WINDOWSNT */ + +void +message (int is_error, char *message, ...) +{ + char msg [2048]; + va_list args; + + va_start (args, message); + vsprintf (msg, message, args); + va_end (args); + +#ifdef WINDOWSNT + if (w32_window_app ()) + { + if (is_error) + MessageBox (NULL, msg, "Emacsclient ERROR", MB_ICONERROR); + else + MessageBox (NULL, msg, "Emacsclient", MB_ICONINFORMATION); + } + else +#endif + { + FILE *f = is_error ? stderr : stdout; + + fputs (msg, f); + fflush (f); + } +} + /* Decode the options from argv and argc. The global variable `optind' will say how many arguments we used up. */ @@ -118,7 +389,12 @@ decode_options (argc, argv) while (1) { int opt = getopt_long (argc, argv, - "VHnea:s:d:tc", longopts, 0); +#ifndef NO_SOCKETS_IN_FILE_SYSTEM + "VHnea:s:f:d:tc", +#else + "VHnea:f:d:tc", +#endif + longopts, 0); if (opt == EOF) break; @@ -134,9 +410,15 @@ decode_options (argc, argv) alternate_editor = optarg; break; +#ifndef NO_SOCKETS_IN_FILE_SYSTEM case 's': socket_name = optarg; break; +#endif + + case 'f': + server_file = optarg; + break; case 'd': display = optarg; @@ -151,7 +433,7 @@ decode_options (argc, argv) break; case 'V': - printf ("emacsclient %s\n", VERSION); + message (FALSE, "emacsclient %s\n", VERSION); exit (EXIT_SUCCESS); break; @@ -168,7 +450,7 @@ decode_options (argc, argv) break; default: - fprintf (stderr, "Try `%s --help' for more information\n", progname); + message (TRUE, "Try `%s --help' for more information\n", progname); exit (EXIT_FAILURE); break; } @@ -176,9 +458,11 @@ decode_options (argc, argv) if (!tty && display) window_system = 1; +#if !defined (WINDOWSNT) && !defined (HAVE_CARBON) else tty = 1; - +#endif + /* --no-wait implies --current-frame on ttys when there are file arguments or expressions given. */ if (nowait && tty && argc - optind > 0) @@ -194,24 +478,29 @@ decode_options (argc, argv) window_system = 0; } + void print_help_and_exit () { - printf ( - "Usage: %s [OPTIONS] FILE...\n\ + message (FALSE, + "Usage: %s [OPTIONS] FILE...\n\ Tell the Emacs server to visit the specified files.\n\ Every FILE can be either just a FILENAME or [+LINE[:COLUMN]] FILENAME.\n\ \n\ The following OPTIONS are accepted:\n\ --V, --version Just print a version info and return\n\ +-V, --version Just print version info and return\n\ -H, --help Print this usage information message\n\ -t, --tty Open a new Emacs frame on the current terminal\n\ -c, --current-frame Do not create a new frame; use the current Emacs frame\n\ --n, --no-wait Don't wait for the server to return\n\ -e, --eval Evaluate the FILE arguments as ELisp expressions\n\ --d, --display=DISPLAY Visit the file in the given display\n\ --s, --socket-name=FILENAME\n\ - Set the filename of the UNIX socket for communication\n\ +-n, --no-wait Don't wait for the server to return\n\ +-d, --display=DISPLAY Visit the file in the given display\n" +#ifndef NO_SOCKETS_IN_FILE_SYSTEM +"-s, --socket-name=FILENAME\n\ + Set filename of the UNIX socket for communication\n" +#endif +"-f, --server-file=FILENAME\n\ + Set filename of the TCP authentication file\n\ -a, --alternate-editor=EDITOR\n\ Editor to fallback to if the server is not running\n\ \n\ @@ -219,45 +508,114 @@ Report bugs to bug-gnu-emacs@gnu.org.\n", progname); exit (EXIT_SUCCESS); } -/* Like malloc but get fatal error if memory is exhausted. */ - -long * -xmalloc (size) - unsigned int size; +/* + Try to run a different command, or --if no alternate editor is + defined-- exit with an errorcode. +*/ +void +fail (void) { - long *result = (long *) malloc (size); - if (result == NULL) + if (alternate_editor) { - perror ("malloc"); - exit (EXIT_FAILURE); + int i = optind - 1; + + execvp (alternate_editor, main_argv + i); + message (TRUE, "%s: error executing alternate editor \"%s\"\n", + progname, alternate_editor); } - return result; + exit (EXIT_FAILURE); } -/* Like strdup but get a fatal error if memory is exhausted. */ + +#if !defined (HAVE_SOCKETS) || !defined (HAVE_INET_SOCKETS) -char * -xstrdup (const char *s) +int +main (argc, argv) + int argc; + char **argv; { - char *result = strdup (s); - if (result == NULL) + 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 */ + +#ifdef WINDOWSNT +# include +#else +# include +# include +# include +# include +# include +#endif + +#define AUTH_KEY_LENGTH 64 +#define SEND_BUFFER_SIZE 4096 + +extern char *strerror (); +extern int errno; + +/* 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; + +/* Let's send the data to Emacs when either + - the data ends in "\n", or + - the buffer is full (but this shouldn't happen) + Otherwise, we just accumulate it. */ +void +send_to_emacs (s, data) + HSOCKET s; + char *data; +{ + while (data) { - perror ("strdup"); - exit (EXIT_FAILURE); + int dlen = strlen (data); + if (dlen + sblen >= SEND_BUFFER_SIZE) + { + int part = SEND_BUFFER_SIZE - sblen; + strncpy (&send_buffer[sblen], data, part); + data += part; + sblen = SEND_BUFFER_SIZE; + } + else if (dlen) + { + strcpy (&send_buffer[sblen], data); + data = NULL; + sblen += dlen; + } + else + break; + + if (sblen == SEND_BUFFER_SIZE + || (sblen > 0 && send_buffer[sblen-1] == '\n')) + { + int sent = send (s, send_buffer, sblen, 0); + if (sent != sblen) + strcpy (send_buffer, &send_buffer[sent]); + sblen -= sent; + } } - return result; } + /* In STR, insert a & before each &, each space, each newline, and any initial -. Change spaces to underscores, too, so that the return value never contains a space. Does not change the string. Outputs the result to STREAM. */ - void -quote_argument (str, stream) +quote_argument (s, str) + HSOCKET s; char *str; - FILE *stream; { char *copy = (char *) xmalloc (strlen (str) * 2 + 1); char *p, *q; @@ -287,7 +645,7 @@ quote_argument (str, stream) } *q++ = 0; - fprintf (stream, "%s", copy); + send_to_emacs (s, copy); free (copy); } @@ -328,31 +686,247 @@ unquote_argument (str) } -/* - Try to run a different command, or --if no alternate editor is - defined-- exit with an errorcode. -*/ +int +file_name_absolute_p (filename) + const unsigned 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 (filename[0]) + && filename[1] == ':' && (filename[2] == '\\' || filename[2] == '/')) + return TRUE; + + /* Both \xxx and \\xxx\yyy are absolute. */ + if (filename[0] == '\\') return TRUE; + + /* + FIXME: There's a corner case not dealt with, "x:y", where: + + 1) x is a valid drive designation (usually a letter in the A-Z range) + and y is a path, relative to the current directory on drive x. This + is absolute, *after* fixing the y part to include the current + directory in x. + + 2) x is a relative file name, and y is an NTFS stream name. This is a + correct relative path, but it is very unusual. + + The trouble is that first case items are also valid examples of the + second case, i.e., "c:test" can be understood as drive:path or as + file:stream. + + The "right" fix would involve checking whether + - the current drive/partition is NTFS, + - x is a valid (and accesible) drive designator, + - x:y already exists as a file:stream in the current directory, + - y already exists on the current directory of drive x, + - the auspices are favorable, + and then taking an "informed decision" based on the above. + + Whatever the result, Emacs currently does a very bad job of dealing + with NTFS file:streams: it cannot visit them, and the only way to + create one is by setting `buffer-file-name' to point to it (either + manually or with emacsclient). So perhaps resorting to 1) and ignoring + 2) for now is the right thing to do. + + Anyway, something to decide After the Release. + */ +#endif + + return FALSE; +} + +#ifdef WINDOWSNT +/* Wrapper to make WSACleanup a cdecl, as required by atexit. */ void -fail (void) +__cdecl close_winsock () { - if (alternate_editor) + WSACleanup (); +} + +/* Initialize the WinSock2 library. */ +void +initialize_sockets () +{ + WSADATA wsaData; + + if (WSAStartup (MAKEWORD (2, 0), &wsaData)) { - int i = optind - 1; - execvp (alternate_editor, main_argv + i); - return; + message (TRUE, "%s: error initializing WinSock2", progname); + exit (EXIT_FAILURE); + } + + atexit (close_winsock); +} +#endif /* WINDOWSNT */ + + +/* + * Read the information needed to set up a TCP comm channel with + * the Emacs server: host, port, pid and authentication string. + */ +int +get_server_config (server, authentication) + struct sockaddr_in *server; + char *authentication; +{ + char dotted[32]; + char *port; + char *pid; + FILE *config = NULL; + + if (file_name_absolute_p (server_file)) + config = fopen (server_file, "rb"); + else + { + char *home = getenv ("HOME"); + + if (home) + { + char *path = alloca (32 + strlen (home) + strlen (server_file)); + sprintf (path, "%s/.emacs.d/server/%s", home, server_file); + config = fopen (path, "rb"); + } +#ifdef WINDOWSNT + if (!config && (home = getenv ("APPDATA"))) + { + char *path = alloca (32 + strlen (home) + strlen (server_file)); + sprintf (path, "%s/.emacs.d/server/%s", home, server_file); + config = fopen (path, "rb"); + } +#endif + } + + if (! config) + return FALSE; + + if (fgets (dotted, sizeof dotted, config) + && (port = strchr (dotted, ':')) + && (pid = strchr (port, ' '))) + { + *port++ = '\0'; + *pid++ = '\0'; } else { + message (TRUE, "%s: invalid configuration info", progname); exit (EXIT_FAILURE); } + + server->sin_family = AF_INET; + server->sin_addr.s_addr = inet_addr (dotted); + server->sin_port = htons (atoi (port)); + + if (! fread (authentication, AUTH_KEY_LENGTH, 1, config)) + { + message (TRUE, "%s: cannot read authentication info", progname); + exit (EXIT_FAILURE); + } + + fclose (config); + + emacs_pid = atoi (pid); + + return TRUE; } -/* The process id of Emacs. */ -int emacs_pid; +HSOCKET +set_tcp_socket () +{ + HSOCKET s; + struct sockaddr_in server; + struct linger l_arg = {1, 1}; + char auth_string[AUTH_KEY_LENGTH + 1]; + + if (! get_server_config (&server, auth_string)) + return INVALID_SOCKET; + + if (server.sin_addr.s_addr != inet_addr ("127.0.0.1")) + message (FALSE, "%s: connected to remote socket at %s\n", + progname, inet_ntoa (server.sin_addr)); + + /* + * Open up an AF_INET socket + */ + if ((s = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) + { + message (TRUE, "%s: socket: %s\n", progname, strerror (errno)); + return INVALID_SOCKET; + } + + /* + * Set up the socket + */ + if (connect (s, (struct sockaddr *) &server, sizeof server) < 0) + { + message (TRUE, "%s: connect: %s\n", progname, strerror (errno)); + return INVALID_SOCKET; + } + + setsockopt (s, SOL_SOCKET, SO_LINGER, (char *) &l_arg, sizeof l_arg); + + /* + * Send the authentication + */ + auth_string[AUTH_KEY_LENGTH] = '\0'; + + send_to_emacs (s, "-auth "); + send_to_emacs (s, auth_string); + send_to_emacs (s, "\n"); + + return s; +} + + +/* Returns 1 if PREFIX is a prefix of STRING. */ +static int +strprefix (char *prefix, char *string) +{ + int i; + if (! prefix) + return 1; + + if (!string) + return 0; + + for (i = 0; prefix[i]; i++) + if (!string[i] || string[i] != prefix[i]) + return 0; + return 1; +} + + +#if !defined (NO_SOCKETS_IN_FILE_SYSTEM) + +/* Three possibilities: + 2 - can't be `stat'ed (sets errno) + 1 - isn't owned by us + 0 - success: none of the above */ + +static int +socket_status (socket_name) + char *socket_name; +{ + struct stat statbfr; + + if (stat (socket_name, &statbfr) == -1) + return 2; + + if (statbfr.st_uid != geteuid ()) + return 1; -/* File handles for communicating with Emacs. */ -FILE *out, *in; + return 0; +} + /* A signal handler that passes the signal to the Emacs process. Useful for SIGWINCH. */ @@ -379,9 +953,7 @@ handle_sigcont (int signalnum) if (tcgetpgrp (1) == getpgrp ()) { /* We are in the foreground. */ - fprintf (out, "-resume \n"); - fflush (out); - fsync (fileno (out)); + send_to_emacs (emacs_socket, "-resume \n"); } else { @@ -405,12 +977,8 @@ handle_sigtstp (int signalnum) int old_errno = errno; sigset_t set; - if (out) - { - fprintf (out, "-suspend \n"); - fflush (out); - fsync (fileno (out)); - } + if (emacs_socket) + send_to_emacs (emacs_socket, "-suspend \n"); /* Unblock this signal and call the default handler by temprarily changing the handler and resignalling. */ @@ -423,7 +991,6 @@ handle_sigtstp (int signalnum) errno = old_errno; } - /* Set up signal handlers before opening a frame on the current tty. */ void @@ -445,92 +1012,12 @@ init_signals (void) signal (SIGTTOU, handle_sigtstp); } - -#if !defined (HAVE_SOCKETS) || defined (NO_SOCKETS_IN_FILE_SYSTEM) - -int -main (argc, argv) - int argc; - char **argv; -{ - fprintf (stderr, "%s: Sorry, the Emacs server is supported only\n", - argv[0]); - fprintf (stderr, "on systems with Berkeley sockets.\n"); - - fail (); -} - -#else /* HAVE_SOCKETS */ - -#include -#include -#include -#include -#include - -extern char *strerror (); -extern int errno; - -/* Three possibilities: - 2 - can't be `stat'ed (sets errno) - 1 - isn't owned by us - 0 - success: none of the above */ - -static int -socket_status (socket_name) - char *socket_name; -{ - struct stat statbfr; - - if (stat (socket_name, &statbfr) == -1) - return 2; - - if (statbfr.st_uid != geteuid ()) - return 1; - - return 0; -} - -/* Returns 1 if PREFIX is a prefix of STRING. */ -static int -strprefix (char *prefix, char *string) -{ - int i; - if (! prefix) - return 1; - - if (!string) - return 0; - - for (i = 0; prefix[i]; i++) - if (!string[i] || string[i] != prefix[i]) - return 0; - return 1; -} -int -main (argc, argv) - int argc; - char **argv; +HSOCKET +set_local_socket () { - int s, i, needlf = 0; + HSOCKET s; struct sockaddr_un server; - char *cwd, *str; - char string[BUFSIZ]; - - main_argc = argc; - main_argv = argv; - progname = argv[0]; - - /* Process options. */ - decode_options (argc, argv); - - if ((argc - optind < 1) && !eval && !tty && !window_system) - { - fprintf (stderr, "%s: file name or argument required\n", progname); - fprintf (stderr, "Try `%s --help' for more information\n", progname); - exit (EXIT_FAILURE); - } /* * Open up an AF_UNIX socket in this person's home directory @@ -538,9 +1025,8 @@ main (argc, argv) if ((s = socket (AF_UNIX, SOCK_STREAM, 0)) < 0) { - fprintf (stderr, "%s: ", argv[0]); - perror ("socket"); - fail (); + message (TRUE, "%s: socket: %s\n", progname, strerror (errno)); + return INVALID_SOCKET; } server.sun_family = AF_UNIX; @@ -550,16 +1036,16 @@ main (argc, argv) int default_sock = !socket_name; int saved_errno = 0; - char *server_name = "server"; + char *server_name = "server"; - if (socket_name && !index (socket_name, '/') && !index (socket_name, '\\')) - { /* socket_name is a file name component. */ + if (socket_name && !index (socket_name, '/') && !index (socket_name, '\\')) + { /* socket_name is a file name component. */ server_name = socket_name; socket_name = NULL; default_sock = 1; /* Try both UIDs. */ - } + } - if (default_sock) + if (default_sock) { socket_name = alloca (100 + strlen (server_name)); sprintf (socket_name, "/tmp/emacs%d/%s", @@ -570,8 +1056,8 @@ main (argc, argv) strcpy (server.sun_path, socket_name); else { - fprintf (stderr, "%s: socket-name %s too long", - argv[0], socket_name); + message (TRUE, "%s: socket-name %s too long", + progname, socket_name); fail (); } @@ -605,8 +1091,8 @@ main (argc, argv) strcpy (server.sun_path, socket_name); else { - fprintf (stderr, "%s: socket-name %s too long", - argv[0], socket_name); + message (TRUE, "%s: socket-name %s too long", + progname, socket_name); exit (EXIT_FAILURE); } @@ -618,81 +1104,203 @@ main (argc, argv) } } - 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 ()) - { - fprintf (stderr, "%s: Invalid socket owner\n", argv[0]); - fail (); - } - break; - - case 2: - /* `stat' failed */ - if (saved_errno == ENOENT) - fprintf (stderr, - "%s: can't find socket; have you started the server?\n\ + 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; + + 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", - argv[0]); - else - fprintf (stderr, "%s: can't stat %s: %s\n", - argv[0], server.sun_path, strerror (saved_errno)); - fail (); - break; - } + progname); + else + message (TRUE, "%s: can't stat %s: %s\n", + progname, server.sun_path, strerror (saved_errno)); + return INVALID_SOCKET; + } } if (connect (s, (struct sockaddr *) &server, strlen (server.sun_path) + 2) < 0) { - fprintf (stderr, "%s: ", argv[0]); - perror ("connect"); - fail (); + message (TRUE, "%s: connect: %s\n", progname, strerror (errno)); + return INVALID_SOCKET; } - /* We use the stream OUT to send our commands to the server. */ - if ((out = fdopen (s, "r+")) == NULL) + return s; +} +#endif /* ! NO_SOCKETS_IN_FILE_SYSTEM */ + +HSOCKET +set_socket () +{ + HSOCKET s; + + INITIALIZE (); + +#ifndef NO_SOCKETS_IN_FILE_SYSTEM + /* Explicit --socket-name argument. */ + if (socket_name) { - fprintf (stderr, "%s: ", argv[0]); - perror ("fdopen"); - fail (); + s = set_local_socket (); + if ((s != INVALID_SOCKET) || alternate_editor) + return s; + message (TRUE, "%s: error accessing socket \"%s\"", + progname, socket_name); + exit (EXIT_FAILURE); } +#endif + + /* Explicit --server-file arg or EMACS_SERVER_FILE variable. */ + if (!server_file) + server_file = getenv ("EMACS_SERVER_FILE"); - /* We use the stream IN to read the responses. - We used to use just one stream for both output and input - on the socket, but reversing direction works nonportably: - on some systems, the output appears as the first input; - on other systems it does not. */ - if ((in = fdopen (s, "r+")) == NULL) + if (server_file) { - fprintf (stderr, "%s: ", argv[0]); - perror ("fdopen"); - fail (); + s = set_tcp_socket (); + if ((s != INVALID_SOCKET) || alternate_editor) + return s; + + message (TRUE, "%s: error accessing server file \"%s\"", + progname, server_file); + exit (EXIT_FAILURE); } + +#ifndef NO_SOCKETS_IN_FILE_SYSTEM + /* Implicit local socket. */ + s = set_local_socket (); + if (s != INVALID_SOCKET) + return s; +#endif -#ifdef HAVE_GETCWD - cwd = getcwd (string, sizeof string); -#else - cwd = getwd (string); + /* Implicit server file. */ + server_file = "server"; + s = set_tcp_socket (); + if ((s != INVALID_SOCKET) || alternate_editor) + 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 +"\t--socket-name\n" #endif +"\t--server-file (or environment variable EMACS_SERVER_FILE)\n\ +\t--alternate-editor (or environment variable ALTERNATE_EDITOR)\n", + progname); + exit (EXIT_FAILURE); +} + +#ifdef WINDOWSNT +FARPROC set_fg; /* Pointer to AllowSetForegroundWindow. */ +FARPROC get_wc; /* Pointer to RealGetWindowClassA. */ + +BOOL CALLBACK +w32_find_emacs_process (hWnd, lParam) + HWND hWnd; + LPARAM lParam; +{ + DWORD pid; + char class[6]; + + /* Reject any window not of class "Emacs". */ + if (! get_wc (hWnd, class, sizeof (class)) + || strcmp (class, "Emacs")) + return TRUE; + + /* We only need the process id, not the thread id. */ + (void) GetWindowThreadProcessId (hWnd, &pid); + + /* Not the one we're looking for. */ + if (pid != (DWORD) emacs_pid) return TRUE; + + /* OK, let's raise it. */ + set_fg (emacs_pid); + + /* Stop enumeration. */ + return FALSE; +} + +/* + * Search for a window of class "Emacs" and owned by a process with + * process id = emacs_pid. If found, allow it to grab the focus. + */ +void +w32_give_focus () +{ + HMODULE hUser32; + + /* It shouldn't happen when dealing with TCP sockets. */ + if (!emacs_pid) return; + + if (!(hUser32 = LoadLibrary ("user32.dll"))) return; + + /* Modern Windows restrict which processes can set the foreground window. + emacsclient can allow Emacs to grab the focus by calling the function + AllowSetForegroundWindow. Unfortunately, older Windows (W95, W98 and + NT) lack this function, so we have to check its availability. */ + if ((set_fg = GetProcAddress (hUser32, "AllowSetForegroundWindow")) + && (get_wc = GetProcAddress (hUser32, "RealGetWindowClassA"))) + EnumWindows (w32_find_emacs_process, (LPARAM) 0); + + FreeLibrary (hUser32); +} +#endif + +int +main (argc, argv) + int argc; + char **argv; +{ + int i, rl, needlf = 0; + char *cwd, *str; + char string[BUFSIZ+1]; + + main_argc = argc; + main_argv = argv; + progname = argv[0]; + + /* Process options. */ + decode_options (argc, argv); + + if ((argc - optind < 1) && !eval && !tty && !window_system) + { + message (TRUE, "%s: file name or argument required\n" + "Try `%s --help' for more information\n", + progname, progname); + exit (EXIT_FAILURE); + } + + if ((emacs_socket = set_socket ()) == INVALID_SOCKET) + fail (); + + + cwd = get_current_dir_name (); if (cwd == 0) { /* getwd puts message in STRING if it fails. */ - -#ifdef HAVE_GETCWD - fprintf (stderr, "%s: %s (%s)\n", argv[0], - "cannot get current working directory", strerror (errno)); -#else - fprintf (stderr, "%s: %s (%s)\n", argv[0], string, strerror (errno)); -#endif + message (TRUE, "%s: %s\n", progname, + "Cannot get current working directory"); fail (); } +#ifdef WINDOWSNT + w32_give_focus (); +#endif + /* First of all, send our version number for verification. */ - fprintf (out, "-version %s ", VERSION); + send_to_emacs (emacs_socket, "-version "); + send_to_emacs (emacs_socket, VERSION); + send_to_emacs (emacs_socket, " "); /* Send over our environment. */ if (!current_frame) @@ -703,40 +1311,52 @@ To start the server in Emacs, type \"M-x server-start\".\n", { char *name = xstrdup (environ[i]); char *value = strchr (name, '='); - fprintf (out, "-env "); - quote_argument (environ[i], out); - fprintf (out, " "); + send_to_emacs (emacs_socket, "-env "); + quote_argument (emacs_socket, environ[i]); + send_to_emacs (emacs_socket, " "); } } + /* Send over our current directory. */ + if (!current_frame) + { + send_to_emacs (emacs_socket, "-dir "); + quote_argument (emacs_socket, cwd); + send_to_emacs (emacs_socket, "/"); + send_to_emacs (emacs_socket, " "); + } + retry: if (nowait) - fprintf (out, "-nowait "); + send_to_emacs (emacs_socket, "-nowait "); if (current_frame) - fprintf (out, "-current-frame "); + send_to_emacs (emacs_socket, "-current-frame "); if (display) { - fprintf (out, "-display "); - quote_argument (display, out); - fprintf (out, " "); + send_to_emacs (emacs_socket, "-display "); + quote_argument (emacs_socket, display); + send_to_emacs (emacs_socket, " "); } if (tty) { - char *tty_name = ttyname (fileno (stdin)); + char *tty_name = NULL; +#ifndef WINDOWSNT + tty_name = ttyname (fileno (stdin)); +#endif char *type = getenv ("TERM"); if (! tty_name) { - fprintf (stderr, "%s: could not get terminal name\n", progname); + message (TRUE, "%s: could not get terminal name\n", progname); fail (); } if (! type) { - fprintf (stderr, "%s: please set the TERM variable to your terminal type\n", + message (TRUE, "%s: please set the TERM variable to your terminal type\n", progname); fail (); } @@ -744,22 +1364,23 @@ To start the server in Emacs, type \"M-x server-start\".\n", if (! strcmp (type, "eterm")) { /* This causes nasty, MULTI_KBOARD-related input lockouts. */ - fprintf (stderr, "%s: opening a frame in an Emacs term buffer" + message (TRUE, "%s: opening a frame in an Emacs term buffer" " is not supported\n", progname); fail (); } - +#if !defined (NO_SOCKETS_IN_FILE_SYSTEM) init_signals (); +#endif - fprintf (out, "-tty "); - quote_argument (tty_name, out); - fprintf (out, " "); - quote_argument (type, out); - fprintf (out, " "); + send_to_emacs (emacs_socket, "-tty "); + quote_argument (emacs_socket, tty_name); + send_to_emacs (emacs_socket, " "); + quote_argument (emacs_socket, type); + send_to_emacs (emacs_socket, " "); } if (window_system) - fprintf (out, "-window-system "); + send_to_emacs (emacs_socket, "-window-system "); if ((argc - optind > 0)) { @@ -769,10 +1390,10 @@ To start the server in Emacs, type \"M-x server-start\".\n", if (eval) { - /* Don't prepend any cwd or anything like that. */ - fprintf (out, "-eval "); - quote_argument (argv[i], out); - fprintf (out, " "); + /* Don't prepend cwd or anything like that. */ + send_to_emacs (emacs_socket, "-eval "); + quote_argument (emacs_socket, argv[i]); + send_to_emacs (emacs_socket, " "); continue; } @@ -782,25 +1403,25 @@ To start the server in Emacs, type \"M-x server-start\".\n", while (isdigit ((unsigned char) *p) || *p == ':') p++; if (*p == 0) { - fprintf (out, "-position "); - quote_argument (argv[i], out); - fprintf (out, " "); + send_to_emacs (emacs_socket, "-position "); + quote_argument (emacs_socket, argv[i]); + send_to_emacs (emacs_socket, " "); continue; } else relative = 1; } - else if (*argv[i] != '/') + else if (! file_name_absolute_p (argv[i])) relative = 1; - fprintf (out, "-file "); + send_to_emacs (emacs_socket, "-file "); if (relative) { - quote_argument (cwd, out); - fprintf (out, "/"); + quote_argument (emacs_socket, cwd); + send_to_emacs (emacs_socket, "/"); } - quote_argument (argv[i], out); - fprintf (out, " "); + quote_argument (emacs_socket, argv[i]); + send_to_emacs (emacs_socket, " "); } } else @@ -810,18 +1431,16 @@ To start the server in Emacs, type \"M-x server-start\".\n", while ((str = fgets (string, BUFSIZ, stdin))) { if (eval) - fprintf (out, "-eval "); + send_to_emacs (emacs_socket, "-eval "); else - fprintf (out, "-file "); - quote_argument (str, out); + send_to_emacs (emacs_socket, "-file "); + quote_argument (emacs_socket, str); } - fprintf (out, " "); + send_to_emacs (emacs_socket, " "); } } - fprintf (out, "\n"); - fflush (out); - fsync (fileno (out)); + send_to_emacs (emacs_socket, "\n"); /* Wait for an answer. */ if (!eval && !tty && !nowait) @@ -833,22 +1452,25 @@ To start the server in Emacs, type \"M-x server-start\".\n", fsync (1); /* Now, wait for an answer and print any messages. */ - while ((str = fgets (string, BUFSIZ, in))) + while ((rl = recv (emacs_socket, string, BUFSIZ, 0)) > 0) { - char *p = str + strlen (str) - 1; - while (p > str && *p == '\n') + char *p; + string[rl] = '\0'; + + p = string + strlen (string) - 1; + while (p > string && *p == '\n') *p-- = 0; - if (strprefix ("-good-version ", str)) + if (strprefix ("-good-version ", string)) { /* -good-version: The versions match. */ } - else if (strprefix ("-emacs-pid ", str)) + else if (strprefix ("-emacs-pid ", string)) { /* -emacs-pid PID: The process id of the Emacs process. */ emacs_pid = strtol (string + strlen ("-emacs-pid"), NULL, 10); } - else if (strprefix ("-window-system-unsupported ", str)) + else if (strprefix ("-window-system-unsupported ", string)) { /* -window-system-unsupported: Emacs was compiled without X support. Try again on the terminal. */ @@ -857,25 +1479,26 @@ To start the server in Emacs, type \"M-x server-start\".\n", tty = 1; goto retry; } - else if (strprefix ("-print ", str)) + else if (strprefix ("-print ", string)) { /* -print STRING: Print STRING on the terminal. */ - str = unquote_argument (str + strlen ("-print ")); + str = unquote_argument (string + strlen ("-print ")); if (needlf) printf ("\n"); printf ("%s", str); needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n'; } - else if (strprefix ("-error ", str)) + else if (strprefix ("-error ", string)) { /* -error DESCRIPTION: Signal an error on the terminal. */ - str = unquote_argument (str + strlen ("-error ")); + str = unquote_argument (string + strlen ("-error ")); if (needlf) printf ("\n"); - printf ("*ERROR*: %s", str); + fprintf (stderr, "*ERROR*: %s", str); needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n'; } - else if (strprefix ("-suspend ", str)) +#ifndef WINDOWSNT + else if (strprefix ("-suspend ", string)) { /* -suspend: Suspend this terminal, i.e., stop the process. */ if (needlf) @@ -883,13 +1506,14 @@ To start the server in Emacs, type \"M-x server-start\".\n", needlf = 0; kill (0, SIGSTOP); } +#endif else { /* Unknown command. */ if (needlf) printf ("\n"); - printf ("*ERROR*: Unknown message: %s", str); - needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n'; + printf ("*ERROR*: Unknown message: %s", string); + needlf = string[0] == '\0' ? needlf : string[strlen (string) - 1] != '\n'; } } @@ -898,10 +1522,12 @@ To start the server in Emacs, type \"M-x server-start\".\n", fflush (stdout); fsync (1); + CLOSE_SOCKET (emacs_socket); return EXIT_SUCCESS; } -#endif /* HAVE_SOCKETS */ +#endif /* HAVE_SOCKETS && HAVE_INET_SOCKETS */ + #ifndef HAVE_STRERROR char *