/* Client process that communicates with GNU Emacs acting as server.
- Copyright (C) 1986, 1987, 1994 Free Software Foundation, Inc.
+ Copyright (C) 1986, 1987, 1994, 1999 Free Software Foundation, Inc.
This file is part of GNU Emacs.
#define NO_SHORTNAMES
#include <../src/config.h>
-#undef read
-#undef write
-#undef open
-#undef close
#undef signal
#include <stdio.h>
#include <getopt.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
char *getenv (), *getwd ();
char *getcwd ();
-int geteuid ();
/* This is defined with -D from the compilation command,
which extracts it from ../lisp/version.el. */
/* Name used to invoke this program. */
char *progname;
-/* Nonzero means don't wait for a response from Emacs. --nowait. */
+/* Nonzero means don't wait for a response from Emacs. --no-wait. */
int nowait = 0;
+void print_help_and_exit ();
+
struct option longopts[] =
{
- { "nowait", no_argument, NULL, 'n' },
+ { "no-wait", no_argument, NULL, 'n' },
{ "help", no_argument, NULL, 'H' },
{ "version", no_argument, NULL, 'V' },
{ 0 }
};
/* Decode the options from argv and argc.
- Return the number of remaining arguments. */
+ The global variable `optind' will say how many arguments we used up. */
-int
+void
decode_options (argc, argv)
int argc;
char **argv;
break;
case 'V':
- fprintf (stderr, "Version %s\n", VERSION);
+ fprintf (stderr, "emacsclient %s\n", VERSION);
exit (1);
break;
print_help_and_exit ();
}
}
-
- return argc;
}
+void
print_help_and_exit ()
{
fprintf (stderr,
- "Usage: %s [-n] [--nowait] [+linenumber] filename\n",
+ "Usage: %s [-n] [--no-wait] [+LINENUMBER] FILENAME\n",
progname);
fprintf (stderr,
- "Report bugs to bug-gnu-emacs@prep.ai.mit.edu.\n");
+ "Or %s --version\n",
+ progname);
+ fprintf (stderr,
+ "Report bugs to bug-gnu-emacs@gnu.org.\n");
exit (1);
}
+
+/* Return a copy of NAME, inserting a &
+ before each &, each space, and any initial -.
+ Change spaces to underscores, too, so that the
+ return value never contains a space. */
+
+char *
+quote_file_name (name)
+ char *name;
+{
+ char *copy = (char *) malloc (strlen (name) * 2 + 1);
+ char *p, *q;
+
+ p = name;
+ q = copy;
+ while (*p)
+ {
+ if (*p == ' ')
+ {
+ *q++ = '&';
+ *q++ = '_';
+ p++;
+ }
+ else
+ {
+ if (*p == '&' || (*p == '-' && p == name))
+ *q++ = '&';
+ *q++ = *p++;
+ }
+ }
+ *q++ = 0;
+
+ return copy;
+}
+
+/* Like malloc but get fatal error if memory is exhausted. */
+
+long *
+xmalloc (size)
+ unsigned int size;
+{
+ long *result = (long *) malloc (size);
+ if (result == NULL)
+ {
+ perror ("malloc");
+ exit (1);
+ }
+ return result;
+}
\f
#if !defined (HAVE_SOCKETS) && !defined (HAVE_SYSVIPC)
int argc;
char **argv;
{
- char system_name[32];
+ char *system_name;
+ int system_name_length;
int s, i;
FILE *out, *in;
struct sockaddr_un server;
char *homedir, *cwd, *str;
char string[BUFSIZ];
- int args_left;
progname = argv[0];
/* Process options. */
- args_left = decode_options (argc, argv);
-
- /* Advance argv and decrement argc for the options that were skipped. */
- argv += argc - args_left;
- argc = args_left;
+ decode_options (argc, argv);
- if (argc < 2)
+ if (argc - optind < 1)
print_help_and_exit ();
/*
exit (1);
}
server.sun_family = AF_UNIX;
+
+ {
+ system_name_length = 32;
+
+ while (1)
+ {
+ 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;
+ }
+ }
+
#ifndef SERVER_HOME_DIR
{
struct stat statbfr;
- gethostname (system_name, sizeof (system_name));
sprintf (server.sun_path, "/tmp/esrv%d-%s", geteuid (), system_name);
if (stat (server.sun_path, &statbfr) == -1)
}
strcpy (server.sun_path, homedir);
strcat (server.sun_path, "/.emacs-server-");
- gethostname (system_name, sizeof (system_name));
strcat (server.sun_path, system_name);
#endif
exit (1);
}
-#ifdef BSD
+#ifdef BSD_SYSTEM
cwd = getwd (string);
#else
cwd = getcwd (string, sizeof string);
if (cwd == 0)
{
/* getwd puts message in STRING if it fails. */
- fprintf (stderr, "%s: %s (%s)\n", argv[0], string, strerror (errno));
+ fprintf (stderr, "%s: %s (%s)\n", argv[0],
+#ifdef BSD_SYSTEM
+ string,
+#else
+ "Cannot get current working directory",
+#endif
+ strerror (errno));
exit (1);
}
- for (i = 1; i < argc; i++)
- {
- /* If -nowait or --nowait option is used,
- report it to the server. */
- if (!strcmp (argv[i], "-nowait")
- || (!strncmp (argv[i], "--nowait", strlen (argv[i]))
- && strlen (argv[i]) >= 3))
- {
- fprintf (out, "-nowait ");
- nowait = 1;
- continue;
- }
+ if (nowait)
+ fprintf (out, "-nowait ");
+ for (i = optind; i < argc; i++)
+ {
if (*argv[i] == '+')
{
char *p = argv[i] + 1;
while (*p >= '0' && *p <= '9') p++;
if (*p != 0)
- fprintf (out, "%s/", cwd);
+ fprintf (out, "%s/", quote_file_name (cwd));
}
else if (*argv[i] != '/')
- fprintf (out, "%s/", cwd);
- fprintf (out, "%s ", argv[i]);
+ fprintf (out, "%s/", quote_file_name (cwd));
+
+ fprintf (out, "%s ", quote_file_name (argv[i]));
}
fprintf (out, "\n");
fflush (out);
#include <sys/msg.h>
#include <sys/utsname.h>
#include <stdio.h>
+#include <errno.h>
+extern int errno;
char *getwd (), *getcwd (), *getenv ();
struct utsname system_name;
progname = argv[0];
/* Process options. */
- args_left = decode_options (argc, argv);
+ decode_options (argc, argv);
- /* Advance argv and decrement argc for the options that were skipped. */
- argv += argc - args_left;
- argc = args_left;
-
- if (argc < 2)
+ if (argc - optind < 1)
print_help_and_exit ();
/*
}
/* Determine working dir, so we can prefix it to all the arguments. */
-#ifdef BSD
+#ifdef BSD_SYSTEM
temp = getwd (gwdirb);
#else
temp = getcwd (gwdirb, sizeof gwdirb);
}
else
{
+#ifdef BSD_SYSTEM
fprintf (stderr, "%s: %s\n", argv[0], cwd);
+#else
+ fprintf (stderr, "%s: Cannot get current working directory: %s\n",
+ argv[0], strerror (errno));
+#endif
exit (1);
}
msgp->mtext[0] = 0;
used = 0;
- argc--; argv++;
+
+ if (nowait)
+ {
+ strcat (msgp->mtext, "-nowait ");
+ used += 8;
+ }
+
+ argc -= optind;
+ argv += optind;
+
while (argc)
{
int need_cwd = 0;
char *modified_arg = argv[0];
- /* If -nowait or --nowait option is used,
- report it to the server. */
- if (!strcmp (modified_arg, "-nowait")
- || (!strncmp (modified_arg, "--nowait", strlen (modified_arg))
- && strlen (modified_arg) >= 3))
- {
- modified_arg = "-nowait";
- nowait = 1;
- }
- else if (*modified_arg == '+')
+ if (*modified_arg == '+')
{
char *p = modified_arg + 1;
while (*p >= '0' && *p <= '9') p++;
else if (*modified_arg != '/')
need_cwd = 1;
+ modified_arg = quote_file_name (modified_arg);
+
if (need_cwd)
- used += strlen (cwd);
+ /* Overestimate in case we have to quote something in CWD. */
+ used += 2 * strlen (cwd);
used += strlen (modified_arg) + 1;
while (used + 2 > size_allocated)
{
}
if (need_cwd)
- strcat (msgp->mtext, cwd);
+ strcat (msgp->mtext, quote_file_name (cwd));
strcat (msgp->mtext, modified_arg);
strcat (msgp->mtext, " ");