xemacs-beta: lib-src/gnuclient.c comparison

comparison lib-src/gnuclient.c @ 442:abe6d1db359e r21-2-36

Import from CVS: tag r21-2-36

author	cvs
date	Mon, 13 Aug 2007 11:35:02 +0200
parents	8de8e3f6228a
children	e7ef97881643

comparison

equal deleted inserted replaced

-:72a7cfa4a488
+:abe6d1db359e
 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>.
 #include "getopt.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
-#define DONT_ENCAPSULATE
 #include <sysfile.h>
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif /* HAVE_STRING_H */
 }
 initialize_signals ();
 }
 void
-initialize_signals ()
+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.  */
 if (filename[0] && filename[0] == '/')
 {
 /* Absolute (unix-style) pathname.  Do nothing */
 strcat (fullpath, filename);
 }
-#ifdef  __CYGWIN32__
+#ifdef  CYGWIN
 else if (filename[0] && filename[0] == '\\' &&
 filename[1] && filename[1] == '\\')
 {
 /* This path includes the server name (something like
 "\\server\path"), so we assume it's absolute.  Do nothing to
 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 */
 } /* filename_expand */
 /* Encase the string in quotes, escape all the backslashes and quotes
 in string.  */
 static char *
-clean_string (CONST char *s)
+clean_string (const char *s)
 {
 int i = 0;
 char *p, *res;
 {
-CONST char *const_p;
+const char *const_p;
 for (const_p = s; *const_p; const_p++, i++)
 {
 	if (*const_p == '\\' || *const_p == '\"')
 	  ++i;
 	else if (*const_p == '\004')
 over = 1;								   \
 } while (0)
 /* A strdup imitation. */
 static char *
-my_strdup (CONST char *s)
+my_strdup (const char *s)
 {
 char *new_s = (char *) malloc (strlen (s) + 1);
 if (new_s)
 strcpy (new_s, s);
 return new_s;
 if (errflg)
 {
 fprintf (stderr,
 #ifdef INTERNET_DOMAIN_SOCKETS
-	       "usage: %s [-nw] [-display display] [-q] [-v] [-l library]\n"
+	       "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] "
+	       "Usage: %s [-nw] [-q] [-v] [-l library] [-f function] [-eval form] "
 	       "[[+line] path] ...\n",
 #endif /* !INTERNET_DOMAIN_SOCKETS */
 	       progname);
 exit (1);
 }
 	    {
 	      fprintf (stderr, "%s: Could not establish Emacs process id\n",
 		       progname);
 	      exit (1);
 	    }
-/* Don't do disconnect_from_server becasue we have already read
+/* Don't do disconnect_from_server because 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 */

Mercurial > hg > xemacs-beta

comparison lib-src/gnuclient.c @ 442:abe6d1db359e r21-2-36