Importing from xemacs-20.3

Initial revision
Committing changes from `src/daemon'.
1998-06-14 17:04:10 +00:00 · 1998-06-14 17:04:10 +00:00 · 1998-06-14 17:03:32 +00:00 · 1998-06-14 17:02:44 +00:00 · 1998-06-14 17:02:44 +00:00 · 1998-06-14 16:54:23 +00:00
16 changed files with 3613 additions and 0 deletions
--- a/13
+++ b/13
@@ -1,5 +1,18 @@
 1998-06-14  Martin Baulig  <martin@home-of-linux.org>

+	* acconfig.h (HAVE_XAUTH): New tag.
+
+	* configure.in: Added check for `HAVE_XAUTH'.
+
+	* sysdeps/common/error.c (glibtop_warn_r): New function -
+	same as `glibtop_error_r', but doesn't call `exit'.
+	(glibtop_error_io_r, glibtop_warn_io_r): New functions,
+	display `strerror (errno)' together with message.
+
+	* include/glibtop/global.h (TIME_WITH_SYS_TIME): including
+	correct headers; (HAVE_UNISTD_H): Added conditional.
+	Added `#include <sys/param.h>' and `#include <sys/stat.h>'.
+
 	* acconfig.h (HAVE_LINUX_TABLE): New tag.

 	* lib/lib.awk: New file.
--- a/acconfig.h
+++ b/acconfig.h
@@ -35,3 +35,5 @@
 #undef NEED_LIBGTOP

 #undef HAVE_LINUX_TABLE
+
+#undef HAVE_XAUTH
--- a/configure.in
+++ b/configure.in
@@ -13,6 +13,8 @@ AC_PROG_CC
 AC_STDC_HEADERS
 AC_ARG_PROGRAM

+AC_PROG_AWK
+
 AC_CHECK_TOOL(CC,gcc)
 AC_CHECK_TOOL(RANLIB,ranlib)
 AC_CHECK_TOOL(AS,as)
@@ -100,6 +102,30 @@ AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv strdup strtoul uname)
 ALL_LINGUAS="fr"
 AM_GNU_GETTEXT

+AC_PATH_XTRA
+
+dnl The construct foo=`echo $w1 $w2 $w3` fails on some systems if $w1 = -e or -n
+dnl So we use the following instead.
+dnl XE_SPACE(var, words)
+define([XE_SPACE],[
+T=""
+for W in $2; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
+$1="$T"
+])dnl
+
+dnl Autodetect Xauth
+dnl -lXau is only used by gnuclient, so use a special variable for Xauth X libs
+test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no
+test -z "$with_xauth" && { AC_CHECK_HEADER(X11/Xauth.h,          ,with_xauth=no) }
+test -z "$with_xauth" && { AC_CHECK_LIB(Xau, XauGetAuthByAddr,[:],with_xauth=no, $X_LIBS) }
+test -z "$with_xauth" && with_xauth=yes
+if test "$with_xauth" = "yes"; then
+  AC_DEFINE(HAVE_XAUTH)
+  XE_SPACE(libs_xauth, $X_EXTRA_LIBS -lXau $libs_x $X_PRE_LIBS)
+fi
+AC_SUBST(libs_xauth)
+
+
 CFLAGS="$CFLAGS -D_IN_LIBGTOP"

 AC_SUBST(CFLAGS)
@@ -219,6 +245,7 @@ sysdeps/kernel/Makefile
 src/Makefile
 src/server/Makefile
 src/proxy/Makefile
+src/daemon/Makefile
 lib/Makefile
 examples/Makefile
 support/Makefile
--- a/include/glibtop/error.h
+++ b/include/glibtop/error.h
@@ -27,8 +27,16 @@
 __BEGIN_DECLS

 #define glibtop_error(p1, args...)	glibtop_error_r(glibtop_global_server , p1 , ## args)
+#define glibtop_warn(p1, args...)	glibtop_warn_r(glibtop_global_server , p1 , ## args)
+
+#define glibtop_error_io(p1, args...)	glibtop_error_io_r(glibtop_global_server , p1 , ## args)
+#define glibtop_warn_io(p1, args...)	glibtop_warn_io_r(glibtop_global_server , p1 , ## args)

 extern void glibtop_error_r __P((glibtop *, char *, ...));
+extern void glibtop_warn_r __P((glibtop *, char *, ...));
+
+extern void glibtop_error_io_r __P((glibtop *, char *, ...));
+extern void glibtop_warn_io_r __P((glibtop *, char *, ...));

 __END_DECLS

--- a/include/glibtop/global.h
+++ b/include/glibtop/global.h
@@ -51,6 +51,17 @@
 # define __P(protos) ()
 #endif

+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #ifdef HAVE_GUILE
 #include <guile/gh.h>
 #endif
@@ -67,7 +78,10 @@
 #include <stdlib.h>

 #include <stdarg.h>
+
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif

 #ifdef HAVE_MEMORY_H
 #include <memory.h>
@@ -75,7 +89,9 @@

 #include <string.h>
 #include <sys/types.h>
+#include <sys/param.h>
 #include <sys/socket.h>
+#include <sys/stat.h>
 #include <signal.h>
 #include <errno.h>

