diff options
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog.multi-tty | 79 | ||||
| -rw-r--r-- | lib-src/emacsclient.c | 805 | ||||
| -rw-r--r-- | lib-src/makefile.w32-in | 2 |
3 files changed, 718 insertions, 168 deletions
diff --git a/lib-src/ChangeLog.multi-tty b/lib-src/ChangeLog.multi-tty new file mode 100644 index 00000000000..5008f8d21b7 --- /dev/null +++ b/lib-src/ChangeLog.multi-tty @@ -0,0 +1,79 @@ +0000-00-00 Dan Nicolaescu <dann@ics.uci.edu> + + * emacsclient.c (w32_execvp): Move definition before use. + (decode_options): Don't use a tty on mac carbon or windows. + +0000-00-00 Jason Rumney <jasonr@gnu.org> + + * emacsclient.c (SEND_STRING, SEND_QUOTED): Remove obfuscation + macros. + (quote_argument, set_tcp_socket, handle_sigcont, handle_sigtstp): + (main): Expand removed macros inline. + (main) [WINDOWSNT]: Don't call ttyname. Don't recognize -suspend + option. + (main) [NO_SOCKETS_IN_FILE_SYSTEM]: Don't call init_signals. + +0000-00-00 Karoly Lorentey <lorentey@elte.hu> + + * emacsclient.c (signal.h): New include. + (sys/stat.h, errno.h): Always include, even on WINDOWSNT. + (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP, IS_ANY_SEP): Copy + definitions here from src/lisp.h. + (main_argc, main_argv, current_frame, window_system, tty): New + variables. + (longopts): Add tty, current-frame. + (xmalloc, xstrdup): New functions. + (get_current_dir_name): New function, copied from src/sysdep.c. + (decode_options): Set display from environment. Add tty and + current_frame options. Make --no-wait imply --current-frame, + except when it is the only option given. Make sure no frame is + opened when --current-frame is set. + (print_help_and_exit): Document tty and current-frame options. + (fail): Change arguments to void. + (main): When sockets are not defined, set main_argc, main_argv, + and call fail() with no arguments. + (emacs_socket): New variable (moved out from main `s'). + (quote_file_name): Rename to quote_argument. + (quote_argument): New name for old quote_file_name. + (unquote_argument, strprefix, pass_signal_to_emacs) + (handle_sigcont, handle_sigtstp, init_signals): New functions. + (set_local_socket): Initialize saved_errno to 0. If socket-name + is too long, call `fail' rather than `exit'. + (main): Doc update. Set main_argc, main_argv. New var `str'. + Don't need a filename or argument if tty or window_system set. + Call fail with no arguments. Use get_current_dir_name to send + over the current directory. Send version number to Emacs for + verification. If tty is set, check TERM, and pass name and type + to Emacs. Pass window_system to Emacs. Move sending of eval to + optind loop. Send -position, -file to Emacs. Call fsync after + fflush. Check for a client/server version match. Handle + -emacs-pid, -window-system-unsupported, -print, -error, -suspend + commands. Don't exit prematurely on --no-wait, let Emacs close + the connection for us. When creating a new frame, send + environment and pwd to Emacs. Send current-frame to Emacs. + +;; Local Variables: +;; coding: iso-2022-7bit +;; add-log-time-zone-rule: t +;; End: + + Copyright (C) 2007 Free Software Foundation, Inc. + + This file is part of GNU Emacs. + + GNU Emacs is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + GNU Emacs is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with GNU Emacs; see the file COPYING. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. + +;; arch-tag: 7080ff76-36b5-4471-8135-2813915e91cc diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 9edba132134..ae7ff12e17d 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -76,7 +76,31 @@ Boston, MA 02110-1301, USA. */ # include <pwd.h> #endif /* not WINDOWSNT */ #endif /* not VMS */ +#include <sys/stat.h> +#include <signal.h> +#include <errno.h> + +/* 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) (); @@ -84,8 +108,6 @@ char *(getcwd) (); #define VERSION "unspecified" #endif -#define SEND_STRING(data) (send_to_emacs (s, (data))) -#define SEND_QUOTED(data) (quote_file_name (s, (data))) #ifndef EXIT_SUCCESS #define EXIT_SUCCESS 0 @@ -110,15 +132,30 @@ char *(getcwd) (); /* Name used to invoke this program. */ char *progname; +/* The first argument to main. */ +int main_argc; + +/* The second argument to main. */ +char **main_argv; + /* Nonzero means don't wait for a response from Emacs. --no-wait. */ int nowait = 0; /* Nonzero means args are expressions to be evaluated. --eval. */ int eval = 0; +/* Nonzero means don't open a new frame. --current-frame. */ +int current_frame = 0; + +/* Nonzero means open a new graphical frame. */ +int window_system = 0; + /* The display on which Emacs should work. --display. */ char *display = NULL; +/* Nonzero means open a new Emacs frame on the current terminal. */ +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; @@ -140,6 +177,8 @@ struct option longopts[] = { "eval", no_argument, NULL, 'e' }, { "help", no_argument, NULL, 'H' }, { "version", no_argument, NULL, 'V' }, + { "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' }, @@ -149,6 +188,111 @@ struct option longopts[] = { 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 @@ -165,7 +309,41 @@ w32_window_app () return window_app; } -#endif + +/* + 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, ...) @@ -204,16 +382,19 @@ decode_options (argc, argv) char **argv; { alternate_editor = getenv ("ALTERNATE_EDITOR"); + display = getenv ("DISPLAY"); + if (display && strlen (display) == 0) + display = NULL; while (1) { int opt = getopt_long (argc, argv, #ifndef NO_SOCKETS_IN_FILE_SYSTEM - "VHnea:s:f:d:", + "VHnea:s:f:d:tc", #else - "VHnea:f:d:", + "VHnea:f:d:tc", #endif - longopts, 0); + longopts, 0); if (opt == EOF) break; @@ -256,6 +437,14 @@ decode_options (argc, argv) exit (EXIT_SUCCESS); break; + case 't': + tty = 1; + break; + + case 'c': + current_frame = 1; + break; + case 'H': print_help_and_exit (); break; @@ -266,21 +455,49 @@ decode_options (argc, argv) break; } } + + 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) + current_frame = 1; + + if (current_frame) + { + tty = 0; + window_system = 0; + } + + if (tty) + window_system = 0; } + void print_help_and_exit () { + /* Spaces and tabs are significant in this message; they're chosen so the + message aligns properly both in a tty and in a Windows message box. + Please try to preserve them; otherwise the output is very hard to read + when using emacsclientw. */ message (FALSE, - "Usage: %s [OPTIONS] FILE...\n\ + "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\ -\n\ -V, --version Just print version info and return\n\ --H, --help Print this usage information message\n\ --e, --eval Evaluate FILE arguments as Lisp expressions\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;\n\ + use the current Emacs frame\n\ +-e, --eval Evaluate the FILE arguments as ELisp expressions\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 @@ -290,66 +507,26 @@ The following OPTIONS are accepted:\n\ "-f, --server-file=FILENAME\n\ Set filename of the TCP authentication file\n\ -a, --alternate-editor=EDITOR\n\ - Editor to fallback to if server is not running\n\ + Editor to fallback to if the server is not running\n\ \n\ Report bugs to bug-gnu-emacs@gnu.org.\n", progname); exit (EXIT_SUCCESS); } - -#ifdef WINDOWSNT - -/* - 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 */ - /* Try to run a different command, or --if no alternate editor is defined-- exit with an errorcode. */ void -fail (argc, argv) - int argc; - char **argv; +fail (void) { if (alternate_editor) { int i = optind - 1; - execvp (alternate_editor, argv + i); + execvp (alternate_editor, main_argv + i); message (TRUE, "%s: error executing alternate editor \"%s\"\n", - progname, alternate_editor); + progname, alternate_editor); } exit (EXIT_FAILURE); } @@ -362,10 +539,13 @@ main (argc, argv) int argc; char **argv; { - message (TRUE, "%s: Sorry, the Emacs server is supported only\non systems with Berkely sockets.\n", + 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 (argc, argv); + fail (); } #else /* HAVE_SOCKETS && HAVE_INET_SOCKETS */ @@ -376,8 +556,6 @@ main (argc, argv) # include <sys/types.h> # include <sys/socket.h> # include <sys/un.h> -# include <sys/stat.h> -# include <errno.h> #endif #define AUTH_KEY_LENGTH 64 @@ -389,6 +567,8 @@ 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 @@ -429,18 +609,21 @@ send_to_emacs (s, data) } } -/* In NAME, insert a & before each &, each space, each newline, and + +/* 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. */ + return value never contains a space. + + Does not change the string. Outputs the result to STREAM. */ void -quote_file_name (s, name) +quote_argument (s, str) HSOCKET s; - char *name; + char *str; { - char *copy = (char *) malloc (strlen (name) * 2 + 1); + char *copy = (char *) xmalloc (strlen (str) * 2 + 1); char *p, *q; - p = name; + p = str; q = copy; while (*p) { @@ -458,18 +641,54 @@ quote_file_name (s, name) } else { - if (*p == '&' || (*p == '-' && p == name)) + if (*p == '&' || (*p == '-' && p == str)) *q++ = '&'; *q++ = *p++; } } *q++ = 0; - SEND_STRING (copy); + send_to_emacs (s, copy); free (copy); } + +/* The inverse of quote_argument. Removes quoting in string STR by + modifying the string in place. Returns STR. */ + +char * +unquote_argument (str) + char *str; +{ + char *p, *q; + + if (! str) + return str; + + p = str; + q = str; + while (*p) + { + if (*p == '&') + { + p++; + if (*p == '&') + *p = '&'; + else if (*p == '_') + *p = ' '; + else if (*p == 'n') + *p = '\n'; + else if (*p == '-') + *p = '-'; + } + *q++ = *p++; + } + *q = 0; + return str; +} + + int file_name_absolute_p (filename) const unsigned char *filename; @@ -551,6 +770,7 @@ initialize_sockets () atexit (close_winsock); } #endif /* WINDOWSNT */ + /* * Read the information needed to set up a TCP comm channel with @@ -661,13 +881,32 @@ set_tcp_socket () */ auth_string[AUTH_KEY_LENGTH] = '\0'; - SEND_STRING ("-auth "); - SEND_STRING (auth_string); - SEND_STRING ("\n"); + 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: @@ -690,6 +929,93 @@ socket_status (socket_name) return 0; } + +/* A signal handler that passes the signal to the Emacs process. + Useful for SIGWINCH. */ + +SIGTYPE +pass_signal_to_emacs (int signalnum) +{ + int old_errno = errno; + + if (emacs_pid) + kill (emacs_pid, signalnum); + + signal (signalnum, pass_signal_to_emacs); + errno = old_errno; +} + +/* Signal handler for SIGCONT; notify the Emacs process that it can + now resume our tty frame. */ + +SIGTYPE +handle_sigcont (int signalnum) +{ + int old_errno = errno; + + if (tcgetpgrp (1) == getpgrp ()) + { + /* We are in the foreground. */ + send_to_emacs (emacs_socket, "-resume \n"); + } + else + { + /* We are in the background; cancel the continue. */ + kill (getpid (), SIGSTOP); + } + + signal (signalnum, handle_sigcont); + errno = old_errno; +} + +/* 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. */ + +SIGTYPE +handle_sigtstp (int signalnum) +{ + 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 temprarily + changing the handler and resignalling. */ + sigprocmask (SIG_BLOCK, NULL, &set); + sigdelset (&set, signalnum); + signal (signalnum, SIG_DFL); + kill (getpid (), signalnum); + sigprocmask (SIG_SETMASK, &set, NULL); /* Let's the above signal through. */ + signal (signalnum, handle_sigtstp); + + errno = old_errno; +} +/* Set up signal handlers before opening a frame on the current tty. */ + +void +init_signals (void) +{ + /* 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 + + signal (SIGCONT, handle_sigcont); + signal (SIGTSTP, handle_sigtstp); + signal (SIGTTOU, handle_sigtstp); +} + + HSOCKET set_local_socket () { @@ -711,30 +1037,31 @@ set_local_socket () { int sock_status = 0; int default_sock = !socket_name; - int saved_errno; + int saved_errno = 0; + char *server_name = "server"; 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. */ + server_name = socket_name; + socket_name = NULL; + default_sock = 1; /* Try both UIDs. */ } if (default_sock) { - socket_name = alloca (100 + strlen (server_name)); - sprintf (socket_name, "/tmp/emacs%d/%s", - (int) geteuid (), server_name); + socket_name = alloca (100 + strlen (server_name)); + sprintf (socket_name, "/tmp/emacs%d/%s", + (int) geteuid (), server_name); } if (strlen (socket_name) < sizeof (server.sun_path)) strcpy (server.sun_path, socket_name); else { - message (TRUE, "%s: socket-name %s too long", - progname, socket_name); - exit (EXIT_FAILURE); + message (TRUE, "%s: socket-name %s too long", + progname, socket_name); + fail (); } /* See if the socket exists, and if it's owned by us. */ @@ -773,7 +1100,7 @@ set_local_socket () } sock_status = socket_status (server.sun_path); - saved_errno = errno; + saved_errno = errno; } else errno = saved_errno; @@ -783,26 +1110,26 @@ set_local_socket () 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); + /* 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; + } + break; case 2: - /* `stat' failed */ - if (saved_errno == ENOENT) - message (TRUE, - "%s: can't find socket; have you started the server?\n\ + /* `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", + else + message (TRUE, "%s: can't stat %s: %s\n", progname, server.sun_path, strerror (saved_errno)); - return INVALID_SOCKET; + return INVALID_SOCKET; } } @@ -830,10 +1157,9 @@ set_socket () { s = set_local_socket (); if ((s != INVALID_SOCKET) || alternate_editor) - return s; - + return s; message (TRUE, "%s: error accessing socket \"%s\"", - progname, socket_name); + progname, socket_name); exit (EXIT_FAILURE); } #endif @@ -846,10 +1172,10 @@ set_socket () { s = set_tcp_socket (); if ((s != INVALID_SOCKET) || alternate_editor) - return s; + return s; message (TRUE, "%s: error accessing server file \"%s\"", - progname, server_file); + progname, server_file); exit (EXIT_FAILURE); } @@ -938,129 +1264,274 @@ main (argc, argv) int argc; char **argv; { - HSOCKET s; int i, rl, needlf = 0; - char *cwd; + 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) + if ((argc - optind < 1) && !eval && !tty && !window_system) { - message (TRUE, "%s: file name or argument required\nTry `%s --help' for more information\n", - progname, progname); + message (TRUE, "%s: file name or argument required\n" + "Try `%s --help' for more information\n", + progname, progname); exit (EXIT_FAILURE); } - if ((s = set_socket ()) == INVALID_SOCKET) - fail (argc, argv); + if ((emacs_socket = set_socket ()) == INVALID_SOCKET) + fail (); -#ifdef HAVE_GETCWD - cwd = getcwd (string, sizeof string); -#else - cwd = getwd (string); -#endif + + cwd = get_current_dir_name (); if (cwd == 0) { /* getwd puts message in STRING if it fails. */ - message (TRUE, "%s: %s (%s)\n", progname, -#ifdef HAVE_GETCWD - "Cannot get current working directory", -#else - string, -#endif - strerror (errno)); - fail (argc, argv); + 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. */ + send_to_emacs (emacs_socket, "-version "); + send_to_emacs (emacs_socket, VERSION); + send_to_emacs (emacs_socket, " "); + + /* Send over our environment. */ + if (!current_frame) + { + extern char **environ; + int i; + for (i = 0; environ[i]; i++) + { + char *name = xstrdup (environ[i]); + char *value = strchr (name, '='); + 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) - SEND_STRING ("-nowait "); + send_to_emacs (emacs_socket, "-nowait "); - if (eval) - SEND_STRING ("-eval "); + if (current_frame) + send_to_emacs (emacs_socket, "-current-frame "); if (display) { - SEND_STRING ("-display "); - SEND_QUOTED (display); - SEND_STRING (" "); + send_to_emacs (emacs_socket, "-display "); + quote_argument (emacs_socket, display); + send_to_emacs (emacs_socket, " "); + } + + if (tty) + { + char *type = getenv ("TERM"); + char *tty_name = NULL; +#ifndef WINDOWSNT + tty_name = ttyname (fileno (stdin)); +#endif + + if (! tty_name) + { + message (TRUE, "%s: could not get terminal name\n", progname); + fail (); + } + + if (! type) + { + message (TRUE, "%s: please set the TERM variable to your terminal type\n", + progname); + fail (); + } + + if (! strcmp (type, "eterm")) + { + /* 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 (); + } +#if !defined (NO_SOCKETS_IN_FILE_SYSTEM) + init_signals (); +#endif + + 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) + send_to_emacs (emacs_socket, "-window-system "); + if ((argc - optind > 0)) { for (i = optind; i < argc; i++) { + int relative = 0; + if (eval) - ; /* Don't prepend any cwd or anything like that. */ - else if (*argv[i] == '+') - { + { + /* 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; + } + + if (*argv[i] == '+') + { char *p = argv[i] + 1; while (isdigit ((unsigned char) *p) || *p == ':') p++; - if (*p != 0) - { - SEND_QUOTED (cwd); - SEND_STRING ("/"); - } - } + if (*p == 0) + { + send_to_emacs (emacs_socket, "-position "); + quote_argument (emacs_socket, argv[i]); + send_to_emacs (emacs_socket, " "); + continue; + } + else + relative = 1; + } else if (! file_name_absolute_p (argv[i])) - { - SEND_QUOTED (cwd); - SEND_STRING ("/"); - } - - SEND_QUOTED (argv[i]); - SEND_STRING (" "); - } + relative = 1; + + send_to_emacs (emacs_socket, "-file "); + if (relative) + { + quote_argument (emacs_socket, cwd); + send_to_emacs (emacs_socket, "/"); + } + quote_argument (emacs_socket, argv[i]); + send_to_emacs (emacs_socket, " "); + } } else { - while (fgets (string, BUFSIZ, stdin)) - { - SEND_QUOTED (string); - } - SEND_STRING (" "); + if (!tty && !window_system) + { + while ((str = fgets (string, BUFSIZ, stdin))) + { + if (eval) + send_to_emacs (emacs_socket, "-eval "); + else + send_to_emacs (emacs_socket, "-file "); + quote_argument (emacs_socket, str); + } + send_to_emacs (emacs_socket, " "); + } } - SEND_STRING ("\n"); + send_to_emacs (emacs_socket, "\n"); - /* Maybe wait for an answer. */ - if (!nowait) + /* Wait for an answer. */ + if (!eval && !tty && !nowait) { - if (!eval) + printf ("Waiting for Emacs..."); + needlf = 2; + } + fflush (stdout); + fsync (1); + + /* Now, wait for an answer and print any messages. */ + while ((rl = recv (emacs_socket, string, BUFSIZ, 0)) > 0) + { + char *p; + string[rl] = '\0'; + + p = string + strlen (string) - 1; + while (p > string && *p == '\n') + *p-- = 0; + + if (strprefix ("-good-version ", string)) { - printf ("Waiting for Emacs..."); - needlf = 2; + /* -good-version: The versions match. */ } - fflush (stdout); - - /* Now, wait for an answer and print any messages. */ - while ((rl = recv (s, string, BUFSIZ, 0)) > 0) + 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 ", string)) { - string[rl] = '\0'; - if (needlf == 2) + /* -window-system-unsupported: Emacs was compiled without X + support. Try again on the terminal. */ + window_system = 0; + nowait = 0; + tty = 1; + goto retry; + } + else if (strprefix ("-print ", string)) + { + /* -print STRING: Print STRING on the terminal. */ + str = unquote_argument (string + strlen ("-print ")); + if (needlf) printf ("\n"); - printf ("%s", string); - needlf = string[0] == '\0' ? needlf : string[strlen (string) - 1] != '\n'; + printf ("%s", str); + needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n'; + } + else if (strprefix ("-error ", string)) + { + /* -error DESCRIPTION: Signal an error on the terminal. */ + str = unquote_argument (string + strlen ("-error ")); + if (needlf) + printf ("\n"); + fprintf (stderr, "*ERROR*: %s", str); + needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n'; + } +#ifndef WINDOWSNT + else if (strprefix ("-suspend ", string)) + { + /* -suspend: Suspend this terminal, i.e., stop the process. */ + if (needlf) + printf ("\n"); + needlf = 0; + kill (0, SIGSTOP); + } +#endif + else + { + /* Unknown command. */ + if (needlf) + printf ("\n"); + printf ("*ERROR*: Unknown message: %s", string); + needlf = string[0] == '\0' ? needlf : string[strlen (string) - 1] != '\n'; } - - if (needlf) - printf ("\n"); - fflush (stdout); } - CLOSE_SOCKET (s); + if (needlf) + printf ("\n"); + fflush (stdout); + fsync (1); + + CLOSE_SOCKET (emacs_socket); return EXIT_SUCCESS; } #endif /* HAVE_SOCKETS && HAVE_INET_SOCKETS */ + #ifndef HAVE_STRERROR char * strerror (errnum) diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index 3076b85dbd8..c21401154eb 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in @@ -24,7 +24,7 @@ ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc emacs .PHONY: $(ALL) -VERSION = 22.1.50 +VERSION = 23.0.51 LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \ -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \ |