/* Communication subprocess for GNU Emacs acting as server.
- Copyright (C) 1986, 1987, 1992 Free Software Foundation, Inc.
+ Copyright (C) 1986, 1987, 1992, 1994 Free Software Foundation, Inc.
This file is part of GNU Emacs.
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
#undef close
#undef signal
-
-#if !defined(HAVE_SOCKETS) && !defined(HAVE_SYSVIPC)
+#if !defined (HAVE_SOCKETS) && !defined (HAVE_SYSVIPC)
#include <stdio.h>
main ()
#else /* HAVE_SOCKETS or HAVE_SYSVIPC */
-#if ! defined (HAVE_SYSVIPC)
+#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/un.h>
#include <stdio.h>
#include <errno.h>
+#include <sys/stat.h>
extern int errno;
+/* Copied from src/process.c */
+#ifdef FD_SET
+/* We could get this from param.h, but better not to depend on finding that.
+ And better not to risk that it might define other symbols used in this
+ file. */
+#ifdef FD_SETSIZE
+#define MAXDESC FD_SETSIZE
+#else
+#define MAXDESC 64
+#endif
+#define SELECT_TYPE fd_set
+#else /* no FD_SET */
+#define MAXDESC 32
+#define SELECT_TYPE int
+
+/* Define the macros to access a single-int bitmap of descriptors. */
+#define FD_SET(n, p) (*(p) |= (1 << (n)))
+#define FD_CLR(n, p) (*(p) &= ~(1 << (n)))
+#define FD_ISSET(n, p) (*(p) & (1 << (n)))
+#define FD_ZERO(p) (*(p) = 0)
+#endif /* no FD_SET */
+
main ()
{
char system_name[32];
FILE *infile;
FILE **openfiles;
int openfiles_size;
+ struct stat statbuf;
#ifndef convex
char *getenv ();
if ((s = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
{
- perror ("socket");
+ perror_1 ("socket");
exit (1);
}
server.sun_family = AF_UNIX;
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
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);
}
signal (SIGPIPE, SIG_IGN);
for (;;)
{
- int rmask = (1 << s) + 1;
+ SELECT_TYPE rmask;
+ FD_ZERO (&rmask);
+ FD_SET (0, &rmask);
+ FD_SET (s, &rmask);
if (select (s + 1, &rmask, 0, 0, 0) < 0)
- perror ("select");
- if (rmask & (1 << s)) /* client sends list of filenames */
+ perror_1 ("select");
+ if (FD_ISSET (s, &rmask)) /* client sends list of filenames */
{
fromlen = sizeof (fromunix);
fromunix.sun_family = AF_UNIX;
- infd = accept (s, (struct sockaddr *) &fromunix, &fromlen); /* open socket fd */
+ infd = accept (s, (struct sockaddr *) &fromunix, &fromlen);
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;
}
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;
str = fgets (string, BUFSIZ, infile);
if (str == NULL)
{
- perror ("fgets");
+ perror_1 ("fgets");
close (infd); /* Prevent descriptor leak.. */
continue;
}
fflush (infile);
continue;
}
- else if (rmask & 1) /* emacs sends codeword, fd, and string message */
+ else if (FD_ISSET (0, &rmask)) /* emacs sends codeword, fd, and string message */
{
/* Read command codeword and fd */
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];
#include <sys/ipc.h>
#include <sys/msg.h>
#include <setjmp.h>
+#include <errno.h>
+#include <sys/utsname.h>
+
+struct utsname system_name;
+
+#ifndef errno
+extern int errno;
+#endif
jmp_buf msgenv;
main ()
{
- int s, infd, fromlen;
+ int s, infd, fromlen, ioproc;
key_t key;
struct msgbuf * msgp =
(struct msgbuf *) malloc (sizeof *msgp + BUFSIZ);
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);
}
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. */
}
}
- /* This is executed in the child made by forking above. */
+ /* This is executed in the child made by forking above.
+ Call it c1. Make another process, ioproc. */
+
+ ioproc = fork ();
+ if (ioproc == 0)
+ {
+ /* In process ioproc, wait for text from Emacs,
+ and send it to the process c1.
+ This way, c1 only has to wait for one source of input. */
+ while (fgets (msgp->mtext, BUFSIZ, stdin))
+ {
+ msgp->mtype = 1;
+ msgsnd (s, msgp, strlen (msgp->mtext) + 1, 0);
+ }
+ exit (1);
+ }
+
+ /* In the process c1,
+ listen for messages from clients and pass them to Emacs. */
while (1)
{
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
{
msgctl (s, IPC_STAT, &msg_st);
+
+ /* Distinguish whether the message came from a client, or from
+ ioproc. */
+ if (msg_st.msg_lspid == ioproc)
+ {
+ char code[BUFSIZ];
+ int inproc;
+
+ /* Message from ioproc: tell a client we are done. */
+ msgp->mtext[strlen (msgp->mtext)-1] = 0;
+ sscanf (msgp->mtext, "%s %d", code, &inproc);
+ msgp->mtype = inproc;
+ msgsnd (s, msgp, strlen (msgp->mtext) + 1, 0);
+ continue;
+ }
+
+ /* This is a request from a client: copy to stdout
+ so that Emacs will get it. Include msg_lspid
+ so server.el can tell us where to send the reply. */
strncpy (string, msgp->mtext, fromlen);
string[fromlen] = 0; /* make sure */
/* Newline is part of string.. */
- printf ("Client: %d %s", s, string);
+ printf ("Client: %d %s", msg_st.msg_lspid, string);
fflush (stdout);
- /* Now, wait for a wakeup */
- fgets (msgp->mtext, BUFSIZ, stdin);
- msgp->mtext[strlen (msgp->mtext)-1] = 0;
- /* strcpy (msgp->mtext, "done");*/
- msgp->mtype = msg_st.msg_lspid;
- msgsnd (s, msgp, strlen (msgp->mtext)+1, 0);
}
}
}
#endif /* HAVE_SYSVIPC */
#endif /* HAVE_SOCKETS or HAVE_SYSVIPC */
+\f
+/* This is like perror but puts `Error: ' at the beginning. */
+
+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);
+}
+
+fatal_error (string)
+ char *string;
+{
+ fprintf (stderr, "%s", "Error: ");
+ fprintf (stderr, string);
+ exit (1);
+}
HCoop / bpt / emacs.git / blobdiff