X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/86af296ba1ea18617c4fc48efe275646289263a7..34663a742b6403d54f18eb5f650e7f2413ee40a2:/lib-src/emacsserver.c diff --git a/lib-src/emacsserver.c b/lib-src/emacsserver.c index 1c8fc1d15b..3675c8efca 100644 --- a/lib-src/emacsserver.c +++ b/lib-src/emacsserver.c @@ -15,7 +15,8 @@ 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, 675 Mass Ave, Cambridge, MA 02139, USA. */ +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ /* The GNU Emacs edit server process is run as a subprocess of Emacs @@ -25,6 +26,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ up to the Emacs which then executes them. */ #define NO_SHORTNAMES +#include #include <../src/config.h> #undef read #undef write @@ -32,10 +34,10 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #undef close #undef signal - -#if !defined(HAVE_SOCKETS) && !defined(HAVE_SYSVIPC) +#if !defined (HAVE_SOCKETS) && !defined (HAVE_SYSVIPC) #include +int main () { fprintf (stderr, "Sorry, the Emacs server is supported only on systems\n"); @@ -45,16 +47,23 @@ main () #else /* HAVE_SOCKETS or HAVE_SYSVIPC */ -#if ! defined (HAVE_SYSVIPC) +void perror_1 (); +void fatal_error (); + +#if defined (HAVE_SOCKETS) && ! defined (NO_SOCKETS_IN_FILE_SYSTEM) /* BSD code is very different from SYSV IPC code */ #include #include #include -#include #include #include #include +#include + +#ifdef HAVE_UNISTD_H +#include +#endif extern int errno; @@ -80,21 +89,151 @@ extern int errno; #define FD_ZERO(p) (*(p) = 0) #endif /* no FD_SET */ -main () +/* This is the file name of the socket that we made. */ + +char *socket_name; + +/* Name of this program. */ + +char *progname; + +/* Handle fatal signals. */ + +/* This is the handler. */ + +SIGTYPE +delete_socket (sig) + int sig; +{ + signal (sig, SIG_DFL); + unlink (socket_name); + kill (getpid (), sig); +} + +/* Set up to handle all the signals. */ + +void +handle_signals () +{ + signal (SIGHUP, delete_socket); + signal (SIGINT, delete_socket); + signal (SIGQUIT, delete_socket); + signal (SIGILL, delete_socket); + signal (SIGTRAP, delete_socket); +#ifdef SIGABRT + signal (SIGABRT, delete_socket); +#endif +#ifdef SIGHWE + signal (SIGHWE, delete_socket); +#endif +#ifdef SIGPRE + signal (SIGPRE, delete_socket); +#endif +#ifdef SIGORE + signal (SIGORE, delete_socket); +#endif +#ifdef SIGUME + signal (SIGUME, delete_socket); +#endif +#ifdef SIGDLK + signal (SIGDLK, delete_socket); +#endif +#ifdef SIGCPULIM + signal (SIGCPULIM, delete_socket); +#endif +#ifdef SIGIOT + /* This is missing on some systems - OS/2, for example. */ + signal (SIGIOT, delete_socket); +#endif +#ifdef SIGEMT + signal (SIGEMT, delete_socket); +#endif + signal (SIGFPE, delete_socket); +#ifdef SIGBUS + signal (SIGBUS, delete_socket); +#endif + signal (SIGSEGV, delete_socket); +#ifdef SIGSYS + signal (SIGSYS, delete_socket); +#endif + signal (SIGTERM, delete_socket); +#ifdef SIGXCPU + signal (SIGXCPU, delete_socket); +#endif +#ifdef SIGXFSZ + signal (SIGXFSZ, delete_socket); +#endif /* SIGXFSZ */ + +#ifdef AIX +/* 20 is SIGCHLD, 21 is SIGTTIN, 22 is SIGTTOU. */ + signal (SIGXCPU, delete_socket); +#ifndef _I386 + signal (SIGIOINT, delete_socket); +#endif + signal (SIGGRANT, delete_socket); + signal (SIGRETRACT, delete_socket); + signal (SIGSOUND, delete_socket); + signal (SIGMSG, delete_socket); +#endif /* AIX */ +} + +/* Print error message. `s1' is printf control string, `s2' is arg for it. */ +void +error (s1, s2) + char *s1, *s2; +{ + fprintf (stderr, "%s: ", progname); + fprintf (stderr, s1, s2); + fprintf (stderr, "\n"); +} + +/* Print error message and exit. */ +void +fatal (s1, s2) + char *s1, *s2; +{ + error (s1, s2); + exit (1); +} + +/* Like malloc but get fatal error if memory is exhausted. */ + +long * +xmalloc (size) + unsigned int size; +{ + long *result = (long *) malloc (size); + if (result == NULL) + fatal ("virtual memory exhausted", 0); + return result; +} + +int +main (argc, argv) + int argc; + char **argv; { char system_name[32]; - int s, infd, fromlen; + int s, infd; +#ifdef SOCKLEN_TYPE + SOCKLEN_TYPE fromlen; +#else + size_t fromlen; +#endif struct sockaddr_un server, fromunix; char *homedir; char *str, string[BUFSIZ], code[BUFSIZ]; FILE *infile; FILE **openfiles; int openfiles_size; + struct stat statbuf; #ifndef convex char *getenv (); #endif + progname = argv[0]; + openfiles_size = 20; openfiles = (FILE **) malloc (openfiles_size * sizeof (FILE *)); if (openfiles == 0) @@ -106,7 +245,7 @@ main () if ((s = socket (AF_UNIX, SOCK_STREAM, 0)) < 0) { - perror ("socket"); + perror_1 ("socket"); exit (1); } server.sun_family = AF_UNIX; @@ -116,34 +255,46 @@ main () if (unlink (server.sun_path) == -1 && errno != ENOENT) { - perror ("unlink"); + perror_1 ("unlink"); exit (1); } #else if ((homedir = getenv ("HOME")) == NULL) - { - fprintf (stderr,"No home directory\n"); - exit (1); - } + fatal_error ("No home directory\n"); + strcpy (server.sun_path, homedir); - strcat (server.sun_path, "/.emacs_server"); + strcat (server.sun_path, "/.emacs-server-"); + gethostname (system_name, sizeof (system_name)); + strcat (server.sun_path, system_name); /* Delete anyone else's old server. */ unlink (server.sun_path); #endif + /* Save the socket name so we can delete it. */ + socket_name = (char *) xmalloc (strlen (server.sun_path) + 1); + strcpy (socket_name, server.sun_path); + + handle_signals (); + if (bind (s, (struct sockaddr *) &server, strlen (server.sun_path) + 2) < 0) { - perror ("bind"); + perror_1 ("bind"); exit (1); } /* Only this user can send commands to this Emacs. */ - chmod (server.sun_path, 0600); + if (stat (server.sun_path, &statbuf) < 0) + { + perror_1 ("bind"); + exit (1); + } + + chmod (server.sun_path, statbuf.st_mode & 0600); /* * Now, just wait for everything to come in.. */ if (listen (s, 5) < 0) { - perror ("listen"); + perror_1 ("listen"); exit (1); } @@ -156,7 +307,7 @@ main () FD_SET (0, &rmask); FD_SET (s, &rmask); if (select (s + 1, &rmask, 0, 0, 0) < 0) - perror ("select"); + perror_1 ("select"); if (FD_ISSET (s, &rmask)) /* client sends list of filenames */ { fromlen = sizeof (fromunix); @@ -165,9 +316,9 @@ main () if (infd < 0) { if (errno == EMFILE || errno == ENFILE) - printf ("Too many clients.\n"); + fprintf (stderr, "Error: too many clients.\n"); else - perror ("accept"); + perror_1 ("accept"); continue; } @@ -183,7 +334,7 @@ main () infile = fdopen (infd, "r+"); /* open stream */ if (infile == NULL) { - printf ("Too many clients.\n"); + fprintf (stderr, "Error: too many clients.\n"); write (infd, "Too many clients.\n", 18); close (infd); /* Prevent descriptor leak.. */ continue; @@ -191,7 +342,7 @@ main () str = fgets (string, BUFSIZ, infile); if (str == NULL) { - perror ("fgets"); + perror_1 ("fgets"); close (infd); /* Prevent descriptor leak.. */ continue; } @@ -216,13 +367,11 @@ main () clearerr (stdin); scanf ("%s %d%*c", code, &infd); if (ferror (stdin) || feof (stdin)) - { - fprintf (stderr, "server: error reading from standard input\n"); - exit (1); - } + fatal_error ("server: error reading from standard input\n"); /* Transfer text from Emacs to the client, up to a newline. */ infile = openfiles[infd]; + rewind (infile); while (1) { if (fgets (string, BUFSIZ, stdin) == 0) @@ -248,10 +397,17 @@ main () #else /* This is the SYSV IPC section */ #include -#include #include #include #include +#include +#include + +struct utsname system_name; + +#ifndef errno +extern int errno; +#endif jmp_buf msgenv; @@ -267,6 +423,7 @@ msgcatch () Its stderr always exists--rms. */ #include +int main () { int s, infd, fromlen, ioproc; @@ -280,21 +437,26 @@ main () FILE *infile; /* - * Create a message queue using ~/.emacs_server as the path for ftok + * Create a message queue using ~/.emacs-server as the path for ftok */ if ((homedir = getenv ("HOME")) == NULL) - { - fprintf (stderr,"No home directory\n"); - exit (1); - } + fatal_error ("No home directory\n"); + strcpy (string, homedir); - strcat (string, "/.emacs_server"); +#ifndef HAVE_LONG_FILE_NAMES + /* If file names are short, we can't fit the host name. */ + strcat (string, "/.emacs-server"); +#else + strcat (string, "/.emacs-server-"); + uname (&system_name); + strcat (string, system_name.nodename); +#endif creat (string, 0600); key = ftok (string, 1); /* unlikely to be anyone else using it */ s = msgget (key, 0600 | IPC_CREAT); if (s == -1) { - perror ("msgget"); + perror_1 ("msgget"); exit (1); } @@ -303,11 +465,13 @@ main () if (setjmp (msgenv)) { msgctl (s, IPC_RMID, 0); - kill (p, SIGKILL); + if (p > 0) + kill (p, SIGKILL); exit (0); } signal (SIGTERM, msgcatch); signal (SIGINT, msgcatch); + signal (SIGHUP, msgcatch); if (p > 0) { /* This is executed in the original process that did the fork above. */ @@ -349,7 +513,11 @@ main () { if ((fromlen = msgrcv (s, msgp, BUFSIZ - 1, 1, 0)) < 0) { - perror ("msgrcv"); +#ifdef EINTR + if (errno == EINTR) + continue; +#endif + perror_1 ("msgrcv"); exit (1); } else @@ -386,3 +554,27 @@ main () #endif /* HAVE_SYSVIPC */ #endif /* HAVE_SOCKETS or HAVE_SYSVIPC */ + +/* This is like perror but puts `Error: ' at the beginning. */ + +void +perror_1 (string) + char *string; +{ + char *copy = (char *) malloc (strlen (string) + 8); + if (copy == 0) + fatal_error ("Virtual memory exhausted"); + + strcpy (copy, "Error: "); + strcat (copy, string); + perror (copy); +} + +void +fatal_error (string) + char *string; +{ + fprintf (stderr, "%s", "Error: "); + fprintf (stderr, string); + exit (1); +}