Mercurial > hg > xemacs-beta
annotate lib-src/gnuclient.c @ 5905:85fd1ab80057
Fix a bug in #'parse-integer with negative bignums and non-nil JUNK-ALLOWED
src/ChangeLog addition:
2015-05-08 Aidan Kehoe <kehoea@parhasard.net>
* data.c (parse_integer):
Fix a bug here with the interaction of negative bignums and a
non-zero JUNK-ALLOWED argument.
tests/ChangeLog addition:
2015-05-08 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Check for a bug just fixed with the interaction of negative
bignums and :junk-allowed non-nil.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Fri, 08 May 2015 16:24:57 +0100 |
| parents | 308d34e9f07d |
| children | 0f2338afbabf |
| rev | line source |
|---|---|
| 428 | 1 /* -*-C-*- |
| 2 Client code to allow local and remote editing of files by XEmacs. | |
| 3 Copyright (C) 1989 Free Software Foundation, Inc. | |
| 4 Copyright (C) 1995 Sun Microsystems, Inc. | |
| 5 Copyright (C) 1997 Free Software Foundation, Inc. | |
| 6 | |
| 7 This file is part of XEmacs. | |
| 8 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5225
diff
changeset
|
9 XEmacs is free software: you can redistribute it and/or modify it |
| 428 | 10 under the terms of the GNU General Public License as published by the |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5225
diff
changeset
|
11 Free Software Foundation, either version 3 of the License, or (at your |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5225
diff
changeset
|
12 option) any later version. |
| 428 | 13 |
| 14 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 17 for more details. | |
| 18 | |
| 19 You should have received a copy of the GNU General Public License | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5225
diff
changeset
|
20 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. |
| 428 | 21 Author: Andy Norman (ange@hplb.hpl.hp.com), based on |
| 22 'etc/emacsclient.c' from the GNU Emacs 18.52 distribution. | |
| 23 | |
| 24 Please mail bugs and suggestions to the XEmacs maintainer. | |
| 25 */ | |
| 26 | |
| 442 | 27 /* #### This file should be a windows-mode, not console-mode program under |
| 28 Windows. (i.e. its entry point should be WinMain.) gnuattach functionality, | |
| 29 to the extent it's used at all, should be retrieved using a script that | |
| 30 calls the i.exe wrapper program, to obtain stdio handles. | |
| 31 | |
| 32 #### For that matter, both the functionality of gnuclient and gnuserv | |
| 33 should be merged into XEmacs itself using a -remote arg, just like | |
| 34 Netscape and other modern programs. | |
| 35 | |
| 36 --ben */ | |
| 37 | |
| 428 | 38 /* |
| 39 * This file incorporates new features added by Bob Weiner <weiner@mot.com>, | |
| 40 * Darrell Kindred <dkindred@cmu.edu> and Arup Mukherjee <arup@cmu.edu>. | |
| 41 * GNUATTACH support added by Ben Wing <wing@xemacs.org>. | |
| 42 * Please see the note at the end of the README file for details. | |
| 43 * | |
| 44 * (If gnuserv came bundled with your emacs, the README file is probably | |
| 45 * ../etc/gnuserv.README relative to the directory containing this file) | |
| 46 */ | |
| 47 | |
| 464 | 48 #ifdef CYGWIN |
| 49 extern void cygwin_conv_to_posix_path(const char *path, char *posix_path); | |
| 50 #endif | |
| 51 | |
| 456 | 52 #include "gnuserv.h" |
| 2286 | 53 #include "compiler.h" |
| 428 | 54 |
| 456 | 55 char gnuserv_version[] = "gnuclient version " GNUSERV_VERSION; |
| 56 | |
| 428 | 57 #include "getopt.h" |
| 58 | |
| 59 #include <sysfile.h> | |
| 60 | |
| 61 #if !defined(SYSV_IPC) && !defined(UNIX_DOMAIN_SOCKETS) && \ | |
| 62 !defined(INTERNET_DOMAIN_SOCKETS) | |
| 63 int | |
| 64 main (int argc, char *argv[]) | |
| 65 { | |
| 66 fprintf (stderr, "Sorry, the Emacs server is only " | |
| 67 "supported on systems that have\n"); | |
| 68 fprintf (stderr, "Unix Domain sockets, Internet Domain " | |
| 69 "sockets or System V IPC.\n"); | |
| 70 exit (1); | |
| 71 } /* main */ | |
| 72 #else /* SYSV_IPC || UNIX_DOMAIN_SOCKETS || INTERNET_DOMAIN_SOCKETS */ | |
| 73 | |
| 2424 | 74 static char cwd[QXE_PATH_MAX+2];/* current working directory when calculated */ |
| 428 | 75 static char *cp = NULL; /* ptr into valid bit of cwd above */ |
| 76 | |
| 2424 | 77 static pid_t emacs_pid; /* Process id for emacs process */ |
| 428 | 78 |
| 79 void initialize_signals (void); | |
| 80 | |
| 81 static void | |
| 2286 | 82 tell_emacs_to_resume (int UNUSED (sig)) |
| 428 | 83 { |
| 84 char buffer[GSERV_BUFSZ+1]; | |
| 85 int s; /* socket / msqid to server */ | |
| 86 int connect_type; /* CONN_UNIX, CONN_INTERNET, or | |
| 87 ONN_IPC */ | |
| 88 | |
| 89 /* Why is SYSV so retarded? */ | |
| 90 /* We want emacs to realize that we are resuming */ | |
| 91 #ifdef SIGCONT | |
| 92 signal(SIGCONT, tell_emacs_to_resume); | |
| 93 #endif | |
| 94 | |
| 458 | 95 connect_type = make_connection (NULL, 0, &s); |
| 428 | 96 |
| 97 sprintf(buffer,"(gnuserv-eval '(resume-pid-console %d))", (int)getpid()); | |
| 98 send_string(s, buffer); | |
| 99 | |
| 100 #ifdef SYSV_IPC | |
| 101 if (connect_type == (int) CONN_IPC) | |
| 102 disconnect_from_ipc_server (s, msgp, FALSE); | |
| 103 #else /* !SYSV_IPC */ | |
| 104 if (connect_type != (int) CONN_IPC) | |
| 105 disconnect_from_server (s, FALSE); | |
| 106 #endif /* !SYSV_IPC */ | |
| 107 } | |
| 108 | |
| 109 static void | |
| 110 pass_signal_to_emacs (int sig) | |
| 111 { | |
| 112 if (kill (emacs_pid, sig) == -1) | |
| 113 { | |
| 114 fprintf (stderr, "gnuattach: Could not pass signal to emacs process\n"); | |
| 115 exit (1); | |
| 116 } | |
| 117 initialize_signals (); | |
| 118 } | |
| 119 | |
| 120 void | |
| 442 | 121 initialize_signals (void) |
| 428 | 122 { |
| 123 /* Set up signal handler to pass relevant signals to emacs process. | |
| 124 We used to send SIGSEGV, SIGBUS, SIGPIPE, SIGILL and others to | |
| 125 Emacs, but I think it's better not to. I can see no reason why | |
| 126 Emacs should SIGSEGV whenever gnuclient SIGSEGV-s, etc. */ | |
| 127 signal (SIGQUIT, pass_signal_to_emacs); | |
| 128 signal (SIGINT, pass_signal_to_emacs); | |
| 129 #ifdef SIGWINCH | |
| 130 signal (SIGWINCH, pass_signal_to_emacs); | |
| 131 #endif | |
| 132 | |
| 133 #ifdef SIGCONT | |
| 134 /* We want emacs to realize that we are resuming */ | |
| 135 signal (SIGCONT, tell_emacs_to_resume); | |
| 136 #endif | |
| 137 } | |
| 138 | |
| 139 | |
| 140 /* | |
| 141 get_current_working_directory -- return the cwd. | |
| 142 */ | |
| 143 static char * | |
| 144 get_current_working_directory (void) | |
| 145 { | |
| 146 if (cp == NULL) | |
| 147 { /* haven't calculated it yet */ | |
| 458 | 148 #ifdef HAVE_GETCWD |
| 2424 | 149 if (getcwd (cwd,QXE_PATH_MAX) == NULL) |
| 458 | 150 #else |
| 428 | 151 if (getwd (cwd) == 0) |
| 458 | 152 #endif /* HAVE_GETCWD */ |
| 428 | 153 { |
| 154 perror (progname); | |
| 155 fprintf (stderr, "%s: unable to get current working directory\n", | |
| 156 progname); | |
| 157 exit (1); | |
| 158 } /* if */ | |
| 159 | |
| 160 /* on some systems, cwd can look like '@machine/' ... */ | |
| 161 /* ignore everything before the first '/' */ | |
| 162 for (cp = cwd; *cp && *cp != '/'; ++cp) | |
| 163 ; | |
| 164 | |
| 165 } /* if */ | |
| 166 | |
| 167 return cp; | |
| 168 | |
| 169 } /* get_current_working_directory */ | |
| 170 | |
| 171 | |
| 172 /* | |
| 173 filename_expand -- try to convert the given filename into a fully-qualified | |
| 174 pathname. | |
| 175 */ | |
| 176 static void | |
| 177 filename_expand (char *fullpath, char *filename) | |
| 178 /* fullpath - returned full pathname */ | |
| 179 /* filename - filename to expand */ | |
| 180 { | |
| 464 | 181 #ifdef CYGWIN |
| 2424 | 182 char cygwinFilename[QXE_PATH_MAX+1]; |
| 502 | 183 extern void cygwin_conv_to_posix_path(const char *, char *); |
| 464 | 184 #endif |
| 185 | |
| 428 | 186 int len; |
| 3556 | 187 fullpath[0] = fullpath[QXE_PATH_MAX] = '\0'; |
| 428 | 188 |
| 464 | 189 #ifdef CYGWIN |
| 190 /* | |
| 191 If we're in cygwin, just convert it and let the unix stuff handle it. | |
| 192 */ | |
| 193 cygwin_conv_to_posix_path(filename, cygwinFilename); | |
| 194 filename = cygwinFilename; | |
| 195 #endif | |
| 428 | 196 |
| 197 if (filename[0] && filename[0] == '/') | |
| 198 { | |
| 199 /* Absolute (unix-style) pathname. Do nothing */ | |
| 3556 | 200 strncat (fullpath, filename, QXE_PATH_MAX); |
| 428 | 201 } |
| 202 else | |
| 203 { | |
| 204 /* Assume relative Unix style path. Get the current directory | |
| 205 and prepend it. FIXME: need to fix the case of DOS paths like | |
| 206 "\foo", where we need to get the current drive. */ | |
| 442 | 207 |
| 3556 | 208 strncat (fullpath, get_current_working_directory (), QXE_PATH_MAX); |
| 428 | 209 len = strlen (fullpath); |
| 210 | |
| 3556 | 211 /* If no trailing slash, add one */ |
| 212 if (len <= 0 || (fullpath[len - 1] != '/' && len < QXE_PATH_MAX)) | |
| 213 { | |
| 214 strcat (fullpath, "/"); | |
| 215 len++; | |
| 216 } | |
| 217 | |
| 428 | 218 /* Don't forget to add the filename! */ |
| 3556 | 219 strncat (fullpath, filename, QXE_PATH_MAX - len); |
| 428 | 220 } |
| 221 } /* filename_expand */ | |
| 222 | |
| 223 /* Encase the string in quotes, escape all the backslashes and quotes | |
| 224 in string. */ | |
| 225 static char * | |
| 442 | 226 clean_string (const char *s) |
| 428 | 227 { |
| 228 int i = 0; | |
| 229 char *p, *res; | |
| 230 | |
| 231 { | |
| 442 | 232 const char *const_p; |
| 428 | 233 for (const_p = s; *const_p; const_p++, i++) |
| 234 { | |
| 235 if (*const_p == '\\' || *const_p == '\"') | |
| 236 ++i; | |
| 237 else if (*const_p == '\004') | |
| 238 i += 3; | |
| 239 } | |
| 240 } | |
| 241 | |
| 242 p = res = (char *) malloc (i + 2 + 1); | |
| 243 *p++ = '\"'; | |
| 244 for (; *s; p++, s++) | |
| 245 { | |
| 246 switch (*s) | |
| 247 { | |
| 248 case '\\': | |
| 249 *p++ = '\\'; | |
| 250 *p = '\\'; | |
| 251 break; | |
| 252 case '\"': | |
| 253 *p++ = '\\'; | |
| 254 *p = '\"'; | |
| 255 break; | |
| 256 case '\004': | |
| 257 *p++ = '\\'; | |
| 258 *p++ = 'C'; | |
| 259 *p++ = '-'; | |
| 260 *p = 'd'; | |
| 261 break; | |
| 262 default: | |
| 263 *p = *s; | |
| 264 } | |
| 265 } | |
| 266 *p++ = '\"'; | |
| 267 *p = '\0'; | |
| 268 return res; | |
| 269 } | |
| 270 | |
| 271 #define GET_ARGUMENT(var, desc) do { \ | |
| 272 if (*(p + 1)) (var) = p + 1; \ | |
| 273 else \ | |
| 274 { \ | |
| 275 if (!argv[++i]) \ | |
| 276 { \ | |
| 277 fprintf (stderr, "%s: `%s' must be followed by an argument\n", \ | |
| 278 progname, desc); \ | |
| 279 exit (1); \ | |
| 280 } \ | |
| 281 (var) = argv[i]; \ | |
| 282 } \ | |
| 283 over = 1; \ | |
| 284 } while (0) | |
| 285 | |
| 440 | 286 /* A strdup imitation. */ |
| 428 | 287 static char * |
| 442 | 288 my_strdup (const char *s) |
| 428 | 289 { |
| 440 | 290 char *new_s = (char *) malloc (strlen (s) + 1); |
| 291 if (new_s) | |
| 292 strcpy (new_s, s); | |
| 293 return new_s; | |
| 428 | 294 } |
| 295 | |
| 296 int | |
| 297 main (int argc, char *argv[]) | |
| 298 { | |
|
4684
15c42a3f4065
Do not move cursor position in gnuclient started buffer if user did
It's me FKtPp \;) <m_pupil@yahoo.com.cn>
parents:
3556
diff
changeset
|
299 int starting_line = 0; /* line to start editing at */ |
|
5225
1086297242fe
Don't throw an error if gnuclient supports GTK and XEmacs doesn't.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4759
diff
changeset
|
300 char command[QXE_PATH_MAX + 512];/* emacs command buffer */ |
| 2424 | 301 char fullpath[QXE_PATH_MAX+1];/* full pathname to file */ |
| 428 | 302 char *eval_form = NULL; /* form to evaluate with `-eval' */ |
| 303 char *eval_function = NULL; /* function to evaluate with `-f' */ | |
| 304 char *load_library = NULL; /* library to load */ | |
| 305 int quick = 0; /* quick edit, don't wait for user to | |
| 306 finish */ | |
| 307 int batch = 0; /* batch mode */ | |
| 308 int view = 0; /* view only. */ | |
| 309 int nofiles = 0; | |
| 310 int errflg = 0; /* option error */ | |
| 311 int s; /* socket / msqid to server */ | |
| 312 int connect_type; /* CONN_UNIX, CONN_INTERNET, or | |
| 313 * CONN_IPC */ | |
| 314 int suppress_windows_system = 0; | |
| 315 char *display = NULL; | |
| 316 #ifdef INTERNET_DOMAIN_SOCKETS | |
| 317 char *hostarg = NULL; /* remote hostname */ | |
| 318 char *remotearg; | |
| 319 char thishost[HOSTNAMSZ]; /* this hostname */ | |
| 2424 | 320 char remotepath[QXE_PATH_MAX+1]; /* remote pathname */ |
| 428 | 321 char *path; |
| 322 int rflg = 0; /* pathname given on cmdline */ | |
| 323 char *portarg; | |
| 458 | 324 unsigned short port = 0; /* port to server */ |
| 428 | 325 #endif /* INTERNET_DOMAIN_SOCKETS */ |
| 326 #ifdef SYSV_IPC | |
| 327 struct msgbuf *msgp; /* message */ | |
| 328 #endif /* SYSV_IPC */ | |
| 329 char *tty = NULL; | |
| 330 char buffer[GSERV_BUFSZ + 1]; /* buffer to read pid */ | |
| 331 char result[GSERV_BUFSZ + 1]; | |
| 332 int i; | |
| 333 | |
| 334 #ifdef INTERNET_DOMAIN_SOCKETS | |
| 335 memset (remotepath, 0, sizeof (remotepath)); | |
| 336 #endif /* INTERNET_DOMAIN_SOCKETS */ | |
| 337 | |
| 338 progname = strrchr (argv[0], '/'); | |
| 339 if (progname) | |
| 340 ++progname; | |
| 341 else | |
| 342 progname = argv[0]; | |
| 343 | |
| 771 | 344 #ifdef WIN32_NATIVE |
| 345 tmpdir = getenv ("TEMP"); | |
| 346 if (!tmpdir) | |
| 347 tmpdir = getenv ("TMP"); | |
| 348 if (!tmpdir) | |
| 349 tmpdir = "c:\\"; | |
| 350 #else | |
| 428 | 351 #ifdef USE_TMPDIR |
| 352 tmpdir = getenv ("TMPDIR"); | |
| 353 #endif | |
| 354 if (!tmpdir) | |
| 355 tmpdir = "/tmp"; | |
| 771 | 356 #endif /* WIN32_NATIVE */ |
| 428 | 357 display = getenv ("DISPLAY"); |
| 358 if (display) | |
| 359 display = my_strdup (display); | |
| 360 #ifndef HAVE_MS_WINDOWS | |
| 361 else | |
| 362 suppress_windows_system = 1; | |
| 363 #endif | |
| 364 | |
| 365 for (i = 1; argv[i] && !errflg; i++) | |
| 366 { | |
| 367 if (*argv[i] != '-') | |
| 368 break; | |
| 369 else if (*argv[i] == '-' | |
| 370 && (*(argv[i] + 1) == '\0' | |
| 371 || (*(argv[i] + 1) == '-' && *(argv[i] + 2) == '\0'))) | |
| 372 { | |
| 373 /* `-' or `--' */ | |
| 374 ++i; | |
| 375 break; | |
| 376 } | |
| 377 | |
| 378 if (!strcmp (argv[i], "-batch") || !strcmp (argv[i], "--batch")) | |
| 379 batch = 1; | |
| 380 else if (!strcmp (argv[i], "-eval") || !strcmp (argv[i], "--eval")) | |
| 381 { | |
| 382 if (!argv[++i]) | |
| 383 { | |
| 384 fprintf (stderr, "%s: `-eval' must be followed by an argument\n", | |
| 385 progname); | |
| 386 exit (1); | |
| 387 } | |
| 388 eval_form = argv[i]; | |
| 389 } | |
| 390 else if (!strcmp (argv[i], "-display") || !strcmp (argv[i], "--display")) | |
| 391 { | |
| 392 suppress_windows_system = 0; | |
| 393 if (!argv[++i]) | |
| 394 { | |
| 395 fprintf (stderr, | |
| 396 "%s: `-display' must be followed by an argument\n", | |
| 397 progname); | |
| 398 exit (1); | |
| 399 } | |
| 400 if (display) | |
| 401 free (display); | |
| 402 /* no need to strdup. */ | |
| 403 display = argv[i]; | |
| 404 } | |
| 405 else if (!strcmp (argv[i], "-nw")) | |
| 406 suppress_windows_system = 1; | |
| 407 else | |
| 408 { | |
| 409 /* Iterate over one-letter options. */ | |
| 410 char *p; | |
| 411 int over = 0; | |
| 412 for (p = argv[i] + 1; *p && !over; p++) | |
| 413 { | |
| 414 switch (*p) | |
| 415 { | |
| 416 case 'q': | |
| 417 quick = 1; | |
| 418 break; | |
| 419 case 'v': | |
| 420 view = 1; | |
| 421 break; | |
| 422 case 'f': | |
| 423 GET_ARGUMENT (eval_function, "-f"); | |
| 424 break; | |
| 425 case 'l': | |
| 426 GET_ARGUMENT (load_library, "-l"); | |
| 427 break; | |
| 428 #ifdef INTERNET_DOMAIN_SOCKETS | |
| 429 case 'h': | |
| 430 GET_ARGUMENT (hostarg, "-h"); | |
| 431 break; | |
| 432 case 'p': | |
| 433 GET_ARGUMENT (portarg, "-p"); | |
| 434 port = atoi (portarg); | |
| 435 break; | |
| 436 case 'r': | |
| 437 GET_ARGUMENT (remotearg, "-r"); | |
| 3556 | 438 strncpy (remotepath, remotearg, QXE_PATH_MAX); |
| 428 | 439 rflg = 1; |
| 440 break; | |
| 441 #endif /* INTERNET_DOMAIN_SOCKETS */ | |
| 442 default: | |
| 443 errflg = 1; | |
| 444 } | |
| 445 } /* for */ | |
| 446 } /* else */ | |
| 447 } /* for */ | |
| 448 | |
| 449 if (errflg) | |
| 450 { | |
| 451 fprintf (stderr, | |
| 452 #ifdef INTERNET_DOMAIN_SOCKETS | |
| 442 | 453 "Usage: %s [-nw] [-display display] [-q] [-v] [-l library]\n" |
| 428 | 454 " [-batch] [-f function] [-eval form]\n" |
| 455 " [-h host] [-p port] [-r remote-path] [[+line] file] ...\n", | |
| 456 #else /* !INTERNET_DOMAIN_SOCKETS */ | |
| 442 | 457 "Usage: %s [-nw] [-q] [-v] [-l library] [-f function] [-eval form] " |
| 428 | 458 "[[+line] path] ...\n", |
| 459 #endif /* !INTERNET_DOMAIN_SOCKETS */ | |
| 460 progname); | |
| 461 exit (1); | |
| 462 } | |
| 463 if (batch && argv[i]) | |
| 464 { | |
| 465 fprintf (stderr, "%s: Cannot specify `-batch' with file names\n", | |
| 466 progname); | |
| 467 exit (1); | |
| 468 } | |
| 881 | 469 #if defined(INTERNET_DOMAIN_SOCKETS) |
| 428 | 470 if (suppress_windows_system && hostarg) |
| 471 { | |
| 472 fprintf (stderr, "%s: Remote editing is available only on X\n", | |
| 473 progname); | |
| 474 exit (1); | |
| 475 } | |
| 881 | 476 #endif |
| 428 | 477 *result = '\0'; |
| 478 if (eval_function || eval_form || load_library) | |
| 479 { | |
| 480 #if defined(INTERNET_DOMAIN_SOCKETS) | |
| 481 connect_type = make_connection (hostarg, port, &s); | |
| 482 #else | |
| 458 | 483 connect_type = make_connection (NULL, 0, &s); |
| 428 | 484 #endif |
| 485 sprintf (command, "(gnuserv-eval%s '(progn ", quick ? "-quickly" : ""); | |
| 486 send_string (s, command); | |
| 487 if (load_library) | |
| 488 { | |
| 489 send_string (s , "(load-library "); | |
| 490 send_string (s, clean_string(load_library)); | |
| 491 send_string (s, ") "); | |
| 492 } | |
| 493 if (eval_form) | |
| 494 { | |
| 495 send_string (s, eval_form); | |
| 496 } | |
| 497 if (eval_function) | |
| 498 { | |
| 499 send_string (s, "("); | |
| 500 send_string (s, eval_function); | |
| 501 send_string (s, ")"); | |
| 502 } | |
| 503 send_string (s, "))"); | |
| 504 /* disconnect already sends EOT_STR */ | |
| 505 #ifdef SYSV_IPC | |
| 506 if (connect_type == (int) CONN_IPC) | |
| 507 disconnect_from_ipc_server (s, msgp, batch && !quick); | |
| 508 #else /* !SYSV_IPC */ | |
| 509 if (connect_type != (int) CONN_IPC) | |
| 510 disconnect_from_server (s, batch && !quick); | |
| 511 #endif /* !SYSV_IPC */ | |
| 512 } /* eval_function || eval_form || load_library */ | |
| 513 else if (batch) | |
| 514 { | |
| 515 /* no sexp on the command line, so read it from stdin */ | |
| 516 int nb; | |
| 517 | |
| 518 #if defined(INTERNET_DOMAIN_SOCKETS) | |
| 519 connect_type = make_connection (hostarg, port, &s); | |
| 520 #else | |
| 458 | 521 connect_type = make_connection (NULL, 0, &s); |
| 428 | 522 #endif |
| 523 sprintf (command, "(gnuserv-eval%s '(progn ", quick ? "-quickly" : ""); | |
| 524 send_string (s, command); | |
| 525 | |
| 526 while ((nb = read(fileno(stdin), buffer, GSERV_BUFSZ-1)) > 0) | |
| 527 { | |
| 528 buffer[nb] = '\0'; | |
| 529 send_string(s, buffer); | |
| 530 } | |
| 531 send_string(s,"))"); | |
| 532 /* disconnect already sends EOT_STR */ | |
| 533 #ifdef SYSV_IPC | |
| 534 if (connect_type == (int) CONN_IPC) | |
| 535 disconnect_from_ipc_server (s, msgp, batch && !quick); | |
| 536 #else /* !SYSV_IPC */ | |
| 537 if (connect_type != (int) CONN_IPC) | |
| 538 disconnect_from_server (s, batch && !quick); | |
| 539 #endif /* !SYSV_IPC */ | |
| 540 } | |
| 541 | |
| 542 if (!batch) | |
| 543 { | |
| 544 if (suppress_windows_system) | |
| 545 { | |
| 546 tty = ttyname (0); | |
| 547 if (!tty) | |
| 548 { | |
| 549 fprintf (stderr, "%s: Not connected to a tty", progname); | |
| 550 exit (1); | |
| 551 } | |
| 552 #if defined(INTERNET_DOMAIN_SOCKETS) | |
| 553 connect_type = make_connection (hostarg, port, &s); | |
| 554 #else | |
| 458 | 555 connect_type = make_connection (NULL, 0, &s); |
| 428 | 556 #endif |
| 557 send_string (s, "(gnuserv-eval '(emacs-pid))"); | |
| 558 send_string (s, EOT_STR); | |
| 559 | |
| 560 if (read_line (s, buffer) == 0) | |
| 561 { | |
| 562 fprintf (stderr, "%s: Could not establish Emacs process id\n", | |
| 563 progname); | |
| 564 exit (1); | |
| 565 } | |
| 442 | 566 /* Don't do disconnect_from_server because we have already read |
| 428 | 567 data, and disconnect doesn't do anything else. */ |
| 881 | 568 #ifdef SYSV_IPC |
| 428 | 569 if (connect_type == (int) CONN_IPC) |
| 570 disconnect_from_ipc_server (s, msgp, FALSE); | |
| 571 #endif /* !SYSV_IPC */ | |
| 572 | |
| 573 emacs_pid = (pid_t)atol(buffer); | |
| 574 initialize_signals(); | |
| 575 } /* suppress_windows_system */ | |
| 576 | |
| 577 #if defined(INTERNET_DOMAIN_SOCKETS) | |
| 578 connect_type = make_connection (hostarg, port, &s); | |
| 579 #else | |
| 458 | 580 connect_type = make_connection (NULL, 0, &s); |
| 428 | 581 #endif |
| 582 | |
| 583 #ifdef INTERNET_DOMAIN_SOCKETS | |
| 584 if (connect_type == (int) CONN_INTERNET) | |
| 585 { | |
| 586 char *ptr; | |
| 587 gethostname (thishost, HOSTNAMSZ); | |
| 588 if (!rflg) | |
| 589 { /* attempt to generate a path | |
| 590 * to this machine */ | |
| 591 if ((ptr = getenv ("GNU_NODE")) != NULL) | |
| 592 /* user specified a path */ | |
| 3556 | 593 strncpy (remotepath, ptr, QXE_PATH_MAX); |
| 428 | 594 } |
| 595 #if 0 /* This is really bogus... re-enable it if you must have it! */ | |
|
4759
aa5ed11f473b
Remove support for obsolete systems. See xemacs-patches message with ID
Jerry James <james@xemacs.org>
parents:
4684
diff
changeset
|
596 #if defined (hp9000s800) |
| 428 | 597 else if (strcmp (thishost,hostarg)) |
| 598 { /* try /net/thishost */ | |
| 599 strcpy (remotepath, "/net/"); /* (this fails using internet | |
| 600 addresses) */ | |
| 601 strcat (remotepath, thishost); | |
| 602 } | |
| 603 #endif | |
| 604 #endif | |
| 605 } | |
| 606 else | |
| 607 { /* same machines, no need for path */ | |
| 608 remotepath[0] = '\0'; /* default is the empty path */ | |
| 609 } | |
| 610 #endif /* INTERNET_DOMAIN_SOCKETS */ | |
| 611 | |
| 612 #ifdef SYSV_IPC | |
| 613 if ((msgp = (struct msgbuf *) | |
| 614 malloc (sizeof *msgp + GSERV_BUFSZ)) == NULL) | |
| 615 { | |
| 616 fprintf (stderr, "%s: not enough memory for message buffer\n", progname); | |
| 617 exit (1); | |
| 618 } /* if */ | |
| 619 | |
| 620 msgp->mtext[0] = '\0'; /* ready for later strcats */ | |
| 621 #endif /* SYSV_IPC */ | |
| 622 | |
| 623 if (suppress_windows_system) | |
| 624 { | |
| 625 char *term = getenv ("TERM"); | |
| 626 if (!term) | |
| 627 { | |
| 628 fprintf (stderr, "%s: unknown terminal type\n", progname); | |
| 629 exit (1); | |
| 630 } | |
| 631 sprintf (command, "(gnuserv-edit-files '(tty %s %s %d) '(", | |
| 632 clean_string (tty), clean_string (term), (int)getpid ()); | |
| 633 } | |
| 634 else /* !suppress_windows_system */ | |
| 635 { | |
| 462 | 636 if (0) |
| 637 ; | |
| 638 #ifdef HAVE_X_WINDOWS | |
| 639 else if (display) | |
| 428 | 640 sprintf (command, "(gnuserv-edit-files '(x %s) '(", |
| 641 clean_string (display)); | |
| 462 | 642 #endif |
| 643 #ifdef HAVE_GTK | |
| 644 else if (display) | |
|
5225
1086297242fe
Don't throw an error if gnuclient supports GTK and XEmacs doesn't.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4759
diff
changeset
|
645 sprintf (command, |
|
1086297242fe
Don't throw an error if gnuclient supports GTK and XEmacs doesn't.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4759
diff
changeset
|
646 /* #### We should probably do this sort of thing for |
|
1086297242fe
Don't throw an error if gnuclient supports GTK and XEmacs doesn't.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4759
diff
changeset
|
647 other window systems. */ |
|
1086297242fe
Don't throw an error if gnuclient supports GTK and XEmacs doesn't.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4759
diff
changeset
|
648 "(gnuserv-edit-files (assoc* t '((gtk nil) (x %s)) " |
|
1086297242fe
Don't throw an error if gnuclient supports GTK and XEmacs doesn't.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4759
diff
changeset
|
649 ":key #'valid-device-type-p) '(", clean_string (display)); |
| 462 | 650 #endif |
| 428 | 651 #ifdef HAVE_MS_WINDOWS |
| 652 else | |
| 653 sprintf (command, "(gnuserv-edit-files '(mswindows nil) '("); | |
| 654 #endif | |
| 655 } /* !suppress_windows_system */ | |
| 656 send_string (s, command); | |
| 657 | |
| 658 if (!argv[i]) | |
| 659 nofiles = 1; | |
| 660 | |
| 661 for (; argv[i]; i++) | |
| 662 { | |
| 663 if (i < argc - 1 && *argv[i] == '+') | |
| 664 starting_line = atoi (argv[i++]); | |
|
4684
15c42a3f4065
Do not move cursor position in gnuclient started buffer if user did
It's me FKtPp \;) <m_pupil@yahoo.com.cn>
parents:
3556
diff
changeset
|
665 |
| 428 | 666 /* If the last argument is +something, treat it as a file. */ |
|
4684
15c42a3f4065
Do not move cursor position in gnuclient started buffer if user did
It's me FKtPp \;) <m_pupil@yahoo.com.cn>
parents:
3556
diff
changeset
|
667 if (i == argc) --i; |
|
15c42a3f4065
Do not move cursor position in gnuclient started buffer if user did
It's me FKtPp \;) <m_pupil@yahoo.com.cn>
parents:
3556
diff
changeset
|
668 |
| 428 | 669 filename_expand (fullpath, argv[i]); |
| 670 #ifdef INTERNET_DOMAIN_SOCKETS | |
| 440 | 671 path = (char *) malloc (strlen (remotepath) + strlen (fullpath) + 1); |
| 428 | 672 sprintf (path, "%s%s", remotepath, fullpath); |
| 673 #else | |
| 674 path = my_strdup (fullpath); | |
| 675 #endif | |
|
4684
15c42a3f4065
Do not move cursor position in gnuclient started buffer if user did
It's me FKtPp \;) <m_pupil@yahoo.com.cn>
parents:
3556
diff
changeset
|
676 if ( starting_line ) { |
|
15c42a3f4065
Do not move cursor position in gnuclient started buffer if user did
It's me FKtPp \;) <m_pupil@yahoo.com.cn>
parents:
3556
diff
changeset
|
677 sprintf (command, "(%d . %s)", starting_line, clean_string (path)); |
|
15c42a3f4065
Do not move cursor position in gnuclient started buffer if user did
It's me FKtPp \;) <m_pupil@yahoo.com.cn>
parents:
3556
diff
changeset
|
678 } else { |
|
15c42a3f4065
Do not move cursor position in gnuclient started buffer if user did
It's me FKtPp \;) <m_pupil@yahoo.com.cn>
parents:
3556
diff
changeset
|
679 sprintf (command, "(nil . %s)", clean_string (path)); |
|
15c42a3f4065
Do not move cursor position in gnuclient started buffer if user did
It's me FKtPp \;) <m_pupil@yahoo.com.cn>
parents:
3556
diff
changeset
|
680 } |
|
15c42a3f4065
Do not move cursor position in gnuclient started buffer if user did
It's me FKtPp \;) <m_pupil@yahoo.com.cn>
parents:
3556
diff
changeset
|
681 |
| 428 | 682 send_string (s, command); |
| 683 free (path); | |
| 684 } /* for */ | |
| 685 | |
| 686 sprintf (command, ")%s%s", | |
| 687 (quick || (nofiles && !suppress_windows_system)) ? " 'quick" : "", | |
| 688 view ? " 'view" : ""); | |
| 689 send_string (s, command); | |
| 690 send_string (s, ")"); | |
| 691 | |
| 692 #ifdef SYSV_IPC | |
| 693 if (connect_type == (int) CONN_IPC) | |
| 694 disconnect_from_ipc_server (s, msgp, FALSE); | |
| 695 #else /* !SYSV_IPC */ | |
| 696 if (connect_type != (int) CONN_IPC) | |
| 697 disconnect_from_server (s, FALSE); | |
| 698 #endif /* !SYSV_IPC */ | |
| 699 } /* not batch */ | |
| 700 | |
| 701 | |
| 702 return 0; | |
| 703 | |
| 704 } /* main */ | |
| 705 | |
| 706 #endif /* SYSV_IPC || UNIX_DOMAIN_SOCKETS || INTERNET_DOMAIN_SOCKETS */ |