--- a/include/glibtop/gnuserv.h
+++ b/include/glibtop/gnuserv.h
@@ -0,0 +1,191 @@
+/* -*-C-*-
+
+ Header file for the GNU Emacs server and client C code.
+
+ This file is part of GNU Emacs.
+
+ Copying is permitted under those conditions described by the GNU
+ General Public License.
+
+ Copyright (C) 1989 Free Software Foundation, Inc.
+
+ Author: Andy Norman (ange@hplb.hpl.hp.com), based on 
+         'etc/server.c' and 'etc/emacsclient.c' from the 18.52 GNU
+         Emacs distribution.
+
+ Please mail bugs and suggestions to the author at the above address.
+*/
+
+/* HISTORY 
+ * 11-Nov-1990		bristor@simba	
+ *    Added EOT stuff.
+ */
+
+/*
+ * This file incorporates new features added by Bob Weiner <weiner@mot.com>,
+ * Darrell Kindred <dkindred@cmu.edu> and Arup Mukherjee <arup@cmu.edu>.
+ * Please see the note at the end of the README file for details.
+ *
+ * (If gnuserv came bundled with your emacs, the README file is probably
+ * ../etc/gnuserv.README relative to the directory containing this file)
+ */
+
+#if 0
+static char header_rcsid [] = "!Header: gnuserv.h,v 2.4 95/02/16 11:58:11 arup alpha !";
+#endif
+
+#define NO_SHORTNAMES
+
+#define PATCHLEVEL 2
+
+#define NO_SHORTNAMES
+/* gnuserv should not be compiled using SOCKS */
+#define DO_NOT_SOCKSIFY
+#include <glibtop.h>
+#include <glibtop/error.h>
+#undef read
+#undef write
+#undef open
+#undef close
+#undef signal
+
+/* Define the communication method between server and clients:
+ *   You can have either or both kinds of sockets, but you can't mix
+ *   sockets with sysv ipc
+ */
+
+
+#define INTERNET_DOMAIN_SOCKETS
+#define UNIX_DOMAIN_SOCKETS 
+/* #define SYSV_IPC  */
+
+/*
+ * Define additional authentication protocols to be used. These methods will
+ * be tried before falling back to the default gnuserv protocol (based on
+ * the GNU_SECURE environment variable). Currently, only MIT-MAGIC-COOKIE-1
+ * is also supported.
+ *
+ * Comment out the next line(s) if you don't want to enable the
+ * appropriate authentication protocol.
+ */
+
+#if defined (HAVE_XAUTH)
+#define AUTH_MAGIC_COOKIE
+#endif /* HAVE_XAUTH */
+
+/*
+ * stuff related to supporting MIT-MAGIC-COOKIE-1
+ */
+
+#define MCOOKIE_SCREEN "999"     /* screen # to use as the gnuserv cookie */
+#define MCOOKIE_NAME   "MAGIC-1" /* authentication protocol name */
+#define MCOOKIE_X_NAME "MIT-MAGIC-COOKIE-1"  /* as needed by X */
+
+
+#define DEFAUTH_NAME "GNU-SECURE"  /* name of default auth protocol */
+#define AUTH_TIMEOUT  15           /* # seconds to wait for auth data */
+#define AUTH_NAMESZ   15           /* max allows auth protocol name size */
+
+
+/*
+ * Pick a default communication scheme, if none was specified.
+ */
+
+#if !defined(SYSV_IPC) && !defined(UNIX_DOMAIN_SOCKETS) && !defined(INTERNET_DOMAIN_SOCKETS)
+
+#ifdef HAVE_SYSVIPC
+#define SYSV_IPC		/* SYSV systems use SYSV IPC by default */
+#endif /* HAVE_SYSVIPC */
+
+#ifdef BSD
+#define UNIX_DOMAIN_SOCKETS	/* BSD systems use Unix Domain sockets by default */
+#endif /* BSD */
+
+#endif /* No communication method pre-defined */
+
+/*
+ * If you are using SYSV_IPC, you might want to make the buffer size bigger
+ * since it limits the size of requests and responses. Don't make it bigger
+ * than your system's max message size though (usually a couple of k) or else
+ * msgsend will start failing. For sockets, using the system BUFSIZ is usually
+ * what you want. 
+ */
+
+# define GSERV_BUFSZ BUFSIZ
+
+
+#ifdef SYSV_IPC
+#include <sys/ipc.h>
+#include <sys/msg.h>
+
+#define send_string(s,str) \
+  if (strlen(msgp->mtext) + strlen(str) < GSERV_BUFSZ) \
+     strcat(msgp->mtext,str); \
+  else \
+  { \
+    fprintf(stderr,"%s: not enough message buffer space\n",progname); \
+     exit(1); \
+  } \
+
+#endif /* SYSV_IPC */
+
+#if defined(INTERNET_DOMAIN_SOCKETS) || defined(UNIX_DOMAIN_SOCKETS)
+#include <sys/socket.h>
+#endif /* INTERNET_DOMAIN_SOCKETS || UNIX_DOMAIN_SOCKETS */
+
+#ifdef INTERNET_DOMAIN_SOCKETS
+#include <netdb.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#define TABLE_SIZE 101		/* The number of entries in the hash table */
+#define HASH(host) host		/* Rather simplistic hash function */
+#define DEFAULT_PORT 21490	/* default port number to use is
+				 * DEFAULT_PORT + uid */
+#endif /* INTERNET_DOMAIN_SOCKETS */
+
+#ifdef UNIX_DOMAIN_SOCKETS
+#include <sys/un.h>
+#define HIDE_UNIX_SOCKET	/* put the unix socket in a protected dir */
+#endif /* UNIX_DOMAIN_SOCKETS */
+
+#define HOSTNAMSZ 255		/* max size of a hostname */
+#define REPLYSIZ 300		/* max size of reply from server to client */
+#undef FALSE
+#define FALSE 0
+#undef TRUE
+#define TRUE 1
+
+extern char *optarg;
+extern int optind;
+extern char *progname;
+
+/* The casts shut Sun's compiler up and are safe in the context these
+   are actually used. */
+#define max2(x,y) (((int) (x) > (int) (y)) ? (x) : (y))
+#define min2(x,y) (((int) (x) < (int) (y)) ? (x) : (y))
+
+#ifndef _NFILE            /* rough guess at maximum number of open files */
+#define _NFILE 20
+#endif
+
+#define EOT_STR "\004"
+#define EOT_CHR '\004'
+
+/* connection types */
+#define CONN_UNIX     0
+#define CONN_INTERNET 1
+#define CONN_IPC      2
+
+/* function declarations */
+int make_connection (char *hostarg, int portarg, int *s);
+#ifdef SYSV_IPC
+void disconnect_from_ipc_server();
+#endif
+#if defined(INTERNET_DOMAIN_SOCKETS) || defined(UNIX_DOMAIN_SOCKETS)
+void send_string (int s, const char *msg);
+void disconnect_from_server (int s, int echo);
+int read_line (int s, char *dest);
+#endif
+#ifdef INTERNET_DOMAIN_SOCKETS
+int internet_addr (char *host);
+#endif
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -0,0 +1,6 @@
+1998-06-14  Martin Baulig  <baulig@taurus.uni-trier.de>
+
+	* README: Added README.
+
+	* kernel.patch: Patch for the Linux kernel to add the
+	new system call.
--- a/kernel/README
+++ b/kernel/README
@@ -0,0 +1,21 @@
+This is a new system call `table ()' for the Linux table. It is faster
+than reading from /proc and can be used to fetch all information required
+for libgtop until whe have some other function (extended sysctl, ...) in
+standard kernels.
+
+I didn't want to change sysctl or some other function myself cause this may
+cause other applications relying upon those function to fail. This is
+something for the ``real'' kernel gurus ...
+
+To use this new system call for libgtop, do the following:
+
+* Copy this directory to /usr/src/linux/table
+* Make /usr/src/linux/include/linux/table.h symlink to /usr/src/linux/table/table.h
+* Apply the patch `kernel.patch' to the kernel, compile, install and reboot
+* Recompile libgtop (remove `config.cache' and run the `autogen.sh' again).
+
+If you want to change and/or add something - feel free to do so !
+
+Have fun,
+
+Martin
--- a/kernel/kernel.patch
+++ b/kernel/kernel.patch
@@ -0,0 +1,49 @@
+diff -ur linux-2.0.32/Makefile linux-hacked/Makefile
+--- linux-2.0.32/Makefile	Fri Nov  7 19:51:05 1997
+++ linux-hacked/Makefile	Thu Jun 11 20:41:12 1998
+@@ -87,7 +87,7 @@
+ # standard CFLAGS
+ #
+ 
+-CFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-strength-reduce
+CFLAGS = -Wall -Wstrict-prototypes -g -O2 -fomit-frame-pointer -fno-strength-reduce
+ 
+ ifdef CONFIG_CPP
+ CFLAGS := $(CFLAGS) -x c++
+@@ -113,12 +113,12 @@
+ # Include the make variables (CC, etc...)
+ #
+ 
+-ARCHIVES	=kernel/kernel.o mm/mm.o fs/fs.o ipc/ipc.o net/network.a
+ARCHIVES	=kernel/kernel.o mm/mm.o fs/fs.o ipc/ipc.o net/network.a table/table.o
+ FILESYSTEMS	=fs/filesystems.a
+ DRIVERS		=drivers/block/block.a \
+ 		 drivers/char/char.a
+ LIBS		=$(TOPDIR)/lib/lib.a
+-SUBDIRS		=kernel drivers mm fs net ipc lib
+SUBDIRS		=kernel drivers mm fs net ipc lib table
+ 
+ ifeq ($(CONFIG_ISDN),y)
+ DRIVERS := $(DRIVERS) drivers/isdn/isdn.a
+diff -ur linux-2.0.32/arch/i386/kernel/entry.S linux-hacked/arch/i386/kernel/entry.S
+--- linux-2.0.32/arch/i386/kernel/entry.S	Tue Sep 16 23:42:45 1997
+++ linux-hacked/arch/i386/kernel/entry.S	Thu Jun 11 21:37:20 1998
+@@ -699,4 +699,6 @@
+ 	.long SYMBOL_NAME(sys_mremap)
+ 	.long 0,0
+ 	.long SYMBOL_NAME(sys_vm86)
+-	.space (NR_syscalls-166)*4
+	.long 0
+	.long SYMBOL_NAME(sys_table)
+	.space (NR_syscalls-168)*4
+diff -ur linux-2.0.32/include/asm-i386/unistd.h linux-hacked/include/asm-i386/unistd.h
+--- linux-2.0.32/include/asm-i386/unistd.h	Fri Mar 22 07:34:02 1996
+++ linux-hacked/include/asm-i386/unistd.h	Thu Jun 11 21:37:03 1998
+@@ -169,6 +169,7 @@
+ #define __NR_sched_rr_get_interval	161
+ #define __NR_nanosleep		162
+ #define __NR_mremap		163
+#define __NR_table		168
+ 
+ /* XXX - _foo needs to be __foo, while __NR_bar could be _NR_bar. */
+ #define _syscall0(type,name) \
--- a/lib/gnuclient.c
+++ b/lib/gnuclient.c
@@ -0,0 +1,620 @@
+/* -*-C-*-
+ Client code to allow local and remote editing of files by XEmacs.
+ Copyright (C) 1989 Free Software Foundation, Inc.
+ Copyright (C) 1995 Sun Microsystems, Inc.
+ Copyright (C) 1997 Free Software Foundation, Inc.
+
+This file is part of XEmacs.
+
+XEmacs 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.
+
+XEmacs 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 XEmacs; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
+
+ Author: Andy Norman (ange@hplb.hpl.hp.com), based on 
+         'etc/emacsclient.c' from the GNU Emacs 18.52 distribution.
+
+ Please mail bugs and suggestions to the author at the above address.
+*/
+
+/*
+ * This file incorporates new features added by Bob Weiner <weiner@mot.com>,
+ * Darrell Kindred <dkindred@cmu.edu> and Arup Mukherjee <arup@cmu.edu>.
+ * GNUATTACH support added by Ben Wing <wing@xemacs.org>.
+ * Please see the note at the end of the README file for details.
+ *
+ * (If gnuserv came bundled with your emacs, the README file is probably
+ * ../etc/gnuserv.README relative to the directory containing this file)
+ */
+
+#if 0
+/* Hand-munged RCS header */
+static char rcsid [] = "!Header: gnuclient.c,v 2.2 95/12/12 01:39:21 wing nene !";
+#endif
+
+#include "gnuserv.h"
+#include "getopt.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif /* HAVE_STRING_H */
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif /* HAVE_UNISTD_H */
+
+#include <signal.h>
+
+#if !defined(SYSV_IPC) && !defined(UNIX_DOMAIN_SOCKETS) && \
+    !defined(INTERNET_DOMAIN_SOCKETS)
+int
+main (int argc, char *argv[])
+{
+  fprintf (stderr, "Sorry, the Emacs server is only "
+	   "supported on systems that have\n");
+  fprintf (stderr, "Unix Domain sockets, Internet Domain "
+	   "sockets or System V IPC.\n");
+  exit (1);
+} /* main */
+#else /* SYSV_IPC || UNIX_DOMAIN_SOCKETS || INTERNET_DOMAIN_SOCKETS */
+
+static char cwd[MAXPATHLEN+2];	/* current working directory when calculated */
+static char *cp = NULL;		/* ptr into valid bit of cwd above */
+
+static pid_t emacs_pid;			/* Process id for emacs process */
+
+void initialize_signals (void);
+
+static void
+tell_emacs_to_resume (int sig)
+{
+  char buffer[GSERV_BUFSZ+1];
+  int s;			/* socket / msqid to server */
+  int connect_type;		/* CONN_UNIX, CONN_INTERNET, or
+				   ONN_IPC */
+
+  /* Why is SYSV so retarded? */
+  /* We want emacs to realize that we are resuming */
+  signal(SIGCONT, tell_emacs_to_resume); 
+
+  connect_type = make_connection (NULL, (u_short) 0, &s);
+
+  sprintf(buffer,"(gnuserv-eval '(resume-pid-console %d))", (int)getpid());
+  send_string(s, buffer);
+
+#ifdef SYSV_IPC
+  if (connect_type == (int) CONN_IPC)
+    disconnect_from_ipc_server (s, msgp, FALSE);
+#else /* !SYSV_IPC */
+  if (connect_type != (int) CONN_IPC)
+    disconnect_from_server (s, FALSE);
+#endif /* !SYSV_IPC */
+}
+
+static void
+pass_signal_to_emacs (int sig)
+{
+  if (kill (emacs_pid, sig) == -1)
+    {
+      fprintf (stderr, "gnuattach: Could not pass signal to emacs process\n");
+      exit (1);
+    }
+  initialize_signals ();
+}
+
+void
+initialize_signals ()
+{
+  /* Set up signal handler to pass relevant signals to emacs process.
+     We used to send SIGSEGV, SIGBUS, SIGPIPE, SIGILL and others to
+     Emacs, but I think it's better not to.  I can see no reason why
+     Emacs should SIGSEGV whenever gnuclient SIGSEGV-s, etc.  */
+  signal (SIGHUP, pass_signal_to_emacs);
+  signal (SIGQUIT, pass_signal_to_emacs);
+  signal (SIGINT, pass_signal_to_emacs);
+#ifdef SIGWINCH
+  signal (SIGWINCH, pass_signal_to_emacs);
+#endif
+
+  /* We want emacs to realize that we are resuming */
+  signal (SIGCONT, tell_emacs_to_resume);
+}
+
+
+/*
+  get_current_working_directory -- return the cwd.
+*/
+static char *
+get_current_working_directory (void)
+{
+  if (cp == NULL)
+    {				/* haven't calculated it yet */
+#ifdef BSD
+      if (getwd (cwd) == 0)
+#else /* !BSD */
+      if (getcwd (cwd,MAXPATHLEN) == NULL)
+#endif /* !BSD */
+	{
+	  perror (progname);
+	  fprintf (stderr, "%s: unable to get current working directory\n",
+		   progname);
+	  exit (1);
+	} /* if */
+    
+      /* on some systems, cwd can look like '@machine/' ... */
+      /* ignore everything before the first '/' */
+      for (cp = cwd; *cp && *cp != '/'; ++cp)
+	;
+
+    } /* if */
+
+  return cp;
+
+} /* get_current_working_directory */
+
+
+/*
+  filename_expand -- try to convert the given filename into a fully-qualified
+  		     pathname.
+*/
+static void
+filename_expand (char *fullpath, char *filename)
+  /* fullpath - returned full pathname */
+  /* filename - filename to expand */
+{
+  int len;
+
+  fullpath[0] = '\0';
+  
+  if (filename[0] && filename[0] != '/')
+    {	/* relative filename */
+      strcat (fullpath, get_current_working_directory ());
+      len = strlen (fullpath);
+
+      if (len > 0 && fullpath[len-1] == '/')	/* trailing slash already? */
+	;					/* yep */
+      else
+	strcat (fullpath, "/");		/* nope, append trailing slash */
+    } /* if */
+
+  strcat (fullpath,filename);
+
+} /* filename_expand */
+
+/* Encase the string in quotes, escape all the backslashes and quotes
+   in string.  */
+static char *
+clean_string (CONST char *s)
+{
+  int i = 0;
+  char *p, *res;
+
+  for (p = s; *p; p++, i++)
+    {
+      if (*p == '\\' || *p == '\"')
+	++i;
+      else if (*p == '\004')
+	i += 3;
+    }
+  p = res = (char *)malloc (i + 2 + 1);
+  *p++ = '\"';
+  for (; *s; p++, s++)
+    {
+      switch (*s)
+	{
+	case '\\':
+	  *p++ = '\\';
+	  *p = '\\';
+	  break;
+	case '\"':
+	  *p++ = '\\';
+	  *p = '\"';
+	  break;
+	case '\004':
+	  *p++ = '\\';
+	  *p++ = 'C';
+	  *p++ = '-';
+	  *p = 'd';
+	  break;
+	default:
+	  *p = *s;
+	}
+    }
+  *p++ = '\"';
+  *p = '\0';
+  return res;
+}
+
+#define GET_ARGUMENT(var, desc) do {					   \
+ if (*(p + 1)) (var) = p + 1;						   \
+   else									   \
+     {									   \
+       if (!argv[++i])							   \
+         {								   \
+           fprintf (stderr, "%s: `%s' must be followed by an argument\n",  \
+		    progname, desc);					   \
+	   exit (1);							   \
+         }								   \
+      (var) = argv[i];							   \
+    }									   \
+  over = 1;								   \
+} while (0)
+
+/* A strdup immitation. */
+static char *
+my_strdup (CONST char *s)
+{
+  char *new = malloc (strlen (s) + 1);
+  if (new)
+    strcpy (new, s);
+  return new;
+}
+
+int
+main (int argc, char *argv[])
+{
+  int starting_line = 1;	/* line to start editing at */
+  char command[MAXPATHLEN+50];	/* emacs command buffer */
+  char fullpath[MAXPATHLEN+1];	/* full pathname to file */
+  char *eval_form = NULL;	/* form to evaluate with `-eval' */
+  char *eval_function = NULL;	/* function to evaluate with `-f' */
+  char *load_library = NULL;	/* library to load */
+  int quick = 0;	       	/* quick edit, don't wait for user to
+				   finish */
+  int batch = 0;		/* batch mode */
+  int view = 0;			/* view only. */
+  int nofiles = 0;
+  int errflg = 0;		/* option error */
+  int s;			/* socket / msqid to server */
+  int connect_type;		/* CONN_UNIX, CONN_INTERNET, or
+				 * CONN_IPC */
+  int suppress_windows_system = 0;
+  char *display = NULL;
+#ifdef INTERNET_DOMAIN_SOCKETS
+  char *hostarg = NULL;		/* remote hostname */
+  char *remotearg;
+  char thishost[HOSTNAMSZ];	/* this hostname */
+  char remotepath[MAXPATHLEN+1]; /* remote pathname */
+  char *path;
+  int rflg = 0;			/* pathname given on cmdline */
+  char *portarg;
+  u_short port = 0;		/* port to server */
+#endif /* INTERNET_DOMAIN_SOCKETS */
+#ifdef SYSV_IPC
+  struct msgbuf *msgp;		/* message */
+#endif /* SYSV_IPC */
+  char *tty = NULL;
+  char buffer[GSERV_BUFSZ + 1];	/* buffer to read pid */
+  char result[GSERV_BUFSZ + 1];
+  int i;
+
+#ifdef INTERNET_DOMAIN_SOCKETS
+  memset (remotepath, 0, sizeof (remotepath));
+#endif /* INTERNET_DOMAIN_SOCKETS */
+
+  progname = strrchr (argv[0], '/');
+  if (progname)
+    ++progname;
+  else
+    progname = argv[0];
+
+  display = getenv ("DISPLAY");
+  if (!display)
+    suppress_windows_system = 1;
+  else
+    display = my_strdup (display);
+
+  for (i = 1; argv[i] && !errflg; i++)
+    {
+      if (*argv[i] != '-')
+	break;
+      else if (*argv[i] == '-'
+	       && (*(argv[i] + 1) == '\0'
+		   || (*(argv[i] + 1) == '-' && *(argv[i] + 2) == '\0')))
+	{
+	  /* `-' or `--' */
+	  ++i;
+	  break;
+	}
+
+      if (!strcmp (argv[i], "-batch") || !strcmp (argv[i], "--batch"))
+	batch = 1;
+      else if (!strcmp (argv[i], "-eval") || !strcmp (argv[i], "--eval"))
+	{
+	  if (!argv[++i])
+	    {
+	      fprintf (stderr, "%s: `-eval' must be followed by an argument\n",
+		       progname);
+	      exit (1);
+	    }
+	  eval_form = argv[i];
+	}
+      else if (!strcmp (argv[i], "-display") || !strcmp (argv[i], "--display"))
+	{
+	  suppress_windows_system = 0;
+	  if (!argv[++i])
+	    {
+	      fprintf (stderr,
+		       "%s: `-display' must be followed by an argument\n",
+		       progname);
+	      exit (1);
+	    }
+	  if (display)
+	    free (display);
+	  /* no need to strdup. */
+	  display = argv[i];
+	}
+      else if (!strcmp (argv[i], "-nw"))
+	suppress_windows_system = 1;
+      else
+	{
+	  /* Iterate over one-letter options. */
+	  char *p;
+	  int over = 0;
+	  for (p = argv[i] + 1; *p && !over; p++)
+	    {
+	      switch (*p)
+		{
+		case 'q':
+		  quick = 1;
+		  break;
+		case 'v':
+		  view = 1;
+		  break;
+		case 'f':
+		  GET_ARGUMENT (eval_function, "-f");
+		  break;
+		case 'l':
+		  GET_ARGUMENT (load_library, "-l");
+		  break;
+#ifdef INTERNET_DOMAIN_SOCKETS
+		case 'h':
+		  GET_ARGUMENT (hostarg, "-h");
+		  break;
+		case 'p':
+		  GET_ARGUMENT (portarg, "-p");
+		  port = atoi (portarg);
+		  break;
+		case 'r':
+		  GET_ARGUMENT (remotearg, "-r");
+		  strcpy (remotepath, remotearg);
+		  rflg = 1;
+		  break;
+#endif /* INTERNET_DOMAIN_SOCKETS */
+		default:
+		  errflg = 1;
+		}
+	    } /* for */
+	} /* else */
+    } /* for */
+
+  if (errflg)
+    {
+      fprintf (stderr,
+#ifdef INTERNET_DOMAIN_SOCKETS
+	       "usage: %s [-nw] [-display display] [-q] [-v] [-l library]\n"
+               "       [-batch] [-f function] [-eval form]\n"
+	       "       [-h host] [-p port] [-r remote-path] [[+line] file] ...\n",
+#else /* !INTERNET_DOMAIN_SOCKETS */
+	       "usage: %s [-nw] [-q] [-v] [-l library] [-f function] [-eval form] "
+	       "[[+line] path] ...\n",
+#endif /* !INTERNET_DOMAIN_SOCKETS */
+	       progname);
+      exit (1);
+    }
+  if (batch && argv[i])
+    {
+      fprintf (stderr, "%s: Cannot specify `-batch' with file names\n",
+	       progname);
+      exit (1);
+    }
+  if (suppress_windows_system && hostarg)
+    {
+      fprintf (stderr, "%s: Remote editing is available only on X\n",
+	       progname);
+      exit (1);
+    }
+
+  *result = '\0';
+  if (eval_function || eval_form || load_library)
+    {
+#if defined(INTERNET_DOMAIN_SOCKETS)
+      connect_type = make_connection (hostarg, port, &s);
+#else
+      connect_type = make_connection (NULL, (u_short) 0, &s);
+#endif
+      sprintf (command, "(gnuserv-eval%s '(progn ", quick ? "-quickly" : "");
+      send_string (s, command);
+      if (load_library)
+	{
+	  sprintf (command, " (load-library %s)", clean_string (load_library));
+	  send_string (s, command);
+	}
+      if (eval_form)
+	{
+	  sprintf (command, " %s", eval_form);
+	  send_string (s, command);
+	}
+      if (eval_function)
+	{
+	  sprintf (command, " (%s)", eval_function);
+	  send_string (s, command);
+	}
+      send_string (s, "))");
+      send_string (s, EOT_STR);
+      if (read_line (s, result) == 0)
+	{
+	  fprintf (stderr, "%s: Could not read\n", progname);
+	  exit (1);
+	}
+    } /* eval_function || eval_form || load_library */
+  else if (batch)
+    {
+      fprintf (stderr, "%s: `-batch' requires an evaluation\n",
+	       progname);
+      exit (1);
+    }
+
+  if (!batch)
+    {
+      if (suppress_windows_system)
+	{
+	  tty = ttyname (0);
+	  if (!tty)
+	    {
+	      fprintf (stderr, "%s: Not connected to a tty", progname);
+	      exit (1);
+	    }
+#if defined(INTERNET_DOMAIN_SOCKETS)
+	  connect_type = make_connection (hostarg, port, &s);
+#else
+	  connect_type = make_connection (NULL, (u_short) 0, &s);
+#endif
+	  send_string (s, "(gnuserv-eval '(emacs-pid))");
+	  send_string (s, EOT_STR);
+
+	  if (read_line (s, buffer) == 0)
+	    {
+	      fprintf (stderr, "%s: Could not establish Emacs procces id\n",
+		       progname);
+	      exit (1);
+	    }
+      /* Don't do disconnect_from_server becasue we have already read
+	 data, and disconnect doesn't do anything else. */
+#ifndef INTERNET_DOMAIN_SOCKETS
+	  if (connect_type == (int) CONN_IPC)
+	    disconnect_from_ipc_server (s, msgp, FALSE);
+#endif /* !SYSV_IPC */
+
+	  emacs_pid = (pid_t)atol(buffer);
+	  initialize_signals();
+	} /* suppress_windows_system */
+
+#if defined(INTERNET_DOMAIN_SOCKETS)
+      connect_type = make_connection (hostarg, port, &s);
+#else
+      connect_type = make_connection (NULL, (u_short) 0, &s);
+#endif
+
+#ifdef INTERNET_DOMAIN_SOCKETS
+      if (connect_type == (int) CONN_INTERNET)
+	{
+	  char *ptr;
+	  gethostname (thishost, HOSTNAMSZ);
+	  if (!rflg)
+	    {				/* attempt to generate a path 
+					 * to this machine */
+	      if ((ptr = getenv ("GNU_NODE")) != NULL)
+		/* user specified a path */
+		strcpy (remotepath, ptr);
+	    }
+#if 0  /* This is really bogus... re-enable it if you must have it! */
+#if defined (hp9000s300) || defined (hp9000s800)
+	  else if (strcmp (thishost,hostarg))
+	    {	/* try /net/thishost */
+	      strcpy (remotepath, "/net/");		/* (this fails using internet 
+							   addresses) */
+	      strcat (remotepath, thishost);
+	    }
+#endif
+#endif
+	}
+      else
+	{			/* same machines, no need for path */
+	  remotepath[0] = '\0';	/* default is the empty path */
+	}
+#endif /* INTERNET_DOMAIN_SOCKETS */
+
+#ifdef SYSV_IPC
+      if ((msgp = (struct msgbuf *) 
+	   malloc (sizeof *msgp + GSERV_BUFSZ)) == NULL)
+	{
+	  fprintf (stderr, "%s: not enough memory for message buffer\n", progname);
+	  exit (1);
+	} /* if */
+
+      msgp->mtext[0] = '\0';			/* ready for later strcats */
+#endif /* SYSV_IPC */
+
+      if (suppress_windows_system)
+	{
+	  char *term = getenv ("TERM");
+	  if (!term)
+	    {
+	      fprintf (stderr, "%s: unknown terminal type\n", progname);
+	      exit (1);
+	    }
+	  sprintf (command, "(gnuserv-edit-files '(tty %s %s %d) '(",
+		   clean_string (tty), clean_string (term), (int)getpid ());
+	}
+      else /* !suppress_windows_system */
+	{
+	  sprintf (command, "(gnuserv-edit-files '(x %s) '(",
+		   clean_string (display));
+	} /* !suppress_windows_system */
+      send_string (s, command);
+
+      if (!argv[i])
+	nofiles = 1;
+
+      for (; argv[i]; i++)
+	{
+	  if (i < argc - 1 && *argv[i] == '+')
+	    starting_line = atoi (argv[i++]);
+	  else
+	    starting_line = 1;
+	  /* If the last argument is +something, treat it as a file. */
+	  if (i == argc)
+	    {
+	      starting_line = 1;
+	      --i;
+	    }
+	  filename_expand (fullpath, argv[i]);
+#ifdef INTERNET_DOMAIN_SOCKETS
+	  path = malloc (strlen (remotepath) + strlen (fullpath) + 1);
+	  sprintf (path, "%s%s", remotepath, fullpath);
+#else
+	  path = my_strdup (fullpath);
+#endif
+	  sprintf (command, "(%d . %s)", starting_line, clean_string (path));
+	  send_string (s, command);
+	  free (path);
+	} /* for */
+
+      sprintf (command, ")%s%s",
+	       (quick || (nofiles && !suppress_windows_system)) ? " 'quick" : "",
+	       view ? " 'view" : "");
+      send_string (s, command);
+      send_string (s, ")");
+
+#ifdef SYSV_IPC
+      if (connect_type == (int) CONN_IPC)
+	disconnect_from_ipc_server (s, msgp, FALSE);
+#else /* !SYSV_IPC */
+      if (connect_type != (int) CONN_IPC)
+	disconnect_from_server (s, FALSE);
+#endif /* !SYSV_IPC */
+    } /* not batch */
+
+  if (batch && !quick)
+      printf ("%s\n", result);
+
+  return 0;
+
+} /* main */
+
+#endif /* SYSV_IPC || UNIX_DOMAIN_SOCKETS || INTERNET_DOMAIN_SOCKETS */
--- a/src/daemon/gnuclient.c
+++ b/src/daemon/gnuclient.c
@@ -0,0 +1,620 @@
+/* -*-C-*-
+ Client code to allow local and remote editing of files by XEmacs.
+ Copyright (C) 1989 Free Software Foundation, Inc.
+ Copyright (C) 1995 Sun Microsystems, Inc.
+ Copyright (C) 1997 Free Software Foundation, Inc.
+
+This file is part of XEmacs.
+
+XEmacs 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.
+
+XEmacs 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 XEmacs; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
+
+ Author: Andy Norman (ange@hplb.hpl.hp.com), based on 
+         'etc/emacsclient.c' from the GNU Emacs 18.52 distribution.
+
+ Please mail bugs and suggestions to the author at the above address.
+*/
+
+/*
+ * This file incorporates new features added by Bob Weiner <weiner@mot.com>,
+ * Darrell Kindred <dkindred@cmu.edu> and Arup Mukherjee <arup@cmu.edu>.
+ * GNUATTACH support added by Ben Wing <wing@xemacs.org>.
+ * Please see the note at the end of the README file for details.
+ *
+ * (If gnuserv came bundled with your emacs, the README file is probably
+ * ../etc/gnuserv.README relative to the directory containing this file)
+ */
+
+#if 0
+/* Hand-munged RCS header */
+static char rcsid [] = "!Header: gnuclient.c,v 2.2 95/12/12 01:39:21 wing nene !";
+#endif
+
+#include "gnuserv.h"
+#include "getopt.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif /* HAVE_STRING_H */
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif /* HAVE_UNISTD_H */
+
+#include <signal.h>
+
+#if !defined(SYSV_IPC) && !defined(UNIX_DOMAIN_SOCKETS) && \
+    !defined(INTERNET_DOMAIN_SOCKETS)
+int
+main (int argc, char *argv[])
+{
+  fprintf (stderr, "Sorry, the Emacs server is only "
+	   "supported on systems that have\n");
+  fprintf (stderr, "Unix Domain sockets, Internet Domain "
+	   "sockets or System V IPC.\n");
+  exit (1);
+} /* main */
+#else /* SYSV_IPC || UNIX_DOMAIN_SOCKETS || INTERNET_DOMAIN_SOCKETS */
+
+static char cwd[MAXPATHLEN+2];	/* current working directory when calculated */
+static char *cp = NULL;		/* ptr into valid bit of cwd above */
+
+static pid_t emacs_pid;			/* Process id for emacs process */
+
+void initialize_signals (void);
+
+static void
+tell_emacs_to_resume (int sig)
+{
+  char buffer[GSERV_BUFSZ+1];
+  int s;			/* socket / msqid to server */
+  int connect_type;		/* CONN_UNIX, CONN_INTERNET, or
+				   ONN_IPC */
+
+  /* Why is SYSV so retarded? */
+  /* We want emacs to realize that we are resuming */
+  signal(SIGCONT, tell_emacs_to_resume); 
+
+  connect_type = make_connection (NULL, (u_short) 0, &s);
+
+  sprintf(buffer,"(gnuserv-eval '(resume-pid-console %d))", (int)getpid());
+  send_string(s, buffer);
+
+#ifdef SYSV_IPC
+  if (connect_type == (int) CONN_IPC)
+    disconnect_from_ipc_server (s, msgp, FALSE);
+#else /* !SYSV_IPC */
+  if (connect_type != (int) CONN_IPC)
+    disconnect_from_server (s, FALSE);
+#endif /* !SYSV_IPC */
+}
+
+static void
+pass_signal_to_emacs (int sig)
+{
+  if (kill (emacs_pid, sig) == -1)
+    {
+      fprintf (stderr, "gnuattach: Could not pass signal to emacs process\n");
+      exit (1);
+    }
+  initialize_signals ();
+}
+
+void
+initialize_signals ()
+{
+  /* Set up signal handler to pass relevant signals to emacs process.
+     We used to send SIGSEGV, SIGBUS, SIGPIPE, SIGILL and others to
+     Emacs, but I think it's better not to.  I can see no reason why
+     Emacs should SIGSEGV whenever gnuclient SIGSEGV-s, etc.  */
+  signal (SIGHUP, pass_signal_to_emacs);
+  signal (SIGQUIT, pass_signal_to_emacs);
+  signal (SIGINT, pass_signal_to_emacs);
+#ifdef SIGWINCH
+  signal (SIGWINCH, pass_signal_to_emacs);
+#endif
+
+  /* We want emacs to realize that we are resuming */
+  signal (SIGCONT, tell_emacs_to_resume);
+}
+
+
+/*
+  get_current_working_directory -- return the cwd.
+*/
+static char *
+get_current_working_directory (void)
+{
+  if (cp == NULL)
+    {				/* haven't calculated it yet */
+#ifdef BSD
+      if (getwd (cwd) == 0)
+#else /* !BSD */
+      if (getcwd (cwd,MAXPATHLEN) == NULL)
+#endif /* !BSD */
+	{
+	  perror (progname);
+	  fprintf (stderr, "%s: unable to get current working directory\n",
+		   progname);
+	  exit (1);
+	} /* if */
+    
+      /* on some systems, cwd can look like '@machine/' ... */
+      /* ignore everything before the first '/' */
+      for (cp = cwd; *cp && *cp != '/'; ++cp)
+	;
+
+    } /* if */
+
+  return cp;
+
+} /* get_current_working_directory */
+
+
+/*
+  filename_expand -- try to convert the given filename into a fully-qualified
+  		     pathname.
+*/
+static void
+filename_expand (char *fullpath, char *filename)
+  /* fullpath - returned full pathname */
+  /* filename - filename to expand */
+{
+  int len;
+
+  fullpath[0] = '\0';
+  
+  if (filename[0] && filename[0] != '/')
+    {	/* relative filename */
+      strcat (fullpath, get_current_working_directory ());
+      len = strlen (fullpath);
+
+      if (len > 0 && fullpath[len-1] == '/')	/* trailing slash already? */
+	;					/* yep */
+      else
+	strcat (fullpath, "/");		/* nope, append trailing slash */
+    } /* if */
+
+  strcat (fullpath,filename);
+
+} /* filename_expand */
+
+/* Encase the string in quotes, escape all the backslashes and quotes
+   in string.  */
+static char *
+clean_string (const char *s)
+{
+  int i = 0;
+  char *p, *res;
+
+  for (p = s; *p; p++, i++)
+    {
+      if (*p == '\\' || *p == '\"')
+	++i;
+      else if (*p == '\004')
+	i += 3;
+    }
+  p = res = (char *)malloc (i + 2 + 1);
+  *p++ = '\"';
+  for (; *s; p++, s++)
+    {
+      switch (*s)
+	{
+	case '\\':
+	  *p++ = '\\';
+	  *p = '\\';
+	  break;
+	case '\"':
+	  *p++ = '\\';
+	  *p = '\"';
+	  break;
+	case '\004':
+	  *p++ = '\\';
+	  *p++ = 'C';
+	  *p++ = '-';
+	  *p = 'd';
+	  break;
+	default:
+	  *p = *s;
+	}
+    }
+  *p++ = '\"';
+  *p = '\0';
+  return res;
+}
+
+#define GET_ARGUMENT(var, desc) do {					   \
+ if (*(p + 1)) (var) = p + 1;						   \
+   else									   \
+     {									   \
+       if (!argv[++i])							   \
+         {								   \
+           fprintf (stderr, "%s: `%s' must be followed by an argument\n",  \
+		    progname, desc);					   \
+	   exit (1);							   \
+         }								   \
+      (var) = argv[i];							   \
+    }									   \
+  over = 1;								   \
+} while (0)
+
+/* A strdup immitation. */
+static char *
+my_strdup (const char *s)
+{
+  char *new = malloc (strlen (s) + 1);
+  if (new)
+    strcpy (new, s);
+  return new;
+}
+
+int
+main (int argc, char *argv[])
+{
+  int starting_line = 1;	/* line to start editing at */
+  char command[MAXPATHLEN+50];	/* emacs command buffer */
+  char fullpath[MAXPATHLEN+1];	/* full pathname to file */
+  char *eval_form = NULL;	/* form to evaluate with `-eval' */
+  char *eval_function = NULL;	/* function to evaluate with `-f' */
+  char *load_library = NULL;	/* library to load */
+  int quick = 0;	       	/* quick edit, don't wait for user to
+				   finish */
+  int batch = 0;		/* batch mode */
+  int view = 0;			/* view only. */
+  int nofiles = 0;
+  int errflg = 0;		/* option error */
+  int s;			/* socket / msqid to server */
+  int connect_type;		/* CONN_UNIX, CONN_INTERNET, or
+				 * CONN_IPC */
+  int suppress_windows_system = 0;
+  char *display = NULL;
+#ifdef INTERNET_DOMAIN_SOCKETS
+  char *hostarg = NULL;		/* remote hostname */
+  char *remotearg;
+  char thishost[HOSTNAMSZ];	/* this hostname */
+  char remotepath[MAXPATHLEN+1]; /* remote pathname */
+  char *path;
+  int rflg = 0;			/* pathname given on cmdline */
+  char *portarg;
+  u_short port = 0;		/* port to server */
+#endif /* INTERNET_DOMAIN_SOCKETS */
+#ifdef SYSV_IPC
+  struct msgbuf *msgp;		/* message */
+#endif /* SYSV_IPC */
+  char *tty = NULL;
+  char buffer[GSERV_BUFSZ + 1];	/* buffer to read pid */
+  char result[GSERV_BUFSZ + 1];
+  int i;
+
+#ifdef INTERNET_DOMAIN_SOCKETS
+  memset (remotepath, 0, sizeof (remotepath));
+#endif /* INTERNET_DOMAIN_SOCKETS */
+
+  progname = strrchr (argv[0], '/');
+  if (progname)
+    ++progname;
+  else
+    progname = argv[0];
+
+  display = getenv ("DISPLAY");
+  if (!display)
+    suppress_windows_system = 1;
+  else
+    display = my_strdup (display);
+
+  for (i = 1; argv[i] && !errflg; i++)
+    {
+      if (*argv[i] != '-')
+	break;
+      else if (*argv[i] == '-'
+	       && (*(argv[i] + 1) == '\0'
+		   || (*(argv[i] + 1) == '-' && *(argv[i] + 2) == '\0')))
+	{
+	  /* `-' or `--' */
+	  ++i;
+	  break;
+	}
+
+      if (!strcmp (argv[i], "-batch") || !strcmp (argv[i], "--batch"))
+	batch = 1;
+      else if (!strcmp (argv[i], "-eval") || !strcmp (argv[i], "--eval"))
+	{
+	  if (!argv[++i])
+	    {
+	      fprintf (stderr, "%s: `-eval' must be followed by an argument\n",
+		       progname);
+	      exit (1);
+	    }
+	  eval_form = argv[i];
+	}
+      else if (!strcmp (argv[i], "-display") || !strcmp (argv[i], "--display"))
+	{
+	  suppress_windows_system = 0;
+	  if (!argv[++i])
+	    {
+	      fprintf (stderr,
+		       "%s: `-display' must be followed by an argument\n",
+		       progname);
+	      exit (1);
+	    }
+	  if (display)
+	    free (display);
+	  /* no need to strdup. */
+	  display = argv[i];
+	}
+      else if (!strcmp (argv[i], "-nw"))
+	suppress_windows_system = 1;
+      else
+	{
+	  /* Iterate over one-letter options. */
+	  char *p;
+	  int over = 0;
+	  for (p = argv[i] + 1; *p && !over; p++)
+	    {
+	      switch (*p)
+		{
+		case 'q':
+		  quick = 1;
+		  break;
+		case 'v':
+		  view = 1;
+		  break;
+		case 'f':
+		  GET_ARGUMENT (eval_function, "-f");
+		  break;
+		case 'l':
+		  GET_ARGUMENT (load_library, "-l");
+		  break;
+#ifdef INTERNET_DOMAIN_SOCKETS
+		case 'h':
+		  GET_ARGUMENT (hostarg, "-h");
+		  break;
+		case 'p':
+		  GET_ARGUMENT (portarg, "-p");
+		  port = atoi (portarg);
+		  break;
+		case 'r':
+		  GET_ARGUMENT (remotearg, "-r");
+		  strcpy (remotepath, remotearg);
+		  rflg = 1;
+		  break;
+#endif /* INTERNET_DOMAIN_SOCKETS */
+		default:
+		  errflg = 1;
+		}
+	    } /* for */
+	} /* else */
+    } /* for */
+
+  if (errflg)
+    {
+      fprintf (stderr,
+#ifdef INTERNET_DOMAIN_SOCKETS
+	       "usage: %s [-nw] [-display display] [-q] [-v] [-l library]\n"
+               "       [-batch] [-f function] [-eval form]\n"
+	       "       [-h host] [-p port] [-r remote-path] [[+line] file] ...\n",
+#else /* !INTERNET_DOMAIN_SOCKETS */
+	       "usage: %s [-nw] [-q] [-v] [-l library] [-f function] [-eval form] "
+	       "[[+line] path] ...\n",
+#endif /* !INTERNET_DOMAIN_SOCKETS */
+	       progname);
+      exit (1);
+    }
+  if (batch && argv[i])
+    {
+      fprintf (stderr, "%s: Cannot specify `-batch' with file names\n",
+	       progname);
+      exit (1);
+    }
+  if (suppress_windows_system && hostarg)
+    {
+      fprintf (stderr, "%s: Remote editing is available only on X\n",
+	       progname);
+      exit (1);
+    }
+
+  *result = '\0';
+  if (eval_function || eval_form || load_library)
+    {
+#if defined(INTERNET_DOMAIN_SOCKETS)
+      connect_type = make_connection (hostarg, port, &s);
+#else
+      connect_type = make_connection (NULL, (u_short) 0, &s);
+#endif
+      sprintf (command, "(gnuserv-eval%s '(progn ", quick ? "-quickly" : "");
+      send_string (s, command);
+      if (load_library)
+	{
+	  sprintf (command, " (load-library %s)", clean_string (load_library));
+	  send_string (s, command);
+	}
+      if (eval_form)
+	{
+	  sprintf (command, " %s", eval_form);
+	  send_string (s, command);
+	}
+      if (eval_function)
+	{
+	  sprintf (command, " (%s)", eval_function);
+	  send_string (s, command);
+	}
+      send_string (s, "))");
+      send_string (s, EOT_STR);
+      if (read_line (s, result) == 0)
+	{
+	  fprintf (stderr, "%s: Could not read\n", progname);
+	  exit (1);
+	}
+    } /* eval_function || eval_form || load_library */
+  else if (batch)
+    {
+      fprintf (stderr, "%s: `-batch' requires an evaluation\n",
+	       progname);
+      exit (1);
+    }
+
+  if (!batch)
+    {
+      if (suppress_windows_system)
+	{
+	  tty = ttyname (0);
+	  if (!tty)
+	    {
+	      fprintf (stderr, "%s: Not connected to a tty", progname);
+	      exit (1);
+	    }
+#if defined(INTERNET_DOMAIN_SOCKETS)
+	  connect_type = make_connection (hostarg, port, &s);
+#else
+	  connect_type = make_connection (NULL, (u_short) 0, &s);
+#endif
+	  send_string (s, "(gnuserv-eval '(emacs-pid))");
+	  send_string (s, EOT_STR);
+
+	  if (read_line (s, buffer) == 0)
+	    {
+	      fprintf (stderr, "%s: Could not establish Emacs procces id\n",
+		       progname);
+	      exit (1);
+	    }
+      /* Don't do disconnect_from_server becasue we have already read
+	 data, and disconnect doesn't do anything else. */
+#ifndef INTERNET_DOMAIN_SOCKETS
+	  if (connect_type == (int) CONN_IPC)
+	    disconnect_from_ipc_server (s, msgp, FALSE);
+#endif /* !SYSV_IPC */
+
+	  emacs_pid = (pid_t)atol(buffer);
+	  initialize_signals();
+	} /* suppress_windows_system */
+
+#if defined(INTERNET_DOMAIN_SOCKETS)
+      connect_type = make_connection (hostarg, port, &s);
+#else
+      connect_type = make_connection (NULL, (u_short) 0, &s);
+#endif
+
+#ifdef INTERNET_DOMAIN_SOCKETS
+      if (connect_type == (int) CONN_INTERNET)
+	{
+	  char *ptr;
+	  gethostname (thishost, HOSTNAMSZ);
+	  if (!rflg)
+	    {				/* attempt to generate a path 
+					 * to this machine */
+	      if ((ptr = getenv ("GNU_NODE")) != NULL)
+		/* user specified a path */
+		strcpy (remotepath, ptr);
+	    }
+#if 0  /* This is really bogus... re-enable it if you must have it! */
+#if defined (hp9000s300) || defined (hp9000s800)
+	  else if (strcmp (thishost,hostarg))
+	    {	/* try /net/thishost */
+	      strcpy (remotepath, "/net/");		/* (this fails using internet 
+							   addresses) */
+	      strcat (remotepath, thishost);
+	    }
+#endif
+#endif
+	}
+      else
+	{			/* same machines, no need for path */
+	  remotepath[0] = '\0';	/* default is the empty path */
+	}
+#endif /* INTERNET_DOMAIN_SOCKETS */
+
+#ifdef SYSV_IPC
+      if ((msgp = (struct msgbuf *) 
+	   malloc (sizeof *msgp + GSERV_BUFSZ)) == NULL)
+	{
+	  fprintf (stderr, "%s: not enough memory for message buffer\n", progname);
+	  exit (1);
+	} /* if */
+
+      msgp->mtext[0] = '\0';			/* ready for later strcats */
+#endif /* SYSV_IPC */
+
+      if (suppress_windows_system)
+	{
+	  char *term = getenv ("TERM");
+	  if (!term)
+	    {
+	      fprintf (stderr, "%s: unknown terminal type\n", progname);
+	      exit (1);
+	    }
+	  sprintf (command, "(gnuserv-edit-files '(tty %s %s %d) '(",
+		   clean_string (tty), clean_string (term), (int)getpid ());
+	}
+      else /* !suppress_windows_system */
+	{
+	  sprintf (command, "(gnuserv-edit-files '(x %s) '(",
+		   clean_string (display));
+	} /* !suppress_windows_system */
+      send_string (s, command);
+
+      if (!argv[i])
+	nofiles = 1;
+
+      for (; argv[i]; i++)
+	{
+	  if (i < argc - 1 && *argv[i] == '+')
+	    starting_line = atoi (argv[i++]);
+	  else
+	    starting_line = 1;
+	  /* If the last argument is +something, treat it as a file. */
+	  if (i == argc)
+	    {
+	      starting_line = 1;
+	      --i;
+	    }
+	  filename_expand (fullpath, argv[i]);
+#ifdef INTERNET_DOMAIN_SOCKETS
+	  path = malloc (strlen (remotepath) + strlen (fullpath) + 1);
+	  sprintf (path, "%s%s", remotepath, fullpath);
+#else
+	  path = my_strdup (fullpath);
+#endif
+	  sprintf (command, "(%d . %s)", starting_line, clean_string (path));
+	  send_string (s, command);
+	  free (path);
+	} /* for */
+
+      sprintf (command, ")%s%s",
+	       (quick || (nofiles && !suppress_windows_system)) ? " 'quick" : "",
+	       view ? " 'view" : "");
+      send_string (s, command);
+      send_string (s, ")");
+
+#ifdef SYSV_IPC
+      if (connect_type == (int) CONN_IPC)
+	disconnect_from_ipc_server (s, msgp, FALSE);
+#else /* !SYSV_IPC */
+      if (connect_type != (int) CONN_IPC)
+	disconnect_from_server (s, FALSE);
+#endif /* !SYSV_IPC */
+    } /* not batch */
+
+  if (batch && !quick)
+      printf ("%s\n", result);
+
+  return 0;
+
+} /* main */
+
+#endif /* SYSV_IPC || UNIX_DOMAIN_SOCKETS || INTERNET_DOMAIN_SOCKETS */
--- a/src/daemon/gnuserv.c
+++ b/src/daemon/gnuserv.c
@@ -0,0 +1,897 @@
+/* -*-C-*-
+ Server code for handling requests from clients and forwarding them
+ on to the GNU Emacs process.
+
+ This file is part of GNU Emacs.
+
+ Copying is permitted under those conditions described by the GNU
+ General Public License.
+
+ Copyright (C) 1989 Free Software Foundation, Inc.
+
+ Author: Andy Norman (ange@hplb.hpl.hp.com), based on 'etc/server.c'
+         from the 18.52 GNU Emacs distribution.
+
+ Please mail bugs and suggestions to the author at the above address.
+*/
+
+/* HISTORY 
+ * 11-Nov-1990		bristor@simba	
+ *    Added EOT stuff.
+ */
+
+/*
+ * This file incorporates new features added by Bob Weiner <weiner@mot.com>,
+ * Darrell Kindred <dkindred@cmu.edu> and Arup Mukherjee <arup@cmu.edu>.
+ * Please see the note at the end of the README file for details.
+ *
+ * (If gnuserv came bundled with your emacs, the README file is probably
+ * ../etc/gnuserv.README relative to the directory containing this file)
+ */
+
+#if 0
+static char rcsid [] = "!Header: gnuserv.c,v 2.1 95/02/16 11:58:27 arup alpha !";
+#endif
+
+#include "gnuserv.h"
+
+#ifdef AIX
+#include <sys/select.h>
+#endif
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif /* HAVE_UNISTD_H */
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif /* HAVE_STRING_H */
+
+#if !defined(SYSV_IPC) && !defined(UNIX_DOMAIN_SOCKETS) && \
+    !defined(INTERNET_DOMAIN_SOCKETS)
+main ()
+{
+  fprintf (stderr,"Sorry, the Emacs server is only supported on systems that have\n");
+  fprintf (stderr,"Unix Domain sockets, Internet Domain sockets or System V IPC\n");
+  exit (1);
+} /* main */
+#else /* SYSV_IPC || UNIX_DOMAIN_SOCKETS || INTERNET_DOMAIN_SOCKETS */
+
+#ifdef SYSV_IPC
+
+int ipc_qid = 0;		/* ipc message queue id */
+int ipc_wpid = 0;		/* watchdog task pid */
+
+
+/*
+  ipc_exit -- clean up the queue id and queue, then kill the watchdog task
+              if it exists. exit with the given status.
+*/
+void
+ipc_exit (int stat)
+{
+  msgctl (ipc_qid,IPC_RMID,0);
+  
+  if  (ipc_wpid != 0)
+    kill (ipc_wpid, SIGKILL);
+
+  exit (stat);
+} /* ipc_exit */
+
+
+/*
+  ipc_handle_signal -- catch the signal given and clean up.
+*/
+void
+ipc_handle_signal(int sig)
+{
+  ipc_exit (0);
+} /* ipc_handle_signal */
+
+
+/* 
+  ipc_spawn_watchdog -- spawn a watchdog task to clean up the message queue should the
+			server process die.
+*/
+void
+ipc_spawn_watchdog (void)
+{
+  if ((ipc_wpid = fork ()) == 0)
+    { /* child process */
+      int ppid = getppid ();	/* parent's process id */
+
+      setpgrp();		/* gnu kills process group on exit */
+
+      while (1)
+	{
+	  if (kill (ppid, 0) < 0) /* ppid is no longer valid, parent
+				     may have died */
+	    {
+	      ipc_exit (0);
+	    } /* if */
+
+	  sleep(10);		/* have another go later */
+	} /* while */
+    } /* if */
+
+} /* ipc_spawn_watchdog */
+
+
+/*
+  ipc_init -- initialize server, setting the global msqid that can be listened on.
+*/
+void
+ipc_init (struct msgbuf **msgpp)
+{
+  key_t key;			/* messge key */
+  char buf[GSERV_BUFSZ];	/* pathname for key */
+
+  sprintf (buf,"/tmp/gsrv%d",(int)geteuid ());
+  creat (buf,0600);
+  key = ftok (buf,1);
+
+  if ((ipc_qid = msgget (key,0600|IPC_CREAT)) == -1)
+    {
+      perror (progname);
+      fprintf (stderr, "%s: unable to create msg queue\n", progname);
+      ipc_exit (1);
+    } /* if */
+
+  ipc_spawn_watchdog ();
+
+  signal (SIGTERM,ipc_handle_signal);
+  signal (SIGINT,ipc_handle_signal);
+
+  if ((*msgpp = (struct msgbuf *)
+       malloc (sizeof **msgpp + GSERV_BUFSZ)) == NULL)
+    {
+      fprintf (stderr,
+	       "%s: unable to allocate space for message buffer\n", progname);
+      ipc_exit(1);
+    } /* if */
+} /* ipc_init */
+
+
+/*
+  handle_ipc_request -- accept a request from a client, pass the request on
+  			to the GNU Emacs process, then wait for its reply and
+			pass that on to the client.
+*/
+void
+handle_ipc_request (struct msgbuf *msgp)
+{
+  struct msqid_ds msg_st;	/* message status */
+  char buf[GSERV_BUFSZ];
+  int len;			/* length of message / read */
+  int s, result_len;            /* tag fields on the response from emacs */
+  int offset = 0;
+  int total = 1;                /* # bytes that will actually be sent off */
+
+  if ((len = msgrcv (ipc_qid, msgp, GSERV_BUFSZ - 1, 1, 0)) < 0)
+    {
+      perror (progname);
+      fprintf (stderr, "%s: unable to receive\n", progname);
+      ipc_exit (1);
+    } /* if */
+
+  msgctl (ipc_qid, IPC_STAT, &msg_st);
+  strncpy (buf, msgp->mtext, len);
+  buf[len] = '\0';		/* terminate */
+  
+  printf ("%d %s", ipc_qid, buf);
+  fflush (stdout);
+
+  /* now for the response from gnu */
+  msgp->mtext[0] = '\0';
+
+#if 0
+  if ((len = read(0,buf,GSERV_BUFSZ-1)) < 0)
+    {
+      perror (progname);
+      fprintf (stderr, "%s: unable to read\n", progname);
+      ipc_exit (1);
+  } /* if */
+
+  sscanf (buf, "%d:%[^\n]\n", &junk, msgp->mtext);
+#else
+
+  /* read in "n/m:" (n=client fd, m=message length) */
+
+  while (offset < (GSERV_BUFSZ-1) && 
+	 ((len = read (0, buf + offset, 1)) > 0) &&
+	 buf[offset] != ':')
+    {
+      offset += len;
+    }
+
+  if (len < 0)
+    {
+      perror (progname);
+      fprintf (stderr, "%s: unable to read\n", progname);
+      exit(1);
+    }
+
+  /* parse the response from emacs, getting client fd & result length */
+  buf[offset] = '\0';
+  sscanf (buf, "%d/%d", &s, &result_len);
+
+  while (result_len > 0)
+    {
+      if ((len = read(0, buf, min2 (result_len, GSERV_BUFSZ - 1))) < 0)
+	{
+	  perror (progname);
+	  fprintf (stderr, "%s: unable to read\n", progname);
+	  exit (1);
+	}
+
+      /* Send this string off, but only if we have enough space */ 
+
+      if (GSERV_BUFSZ > total)
+	{
+	  if (total + len <= GSERV_BUFSZ)
+	    buf[len] = 0;
+	  else
+	    buf[GSERV_BUFSZ - total] = 0;
+
+	  send_string(s,buf);
+	  total += strlen(buf);
+	}
+
+      result_len -= len;
+    }
+
+  /* eat the newline */
+  while ((len = read (0,buf,1)) == 0)
+    ;
+  if (len < 0)
+    {
+      perror(progname);
+      fprintf (stderr,"%s: unable to read\n", progname);
+      exit (1);
+    }
+  if (buf[0] != '\n')
+    {
+      fprintf (stderr,"%s: garbage after result [%c]\n", progname, buf[0]);
+      exit (1);
+    }
+#endif
+
+  /* Send a response back to the client. */
+
+  msgp->mtype = msg_st.msg_lspid;
+  if (msgsnd (ipc_qid,msgp,strlen(msgp->mtext)+1,0) < 0)
+    perror ("msgsend(gnuserv)");
+
+} /* handle_ipc_request */
+#endif /* SYSV_IPC */
+
+
+#if defined(INTERNET_DOMAIN_SOCKETS) || defined(UNIX_DOMAIN_SOCKETS)
+/*
+  echo_request -- read request from a given socket descriptor, and send the information
+                  to stdout (the gnu process).
+*/
+static void
+echo_request (int s)
+{
+  char buf[GSERV_BUFSZ];
+  int len;
+
+  printf("%d ",s);
+  
+  /* read until we get a newline or no characters */
+  while ((len = recv(s,buf,GSERV_BUFSZ-1,0)) > 0) {
+    buf[len] = '\0';
+    printf("%s",buf);
+
+    if (buf[len-1] == EOT_CHR) {
+      fflush(stdout);
+      break;			/* end of message */
+    }
+
+  } /* while */
+
+  if (len < 0) {
+    perror(progname);
+    fprintf(stderr,"%s: unable to recv\n",progname);
+    exit(1);
+  } /* if */
+  
+} /* echo_request */
+
+
+/*
+  handle_response -- accept a response from stdin (the gnu process) and pass the
+                     information on to the relevant client.
+*/
+static void
+handle_response (void)
+{
+  char buf[GSERV_BUFSZ+1];
+  int offset=0;
+  int s;
+  int len;
+  int result_len;
+
+  /* read in "n/m:" (n=client fd, m=message length) */
+  while (offset < GSERV_BUFSZ && 
+	 ((len = read(0,buf+offset,1)) > 0) &&
+	 buf[offset] != ':') {
+    offset += len;
+  }
+
+  if (len < 0) {
+    perror(progname);
+    fprintf(stderr,"%s: unable to read\n",progname);
+    exit(1);
+  }
+      
+  /* parse the response from emacs, getting client fd & result length */
+  buf[offset] = '\0';
+  sscanf(buf,"%d/%d", &s, &result_len);
+
+  while (result_len > 0) {
+    if ((len = read(0,buf,min2(result_len,GSERV_BUFSZ))) < 0) {
+      perror(progname);
+      fprintf(stderr,"%s: unable to read\n",progname);
+      exit(1);
+    }
+    buf[len] = '\0';
+    send_string(s,buf);
+    result_len -= len;
+  }
+
+  /* eat the newline */
+  while ((len = read(0,buf,1)) == 0)
+    ;
+  if (len < 0)
+    {
+      perror(progname);
+      fprintf(stderr,"%s: unable to read\n",progname);
+      exit(1);
+    }
+  if (buf[0] != '\n')
+    {
+      fprintf(stderr,"%s: garbage after result\n",progname);
+      exit(1);
+    }
+  /* send the newline */
+  buf[1] = '\0';
+  send_string(s,buf);
+  close(s); 
+
+} /* handle_response */
+#endif /* INTERNET_DOMAIN_SOCKETS || UNIX_DOMAIN_SOCKETS */
+
+
+#ifdef INTERNET_DOMAIN_SOCKETS
+struct entry {
+  u_long host_addr;
+  struct entry *next;
+};
+
+struct entry *permitted_hosts[TABLE_SIZE];
+
+#ifdef AUTH_MAGIC_COOKIE
+# include <X11/X.h>
+# include <X11/Xauth.h>
+
+static Xauth *server_xauth = NULL;
+#endif 
+
+static int 
+timed_read (int fd, char *buf, int max, int timeout, int one_line)
+{
+  fd_set rmask;
+  struct timeval tv; /* = {timeout, 0}; */
+  char c = 0;
+  int nbytes = 0;
+  int r;
+  
+  tv.tv_sec = timeout;
+  tv.tv_usec = 0;
+
+  FD_ZERO(&rmask);
+  FD_SET(fd, &rmask);
+  
+  do
+    {
+      r = select(fd + 1, &rmask, NULL, NULL, &tv);
+
+      if (r > 0)
+	{
+	  if (read (fd, &c, 1) == 1 )
+	    {
+	      *buf++ = c;
+	      ++nbytes;
+	    }
+	  else
+	    {
+	      printf ("read error on socket\004\n");
+	      return -1;
+	    }
+	}
+      else if (r == 0)
+	{
+	  printf ("read timed out\004\n");
+	  return -1;
+	}
+      else
+	{
+	  printf ("error in select\004\n");
+	  return -1;
+	}
+    } while ((nbytes < max) &&  !(one_line && (c == '\n')));
+
+  --buf;
+  if (one_line && *buf == '\n')
+    {
+      *buf = 0;
+    }
+
+  return nbytes;
+}
+	
+	
+
+/*
+  permitted -- return whether a given host is allowed to connect to the server.
+*/
+static int
+permitted (u_long host_addr, int fd)
+{
+  int key;
+  struct entry *entry;
+
+  char auth_protocol[128]; 
+  char buf[1024];
+  int  auth_data_len;
+
+  if (fd > 0)
+    {
+      /* we are checking permission on a real connection */
+
+      /* Read auth protocol name */
+  
+      if (timed_read(fd, auth_protocol, AUTH_NAMESZ, AUTH_TIMEOUT, 1) <= 0)
+	return FALSE;
+
+      if (strcmp (auth_protocol, DEFAUTH_NAME) &&
+	  strcmp (auth_protocol, MCOOKIE_NAME))
+	{
+	  printf ("authentication protocol (%s) from client is invalid...\n", 
+		  auth_protocol);
+	  printf ("... Was the client an old version of gnuclient/gnudoit?\004\n");
+      
+	  return FALSE;
+	}
+
+      if (!strcmp(auth_protocol, MCOOKIE_NAME))
+	{
+
+	  /*
+	   * doing magic cookie auth
+	   */
+
+	  if (timed_read(fd, buf, 10, AUTH_TIMEOUT, 1) <= 0)
+	    return FALSE;
+
+	  auth_data_len = atoi(buf);
+
+	  if (timed_read(fd, buf, auth_data_len, AUTH_TIMEOUT, 0) != auth_data_len)
+	    return FALSE;
+      
+#ifdef AUTH_MAGIC_COOKIE
+	  if (server_xauth && server_xauth->data &&
+	      !memcmp(buf, server_xauth->data, auth_data_len))
+	    {
+	      return TRUE;
+	    }
+#else 
+	  printf ("client tried Xauth, but server is not compiled with Xauth\n");
+#endif
+      
+      /*
+       * auth failed, but allow this to fall through to the GNU_SECURE
+       * protocol....
+       */
+
+	  printf ("Xauth authentication failed, trying GNU_SECURE auth...\004\n");
+
+	}
+    
+      /* Other auth protocols go here, and should execute only if the
+       * auth_protocol name matches.
+       */
+
+    }
+
+
+  /* Now, try the old GNU_SECURE stuff... */
+  
+  /* First find the hash key */
+  key = HASH(host_addr) % TABLE_SIZE;
+  
+  /* Now check the chain for that hash key */
+  for(entry=permitted_hosts[key]; entry != NULL; entry=entry->next)
+    if (host_addr == entry->host_addr) 
+      return(TRUE);
+  
+  return(FALSE);
+
+} /* permitted */
+
+
+/* 
+  add_host -- add the given host to the list of permitted hosts, provided it isn't
+              already there.
+*/	
+static void
+add_host (u_long host_addr)
+{
+  int key;
+  struct entry *new_entry;
+  
+  if (!permitted(host_addr, -1))
+    {
+      if ((new_entry = (struct entry *) malloc(sizeof(struct entry))) == NULL) {
+	fprintf(stderr,"%s: unable to malloc space for permitted host entry\n",
+		progname);
+	exit(1);
+      } /* if */
+
+      new_entry->host_addr = host_addr;
+      key = HASH(host_addr) % TABLE_SIZE;
+      new_entry->next = permitted_hosts[key];
+      permitted_hosts[key] = new_entry;
+    } /* if */
+
+} /* add_host */
+
+
+/*
+  setup_table -- initialise the table of hosts allowed to contact the server,
+                 by reading from the file specified by the GNU_SECURE
+		 environment variable
+                 Put in the local machine, and, if a security file is specifed,
+                 add each host that is named in the file.
+		 Return the number of hosts added.
+*/
+static int
+setup_table (void)
+{
+  FILE *host_file;
+  char *file_name;
+  char hostname[HOSTNAMSZ];
+  u_int host_addr;
+  int i, hosts=0;
+  
+  /* Make sure every entry is null */
+  for (i=0; i<TABLE_SIZE; i++)
+    permitted_hosts[i] = NULL;
+
+  gethostname(hostname,HOSTNAMSZ);
+
+  if ((host_addr = internet_addr(hostname)) == -1)
+    {
+      fprintf(stderr,"%s: unable to find %s in /etc/hosts or from YP", 
+	      progname,hostname);
+      exit(1);
+    } /* if */
+
+#ifdef AUTH_MAGIC_COOKIE
+  
+  server_xauth = XauGetAuthByAddr (FamilyInternet, 
+				   sizeof(host_addr), (char *)&host_addr,
+				   strlen(MCOOKIE_SCREEN), MCOOKIE_SCREEN, 
+				   strlen(MCOOKIE_X_NAME), MCOOKIE_X_NAME);
+  hosts++;
+
+#endif /* AUTH_MAGIC_COOKIE */
+  
+
+#if 0 /* Don't even want to allow access from the local host by default */
+  add_host(host_addr);					/* add local host */
+#endif 
+
+  if (((file_name = getenv("GNU_SECURE")) != NULL &&    /* security file  */
+       (host_file = fopen(file_name,"r")) != NULL))	/* opened ok */
+    {
+      while ((fscanf(host_file,"%s",hostname) != EOF))	/* find a host */
+	if ((host_addr = internet_addr(hostname)) != -1)/* get its addr */
+	  {
+	    add_host(host_addr);				/* add the addr */
+	    hosts++;
+	  }
+      fclose(host_file);
+    } /* if */
+
+  return hosts;
+} /* setup_table */
+
+
+/*
+  internet_init -- initialize server, returning an internet socket that can
+                    be listened on.
+*/
+static int
+internet_init (void)
+{
+  int ls;			/* socket descriptor */
+  struct servent *sp;		/* pointer to service information */
+  struct sockaddr_in server;	/* for local socket address */
+  char *ptr;			/* ptr to return from getenv */
+
+  if (setup_table() == 0) 
+    return -1;
+
+  /* clear out address structure */
+  memset((char *)&server,0,sizeof(struct sockaddr_in));
+  
+  /* Set up address structure for the listen socket. */
+  server.sin_family = AF_INET;
+  server.sin_addr.s_addr = INADDR_ANY;
+
+  /* Find the information for the gnu server
+   * in order to get the needed port number.
+   */
+  if ((ptr=getenv("GNU_PORT")) != NULL)
+    server.sin_port = htons(atoi(ptr));
+  else if ((sp = getservbyname ("gnuserv", "tcp")) == NULL)
+    server.sin_port = htons(DEFAULT_PORT+getuid());
+  else
+    server.sin_port = sp->s_port;
+  
+  /* Create the listen socket. */
+  if ((ls = socket (AF_INET,SOCK_STREAM, 0)) == -1)
+    {
+      perror(progname);
+      fprintf(stderr,"%s: unable to create socket\n",progname);
+      exit(1);
+    } /* if */
+  
+  /* Bind the listen address to the socket. */
+  if (bind(ls,(struct sockaddr *) &server,sizeof(struct sockaddr_in)) == -1)
+    {
+      perror(progname);
+      fprintf(stderr,"%s: unable to bind socket\n",progname);
+      exit(1);
+    } /* if */
+
+  /* Initiate the listen on the socket so remote users
+   * can connect. 
+   */
+  if (listen(ls,20) == -1)
+    {
+      perror(progname);
+      fprintf(stderr,"%s: unable to listen\n",progname);
+      exit(1);
+    } /* if */
+
+  return(ls);
+
+} /* internet_init */
+
+
+/*
+  handle_internet_request -- accept a request from a client and send the information
+                             to stdout (the gnu process).
+*/
+static void
+handle_internet_request (int ls)
+{
+  int s;
+  size_t addrlen = sizeof(struct sockaddr_in);
+  struct sockaddr_in peer;	/* for peer socket address */
+
+  memset((char *)&peer,0,sizeof(struct sockaddr_in));
+
+  if ((s = accept(ls,(struct sockaddr *)&peer, (void *) &addrlen)) == -1)
+    {
+      perror(progname);
+      fprintf(stderr,"%s: unable to accept\n",progname);
+      exit(1);
+    } /* if */
+    
+  /* Check that access is allowed - if not return crud to the client */
+  if (!permitted(peer.sin_addr.s_addr, s))
+    {
+      send_string(s,"gnudoit: Connection refused\ngnudoit: unable to connect to remote");
+      close(s);
+
+      printf("Refused connection from %s\004\n", inet_ntoa(peer.sin_addr));
+      return;
+    } /* if */
+
+  echo_request(s);
+  
+} /* handle_internet_request */
+#endif /* INTERNET_DOMAIN_SOCKETS */
+
+
+#ifdef UNIX_DOMAIN_SOCKETS
+/*
+  unix_init -- initialize server, returning an unix-domain socket that can
+               be listened on.
+*/
+static int
+unix_init (void)
+{
+  int ls;			/* socket descriptor */
+  struct sockaddr_un server; 	/* unix socket address */
+  int bindlen;
+
+  if ((ls = socket(AF_UNIX,SOCK_STREAM, 0)) < 0)
+    {
+      perror(progname);
+      fprintf(stderr,"%s: unable to create socket\n",progname);
+      exit(1);
+    } /* if */
+
+  /* Set up address structure for the listen socket. */
+#ifdef HIDE_UNIX_SOCKET
+  sprintf(server.sun_path,"/tmp/gsrvdir%d",(int)geteuid());
+  if (mkdir(server.sun_path, 0700) < 0)
+    {
+      /* assume it already exists, and try to set perms */
+      if (chmod(server.sun_path, 0700) < 0)
+	{
+	  perror(progname);
+	  fprintf(stderr,"%s: can't set permissions on %s\n",
+		  progname, server.sun_path);
+	  exit(1);
+	}
+    }
+  strcat(server.sun_path,"/gsrv");
+  unlink(server.sun_path);	/* remove old file if it exists */
+#else /* HIDE_UNIX_SOCKET */
+  sprintf(server.sun_path,"/tmp/gsrv%d",(int)geteuid());
+  unlink(server.sun_path);	/* remove old file if it exists */
+#endif /* HIDE_UNIX_SOCKET */
+
+  server.sun_family = AF_UNIX;
+#ifdef HAVE_SOCKADDR_SUN_LEN
+  /* See W. R. Stevens "Advanced Programming in the Unix Environment"
+     p. 502 */
+  bindlen = (sizeof (server.sun_len) + sizeof (server.sun_family)
+	     + strlen (server.sun_path) + 1);
+  server.sun_len = bindlen;
+#else
+  bindlen = strlen (server.sun_path) + sizeof (server.sun_family);
+#endif
+ 
+  if (bind(ls,(struct sockaddr *)&server,bindlen) < 0)
+    {
+      perror(progname);
+      fprintf(stderr,"%s: unable to bind socket\n",progname);
+      exit(1);
+    } /* if */
+
+  chmod(server.sun_path,0700);	/* only this user can send commands */
+
+  if (listen(ls,20) < 0) {
+    perror(progname);
+    fprintf(stderr,"%s: unable to listen\n",progname);
+    exit(1);
+  } /* if */
+
+  /* #### there are also better ways of dealing with this when
+     sigvec() is present. */
+#if  defined (HAVE_SIGPROCMASK)
+  {						
+  sigset_t _mask;
+  sigemptyset (&_mask);
+  sigaddset (&_mask, SIGPIPE);
+  sigprocmask (SIG_BLOCK, &_mask, NULL);
+  }
+#else
+  signal(SIGPIPE,SIG_IGN);	/* in case user kills client */
+#endif
+
+  return(ls);
+
+} /* unix_init */
+
+
+/*
+  handle_unix_request -- accept a request from a client and send the information
+                         to stdout (the gnu process).
+*/
+static void
+handle_unix_request (int ls)
+{
+  int s;
+  size_t len = sizeof(struct sockaddr_un);
+  struct sockaddr_un server; 	/* for unix socket address */
+
+  server.sun_family = AF_UNIX;
+
+  if ((s = accept(ls,(struct sockaddr *)&server, (void *)&len)) < 0)
+    {
+      perror(progname);
+      fprintf(stderr,"%s: unable to accept\n",progname);
+    } /* if */
+
+  echo_request(s);
+  
+} /* handle_unix_request */
+#endif /* UNIX_DOMAIN_SOCKETS */
+
+
+int
+main(argc,argv)
+     int argc;
+     char *argv[];
+{
+  int chan;			/* temporary channel number */
+#ifdef INTERNET_DOMAIN_SOCKETS
+  int ils = -1;			/* internet domain listen socket */
+#endif
+#ifdef UNIX_DOMAIN_SOCKETS
+  int uls = -1;			/* unix domain listen socket */
+#endif
+#ifdef SYSV_IPC
+  struct msgbuf *msgp;		/* message buffer */
+#endif /* SYSV_IPC */
+
+  progname = argv[0];
+
+  for(chan=3; chan < _NFILE; close(chan++)) /* close unwanted channels */
+    ;
+
+#ifdef SYSV_IPC
+  ipc_init(&msgp);		/* get a msqid to listen on, and a message buffer */
+#endif /* SYSV_IPC */
+
+#ifdef INTERNET_DOMAIN_SOCKETS
+  ils = internet_init();	/* get a internet domain socket to listen on */
+#endif /* INTERNET_DOMAIN_SOCKETS */
+
+#ifdef UNIX_DOMAIN_SOCKETS
+  uls = unix_init();		/* get a unix domain socket to listen on */
+#endif /* UNIX_DOMAIN_SOCKETS */
+
+  while (1) {
+#ifdef SYSV_IPC
+    handle_ipc_request(msgp);
+#else /* NOT SYSV_IPC */
+    fd_set rmask;
+    FD_ZERO(&rmask);
+    FD_SET(fileno(stdin), &rmask);
+    if (uls >= 0)
+      FD_SET(uls, &rmask);
+    if (ils >= 0)
+      FD_SET(ils, &rmask);
+    
+    if (select(max2(fileno(stdin),max2(uls,ils)) + 1, &rmask, 
+	       (fd_set *)NULL, (fd_set *)NULL, (struct timeval *)NULL) < 0)
+      {
+	perror(progname);
+	fprintf(stderr,"%s: unable to select\n",progname);
+	exit(1);
+      } /* if */
+
+#ifdef UNIX_DOMAIN_SOCKETS
+    if (uls > 0 && FD_ISSET(uls, &rmask))
+      handle_unix_request(uls);
+#endif
+
+#ifdef INTERNET_DOMAIN_SOCKETS
+    if (ils > 0 && FD_ISSET(ils, &rmask))
+      handle_internet_request(ils);
+#endif /* INTERNET_DOMAIN_SOCKETS */
+
+    if (FD_ISSET(fileno(stdin), &rmask))      /* from stdin (gnu process) */
+      handle_response();
+#endif /* NOT SYSV_IPC */
+  } /* while */
+
+  return 0;
+} /* main */
+
+#endif /* SYSV_IPC || UNIX_DOMAIN_SOCKETS || INTERNET_DOMAIN_SOCKETS */
--- a/src/daemon/gnuserv.h
+++ b/src/daemon/gnuserv.h
@@ -0,0 +1,190 @@
+/* -*-C-*-
+
+ Header file for the GNU Emacs server and client C code.
+
+ This file is part of GNU Emacs.
+
+ Copying is permitted under those conditions described by the GNU
+ General Public License.
+
+ Copyright (C) 1989 Free Software Foundation, Inc.
+
+ Author: Andy Norman (ange@hplb.hpl.hp.com), based on 
+         'etc/server.c' and 'etc/emacsclient.c' from the 18.52 GNU
+         Emacs distribution.
+
+ Please mail bugs and suggestions to the author at the above address.
+*/
+
+/* HISTORY 
+ * 11-Nov-1990		bristor@simba	
+ *    Added EOT stuff.
+ */
+
+/*
+ * This file incorporates new features added by Bob Weiner <weiner@mot.com>,
+ * Darrell Kindred <dkindred@cmu.edu> and Arup Mukherjee <arup@cmu.edu>.
+ * Please see the note at the end of the README file for details.
+ *
+ * (If gnuserv came bundled with your emacs, the README file is probably
+ * ../etc/gnuserv.README relative to the directory containing this file)
+ */
+
+#if 0
+static char header_rcsid [] = "!Header: gnuserv.h,v 2.4 95/02/16 11:58:11 arup alpha !";
+#endif
+
+#define NO_SHORTNAMES
+
+#define PATCHLEVEL 2
+
+#define NO_SHORTNAMES
+/* gnuserv should not be compiled using SOCKS */
+#define DO_NOT_SOCKSIFY
+#include <glibtop/global.h>
+#undef read
+#undef write
+#undef open
+#undef close
+#undef signal
+
+/* Define the communication method between server and clients:
+ *   You can have either or both kinds of sockets, but you can't mix
+ *   sockets with sysv ipc
+ */
+
+
+#define INTERNET_DOMAIN_SOCKETS
+#define UNIX_DOMAIN_SOCKETS 
+/* #define SYSV_IPC  */
+
+/*
+ * Define additional authentication protocols to be used. These methods will
+ * be tried before falling back to the default gnuserv protocol (based on
+ * the GNU_SECURE environment variable). Currently, only MIT-MAGIC-COOKIE-1
+ * is also supported.
+ *
+ * Comment out the next line(s) if you don't want to enable the
+ * appropriate authentication protocol.
+ */
+
+#if defined (HAVE_XAUTH)
+#define AUTH_MAGIC_COOKIE
+#endif /* HAVE_XAUTH */
+
+/*
+ * stuff related to supporting MIT-MAGIC-COOKIE-1
+ */
+
+#define MCOOKIE_SCREEN "999"     /* screen # to use as the gnuserv cookie */
+#define MCOOKIE_NAME   "MAGIC-1" /* authentication protocol name */
+#define MCOOKIE_X_NAME "MIT-MAGIC-COOKIE-1"  /* as needed by X */
+
+
+#define DEFAUTH_NAME "GNU-SECURE"  /* name of default auth protocol */
+#define AUTH_TIMEOUT  15           /* # seconds to wait for auth data */
+#define AUTH_NAMESZ   15           /* max allows auth protocol name size */
+
+
+/*
+ * Pick a default communication scheme, if none was specified.
+ */
+
+#if !defined(SYSV_IPC) && !defined(UNIX_DOMAIN_SOCKETS) && !defined(INTERNET_DOMAIN_SOCKETS)
+
+#ifdef HAVE_SYSVIPC
+#define SYSV_IPC		/* SYSV systems use SYSV IPC by default */
+#endif /* HAVE_SYSVIPC */
+
+#ifdef BSD
+#define UNIX_DOMAIN_SOCKETS	/* BSD systems use Unix Domain sockets by default */
+#endif /* BSD */
+
+#endif /* No communication method pre-defined */
+
+/*
+ * If you are using SYSV_IPC, you might want to make the buffer size bigger
+ * since it limits the size of requests and responses. Don't make it bigger
+ * than your system's max message size though (usually a couple of k) or else
+ * msgsend will start failing. For sockets, using the system BUFSIZ is usually
+ * what you want. 
+ */
+
+# define GSERV_BUFSZ BUFSIZ
+
+
+#ifdef SYSV_IPC
+#include <sys/ipc.h>
+#include <sys/msg.h>
+
+#define send_string(s,str) \
+  if (strlen(msgp->mtext) + strlen(str) < GSERV_BUFSZ) \
+     strcat(msgp->mtext,str); \
+  else \
+  { \
+    fprintf(stderr,"%s: not enough message buffer space\n",progname); \
+     exit(1); \
+  } \
+
+#endif /* SYSV_IPC */
+
+#if defined(INTERNET_DOMAIN_SOCKETS) || defined(UNIX_DOMAIN_SOCKETS)
+#include <sys/socket.h>
+#endif /* INTERNET_DOMAIN_SOCKETS || UNIX_DOMAIN_SOCKETS */
+
+#ifdef INTERNET_DOMAIN_SOCKETS
+#include <netdb.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#define TABLE_SIZE 101		/* The number of entries in the hash table */
+#define HASH(host) host		/* Rather simplistic hash function */
+#define DEFAULT_PORT 21490	/* default port number to use is
+				 * DEFAULT_PORT + uid */
+#endif /* INTERNET_DOMAIN_SOCKETS */
+
+#ifdef UNIX_DOMAIN_SOCKETS
+#include <sys/un.h>
+#define HIDE_UNIX_SOCKET	/* put the unix socket in a protected dir */
+#endif /* UNIX_DOMAIN_SOCKETS */
+
+#define HOSTNAMSZ 255		/* max size of a hostname */
+#define REPLYSIZ 300		/* max size of reply from server to client */
+#undef FALSE
+#define FALSE 0
+#undef TRUE
+#define TRUE 1
+
+extern char *optarg;
+extern int optind;
+extern char *progname;
+
+/* The casts shut Sun's compiler up and are safe in the context these
+   are actually used. */
+#define max2(x,y) (((int) (x) > (int) (y)) ? (x) : (y))
+#define min2(x,y) (((int) (x) < (int) (y)) ? (x) : (y))
+
+#ifndef _NFILE            /* rough guess at maximum number of open files */
+#define _NFILE 20
+#endif
+
+#define EOT_STR "\004"
+#define EOT_CHR '\004'
+
+/* connection types */
+#define CONN_UNIX     0
+#define CONN_INTERNET 1
+#define CONN_IPC      2
+
+/* function declarations */
+int make_connection (char *hostarg, int portarg, int *s);
+#ifdef SYSV_IPC
+void disconnect_from_ipc_server();
+#endif
+#if defined(INTERNET_DOMAIN_SOCKETS) || defined(UNIX_DOMAIN_SOCKETS)
+void send_string (int s, const char *msg);
+void disconnect_from_server (int s, int echo);
+int read_line (int s, char *dest);
+#endif
+#ifdef INTERNET_DOMAIN_SOCKETS
+int internet_addr (char *host);
+#endif
--- a/src/daemon/gnuslib.c
+++ b/src/daemon/gnuslib.c
@@ -0,0 +1,454 @@
+/* -*-C-*-
+ Common library code for the GNU Emacs server and client.
+
+ This file is part of GNU Emacs.
+
+ Copying is permitted under those conditions described by the GNU
+ General Public License.
+
+ Copyright (C) 1989 Free Software Foundation, Inc.
+
+ Author: Andy Norman (ange@hplb.hpl.hp.com), based on 
+         'etc/server.c' and 'etc/emacsclient.c' from the 18.52 GNU
+         Emacs distribution.
+
+ Please mail bugs and suggestions to the author at the above address.
+*/
+
+/* HISTORY 
+ * 11-Nov-1990		bristor@simba	
+ *    Added EOT stuff.
+ */
+
+/*
+ * This file incorporates new features added by Bob Weiner <weiner@mot.com>,
+ * Darrell Kindred <dkindred@cmu.edu> and Arup Mukherjee <arup@cmu.edu>.
+ * Please see the note at the end of the README file for details.
+ *
+ * (If gnuserv came bundled with your emacs, the README file is probably
+ * ../etc/gnuserv.README relative to the directory containing this file)
+ */
+
+#if 0
+static char rcsid [] = "!Header: gnuslib.c,v 2.4 95/02/16 11:57:37 arup alpha !";
+#endif
+
+#include "gnuserv.h"
+#include <errno.h>
+
+#ifdef SYSV_IPC
+static int connect_to_ipc_server (void);
+#endif
+#ifdef UNIX_DOMAIN_SOCKETS
+static int connect_to_unix_server (void);
+#endif
+#ifdef INTERNET_DOMAIN_SOCKETS
+static int connect_to_internet_server (char *serverhost, u_short port);
+#endif
+
+/* On some systems, e.g. DGUX, inet_addr returns a 'struct in_addr'. */
+#ifdef HAVE_BROKEN_INET_ADDR
+# define IN_ADDR struct in_addr
+# define NUMERIC_ADDR_ERROR (numeric_addr.s_addr == -1)
+#else
+# if (LONGBITS > 32)
+#  define IN_ADDR unsigned int
+# else
+#  define IN_ADDR unsigned long
+# endif
+# define NUMERIC_ADDR_ERROR (numeric_addr == (IN_ADDR) -1)
+#endif
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif /* HAVE_UNISTD_H */
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif /* HAVE_STRING_H */
+
+#include <arpa/inet.h>
+
+char *progname = NULL;
+
+int make_connection(hostarg, portarg, s)
+     char *hostarg;
+     int portarg;
+     int *s;
+{
+#ifdef INTERNET_DOMAIN_SOCKETS
+  char *ptr;
+  if (hostarg == NULL)
+    hostarg = getenv("GNU_HOST");
+  if (portarg == 0 && (ptr=getenv("GNU_PORT")) != NULL)
+    portarg = atoi(ptr);
+#endif
+
+  if (hostarg != NULL) {
+    /* hostname was given explicitly, via cmd line arg or GNU_HOST, 
+     * so obey it. */
+#ifdef UNIX_DOMAIN_SOCKETS
+    if (!strcmp(hostarg, "unix")) {
+      *s = connect_to_unix_server();
+      return (int) CONN_UNIX;
+    } 
+#endif /* UNIX_DOMAIN_SOCKETS */
+#ifdef INTERNET_DOMAIN_SOCKETS
+    *s = connect_to_internet_server(hostarg, portarg);
+    return (int) CONN_INTERNET;
+#endif
+#ifdef SYSV_IPC
+    return -1;              /* hostarg should always be NULL for SYSV_IPC */
+#endif
+  } else {
+    /* no hostname given.  Use unix-domain/sysv-ipc, or
+     * internet-domain connection to local host if they're not available. */
+#if   defined(UNIX_DOMAIN_SOCKETS)
+    *s = connect_to_unix_server();
+    return (int) CONN_UNIX;
+#elif defined(SYSV_IPC)
+    *s = connect_to_ipc_server();
+    return (int) CONN_IPC;
+#elif defined(INTERNET_DOMAIN_SOCKETS)
+    {
+      char localhost[HOSTNAMSZ];
+      gethostname(localhost,HOSTNAMSZ);	  /* use this host by default */    
+      *s = connect_to_internet_server(localhost, portarg);
+      return (int) CONN_INTERNET;
+    }
+#endif /* IPC type */
+  }
+}
+
+#ifdef SYSV_IPC
+/*
+  connect_to_ipc_server -- establish connection with server process via SYSV IPC
+  			   Returns msqid for server if successful.
+*/
+static int connect_to_ipc_server (void)
+{
+  int s;			/* connected msqid */
+  key_t key;			/* message key */
+  char buf[GSERV_BUFSZ+1];		/* buffer for filename */
+
+  sprintf(buf,"/tmp/gsrv%d",(int)geteuid());
+  creat(buf,0600);
+  if ((key = ftok(buf,1)) == -1) {
+    perror(progname);
+    fprintf(stderr, "%s: unable to get ipc key from %s\n",
+	    progname, buf);
+    exit(1);
+  }
+
+  if ((s = msgget(key,0600)) == -1) {
+    perror(progname);
+    fprintf(stderr,"%s: unable to access msg queue\n",progname);
+    exit(1);
+  }; /* if */
+
+  return(s);
+
+} /* connect_to_ipc_server */
+
+
+/*
+  disconnect_from_ipc_server -- inform the server that sending has finished,
+                                and wait for its reply.
+*/
+void disconnect_from_ipc_server(s,msgp,echo)
+     int s;
+     struct msgbuf *msgp;
+     int echo;
+{
+  int len;			/* length of received message */
+
+  send_string(s,EOT_STR);	/* EOT terminates this message */
+  msgp->mtype = 1;
+
+  if(msgsnd(s,msgp,strlen(msgp->mtext)+1,0) < 0) {
+    perror(progname);
+    fprintf(stderr,"%s: unable to send message to server\n",progname);
+    exit(1);
+  }; /* if */
+  
+  if((len = msgrcv(s,msgp,GSERV_BUFSZ,getpid(),0)) < 0) {
+    perror(progname);
+    fprintf(stderr,"%s: unable to receive message from server\n",progname);
+    exit(1);
+  }; /* if */
+
+  if (echo) {
+    msgp->mtext[len] = '\0';	/* string terminate message */
+    fputs(msgp->mtext, stdout);
+    if (msgp->mtext[len-1] != '\n') putchar ('\n');
+  }; /* if */
+
+} /* disconnect_from_ipc_server */  
+#endif /* SYSV_IPC */
+
+
+#if defined(INTERNET_DOMAIN_SOCKETS) || defined(UNIX_DOMAIN_SOCKETS)
+/*
+  send_string -- send string to socket.
+*/
+void send_string(s,msg)
+     int s;
+     const char *msg;
+{
+#if 0
+  if (send(s,msg,strlen(msg),0) < 0) {
+    perror(progname);
+    fprintf(stderr,"%s: unable to send\n",progname);
+    exit(1);
+  }; /* if */ 
+#else  
+  int len, left=strlen(msg);
+  while (left > 0) {
+    if ((len=write(s,msg,min2(left,GSERV_BUFSZ))) < 0) {
+       /* XEmacs addition: robertl@arnet.com */
+       if (errno == EPIPE) {
+ 	return ;
+       }
+      perror(progname);
+      fprintf(stderr,"%s: unable to send\n",progname);
+      exit(1);
+    }; /* if */
+    left -= len;
+    msg += len;
+  }; /* while */ 
+#endif
+} /* send_string */
+
+/*
+  read_line -- read a \n terminated line from a socket
+*/
+int read_line(int s, char *dest)
+{
+  int length;
+  int offset=0;
+  char buffer[GSERV_BUFSZ+1];
+
+  while ((length=read(s,buffer+offset,1)>0) && buffer[offset]!='\n'
+	 && buffer[offset] != EOT_CHR) {
+    offset += length;
+    if (offset >= GSERV_BUFSZ) 
+      break;
+  }
+  buffer[offset] = '\0';
+  strcpy(dest,buffer);
+  return 1;
+} /* read_line */
+#endif /* INTERNET_DOMAIN_SOCKETS || UNIX_DOMAIN_SOCKETS */
+
+
+#ifdef UNIX_DOMAIN_SOCKETS
+/*
+  connect_to_unix_server -- establish connection with server process via a unix-
+  			    domain socket. Returns socket descriptor for server
+			    if successful.
+*/
+static int connect_to_unix_server (void)
+{
+  int s;			/* connected socket descriptor */
+  struct sockaddr_un server; 	/* for unix connections */
+
+  if ((s = socket(AF_UNIX,SOCK_STREAM,0)) < 0) {
+    perror(progname);
+    fprintf(stderr,"%s: unable to create socket\n",progname);
+    exit(1);
+  }; /* if */
+  
+  server.sun_family = AF_UNIX;
+#ifdef HIDE_UNIX_SOCKET
+  sprintf(server.sun_path,"/tmp/gsrvdir%d/gsrv",(int)geteuid());
+#else  /* HIDE_UNIX_SOCKET */
+  sprintf(server.sun_path,"/tmp/gsrv%d",(int)geteuid());
+#endif /* HIDE_UNIX_SOCKET */
+  if (connect(s,(struct sockaddr *)&server,strlen(server.sun_path)+2) < 0) {
+    perror(progname);
+    fprintf(stderr,"%s: unable to connect to local\n",progname);
+    exit(1);
+  }; /* if */
+
+  return(s);
+
+} /* connect_to_unix_server */
+#endif /* UNIX_DOMAIN_SOCKETS */
+
+
+#ifdef INTERNET_DOMAIN_SOCKETS
+/*
+  internet_addr -- return the internet addr of the hostname or
+                   internet address passed. Return -1 on error.
+*/
+int internet_addr(host)
+     char *host;
+{
+  struct hostent *hp;		/* pointer to host info for remote host */
+  IN_ADDR numeric_addr;		/* host address */
+
+  numeric_addr = inet_addr(host);
+  if (!NUMERIC_ADDR_ERROR)
+    return numeric_addr;
+  else if ((hp = gethostbyname(host)) != NULL)
+    return ((struct in_addr *)(hp->h_addr))->s_addr;
+  else
+    return -1;
+
+} /* internet_addr */
+
+#ifdef AUTH_MAGIC_COOKIE
+# include <X11/X.h>
+# include <X11/Xauth.h>
+
+static Xauth *server_xauth = NULL;
+#endif
+
+/*
+  connect_to_internet_server -- establish connection with server process via 
+  				an internet domain socket. Returns socket
+				descriptor for server if successful.
+*/
+static int connect_to_internet_server (char *serverhost, u_short port)
+{
+  int s;				/* connected socket descriptor */
+  struct servent *sp;			/* pointer to service information */
+  struct sockaddr_in peeraddr_in;	/* for peer socket address */
+  char buf[512];                        /* temporary buffer */
+
+  /* clear out address structures */
+  memset((char *)&peeraddr_in,0,sizeof(struct sockaddr_in));
+  
+  /* Set up the peer address to which we will connect. */
+  peeraddr_in.sin_family = AF_INET;
+
+  /* look up the server host's internet address */
+  if ((peeraddr_in.sin_addr.s_addr = internet_addr(serverhost)) == -1) {
+    fprintf(stderr,"%s: unable to find %s in /etc/hosts or from YP\n",
+	    progname,serverhost);
+    exit(1);
+  }; /* if */
+  
+  if (port == 0) {
+    if ((sp = getservbyname ("gnuserv","tcp")) == NULL)
+      peeraddr_in.sin_port = htons(DEFAULT_PORT+getuid());
+    else
+      peeraddr_in.sin_port = sp->s_port;
+  } /* if */
+  else
+    peeraddr_in.sin_port = htons(port);
+  
+  /* Create the socket. */
+  if ((s = socket (AF_INET,SOCK_STREAM, 0))== -1) {
+    perror(progname);
+    fprintf(stderr,"%s: unable to create socket\n",progname);
+    exit(1);
+  }; /* if */
+  
+  /* Try to connect to the remote server at the address
+   * which was just built into peeraddr.
+   */
+  if (connect(s, (struct sockaddr *)&peeraddr_in,
+	      sizeof(struct sockaddr_in)) == -1) {
+    perror(progname);
+    fprintf(stderr, "%s: unable to connect to remote\n",progname);
+    exit(1);
+  }; /* if */
+
+#ifdef AUTH_MAGIC_COOKIE
+
+  /* send credentials using MIT-MAGIC-COOKIE-1 protocol */
+  
+  server_xauth = 
+    XauGetAuthByAddr(FamilyInternet, 
+		     sizeof(peeraddr_in.sin_addr.s_addr), 
+		     (char *) &peeraddr_in.sin_addr.s_addr,
+		     strlen(MCOOKIE_SCREEN), MCOOKIE_SCREEN,
+		     strlen(MCOOKIE_X_NAME), MCOOKIE_X_NAME);
+
+  if (server_xauth && server_xauth->data) {
+    sprintf(buf, "%s\n%d\n", MCOOKIE_NAME, server_xauth->data_length);
+    write (s, buf, strlen(buf));
+    write (s, server_xauth->data, server_xauth->data_length);
+
+    return (s);
+  }
+
+#endif /* AUTH_MAGIC_COOKIE */
+
+  sprintf (buf, "%s\n", DEFAUTH_NAME);
+  write (s, buf, strlen(buf));
+
+  return(s);
+
+} /* connect_to_internet_server */
+#endif /* INTERNET_DOMAIN_SOCKETS */
+
+
+#if defined(INTERNET_DOMAIN_SOCKETS) || defined(UNIX_DOMAIN_SOCKETS)
+/*
+  disconnect_from_server -- inform the server that sending has finished, and wait for
+                            its reply.
+*/
+void disconnect_from_server(s,echo)
+     int s;
+     int echo;
+{
+#if 0
+  char buffer[REPLYSIZ+1];
+#else
+  char buffer[GSERV_BUFSZ+1];
+#endif
+  int add_newline = 1;
+  int length;
+
+  send_string(s,EOT_STR);		/* make sure server gets string */
+
+#if !defined (linux)  && !defined (_SCO_DS) 
+  /*
+   * shutdown is completely hozed under linux. If s is a unix domain socket,
+   * you'll get EOPNOTSUPP back from it. If s is an internet socket, you get
+   * a broken pipe when you try to read a bit later. The latter
+   * problem is fixed for linux versions >= 1.1.46, but the problem
+   * with unix sockets persists. Sigh.
+   */
+
+  if (shutdown(s,1) == -1) {
+     perror(progname);
+     fprintf(stderr, "%s: unable to shutdown socket\n",progname);
+     exit(1);
+  }; /* if */
+#endif
+
+#if 0
+  while((length = recv(s,buffer,REPLYSIZ,0)) > 0) {
+    buffer[length] = '\0';
+    if (echo) fputs(buffer,stdout);
+    add_newline = (buffer[length-1] != '\n');
+  }; /* while */
+#else
+  while ((length = read(s,buffer,GSERV_BUFSZ)) > 0 ||
+      (length == -1 && errno == EINTR)) {
+    if (length) {
+      buffer[length] = '\0';
+      if (echo) {
+	fputs(buffer,stdout);
+	add_newline = (buffer[length-1] != '\n');
+      }; /* if */
+    }; /* if */
+  }; /* while */
+#endif
+  
+  if (echo && add_newline) putchar('\n');
+
+  if(length < 0) {
+    perror(progname);
+    fprintf(stderr,"%s: unable to read the reply from the server\n",progname);
+    exit(1);
+  }; /* if */
+
+} /* disconnect_from_server */  
+#endif /* INTERNET_DOMAIN_SOCKETS || UNIX_DOMAIN_SOCKETS */
--- a/sysdeps/common/error.c
+++ b/sysdeps/common/error.c
@@ -37,3 +37,46 @@ glibtop_error_r (glibtop *server, char *format, ...)
 	va_end (ap);
 	exit (1);
 }
