X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/3b7ad313e0d7b351c55cf999474b61cdc18ecad1..34663a742b6403d54f18eb5f650e7f2413ee40a2:/lib-src/emacsserver.c

diff --git a/lib-src/emacsserver.c b/lib-src/emacsserver.c
index 1306a2b2f7..3675c8efca 100644
--- a/lib-src/emacsserver.c
+++ b/lib-src/emacsserver.c
@@ -26,6 +26,7 @@ Boston, MA 02111-1307, USA.  */
    up to the Emacs which then executes them.  */
 
 #define NO_SHORTNAMES
+#include <signal.h>
 #include <../src/config.h>
 #undef read
 #undef write
@@ -36,6 +37,7 @@ Boston, MA 02111-1307, USA.  */
 #if !defined (HAVE_SOCKETS) && !defined (HAVE_SYSVIPC)
 #include <stdio.h>
 
+int
 main ()
 {
   fprintf (stderr, "Sorry, the Emacs server is supported only on systems\n");
@@ -45,18 +47,24 @@ main ()
 
 #else /* HAVE_SOCKETS or 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 <sys/types.h>
 #include <sys/file.h>
 #include <sys/socket.h>
-#include <sys/signal.h>
 #include <sys/un.h>
 #include <stdio.h>
 #include <errno.h>
 #include <sys/stat.h>
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 extern int errno;
 
 /* Copied from src/process.c */
@@ -81,10 +89,137 @@ 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];
@@ -97,6 +232,8 @@ main ()
   char *getenv ();
 #endif
 
+  progname = argv[0];
+
   openfiles_size = 20;
   openfiles = (FILE **) malloc (openfiles_size * sizeof (FILE *));
   if (openfiles == 0)
@@ -133,6 +270,12 @@ main ()
   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_1 ("bind");
@@ -228,6 +371,7 @@ main ()
 
 	  /* Transfer text from Emacs to the client, up to a newline.  */
 	  infile = openfiles[infd];
+	  rewind (infile);
 	  while (1)
 	    {
 	      if (fgets (string, BUFSIZ, stdin) == 0)
@@ -253,7 +397,6 @@ main ()
 #else  /* This is the SYSV IPC section */
 
 #include <sys/types.h>
-#include <sys/signal.h>
 #include <sys/ipc.h>
 #include <sys/msg.h>
 #include <setjmp.h>
@@ -280,6 +423,7 @@ msgcatch ()
    Its stderr always exists--rms.  */
 #include <stdio.h>
 
+int
 main ()
 {
   int s, infd, fromlen, ioproc;
@@ -413,6 +557,7 @@ main ()
 
 /* This is like perror but puts `Error: ' at the beginning.  */
 
+void
 perror_1 (string)
      char *string;
 {
@@ -425,6 +570,7 @@ perror_1 (string)
   perror (copy);
 }
 
+void
 fatal_error (string)
      char *string;
 {