/* Client process that communicates with GNU Emacs acting as server.
- Copyright (C) 1986, 1987, 1994, 1999, 2000, 2001
- Free Software Foundation, Inc.
+ Copyright (C) 1986, 1987, 1994, 1999, 2000, 2001, 2002, 2003, 2004,
+ 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#define NO_SHORTNAMES
#include <config.h>
#endif
+#ifdef WINDOWSNT
+#define HAVE_SOCKETS
+#define NO_SOCKETS_IN_FILE_SYSTEM
+#endif
+
+#ifdef WINDOWSNT
+# define HSOCKET SOCKET
+# define CLOSE_SOCKET closesocket
+# define IOCTL ioctlsocket
+# define INITIALIZE() (initialize_sockets ())
+typedef unsigned long IOCTL_BOOL_ARG;
+#else
+# define HSOCKET int
+# define CLOSE_SOCKET close
+# define IOCTL ioctl
+# define INITIALIZE()
+typedef int IOCTL_BOOL_ARG;
+#endif
+
#undef signal
#include <ctype.h>
#include <stdio.h>
-#include <getopt.h>
+#include "getopt.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef VMS
# include "vms-pwd.h"
-#else
+#else /* not VMS */
+#ifdef WINDOWSNT
+# include <io.h>
+#else /* not WINDOWSNT */
# include <pwd.h>
+#endif /* not WINDOWSNT */
#endif /* not VMS */
char *getenv (), *getwd ();
-char *getcwd ();
-
-/* This is defined with -D from the compilation command,
- which extracts it from ../lisp/version.el. */
+char *(getcwd) ();
#ifndef VERSION
#define VERSION "unspecified"
#endif
\f
+#define SEND_STRING(data) (send_to_emacs (s, (data)))
+#define SEND_QUOTED(data) (quote_file_name (s, (data)))
+
+#ifndef EXIT_SUCCESS
+#define EXIT_SUCCESS 0
+#endif
+
+#ifndef EXIT_FAILURE
+#define EXIT_FAILURE 1
+#endif
+
+#ifndef FALSE
+#define FALSE 0
+#endif
+
+#ifndef TRUE
+#define TRUE 1
+#endif
+
+#ifndef NO_RETURN
+#define NO_RETURN
+#endif
+\f
/* Name used to invoke this program. */
char *progname;
is not running. --alternate-editor. */
const char * alternate_editor = NULL;
-void print_help_and_exit ();
+/* If non-NULL, the filename of the UNIX socket. */
+char *socket_name = NULL;
+
+/* If non-NULL, the filename of the authentication file. */
+char *server_file = NULL;
+
+void print_help_and_exit () NO_RETURN;
struct option longopts[] =
{
{ "help", no_argument, NULL, 'H' },
{ "version", no_argument, NULL, 'V' },
{ "alternate-editor", required_argument, NULL, 'a' },
+ { "socket-name", required_argument, NULL, 's' },
+ { "server-file", required_argument, NULL, 'f' },
{ "display", required_argument, NULL, 'd' },
{ 0, 0, 0, 0 }
};
int argc;
char **argv;
{
+ alternate_editor = getenv ("ALTERNATE_EDITOR");
+ server_file = getenv ("EMACS_SERVER_FILE");
+
while (1)
{
int opt = getopt_long (argc, argv,
- "VHnea:d:", longopts, 0);
+ "VHnea:s:f:d:", longopts, 0);
if (opt == EOF)
break;
- alternate_editor = getenv ("ALTERNATE_EDITOR");
-
switch (opt)
{
case 0:
alternate_editor = optarg;
break;
+ case 's':
+ socket_name = optarg;
+ break;
+
+ case 'f':
+ server_file = optarg;
+ break;
+
case 'd':
display = optarg;
break;
break;
case 'V':
- fprintf (stderr, "emacsclient %s\n", VERSION);
- exit (1);
+ printf ("emacsclient %s\n", VERSION);
+ exit (EXIT_SUCCESS);
break;
case 'H':
- default:
print_help_and_exit ();
+ break;
+
+ default:
+ fprintf (stderr, "Try `%s --help' for more information\n", progname);
+ exit (EXIT_FAILURE);
+ break;
}
}
}
void
print_help_and_exit ()
{
- fprintf (stderr,
- "Usage: %s [OPTIONS] FILE...\n\
+ printf (
+ "Usage: %s [OPTIONS] FILE...\n\
Tell the Emacs server to visit the specified files.\n\
Every FILE can be either just a FILENAME or [+LINE[:COLUMN]] FILENAME.\n\
+\n\
The following OPTIONS are accepted:\n\
-V, --version Just print a version info and return\n\
-H, --help Print this usage information message\n\
-n, --no-wait Don't wait for the server to return\n\
-e, --eval Evaluate the FILE arguments as ELisp expressions\n\
--d, --display=DISPLAY Visit the file in the given display\n\
+-d, --display=DISPLAY Visit the file in the given display\n"
+#ifndef NO_SOCKETS_IN_FILE_SYSTEM
+"-s, --socket-name=FILENAME\n\
+ Set the filename of the UNIX socket for communication\n"
+#endif
+"-f, --server-file=FILENAME\n\
+ Set the filename of the TCP configuration file\n\
-a, --alternate-editor=EDITOR\n\
Editor to fallback to if the server is not running\n\
+\n\
Report bugs to bug-gnu-emacs@gnu.org.\n", progname);
- exit (1);
+ exit (EXIT_SUCCESS);
}
-/* Return a copy of NAME, inserting a &
- before each &, each space, each newline, and any initial -.
- Change spaces to underscores, too, so that the
- return value never contains a space. */
+\f
+/*
+ Try to run a different command, or --if no alternate editor is
+ defined-- exit with an errorcode.
+*/
+void
+fail (argc, argv)
+ int argc;
+ char **argv;
+{
+ if (alternate_editor)
+ {
+ int i = optind - 1;
+ execvp (alternate_editor, argv + i);
+ fprintf (stderr, "%s: error executing alternate editor \"%s\"\n",
+ progname, alternate_editor);
+ }
+ else
+ {
+ fprintf (stderr, "%s: No socket or alternate editor. Please use:\n\n"
+#if !defined (NO_SOCKETS_IN_FILE_SYSTEM)
+"\t--socket-name\n"
+#endif
+"\t--server-file (or environment variable EMACS_SERVER_FILE)\n\
+\t--alternate-editor (or environment variable ALTERNATE_EDITOR)\n",
+ progname);
+ }
+ exit (EXIT_FAILURE);
+}
-char *
-quote_file_name (name)
+\f
+#if !defined (HAVE_SOCKETS)
+
+int
+main (argc, argv)
+ int argc;
+ char **argv;
+{
+ fprintf (stderr, "%s: Sorry, the Emacs server is supported only\n",
+ argv[0]);
+ fprintf (stderr, "on systems with Berkeley sockets.\n");
+
+ fail (argc, argv);
+}
+
+#else /* HAVE_SOCKETS */
+
+#ifdef WINDOWSNT
+# include <winsock2.h>
+#else
+# include <sys/types.h>
+# include <sys/socket.h>
+# include <sys/un.h>
+# include <sys/stat.h>
+# include <errno.h>
+#endif
+
+#define AUTH_KEY_LENGTH 64
+#define SEND_BUFFER_SIZE 4096
+
+extern char *strerror ();
+extern int errno;
+
+/* Buffer to accumulate data to send in TCP connections. */
+char send_buffer[SEND_BUFFER_SIZE + 1];
+int sblen = 0; /* Fill pointer for the send buffer. */
+
+/* Let's send the data to Emacs when either
+ - the data ends in "\n", or
+ - the buffer is full (but this shouldn't happen)
+ Otherwise, we just accumulate it. */
+void send_to_emacs (s, data)
+ HSOCKET s;
+ char *data;
+{
+ while (data)
+ {
+ int dlen = strlen (data);
+ if (dlen + sblen >= SEND_BUFFER_SIZE)
+ {
+ int part = SEND_BUFFER_SIZE - sblen;
+ strncpy (&send_buffer[sblen], data, part);
+ data += part;
+ sblen = SEND_BUFFER_SIZE;
+ }
+ else if (dlen)
+ {
+ strcpy (&send_buffer[sblen], data);
+ data = NULL;
+ sblen += dlen;
+ }
+ else
+ break;
+
+ if (sblen == SEND_BUFFER_SIZE
+ || (sblen > 0 && send_buffer[sblen-1] == '\n'))
+ {
+ int sent = send (s, send_buffer, sblen, 0);
+ if (sent != sblen)
+ strcpy (send_buffer, &send_buffer[sent]);
+ sblen -= sent;
+ }
+ }
+}
+
+/* In NAME, insert a & before each &, each space, each newline, and
+ any initial -. Change spaces to underscores, too, so that the
+ return value never contains a space. */
+void
+quote_file_name (s, name)
+ HSOCKET s;
char *name;
{
char *copy = (char *) malloc (strlen (name) * 2 + 1);
}
*q++ = 0;
- return copy;
+ SEND_STRING (copy);
+
+ free (copy);
}
-/* Like malloc but get fatal error if memory is exhausted. */
+#ifdef WINDOWSNT
+/* Wrapper to make WSACleanup a cdecl, as required by atexit(). */
+void close_winsock ()
+{
+ WSACleanup ();
+}
-long *
-xmalloc (size)
- unsigned int size;
+void initialize_sockets ()
{
- long *result = (long *) malloc (size);
- if (result == NULL)
- {
- perror ("malloc");
- exit (1);
- }
- return result;
+ WSADATA wsaData;
+
+ /* Initialize the WinSock2 library. */
+ if (WSAStartup (MAKEWORD (2, 0), &wsaData))
+ {
+ fprintf (stderr, "%s: error initializing WinSock2", progname);
+ exit (EXIT_FAILURE);
+ }
+
+ atexit (close_winsock);
+#endif /* WINDOWSNT */
}
\f
/*
- Try to run a different command, or --if no alternate editor is
- defined-- exit with an errorcode.
+ * Read the information needed to set up a TCP comm channel with
+ * the Emacs server: host, port and authentication string.
*/
-void
-fail (argc, argv)
- int argc;
- char **argv;
+int get_server_config (server, authentication)
+ struct sockaddr_in *server;
+ char *authentication;
{
- if (alternate_editor)
+ FILE *config;
+ char dotted[32];
+ char *port;
+
+ if (! (config = fopen (server_file, "rb")))
{
- int i = optind - 1;
- execvp (alternate_editor, argv + i);
- return;
+ char *home = getenv ("HOME");
+#ifdef WINDOWSNT
+ if (! home)
+ home = getenv ("APPDATA");
+#endif
+ if (home)
+ {
+ char *path = alloca (32 + strlen (home) + strlen (server_file));
+ sprintf (path, "%s/.emacs.d/server/%s", home, server_file);
+ config = fopen (path, "rb");
+ }
+ }
+
+ if (! config)
+ return FALSE;
+
+ if (fgets (dotted, sizeof dotted, config)
+ && (port = strchr (dotted, ':')))
+ {
+ *port++ = '\0';
}
else
{
- exit (1);
+ fprintf (stderr, "%s: invalid configuration info", progname);
+ exit (EXIT_FAILURE);
}
-}
+ server->sin_family = AF_INET;
+ server->sin_addr.s_addr = inet_addr (dotted);
+ server->sin_port = htons (atoi (port));
-\f
-#if !defined (HAVE_SOCKETS) || defined (NO_SOCKETS_IN_FILE_SYSTEM)
+ if (! fread (authentication, AUTH_KEY_LENGTH, 1, config))
+ {
+ fprintf (stderr, "%s: cannot read authentication info", progname);
+ exit (EXIT_FAILURE);
+ }
-int
-main (argc, argv)
- int argc;
- char **argv;
-{
- fprintf (stderr, "%s: Sorry, the Emacs server is supported only\n",
- argv[0]);
- fprintf (stderr, "on systems with Berkeley sockets.\n");
+ fclose (config);
- fail (argc, argv);
+ return TRUE;
}
-#else /* HAVE_SOCKETS */
+HSOCKET
+set_tcp_socket ()
+{
+ HSOCKET s;
+ struct sockaddr_in server;
+ IOCTL_BOOL_ARG c_arg = 0;
+ struct linger l_arg = {1, 1};
+ char auth_string[AUTH_KEY_LENGTH + 1];
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/stat.h>
-#include <errno.h>
+ INITIALIZE ();
-extern char *strerror ();
-extern int errno;
+ if (! get_server_config (&server, auth_string))
+ return INVALID_SOCKET;
+
+ /*
+ * Open up an AF_INET socket
+ */
+ if ((s = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
+ {
+ fprintf (stderr, "%s: ", progname);
+ perror ("socket");
+ return INVALID_SOCKET;
+ }
+
+ /*
+ * Set up the socket
+ */
+ if (connect (s, (struct sockaddr *) &server, sizeof server) < 0)
+ {
+ fprintf (stderr, "%s: ", progname);
+ perror ("connect");
+ return INVALID_SOCKET;
+ }
+
+ IOCTL (s, FIONBIO, &c_arg);
+ setsockopt (s, SOL_SOCKET, SO_LINGER, (char *) &l_arg, sizeof l_arg);
+
+ /*
+ * Send the authentication
+ */
+ auth_string[AUTH_KEY_LENGTH] = '\0';
+
+ SEND_STRING ("-auth ");
+ SEND_STRING (auth_string);
+ SEND_STRING ("\n");
+
+ return s;
+}
+
+#if !defined (NO_SOCKETS_IN_FILE_SYSTEM)
/* Three possibilities:
2 - can't be `stat'ed (sets errno)
return 0;
}
-int
-main (argc, argv)
- int argc;
- char **argv;
+HSOCKET
+set_local_socket ()
{
- char *system_name;
- int system_name_length;
- int s, i, needlf = 0;
- FILE *out, *in;
+ HSOCKET s;
struct sockaddr_un server;
- char *cwd, *str;
- char string[BUFSIZ];
-
- progname = argv[0];
-
- /* Process options. */
- decode_options (argc, argv);
-
- if (argc - optind < 1)
- print_help_and_exit ();
/*
* Open up an AF_UNIX socket in this person's home directory
if ((s = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
{
- fprintf (stderr, "%s: ", argv[0]);
+ fprintf (stderr, "%s: ", progname);
perror ("socket");
- fail (argc, argv);
+ return INVALID_SOCKET;
}
server.sun_family = AF_UNIX;
{
- char *dot;
- system_name_length = 32;
+ int sock_status = 0;
+ int default_sock = !socket_name;
+ int saved_errno;
+ char *server_name = "server";
+
+ if (socket_name && !index (socket_name, '/') && !index (socket_name, '\\'))
+ { /* socket_name is a file name component. */
+ server_name = socket_name;
+ socket_name = NULL;
+ default_sock = 1; /* Try both UIDs. */
+ }
- while (1)
+ if (default_sock)
{
- system_name = (char *) xmalloc (system_name_length + 1);
-
- /* system_name must be null-terminated string. */
- system_name[system_name_length] = '\0';
-
- if (gethostname (system_name, system_name_length) == 0)
- break;
-
- free (system_name);
- system_name_length *= 2;
+ socket_name = alloca (100 + strlen (server_name));
+ sprintf (socket_name, "/tmp/emacs%d/%s",
+ (int) geteuid (), server_name);
}
- /* We always use the non-dotted host name, for simplicity. */
- dot = index (system_name, '.');
- if (dot)
- *dot = '\0';
- }
-
- {
- int sock_status = 0;
-
- sprintf (server.sun_path, "/tmp/esrv%d-%s", (int) geteuid (), system_name);
+ if (strlen (socket_name) < sizeof (server.sun_path))
+ strcpy (server.sun_path, socket_name);
+ else
+ {
+ fprintf (stderr, "%s: socket-name %s too long",
+ progname, socket_name);
+ exit (EXIT_FAILURE);
+ }
/* See if the socket exists, and if it's owned by us. */
sock_status = socket_status (server.sun_path);
- if (sock_status)
+ saved_errno = errno;
+ if (sock_status && default_sock)
{
/* Failing that, see if LOGNAME or USER exist and differ from
our euid. If so, look for a socket based on the UID
that init_editfns uses to set the global Vuser_full_name. */
char *user_name = (char *) getenv ("LOGNAME");
+
if (!user_name)
user_name = (char *) getenv ("USER");
if (user_name)
{
struct passwd *pw = getpwnam (user_name);
+
if (pw && (pw->pw_uid != geteuid ()))
{
/* We're running under su, apparently. */
- sprintf (server.sun_path, "/tmp/esrv%d-%s",
- (int) pw->pw_uid, system_name);
+ socket_name = alloca (100 + strlen (server_name));
+ sprintf (socket_name, "/tmp/emacs%d/%s",
+ (int) pw->pw_uid, server_name);
+
+ if (strlen (socket_name) < sizeof (server.sun_path))
+ strcpy (server.sun_path, socket_name);
+ else
+ {
+ fprintf (stderr, "%s: socket-name %s too long",
+ progname, socket_name);
+ exit (EXIT_FAILURE);
+ }
+
sock_status = socket_status (server.sun_path);
+ saved_errno = errno;
}
+ else
+ errno = saved_errno;
}
}
- switch (sock_status)
- {
- case 1:
- /* There's a socket, but it isn't owned by us. This is OK if
- we are root. */
- if (0 != geteuid ())
- {
- fprintf (stderr, "%s: Invalid socket owner\n", argv[0]);
- fail (argc, argv);
- }
- break;
-
- case 2:
- /* `stat' failed */
- if (errno == ENOENT)
- fprintf (stderr,
- "%s: can't find socket; have you started the server?\n\
+ switch (sock_status)
+ {
+ case 1:
+ /* There's a socket, but it isn't owned by us. This is OK if
+ we are root. */
+ if (0 != geteuid ())
+ {
+ fprintf (stderr, "%s: Invalid socket owner\n", argv[0]);
+ return INVALID_SOCKET;
+ }
+ break;
+
+ case 2:
+ /* `stat' failed */
+ if (saved_errno == ENOENT)
+ fprintf (stderr,
+ "%s: can't find socket; have you started the server?\n\
To start the server in Emacs, type \"M-x server-start\".\n",
- argv[0]);
- else
- fprintf (stderr, "%s: can't stat %s: %s\n",
- argv[0], server.sun_path, strerror (errno));
- fail (argc, argv);
- break;
- }
+ progname);
+ else
+ fprintf (stderr, "%s: can't stat %s: %s\n",
+ progname, server.sun_path, strerror (saved_errno));
+ return INVALID_SOCKET;
+ }
}
if (connect (s, (struct sockaddr *) &server, strlen (server.sun_path) + 2)
< 0)
{
- fprintf (stderr, "%s: ", argv[0]);
+ fprintf (stderr, "%s: ", progname);
perror ("connect");
- fail (argc, argv);
+ return INVALID_SOCKET;
}
- /* We use the stream OUT to send our command to the server. */
- if ((out = fdopen (s, "r+")) == NULL)
+ return s;
+}
+#endif /* ! NO_SOCKETS_IN_FILE_SYSTEM */
+
+HSOCKET
+set_socket ()
+{
+ if (server_file)
+ return set_tcp_socket ();
+ else
+#ifndef NO_SOCKETS_IN_FILE_SYSTEM
+ return set_local_socket ();
+#else
{
- fprintf (stderr, "%s: ", argv[0]);
- perror ("fdopen");
- fail (argc, argv);
+ server_file = "server";
+ return set_tcp_socket ();
}
+#endif
+}
+
+int
+main (argc, argv)
+ int argc;
+ char **argv;
+{
+ HSOCKET s;
+ int i, rl, needlf = 0;
+ char *cwd;
+ char string[BUFSIZ+1];
- /* We use the stream IN to read the response.
- We used to use just one stream for both output and input
- on the socket, but reversing direction works nonportably:
- on some systems, the output appears as the first input;
- on other systems it does not. */
- if ((in = fdopen (s, "r+")) == NULL)
+ progname = argv[0];
+
+ /* Process options. */
+ decode_options (argc, argv);
+
+ if ((argc - optind < 1) && !eval)
{
- fprintf (stderr, "%s: ", argv[0]);
- perror ("fdopen");
- fail (argc, argv);
+ fprintf (stderr, "%s: file name or argument required\n", progname);
+ fprintf (stderr, "Try `%s --help' for more information\n", progname);
+ exit (EXIT_FAILURE);
}
+ if ((s = set_socket ()) == INVALID_SOCKET)
+ fail (argc, argv);
+
#ifdef HAVE_GETCWD
cwd = getcwd (string, sizeof string);
#else
if (cwd == 0)
{
/* getwd puts message in STRING if it fails. */
- fprintf (stderr, "%s: %s (%s)\n", argv[0],
#ifdef HAVE_GETCWD
- "Cannot get current working directory",
+ fprintf (stderr, "%s: %s (%s)\n", progname,
+ "Cannot get current working directory", strerror (errno));
#else
- string,
+ fprintf (stderr, "%s: %s (%s)\n", progname, string, strerror (errno));
#endif
- strerror (errno));
fail (argc, argv);
}
if (nowait)
- fprintf (out, "-nowait ");
+ SEND_STRING ("-nowait ");
if (eval)
- fprintf (out, "-eval ");
+ SEND_STRING ("-eval ");
if (display)
- fprintf (out, "-display %s ", quote_file_name (display));
+ {
+ SEND_STRING ("-display ");
+ SEND_QUOTED (display);
+ SEND_STRING (" ");
+ }
- for (i = optind; i < argc; i++)
+ if ((argc - optind > 0))
{
- if (eval)
- ; /* Don't prepend any cwd or anything like that. */
- else if (*argv[i] == '+')
+ for (i = optind; i < argc; i++)
{
- char *p = argv[i] + 1;
- while (isdigit ((unsigned char) *p) || *p == ':') p++;
- if (*p != 0)
- fprintf (out, "%s/", quote_file_name (cwd));
- }
- else if (*argv[i] != '/')
- fprintf (out, "%s/", quote_file_name (cwd));
+ if (eval)
+ ; /* Don't prepend any cwd or anything like that. */
+ else if (*argv[i] == '+')
+ {
+ char *p = argv[i] + 1;
+ while (isdigit ((unsigned char) *p) || *p == ':') p++;
+ if (*p != 0)
+ {
+ SEND_QUOTED (cwd);
+ SEND_STRING ("/");
+ }
+ }
+#ifndef WINDOWSNT
+ else if (*argv[i] != '/')
+#else
+ else if ((*argv[i] != '/')
+ /* Absolute paths can also start with backslash
+ or drive letters. */
+ && (*argv[i] != '\\')
+ && (!islower (tolower (*argv[i]))
+ || (argv[i][1] != ':')))
+#endif
+ {
+ SEND_QUOTED (cwd);
+ SEND_STRING ("/");
+ }
- fprintf (out, "%s ", quote_file_name (argv[i]));
+ SEND_QUOTED (argv[i]);
+ SEND_STRING (" ");
+ }
}
- fprintf (out, "\n");
- fflush (out);
-
- /* Maybe wait for an answer. */
- if (nowait)
- return 0;
-
- if (!eval)
+ else
{
- printf ("Waiting for Emacs...");
- needlf = 2;
+ while (fgets (string, BUFSIZ, stdin))
+ {
+ SEND_QUOTED (string);
+ }
+ SEND_STRING (" ");
}
- fflush (stdout);
- /* Now, wait for an answer and print any messages. */
- while ((str = fgets (string, BUFSIZ, in)))
+ SEND_STRING ("\n");
+
+ /* Maybe wait for an answer. */
+ if (!nowait)
{
- if (needlf == 2)
- printf ("\n");
- printf ("%s", str);
- needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n';
+ if (!eval)
+ {
+ printf ("Waiting for Emacs...");
+ needlf = 2;
+ }
+ fflush (stdout);
+
+ /* Now, wait for an answer and print any messages. */
+ while ((rl = recv (s, string, BUFSIZ, 0)) > 0)
+ {
+ string[rl] = '\0';
+ if (needlf == 2)
+ printf ("\n");
+ printf ("%s", string);
+ needlf = string[0] == '\0' ? needlf : string[strlen (string) - 1] != '\n';
+ }
+
+ if (needlf)
+ printf ("\n");
+ fflush (stdout);
}
- if (needlf)
- printf ("\n");
- fflush (stdout);
-
- return 0;
+ CLOSE_SOCKET (s);
+ return EXIT_SUCCESS;
}
#endif /* HAVE_SOCKETS */
-\f
+
#ifndef HAVE_STRERROR
char *
strerror (errnum)
}
#endif /* ! HAVE_STRERROR */
+
+/* arch-tag: f39bb9c4-73eb-477e-896d-50832e2ca9a7
+ (do not change this comment) */
+
+/* emacsclient.c ends here */
HCoop / bpt / emacs.git / blobdiff