+
+void
+glibtop_error_io_r (glibtop *server, char *format, ...)
+{
+	va_list	ap;
+	
+	va_start (ap, format);
+	
+	fprintf (stderr, "%s: ", server->name);
+	vfprintf (stderr, format, ap);
+	fprintf (stderr, ": %s\n", strerror (errno));
+	
+	va_end (ap);
+	exit (1);
+}
+
+void
+glibtop_warn_r (glibtop *server, char *format, ...)
+{
+	va_list	ap;
+	
+	va_start (ap, format);
+	
+	fprintf (stderr, "%s: ", server->name);
+	vfprintf (stderr, format, ap);
+	fprintf (stderr, "\n");
+	
+	va_end (ap);
+}
+
+void
+glibtop_warn_io_r (glibtop *server, char *format, ...)
+{
+	va_list	ap;
+	
+	va_start (ap, format);
+	
+	fprintf (stderr, "%s: ", server->name);
+	vfprintf (stderr, format, ap);
+	fprintf (stderr, ": %s\n", strerror (errno));
+	
+	va_end (ap);
+}
--- a/sysdeps/common/gnuslib.c
+++ b/sysdeps/common/gnuslib.c
@@ -0,0 +1,456 @@
+/* -*-C-*-
+ Common library code for the GNU Emacs server and client.
+
+ This file is part of GNU Emacs.
+
+ Copying is permitted under those conditions described by the GNU
+ General Public License.
+
+ Copyright (C) 1989 Free Software Foundation, Inc.
+
+ Author: Andy Norman (ange@hplb.hpl.hp.com), based on 
+         'etc/server.c' and 'etc/emacsclient.c' from the 18.52 GNU
+         Emacs distribution.
+
+ Please mail bugs and suggestions to the author at the above address.
+*/
+
+/* HISTORY 
+ * 11-Nov-1990		bristor@simba	
+ *    Added EOT stuff.
+ */
+
+/*
+ * This file incorporates new features added by Bob Weiner <weiner@mot.com>,
+ * Darrell Kindred <dkindred@cmu.edu> and Arup Mukherjee <arup@cmu.edu>.
+ * Please see the note at the end of the README file for details.
+ *
+ * (If gnuserv came bundled with your emacs, the README file is probably
+ * ../etc/gnuserv.README relative to the directory containing this file)
+ */
+
+#if 0
+static char rcsid [] = "!Header: gnuslib.c,v 2.4 95/02/16 11:57:37 arup alpha !";
+#endif
+
+#include "gnuserv.h"
+#include <errno.h>
+
+#ifdef SYSV_IPC
+static int connect_to_ipc_server (void);
+#endif
+#ifdef UNIX_DOMAIN_SOCKETS
+static int connect_to_unix_server (void);
+#endif
+#ifdef INTERNET_DOMAIN_SOCKETS
+static int connect_to_internet_server (char *serverhost, u_short port);
+#endif
+
+/* On some systems, e.g. DGUX, inet_addr returns a 'struct in_addr'. */
+#ifdef HAVE_BROKEN_INET_ADDR
+# define IN_ADDR struct in_addr
+# define NUMERIC_ADDR_ERROR (numeric_addr.s_addr == -1)
+#else
+# if (LONGBITS > 32)
+#  define IN_ADDR unsigned int
+# else
+#  define IN_ADDR unsigned long
+# endif
+# define NUMERIC_ADDR_ERROR (numeric_addr == (IN_ADDR) -1)
+#endif
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif /* HAVE_UNISTD_H */
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif /* HAVE_STRING_H */
+
+#include <arpa/inet.h>
+
+char *progname = NULL;
+
+int make_connection(hostarg, portarg, s)
+     char *hostarg;
+     int portarg;
+     int *s;
+{
+#ifdef INTERNET_DOMAIN_SOCKETS
+  char *ptr;
+  if (hostarg == NULL)
+    hostarg = getenv("GNU_HOST");
+  if (portarg == 0 && (ptr=getenv("GNU_PORT")) != NULL)
+    portarg = atoi(ptr);
+#endif
+
+  if (hostarg != NULL) {
+    /* hostname was given explicitly, via cmd line arg or GNU_HOST, 
+     * so obey it. */
+#ifdef UNIX_DOMAIN_SOCKETS
+    if (!strcmp(hostarg, "unix")) {
+      *s = connect_to_unix_server();
+      return (int) CONN_UNIX;
+    } 
+#endif /* UNIX_DOMAIN_SOCKETS */
+#ifdef INTERNET_DOMAIN_SOCKETS
+    *s = connect_to_internet_server(hostarg, portarg);
+    return (int) CONN_INTERNET;
+#endif
+#ifdef SYSV_IPC
+    return -1;              /* hostarg should always be NULL for SYSV_IPC */
+#endif
+  } else {
+    /* no hostname given.  Use unix-domain/sysv-ipc, or
+     * internet-domain connection to local host if they're not available. */
+#if   defined(UNIX_DOMAIN_SOCKETS)
+    *s = connect_to_unix_server();
+    return (int) CONN_UNIX;
+#elif defined(SYSV_IPC)
+    *s = connect_to_ipc_server();
+    return (int) CONN_IPC;
+#elif defined(INTERNET_DOMAIN_SOCKETS)
+    {
+      char localhost[HOSTNAMSZ];
+      gethostname(localhost,HOSTNAMSZ);	  /* use this host by default */    
+      *s = connect_to_internet_server(localhost, portarg);
+      return (int) CONN_INTERNET;
+    }
+#endif /* IPC type */
+  }
+}
+
+#ifdef SYSV_IPC
+/*
+  connect_to_ipc_server -- establish connection with server process via SYSV IPC
+  			   Returns msqid for server if successful.
+*/
+static int connect_to_ipc_server (void)
+{
+  int s;			/* connected msqid */
+  key_t key;			/* message key */
+  char buf[GSERV_BUFSZ+1];		/* buffer for filename */
+
+  sprintf(buf,"/tmp/gsrv%d",(int)geteuid());
+  creat(buf,0600);
+  if ((key = ftok(buf,1)) == -1) {
+    perror(progname);
+    fprintf(stderr, "%s: unable to get ipc key from %s\n",
+	    progname, buf);
+    exit(1);
+  }
+
+  if ((s = msgget(key,0600)) == -1) {
+    perror(progname);
+    fprintf(stderr,"%s: unable to access msg queue\n",progname);
+    exit(1);
+  }; /* if */
+
+  return(s);
+
+} /* connect_to_ipc_server */
+
+
+/*
+  disconnect_from_ipc_server -- inform the server that sending has finished,
+                                and wait for its reply.
+*/
+void disconnect_from_ipc_server(s,msgp,echo)
+     int s;
+     struct msgbuf *msgp;
+     int echo;
+{
+  int len;			/* length of received message */
+
+  send_string(s,EOT_STR);	/* EOT terminates this message */
+  msgp->mtype = 1;
+
+  if(msgsnd(s,msgp,strlen(msgp->mtext)+1,0) < 0) {
+    perror(progname);
+    fprintf(stderr,"%s: unable to send message to server\n",progname);
+    exit(1);
+  }; /* if */
+  
+  if((len = msgrcv(s,msgp,GSERV_BUFSZ,getpid(),0)) < 0) {
+    perror(progname);
+    fprintf(stderr,"%s: unable to receive message from server\n",progname);
+    exit(1);
+  }; /* if */
+
+  if (echo) {
+    msgp->mtext[len] = '\0';	/* string terminate message */
+    fputs(msgp->mtext, stdout);
+    if (msgp->mtext[len-1] != '\n') putchar ('\n');
+  }; /* if */
+
+} /* disconnect_from_ipc_server */  
+#endif /* SYSV_IPC */
+
+
+#if defined(INTERNET_DOMAIN_SOCKETS) || defined(UNIX_DOMAIN_SOCKETS)
+/*
+  send_string -- send string to socket.
+*/
+void send_string(s,msg)
+     int s;
+     const char *msg;
+{
+#if 0
+  if (send(s,msg,strlen(msg),0) < 0) {
+    perror(progname);
+    fprintf(stderr,"%s: unable to send\n",progname);
+    exit(1);
+  }; /* if */ 
+#else  
+  int len, left=strlen(msg);
+  while (left > 0) {
+    if ((len=write(s,msg,min2(left,GSERV_BUFSZ))) < 0) {
+       /* XEmacs addition: robertl@arnet.com */
+       if (errno == EPIPE) {
+ 	return ;
+       }
+      perror(progname);
+      fprintf(stderr,"%s: unable to send\n",progname);
+      exit(1);
+    }; /* if */
+    left -= len;
+    msg += len;
+  }; /* while */ 
+#endif
+} /* send_string */
+
+/*
+  read_line -- read a \n terminated line from a socket
+*/
+int read_line(int s, char *dest)
+{
+  int length;
+  int offset=0;
+  char buffer[GSERV_BUFSZ+1];
+
+  while ((length=read(s,buffer+offset,1)>0) && buffer[offset]!='\n'
+	 && buffer[offset] != EOT_CHR) {
+    offset += length;
+    if (offset >= GSERV_BUFSZ) 
+      break;
+  }
+  buffer[offset] = '\0';
+  strcpy(dest,buffer);
+  return 1;
+} /* read_line */
+#endif /* INTERNET_DOMAIN_SOCKETS || UNIX_DOMAIN_SOCKETS */
+
+
+#ifdef UNIX_DOMAIN_SOCKETS
+/*
+  connect_to_unix_server -- establish connection with server process via a unix-
+  			    domain socket. Returns socket descriptor for server
+			    if successful.
+*/
+static int connect_to_unix_server (void)
+{
+  int s;			/* connected socket descriptor */
+  struct sockaddr_un server; 	/* for unix connections */
+
+  if ((s = socket(AF_UNIX,SOCK_STREAM,0)) < 0) {
+    perror(progname);
+    fprintf(stderr,"%s: unable to create socket\n",progname);
+    exit(1);
+  }; /* if */
+  
+  server.sun_family = AF_UNIX;
+#ifdef HIDE_UNIX_SOCKET
+  sprintf(server.sun_path,"/tmp/gsrvdir%d/gsrv",(int)geteuid());
+#else  /* HIDE_UNIX_SOCKET */
+  sprintf(server.sun_path,"/tmp/gsrv%d",(int)geteuid());
+#endif /* HIDE_UNIX_SOCKET */
+  if (connect(s,(struct sockaddr *)&server,strlen(server.sun_path)+2) < 0) {
+    perror(progname);
+    fprintf(stderr,"%s: unable to connect to local\n",progname);
+    exit(1);
+  }; /* if */
+
+  return(s);
+
+} /* connect_to_unix_server */
+#endif /* UNIX_DOMAIN_SOCKETS */
+
+
+#ifdef INTERNET_DOMAIN_SOCKETS
+/*
+  internet_addr -- return the internet addr of the hostname or
+                   internet address passed. Return -1 on error.
+*/
+int internet_addr(host)
+     char *host;
+{
+  struct hostent *hp;		/* pointer to host info for remote host */
+  IN_ADDR numeric_addr;		/* host address */
+
+  numeric_addr = inet_addr (host);
+  if (!NUMERIC_ADDR_ERROR)
+    return numeric_addr;
+  else if ((hp = gethostbyname (host)) != NULL)
+    return ((struct in_addr *)(hp->h_addr))->s_addr;
+  else {
+    glibtop_warn_io ("gethostbyname (%s)", host);
+    return -1;
+  }
+
+} /* internet_addr */
+
+#ifdef AUTH_MAGIC_COOKIE
+# include <X11/X.h>
+# include <X11/Xauth.h>
+
+static Xauth *server_xauth = NULL;
+#endif
+
+/*
+  connect_to_internet_server -- establish connection with server process via 
+  				an internet domain socket. Returns socket
+				descriptor for server if successful.
+*/
+static int connect_to_internet_server (char *serverhost, u_short port)
+{
+  int s;				/* connected socket descriptor */
+  struct servent *sp;			/* pointer to service information */
+  struct sockaddr_in peeraddr_in;	/* for peer socket address */
+  char buf[512];                        /* temporary buffer */
+
+  /* clear out address structures */
+  memset((char *)&peeraddr_in,0,sizeof(struct sockaddr_in));
+  
+  /* Set up the peer address to which we will connect. */
+  peeraddr_in.sin_family = AF_INET;
+
+  /* look up the server host's internet address */
+  if ((peeraddr_in.sin_addr.s_addr = internet_addr(serverhost)) == -1) {
+    fprintf(stderr,"%s: unable to find %s in /etc/hosts or from YP\n",
+	    progname,serverhost);
+    exit(1);
+  }; /* if */
+  
+  if (port == 0) {
+    if ((sp = getservbyname ("gnuserv","tcp")) == NULL)
+      peeraddr_in.sin_port = htons(DEFAULT_PORT+getuid());
+    else
+      peeraddr_in.sin_port = sp->s_port;
+  } /* if */
+  else
+    peeraddr_in.sin_port = htons(port);
+  
+  /* Create the socket. */
+  if ((s = socket (AF_INET,SOCK_STREAM, 0))== -1) {
+    perror(progname);
+    fprintf(stderr,"%s: unable to create socket\n",progname);
+    exit(1);
+  }; /* if */
+  
+  /* Try to connect to the remote server at the address
+   * which was just built into peeraddr.
+   */
+  if (connect(s, (struct sockaddr *)&peeraddr_in,
+	      sizeof(struct sockaddr_in)) == -1) {
+    perror(progname);
+    fprintf(stderr, "%s: unable to connect to remote\n",progname);
+    exit(1);
+  }; /* if */
+
+#ifdef AUTH_MAGIC_COOKIE
+
+  /* send credentials using MIT-MAGIC-COOKIE-1 protocol */
+  
+  server_xauth = 
+    XauGetAuthByAddr(FamilyInternet, 
+		     sizeof(peeraddr_in.sin_addr.s_addr), 
+		     (char *) &peeraddr_in.sin_addr.s_addr,
+		     strlen(MCOOKIE_SCREEN), MCOOKIE_SCREEN,
+		     strlen(MCOOKIE_X_NAME), MCOOKIE_X_NAME);
+
+  if (server_xauth && server_xauth->data) {
+    sprintf(buf, "%s\n%d\n", MCOOKIE_NAME, server_xauth->data_length);
+    write (s, buf, strlen(buf));
+    write (s, server_xauth->data, server_xauth->data_length);
+
+    return (s);
+  }
+
+#endif /* AUTH_MAGIC_COOKIE */
+
+  sprintf (buf, "%s\n", DEFAUTH_NAME);
+  write (s, buf, strlen(buf));
+
+  return(s);
+
+} /* connect_to_internet_server */
+#endif /* INTERNET_DOMAIN_SOCKETS */
+
+
+#if defined(INTERNET_DOMAIN_SOCKETS) || defined(UNIX_DOMAIN_SOCKETS)
+/*
+  disconnect_from_server -- inform the server that sending has finished, and wait for
+                            its reply.
+*/
+void disconnect_from_server(s,echo)
+     int s;
+     int echo;
+{
+#if 0
+  char buffer[REPLYSIZ+1];
+#else
+  char buffer[GSERV_BUFSZ+1];
+#endif
+  int add_newline = 1;
+  int length;
+
+  send_string(s,EOT_STR);		/* make sure server gets string */
+
+#if !defined (linux)  && !defined (_SCO_DS) 
+  /*
+   * shutdown is completely hozed under linux. If s is a unix domain socket,
+   * you'll get EOPNOTSUPP back from it. If s is an internet socket, you get
+   * a broken pipe when you try to read a bit later. The latter
+   * problem is fixed for linux versions >= 1.1.46, but the problem
+   * with unix sockets persists. Sigh.
+   */
+
+  if (shutdown(s,1) == -1) {
+     perror(progname);
+     fprintf(stderr, "%s: unable to shutdown socket\n",progname);
+     exit(1);
+  }; /* if */
+#endif
+
+#if 0
+  while((length = recv(s,buffer,REPLYSIZ,0)) > 0) {
+    buffer[length] = '\0';
+    if (echo) fputs(buffer,stdout);
+    add_newline = (buffer[length-1] != '\n');
+  }; /* while */
+#else
+  while ((length = read(s,buffer,GSERV_BUFSZ)) > 0 ||
+      (length == -1 && errno == EINTR)) {
+    if (length) {
+      buffer[length] = '\0';
+      if (echo) {
+	fputs(buffer,stdout);
+	add_newline = (buffer[length-1] != '\n');
+      }; /* if */
+    }; /* if */
+  }; /* while */
+#endif
+  
+  if (echo && add_newline) putchar('\n');
+
+  if(length < 0) {
+    perror(progname);
+    fprintf(stderr,"%s: unable to read the reply from the server\n",progname);
+    exit(1);
+  }; /* if */
+
+} /* disconnect_from_server */  
+#endif /* INTERNET_DOMAIN_SOCKETS || UNIX_DOMAIN_SOCKETS */
Author	SHA1	Message	Date
Martin Baulig	d334a77447	Importing from xemacs-20.3	1998-06-14 17:04:10 +00:00
Martin Baulig	1b7d7976b1	Initial revision	1998-06-14 17:04:10 +00:00
Martin Baulig	d7770a12c6	Committing changes from `src/daemon'.	1998-06-14 17:03:32 +00:00
Martin Baulig	5fef6560bf	Importing from xemacs-20.3	1998-06-14 17:02:44 +00:00
Martin Baulig	75605116d0	Initial revision	1998-06-14 17:02:44 +00:00
Martin Baulig	35943ea8fc	Committing changes I made in 'src/daemon'.	1998-06-14 16:54:23 +00:00
Martin Baulig	e166f54328	Importing from xemacs-20.3	1998-06-14 16:50:30 +00:00
Martin Baulig	c1cc35ac17	Initial revision	1998-06-14 16:50:30 +00:00
Martin Baulig	0acb497216	New tag. 1998-06-14 Martin Baulig <martin@home-of-linux.org> * acconfig.h (HAVE_XAUTH): New tag. * configure.in: Added check for `HAVE_XAUTH'.	1998-06-14 16:48:06 +00:00
Martin Baulig	58707dac42	New function - same as `glibtop_error_r', but doesn't call` exit'. 1998-06-14 Martin Baulig <martin@home-of-linux.org> * sysdeps/common/error.c (glibtop_warn_r): New function - same as `glibtop_error_r', but doesn't call `exit'. (glibtop_error_io_r, glibtop_warn_io_r): New functions, display `strerror (errno)' together with message.	1998-06-14 16:47:09 +00:00
Martin Baulig	8f14d30d11	Compiles and links correctly.	1998-06-14 14:45:57 +00:00
Martin Baulig	bde0d74282	including correct headers; (HAVE_UNISTD_H): Added conditional. Added 1998-06-14 Martin Baulig <martin@home-of-linux.org> * include/glibtop/global.h (TIME_WITH_SYS_TIME): including correct headers; (HAVE_UNISTD_H): Added conditional. Added `#include <sys/param.h>' and `#include <sys/stat.h>'.	1998-06-14 14:44:53 +00:00
Martin Baulig	026e93121e	Forgot to import this file.	1998-06-14 14:39:34 +00:00
Martin Baulig	f87722233a	Initial revision	1998-06-14 14:39:34 +00:00
Martin Baulig	03c5a235ef	Importing gnuserv and gnuclient from XEmacs 20.3.	1998-06-14 14:09:34 +00:00
Martin Baulig	215ab9f17b	Initial revision	1998-06-14 14:09:34 +00:00
Martin Baulig	794a8efaed	Added README. 1998-06-14 Martin Baulig <baulig@taurus.uni-trier.de> * README: Added README. * kernel.patch: Patch for the Linux kernel to add the new system call.	1998-06-14 12:40:59 +00:00