Mercurial > emacs
view lib-src/emacsclient.c @ 4871:30a614eb52f7
(shell-after-partial-filename): Renamed from
shell-after-partial-pathname.
Commented out shell-load-hooks.
(shell-after-partial-pathname): New subroutine.
Renamed shell-command-execonly to
shell-completion-execonly for consistency.
(shell-read-input-ring, shell-input-ring-file-name):
Moved to, and renamed in, comint.el.
(shell-dynamic-complete-command): Make sure local
completion-ignore-case is nil.
(shell-mode): Set buffer-local variable paragraph-start
to comint-prompt-regexp so paragraph motion/mark commands work on
output groups.
Set comint-after-partial-pathname to it.
(shell-read-input-ring): Use find-file-noselect.
(shell-match-cmd-w/optional-arg): Removed.
(shell-delimiter-argument-list): New variable.
(shell-input-ring-file-name): New variable.
(shell-mode-map): Changed file name completions listing
binding to new name comint-dynamic-list-filename-completions.
(shell-mode): Call new function shell-read-input-ring
and shell-dirstack on start up. Doc fix for new functionality.
(shell-mode): Set shell-input-ring-file-name depending
on the command that was invoked for the inferior shell. Set
comint-delimiter-argument-list to shell-delimiter-argument-list.
(shell-read-input-ring): New function.
(shell-directory-tracker): Use comint-arguments.
(shell-front-match): Removed.
(shell-match-cmd-w/optional-arg): Removed.
(shell-process-popd): Fixed bug when numeric argument
equal to length of stack including current directory.
(shell-process-pushd): Fixed missing ()s in cond.
(shell-dynamic-complete-command): Uses exec-path minus
trailing emacs library path. Uses "." for nil elements in
exec-path. Uses string-match rather than funcall to test
candidate extensions. Uses member on completions list rather than
file-exists-p to test for existence. Uses file-directory-p rather
than funcall to test for directory. Uses directories only if in
current directory. Uses comint-dynamic-list-completions.
(shell-command-regexp, shell-command-execonly)
(shell-pushd-tohome, shell-pushd-dextract)
(shell-pushd-dunique): New variables.
(shell-mode-map): Bound shell-forward/backward-command
to C-c C-f and C-c C-b.
(shell-mode): Set comint variables for which
shells have different values:
comint-get-current-command, comint-dynamic-complete-command.
(shell-directory-tracker): Parse through
command sequences for directory commands.
(shell-process-popd): Signal error if can't
process argument/stack. Fixed bug when no argument and no stack.
(shell-process-cd): Signal error if can't process argument.
(shell-process-pushd): Signal error if can't
process argument/stack. Handle shell-pushd-tohome,
shell-pushd-dextract, and shell-pushd-dunique.
(shell-forward-command, shell-backward-command)
(shell-dynamic-complete-command): New commands.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Fri, 22 Oct 1993 02:53:24 +0000 |
parents | 1fc792473491 |
children | 64a936b21f74 |
line wrap: on
line source
/* Client process that communicates with GNU Emacs acting as server. Copyright (C) 1986, 1987 Free Software Foundation, Inc. This file is part of GNU Emacs. GNU Emacs 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 1, or (at your option) any later version. GNU Emacs 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 GNU Emacs; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #define NO_SHORTNAMES #include <../src/config.h> #undef read #undef write #undef open #undef close #undef signal #if !defined(HAVE_SOCKETS) && !defined(HAVE_SYSVIPC) #include <stdio.h> 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 or System V IPC.\n"); exit (1); } #else /* HAVE_SOCKETS or HAVE_SYSVIPC */ #if ! defined (HAVE_SYSVIPC) /* BSD code is very different from SYSV IPC code */ #include <sys/types.h> #include <sys/socket.h> #include <sys/un.h> #include <sys/stat.h> #include <stdio.h> #include <errno.h> extern int sys_nerr; extern char *sys_errlist[]; extern int errno; main (argc, argv) int argc; char **argv; { char system_name[32]; int s, i; FILE *out; struct sockaddr_un server; char *homedir, *cwd, *str; char string[BUFSIZ]; char *getenv (), *getwd (); int geteuid (); if (argc < 2) { fprintf (stderr, "Usage: %s [+linenumber] filename\n", argv[0]); exit (1); } /* * 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]); perror ("socket"); exit (1); } server.sun_family = AF_UNIX; #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) { if (errno == ENOENT) fprintf (stderr, "Can't find socket; have you started the server?\n"); else perror ("stat"); exit (1); } if (statbfr.st_uid != geteuid()) { fprintf (stderr, "Illegal socket owner\n"); exit (1); } } #else if ((homedir = getenv ("HOME")) == NULL) { fprintf (stderr, "%s: No home directory\n", argv[0]); exit (1); } strcpy (server.sun_path, homedir); strcat (server.sun_path, "/.emacs_server"); #endif if (connect (s, (struct sockaddr *) &server, strlen (server.sun_path) + 2) < 0) { fprintf (stderr, "%s: ", argv[0]); perror ("connect"); exit (1); } if ((out = fdopen (s, "r+")) == NULL) { fprintf (stderr, "%s: ", argv[0]); perror ("fdopen"); exit (1); } cwd = getwd (string); if (cwd == 0) { /* getwd puts message in STRING if it fails. */ fprintf (stderr, "%s: %s (%s)\n", argv[0], string, (errno < sys_nerr) ? sys_errlist[errno] : "unknown error"); exit (1); } for (i = 1; i < argc; i++) { if (*argv[i] == '+') { char *p = argv[i] + 1; while (*p >= '0' && *p <= '9') p++; if (*p != 0) fprintf (out, "%s/", cwd); } else if (*argv[i] != '/') fprintf (out, "%s/", cwd); fprintf (out, "%s ", argv[i]); } fprintf (out, "\n"); fflush (out); printf ("Waiting for Emacs..."); fflush (stdout); rewind (out); /* re-read the output */ str = fgets (string, BUFSIZ, out); /* Now, wait for an answer and print any messages. */ while (str = fgets (string, BUFSIZ, out)) printf ("%s", str); exit (0); } #else /* This is the SYSV IPC section */ #include <sys/types.h> #include <sys/ipc.h> #include <sys/msg.h> #include <stdio.h> main (argc, argv) int argc; char **argv; { int s; key_t key; struct msgbuf * msgp = (struct msgbuf *) malloc (sizeof *msgp + BUFSIZ); struct msqid_ds * msg_st; char *homedir, buf[BUFSIZ]; char gwdirb[BUFSIZ]; char *cwd; char *temp; char *getwd (), *getcwd (), *getenv (); if (argc < 2) { fprintf (stderr, "Usage: %s [+linenumber] filename\n", argv[0]); exit (1); } /* * Create a message queue using ~/.emacs_server as the path for ftok */ if ((homedir = getenv ("HOME")) == NULL) { fprintf (stderr, "%s: No home directory\n", argv[0]); exit (1); } strcpy (buf, homedir); strcat (buf, "/.emacs_server"); creat (buf, 0600); key = ftok (buf, 1); /* unlikely to be anyone else using it */ s = msgget (key, 0600 | IPC_CREAT); if (s == -1) { fprintf (stderr, "%s: ", argv[0]); perror ("msgget"); exit (1); } /* Determine working dir, so we can prefix it to all the arguments. */ #ifdef BSD temp = getwd (gwdirb); #else temp = getcwd (gwdirb, sizeof gwdirb); #endif cwd = gwdirb; if (temp != 0) { /* On some systems, cwd can look like `@machine/...'; ignore everything before the first slash in such a case. */ while (*cwd && *cwd != '/') cwd++; strcat (cwd, "/"); } else { fprintf (stderr, cwd); exit (1); } msgp->mtext[0] = 0; argc--; argv++; while (argc) { if (*argv[0] == '+') { char *p = argv[0] + 1; while (*p >= '0' && *p <= '9') p++; if (*p != 0) strcat (msgp->mtext, cwd); } else if (*argv[0] != '/') strcat (msgp->mtext, cwd); strcat (msgp->mtext, argv[0]); strcat (msgp->mtext, " "); argv++; argc--; } strcat (msgp->mtext, "\n"); msgp->mtype = 1; if (msgsnd (s, msgp, strlen (msgp->mtext)+1, 0) < 0) { fprintf (stderr, "%s: ", argv[0]); perror ("msgsnd"); exit (1); } /* * Now, wait for an answer */ printf ("Waiting for Emacs..."); fflush (stdout); msgrcv (s, msgp, BUFSIZ, getpid (), 0); /* wait for anything back */ strcpy (buf, msgp->mtext); printf ("\n%s\n", buf); exit (0); } #endif /* HAVE_SYSVIPC */ #endif /* HAVE_SOCKETS or HAVE_SYSVIPC */