Mercurial > hg > xemacs-beta
view lib-src/gnuclient.c @ 1303:f99d3d25df86
[xemacs-hg @ 2003-02-15 10:15:54 by ben]
autoload fixes, make-doc speed improvements
Makefile.in.in: Run update-elc-2 with -no-autoloads
to avoid multiple autoload-loading problem.
configure.usage: Document quick-build better.
make-docfile.el: Use `message' (defined in this file) in place of `princ'/`print',
and put in a terpri, so that we get correct newline behavior.
Rewrite if-progn -> when and a few similar stylistic niceties.
And the big change: Allow MS Windows to specify the object files
directly and frob them into C files here (formerly this was done
in xemacs.mak, and very slooooooooooooooooooowly). Due to
line-length limitations in CMD, we need to use a "response file"
to hold the arguments, so when we see a response file argument
(preceded by an @), read in the args (a bit of trickiness to do
this), and process recursively. Also frob .obj -> .c as mentioned
earlier and handle other junk dependencies that need to be removed
(NEEDTODUMP, make-docfile.exe).
update-elc-2.el: Use :test `equal' in call to set-difference.
update-elc.el: Put back commented out kill-emacs, update header comment.
xemacs.mak: Delete old unused code that checks SATISFIED.
Move update-elc-2 up to be near update-elc.
Run update-elc-2 with -no-autoloads to avoid multiple
autoload-loading problem.
Don't compute make-docfile args ourselves. Pass the raw objects
to make-docfile.el, which does the computation (much faster than
we could). Don't delete the DOC file, split the invocation into
two calls to make-docfile.exe (one direct, one through
make-docfile.el), etc. In general, all we do is call make-docfile.
Add proper dependencies for DOC-file rebuilding so it doesn't get
done when not necessary. Implement quick-building here: not
building the DOC file unless it doesn't exist, as the quick-build
docs say.
Makefile.in.in: Don't delete the DOC file. Implement quick-building here: not
building the DOC file unless it doesn't exist, as the quick-build
docs say.
config.h.in, emacs.c: Nothing but niggly spacing changes -- one space before a paren
starting a function-call arglist, please.
| author | ben |
|---|---|
| date | Sat, 15 Feb 2003 10:16:14 +0000 |
| parents | dfee0026a079 |
| children | 04bc9d2f42c7 |
line wrap: on
line source
/* -*-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 XEmacs maintainer. */ /* #### This file should be a windows-mode, not console-mode program under Windows. (i.e. its entry point should be WinMain.) gnuattach functionality, to the extent it's used at all, should be retrieved using a script that calls the i.exe wrapper program, to obtain stdio handles. #### For that matter, both the functionality of gnuclient and gnuserv should be merged into XEmacs itself using a -remote arg, just like Netscape and other modern programs. --ben */ /* * 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) */ #ifdef CYGWIN extern void cygwin_conv_to_posix_path(const char *path, char *posix_path); #endif #include "gnuserv.h" char gnuserv_version[] = "gnuclient version " GNUSERV_VERSION; #include "getopt.h" #include <sysfile.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[PATH_MAX+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 */ #ifdef SIGCONT signal(SIGCONT, tell_emacs_to_resume); #endif connect_type = make_connection (NULL, 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 (void) { /* 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 (SIGQUIT, pass_signal_to_emacs); signal (SIGINT, pass_signal_to_emacs); #ifdef SIGWINCH signal (SIGWINCH, pass_signal_to_emacs); #endif #ifdef SIGCONT /* We want emacs to realize that we are resuming */ signal (SIGCONT, tell_emacs_to_resume); #endif } /* get_current_working_directory -- return the cwd. */ static char * get_current_working_directory (void) { if (cp == NULL) { /* haven't calculated it yet */ #ifdef HAVE_GETCWD if (getcwd (cwd,PATH_MAX) == NULL) #else if (getwd (cwd) == 0) #endif /* HAVE_GETCWD */ { 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 */ { #ifdef CYGWIN char cygwinFilename[PATH_MAX+1]; extern void cygwin_conv_to_posix_path(const char *, char *); #endif int len; fullpath[0] = '\0'; #ifdef CYGWIN /* If we're in cygwin, just convert it and let the unix stuff handle it. */ cygwin_conv_to_posix_path(filename, cygwinFilename); filename = cygwinFilename; #endif if (filename[0] && filename[0] == '/') { /* Absolute (unix-style) pathname. Do nothing */ strcat (fullpath, filename); } else { /* Assume relative Unix style path. Get the current directory and prepend it. FIXME: need to fix the case of DOS paths like "\foo", where we need to get the current drive. */ 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 */ /* Don't forget to add the filename! */ 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; { const char *const_p; for (const_p = s; *const_p; const_p++, i++) { if (*const_p == '\\' || *const_p == '\"') ++i; else if (*const_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 imitation. */ static char * my_strdup (const char *s) { char *new_s = (char *) malloc (strlen (s) + 1); if (new_s) strcpy (new_s, s); return new_s; } int main (int argc, char *argv[]) { int starting_line = 1; /* line to start editing at */ char command[PATH_MAX+50]; /* emacs command buffer */ char fullpath[PATH_MAX+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[PATH_MAX+1]; /* remote pathname */ char *path; int rflg = 0; /* pathname given on cmdline */ char *portarg; unsigned 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]; #ifdef WIN32_NATIVE tmpdir = getenv ("TEMP"); if (!tmpdir) tmpdir = getenv ("TMP"); if (!tmpdir) tmpdir = "c:\\"; #else #ifdef USE_TMPDIR tmpdir = getenv ("TMPDIR"); #endif if (!tmpdir) tmpdir = "/tmp"; #endif /* WIN32_NATIVE */ display = getenv ("DISPLAY"); if (display) display = my_strdup (display); #ifndef HAVE_MS_WINDOWS else suppress_windows_system = 1; #endif 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 defined(INTERNET_DOMAIN_SOCKETS) if (suppress_windows_system && hostarg) { fprintf (stderr, "%s: Remote editing is available only on X\n", progname); exit (1); } #endif *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, 0, &s); #endif sprintf (command, "(gnuserv-eval%s '(progn ", quick ? "-quickly" : ""); send_string (s, command); if (load_library) { send_string (s , "(load-library "); send_string (s, clean_string(load_library)); send_string (s, ") "); } if (eval_form) { send_string (s, eval_form); } if (eval_function) { send_string (s, "("); send_string (s, eval_function); send_string (s, ")"); } send_string (s, "))"); /* disconnect already sends EOT_STR */ #ifdef SYSV_IPC if (connect_type == (int) CONN_IPC) disconnect_from_ipc_server (s, msgp, batch && !quick); #else /* !SYSV_IPC */ if (connect_type != (int) CONN_IPC) disconnect_from_server (s, batch && !quick); #endif /* !SYSV_IPC */ } /* eval_function || eval_form || load_library */ else if (batch) { /* no sexp on the command line, so read it from stdin */ int nb; #if defined(INTERNET_DOMAIN_SOCKETS) connect_type = make_connection (hostarg, port, &s); #else connect_type = make_connection (NULL, 0, &s); #endif sprintf (command, "(gnuserv-eval%s '(progn ", quick ? "-quickly" : ""); send_string (s, command); while ((nb = read(fileno(stdin), buffer, GSERV_BUFSZ-1)) > 0) { buffer[nb] = '\0'; send_string(s, buffer); } send_string(s,"))"); /* disconnect already sends EOT_STR */ #ifdef SYSV_IPC if (connect_type == (int) CONN_IPC) disconnect_from_ipc_server (s, msgp, batch && !quick); #else /* !SYSV_IPC */ if (connect_type != (int) CONN_IPC) disconnect_from_server (s, batch && !quick); #endif /* !SYSV_IPC */ } 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, 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 process id\n", progname); exit (1); } /* Don't do disconnect_from_server because we have already read data, and disconnect doesn't do anything else. */ #ifdef SYSV_IPC 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, 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 */ { if (0) ; #ifdef HAVE_X_WINDOWS else if (display) sprintf (command, "(gnuserv-edit-files '(x %s) '(", clean_string (display)); #endif #ifdef HAVE_GTK else if (display) strcpy (command, "(gnuserv-edit-files '(gtk nil) '("); #endif #ifdef HAVE_MS_WINDOWS else sprintf (command, "(gnuserv-edit-files '(mswindows nil) '("); #endif } /* !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 = (char *) 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 */ return 0; } /* main */ #endif /* SYSV_IPC || UNIX_DOMAIN_SOCKETS || INTERNET_DOMAIN_SOCKETS */
