annotate lib-src/emacsclient.c @ 111870:b47e85affa59

Derive from prog-mode, use derived-mode-p, and fix up various minor style issues in lisp/progmodes. * lisp/progmodes/vhdl-mode.el (vhdl-write-file-hooks-init) (vhdl-hs-minor-mode, vhdl-ps-print-init): Fix make-local-variable -> make-local-hook. * lisp/progmodes/sh-script.el (sh-require-final-newline): Remove. (sh-set-shell): Don't set require-final-newline since it's already done by prog-mode. * lisp/progmodes/modula2.el (m2-mode): Don't make m2-end-comment-column since we never set it. * lisp/progmodes/ebrowse.el (ebrowse-set-tree-indentation): Use read-string and standard prompt. * lisp/progmodes/dcl-mode.el (dcl-mode-map): Move init into declaration. * lisp/progmodes/meta-mode.el (meta-mode-abbrev-table): Merge init and decl. (meta-common-mode-syntax-table): Rename from meta-mode-syntax-table. (meta-common-mode-map): Rename from meta-mode-map. Remove C-m binding, which is a user preference, not mode specific. (meta-common-mode): New major mode; replace meta-common-initialization. * lisp/progmodes/js.el (js-mode): Call syntax-propertize rather than messing around with font-lock. * lisp/progmodes/etags.el (select-tags-table-mode): Derive from special-mode. * lisp/progmodes/octave-mod.el (octave-mode): * lisp/progmodes/gdb-mi.el (gdb-inferior-io-mode, gdb-threads-mode) (gdb-memory-mode, gdb-disassembly-mode, gdb-breakpoints-mode) (gdb-frames-mode, gdb-locals-mode, gdb-registers-mode): Let define-derived-mode do its job. * lisp/progmodes/cpp.el (cpp-edit-mode-map): Move initialization into declaration. (cpp-edit-mode): Use define-derived-mode. (cpp-edit-load): Use derived-mode-p. * lisp/progmodes/mixal-mode.el (mixal-mode): * lisp/progmodes/f90.el (f90-mode): * lisp/progmodes/cfengine.el (cfengine-mode): Don't bother setting require-final-newline since prog-mode does it already. * lisp/progmodes/cc-cmds.el (c-update-modeline): Use match-string. * lisp/progmodes/asm-mode.el (asm-mode-map): Fix menu setup. * lisp/progmodes/antlr-mode.el: Require cc-mode upfront. (antlr-mode-syntax-table, antlr-action-syntax-table): Initialize in the declaration. (antlr-directory-dependencies, antlr-show-makefile-rules): Use derived-mode-p. (antlr-language-option): Don't assume point-min==1. (antlr-mode): Use define-derived-mode. * lisp/progmodes/ada-mode.el: Use derived-mode-p. (ada-mode): Use define-derived-mode. Use hack-local-variables-hook. * lisp/progmodes/vhdl-mode.el (vhdl-mode): * lisp/progmodes/verilog-mode.el (verilog-mode): * lisp/progmodes/vera-mode.el (vera-mode): * lisp/progmodes/sql.el (sql-mode): * lisp/progmodes/scheme.el (scheme-mode): * lisp/progmodes/perl-mode.el (perl-mode): * lisp/progmodes/octave-inf.el (inferior-octave-mode): * lisp/progmodes/autoconf.el (autoconf-mode): * lisp/progmodes/m4-mode.el (m4-mode): * lisp/progmodes/inf-lisp.el (inferior-lisp-mode): * lisp/progmodes/idlwave.el (idlwave-mode): * lisp/progmodes/icon.el (icon-mode): * lisp/progmodes/idlw-help.el (idlwave-help-mode): * lisp/progmodes/dcl-mode.el (dcl-mode): * lisp/progmodes/idlw-shell.el (idlwave-shell-mode): * lisp/progmodes/ebrowse.el (ebrowse-tree-mode, ebrowse-electric-list-mode) (ebrowse-member-mode, ebrowse-electric-position-mode): Use define-derived-mode. * lisp/progmodes/xscheme.el (xscheme-start) (local-set-scheme-interaction-buffer, scheme-interaction-mode): * lisp/progmodes/which-func.el (which-function): * lisp/progmodes/vhdl-mode.el (vhdl-set-style): * lisp/progmodes/verilog-mode.el (verilog-set-compile-command) (verilog-modify-compile-command, verilog-error-regexp-add-xemacs) (verilog-set-define, verilog-auto-reeval-locals): * lisp/progmodes/sql.el (sql-product-font-lock, sql-interactive-mode): * lisp/progmodes/simula.el (simula-mode): * lisp/progmodes/scheme.el (scheme-mode-variables, dsssl-mode): * lisp/progmodes/python.el (python-check, python-mode): * lisp/progmodes/prolog.el (prolog-mode-variables): * lisp/progmodes/gud.el (gud-tooltip-activate-mouse-motions): * lisp/progmodes/ebrowse.el (ebrowse-view-file-other-frame): * lisp/progmodes/delphi.el (delphi-mode): * lisp/progmodes/cc-styles.el (c-setup-paragraph-variables): * lisp/progmodes/cc-mode.el (c-basic-common-init, c-common-init) (c-font-lock-init): Move make-local-variable to their setq. * lisp/progmodes/xscheme.el (exit-scheme-interaction-mode) (xscheme-enter-interaction-mode, xscheme-enter-debugger-mode) (xscheme-debugger-mode-p, xscheme-send-string-1): * lisp/progmodes/tcl.el (inferior-tcl-proc, tcl-current-word) (tcl-load-file, tcl-restart-with-file): * lisp/progmodes/ps-mode.el (ps-run-running): * lisp/progmodes/gdb-mi.el (gud-watch, gdb-mouse-set-clear-breakpoint): * lisp/progmodes/js.el (js--get-all-known-symbols): * lisp/progmodes/inf-lisp.el (inferior-lisp-proc): * lisp/progmodes/idlwave.el (idlwave-beginning-of-statement) (idlwave-template, idlwave-update-buffer-routine-info) (idlwave-update-current-buffer-info) (idlwave-get-routine-info-from-buffers, idlwave-choose) (idlwave-scan-class-info, idlwave-fix-keywords) (idlwave-list-buffer-load-path-shadows): * lisp/progmodes/idlw-toolbar.el (idlwave-toolbar, idlwave-toolbar-add) (idlwave-toolbar-remove): * lisp/progmodes/idlw-shell.el (idlwave-shell-save-and-action) (idlwave-shell-file-name, idlwave-shell-electric-debug-all-off) (idlwave-shell-menu-def): * lisp/progmodes/idlw-complete-structtag.el (idlwave-prepare-structure-tag-completion): * lisp/progmodes/gud.el (gud-set-buffer): * lisp/progmodes/f90.el (f90-backslash-not-special): * lisp/progmodes/delphi.el (delphi-find-unit): Use derived-mode-p.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 10 Dec 2010 15:00:25 -0500
parents 3655cc4062e4
children 417b1e4d63cd 2887524f362a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
493
8b101799ff37 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 478
diff changeset
1 /* Client process that communicates with GNU Emacs acting as server.
64769
6358e3c6075c Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 64083
diff changeset
2 Copyright (C) 1986, 1987, 1994, 1999, 2000, 2001, 2002, 2003, 2004,
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 105608
diff changeset
3 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
412
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
4
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
5 This file is part of GNU Emacs.
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6
94828
3a4bc081639c Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 92159
diff changeset
7 GNU Emacs is free software: you can redistribute it and/or modify
412
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
8 it under the terms of the GNU General Public License as published by
94828
3a4bc081639c Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 92159
diff changeset
9 the Free Software Foundation, either version 3 of the License, or
3a4bc081639c Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 92159
diff changeset
10 (at your option) any later version.
412
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
11
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
12 GNU Emacs is distributed in the hope that it will be useful,
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
13 but WITHOUT ANY WARRANTY; without even the implied warranty of
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
15 GNU General Public License for more details.
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
16
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
94828
3a4bc081639c Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 92159
diff changeset
18 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
412
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
19
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
20
42412
83c1951257f1 Include <config.h>.
Pavel Janík <Pavel@Janik.cz>
parents: 42176
diff changeset
21 #include <config.h>
42176
1f5dbeefa536 Include "config.h", not <../src/config.h>.
Pavel Janík <Pavel@Janik.cz>
parents: 39723
diff changeset
22
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
23 #ifdef WINDOWSNT
73585
7d264c036b25 [WINDOWSNT]: Include <malloc.h> and <stdlib.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73583
diff changeset
24
73973
a36e68eb4ae8 [WINDOWSNT]: Undef _WINSOCKAPI_ and _WINSOCK_H.
Juanma Barranquero <lekktu@gmail.com>
parents: 73896
diff changeset
25 /* config.h defines these, which disables sockets altogether! */
a36e68eb4ae8 [WINDOWSNT]: Undef _WINSOCKAPI_ and _WINSOCK_H.
Juanma Barranquero <lekktu@gmail.com>
parents: 73896
diff changeset
26 # undef _WINSOCKAPI_
a36e68eb4ae8 [WINDOWSNT]: Undef _WINSOCKAPI_ and _WINSOCK_H.
Juanma Barranquero <lekktu@gmail.com>
parents: 73896
diff changeset
27 # undef _WINSOCK_H
a36e68eb4ae8 [WINDOWSNT]: Undef _WINSOCKAPI_ and _WINSOCK_H.
Juanma Barranquero <lekktu@gmail.com>
parents: 73896
diff changeset
28
73585
7d264c036b25 [WINDOWSNT]: Include <malloc.h> and <stdlib.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73583
diff changeset
29 # include <malloc.h>
7d264c036b25 [WINDOWSNT]: Include <malloc.h> and <stdlib.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73583
diff changeset
30 # include <stdlib.h>
74118
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
31 # include <windows.h>
78904
5025525d6c9d (w32_window_app): Init common controls when windowed.
Jason Rumney <jasonr@gnu.org>
parents: 78257
diff changeset
32 # include <commctrl.h>
109652
eb720d8ea1c6 emacsclient.c cleanups.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109517
diff changeset
33 # include <io.h>
eb720d8ea1c6 emacsclient.c cleanups.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109517
diff changeset
34 # include <winsock2.h>
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
35
73585
7d264c036b25 [WINDOWSNT]: Include <malloc.h> and <stdlib.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73583
diff changeset
36 # define NO_SOCKETS_IN_FILE_SYSTEM
7d264c036b25 [WINDOWSNT]: Include <malloc.h> and <stdlib.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73583
diff changeset
37
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
38 # define HSOCKET SOCKET
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
39 # define CLOSE_SOCKET closesocket
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
40 # define INITIALIZE() (initialize_sockets ())
73585
7d264c036b25 [WINDOWSNT]: Include <malloc.h> and <stdlib.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73583
diff changeset
41
110746
5c1a707ab452 Fix compilation warnings.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 110706
diff changeset
42 char *w32_getenv (char *);
5c1a707ab452 Fix compilation warnings.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 110706
diff changeset
43 #define egetenv(VAR) w32_getenv(VAR)
5c1a707ab452 Fix compilation warnings.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 110706
diff changeset
44
73585
7d264c036b25 [WINDOWSNT]: Include <malloc.h> and <stdlib.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73583
diff changeset
45 #else /* !WINDOWSNT */
7d264c036b25 [WINDOWSNT]: Include <malloc.h> and <stdlib.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73583
diff changeset
46
100418
9ad0989a1e66 Include syswait.h instead of sys/types.h.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100364
diff changeset
47 # include "syswait.h"
73896
09dabd95380c [!WINDOWSNT]: Include <sys/types.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73816
diff changeset
48
73617
7af864af10b6 [WINDOWSNT]: Define HAVE_INET_SOCKETS.
Juanma Barranquero <lekktu@gmail.com>
parents: 73601
diff changeset
49 # ifdef HAVE_INET_SOCKETS
7af864af10b6 [WINDOWSNT]: Define HAVE_INET_SOCKETS.
Juanma Barranquero <lekktu@gmail.com>
parents: 73601
diff changeset
50 # include <netinet/in.h>
109652
eb720d8ea1c6 emacsclient.c cleanups.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109517
diff changeset
51 # ifdef HAVE_SOCKETS
eb720d8ea1c6 emacsclient.c cleanups.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109517
diff changeset
52 # include <sys/types.h>
eb720d8ea1c6 emacsclient.c cleanups.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109517
diff changeset
53 # include <sys/socket.h>
eb720d8ea1c6 emacsclient.c cleanups.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109517
diff changeset
54 # include <sys/un.h>
eb720d8ea1c6 emacsclient.c cleanups.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109517
diff changeset
55 # endif /* HAVE_SOCKETS */
73617
7af864af10b6 [WINDOWSNT]: Define HAVE_INET_SOCKETS.
Juanma Barranquero <lekktu@gmail.com>
parents: 73601
diff changeset
56 # endif
100154
234ea6739ae8 Fix typo in include.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100149
diff changeset
57 # include <arpa/inet.h>
100149
61db5ca5de78 Include <darpa/inet.h>.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 99334
diff changeset
58
73578
e193b6a3f379 Fixes to emacsclient.c for GNU/Linux.
Juanma Barranquero <lekktu@gmail.com>
parents: 73562
diff changeset
59 # define INVALID_SOCKET -1
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
60 # define HSOCKET int
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
61 # define CLOSE_SOCKET close
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
62 # define INITIALIZE()
73585
7d264c036b25 [WINDOWSNT]: Include <malloc.h> and <stdlib.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73583
diff changeset
63
100364
1cbff49af513 (WCONTINUED): New compatibility define for older systems.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100344
diff changeset
64 # ifndef WCONTINUED
1cbff49af513 (WCONTINUED): New compatibility define for older systems.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100344
diff changeset
65 # define WCONTINUED 8
1cbff49af513 (WCONTINUED): New compatibility define for older systems.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100344
diff changeset
66 # endif
1cbff49af513 (WCONTINUED): New compatibility define for older systems.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100344
diff changeset
67
110746
5c1a707ab452 Fix compilation warnings.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 110706
diff changeset
68 #define egetenv(VAR) getenv(VAR)
5c1a707ab452 Fix compilation warnings.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 110706
diff changeset
69
73585
7d264c036b25 [WINDOWSNT]: Include <malloc.h> and <stdlib.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73583
diff changeset
70 #endif /* !WINDOWSNT */
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
71
3595
e10f7473d2e3 * emacsserver.c (main): When we're passing a `struct sockaddr_un'
Jim Blandy <jimb@redhat.com>
parents: 1031
diff changeset
72 #undef signal
412
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
73
74118
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
74 #include <stdarg.h>
42176
1f5dbeefa536 Include "config.h", not <../src/config.h>.
Pavel Janík <Pavel@Janik.cz>
parents: 39723
diff changeset
75 #include <ctype.h>
16030
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
76 #include <stdio.h>
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
77 #include "getopt.h"
21431
a080769e8f7d Move inclusion of unistd.h to top, else fails on
Dave Love <fx@gnu.org>
parents: 21387
diff changeset
78 #ifdef HAVE_UNISTD_H
109652
eb720d8ea1c6 emacsclient.c cleanups.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109517
diff changeset
79 # include <unistd.h>
21431
a080769e8f7d Move inclusion of unistd.h to top, else fails on
Dave Love <fx@gnu.org>
parents: 21387
diff changeset
80 #endif
412
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
81
109652
eb720d8ea1c6 emacsclient.c cleanups.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109517
diff changeset
82 #include <pwd.h>
83500
0a651d0085ee Fix compilation error on OpenBSD. (Reported by Han Boetes.)
Karoly Lorentey <lorentey@elte.hu>
parents: 83499
diff changeset
83 #include <sys/stat.h>
82995
039bd6989d29 Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents: 82994
diff changeset
84 #include <signal.h>
53229
33c3c7c16e13 lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents: 52848
diff changeset
85 #include <errno.h>
33c3c7c16e13 lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents: 52848
diff changeset
86
109652
eb720d8ea1c6 emacsclient.c cleanups.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109517
diff changeset
87
53229
33c3c7c16e13 lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents: 52848
diff changeset
88
109111
52b76722152a Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108828
diff changeset
89 char *getenv (const char *), *getwd (char *);
109517
d22063077a0c * emacsclient.c (getcwd): Fix previous change.
Juanma Barranquero <lekktu@gmail.com>
parents: 109516
diff changeset
90 #ifdef HAVE_GETCWD
d22063077a0c * emacsclient.c (getcwd): Fix previous change.
Juanma Barranquero <lekktu@gmail.com>
parents: 109516
diff changeset
91 char *(getcwd) (char *, size_t);
79232
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
92 #endif
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
93
16030
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
94 #ifndef VERSION
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
95 #define VERSION "unspecified"
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
96 #endif
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
97
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
98
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
99 #ifndef EXIT_SUCCESS
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
100 #define EXIT_SUCCESS 0
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
101 #endif
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
102
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
103 #ifndef EXIT_FAILURE
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
104 #define EXIT_FAILURE 1
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
105 #endif
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
106
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
107 #ifndef FALSE
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
108 #define FALSE 0
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
109 #endif
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
110
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
111 #ifndef TRUE
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
112 #define TRUE 1
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
113 #endif
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
114
99215
e0e326adf3bc * emacsclient.c (EXTRA_SPACE): New macro.
Juanma Barranquero <lekktu@gmail.com>
parents: 99209
diff changeset
115 /* Additional space when allocating buffers for filenames, etc. */
e0e326adf3bc * emacsclient.c (EXTRA_SPACE): New macro.
Juanma Barranquero <lekktu@gmail.com>
parents: 99209
diff changeset
116 #define EXTRA_SPACE 100
e0e326adf3bc * emacsclient.c (EXTRA_SPACE): New macro.
Juanma Barranquero <lekktu@gmail.com>
parents: 99209
diff changeset
117
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
118
16030
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
119 /* Name used to invoke this program. */
110746
5c1a707ab452 Fix compilation warnings.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 110706
diff changeset
120 const char *progname;
16030
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
121
53341
d4e6a050c9b1 Bugfix festival.
Karoly Lorentey <lorentey@elte.hu>
parents: 53233
diff changeset
122 /* The second argument to main. */
d4e6a050c9b1 Bugfix festival.
Karoly Lorentey <lorentey@elte.hu>
parents: 53233
diff changeset
123 char **main_argv;
d4e6a050c9b1 Bugfix festival.
Karoly Lorentey <lorentey@elte.hu>
parents: 53233
diff changeset
124
16146
a649abfefbb1 (longopts): Change nowait to no-wait.
Richard M. Stallman <rms@gnu.org>
parents: 16074
diff changeset
125 /* Nonzero means don't wait for a response from Emacs. --no-wait. */
16030
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
126 int nowait = 0;
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
127
47647
5498210ad40d Remove SYSV support.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47515
diff changeset
128 /* Nonzero means args are expressions to be evaluated. --eval. */
5498210ad40d Remove SYSV support.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47515
diff changeset
129 int eval = 0;
5498210ad40d Remove SYSV support.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47515
diff changeset
130
84667
f2c11a35b0e3 (current_frame): Change the default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83666
diff changeset
131 /* Nonzero means don't open a new frame. Inverse of --create-frame. */
f2c11a35b0e3 (current_frame): Change the default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83666
diff changeset
132 int current_frame = 1;
83367
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
133
47647
5498210ad40d Remove SYSV support.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47515
diff changeset
134 /* The display on which Emacs should work. --display. */
109744
fdbd24f8d999 Fix warnings produced by compiling with -Wwrite_strings (i.e. use const char *).
Jan D <jan.h.d@swipnet.se>
parents: 109652
diff changeset
135 const char *display = NULL;
47647
5498210ad40d Remove SYSV support.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47515
diff changeset
136
108828
87dad1e1c860 Add --parent-id argument to emacsclient.
Chong Yidong <cyd@stupidchicken.com>
parents: 107737
diff changeset
137 /* The parent window ID, if we are opening a frame via XEmbed. */
87dad1e1c860 Add --parent-id argument to emacsclient.
Chong Yidong <cyd@stupidchicken.com>
parents: 107737
diff changeset
138 char *parent_id = NULL;
47647
5498210ad40d Remove SYSV support.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47515
diff changeset
139
53229
33c3c7c16e13 lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents: 52848
diff changeset
140 /* Nonzero means open a new Emacs frame on the current terminal. */
83043
78a785f205ea Added -w option to emacsclient for opening a new X frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83037
diff changeset
141 int tty = 0;
53229
33c3c7c16e13 lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents: 52848
diff changeset
142
47647
5498210ad40d Remove SYSV support.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47515
diff changeset
143 /* If non-NULL, the name of an editor to fallback to if the server
5498210ad40d Remove SYSV support.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47515
diff changeset
144 is not running. --alternate-editor. */
73765
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
145 const char *alternate_editor = NULL;
47647
5498210ad40d Remove SYSV support.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47515
diff changeset
146
52532
cd53bfef4ab1 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 52479
diff changeset
147 /* If non-NULL, the filename of the UNIX socket. */
52479
bc2610a13fbf (socket_name): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 52401
diff changeset
148 char *socket_name = NULL;
bc2610a13fbf (socket_name): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 52401
diff changeset
149
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
150 /* If non-NULL, the filename of the authentication file. */
109744
fdbd24f8d999 Fix warnings produced by compiling with -Wwrite_strings (i.e. use const char *).
Jan D <jan.h.d@swipnet.se>
parents: 109652
diff changeset
151 const char *server_file = NULL;
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
152
74342
c6cb776ffbb7 (emacs_pid): New variable.
Juanma Barranquero <lekktu@gmail.com>
parents: 74341
diff changeset
153 /* PID of the Emacs server process. */
c6cb776ffbb7 (emacs_pid): New variable.
Juanma Barranquero <lekktu@gmail.com>
parents: 74341
diff changeset
154 int emacs_pid = 0;
c6cb776ffbb7 (emacs_pid): New variable.
Juanma Barranquero <lekktu@gmail.com>
parents: 74341
diff changeset
155
109111
52b76722152a Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108828
diff changeset
156 void print_help_and_exit (void) NO_RETURN;
109511
09a43f890565 Add NO_RETURN specifiers to functions in lib-src.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109480
diff changeset
157 void fail (void) NO_RETURN;
09a43f890565 Add NO_RETURN specifiers to functions in lib-src.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109480
diff changeset
158
21387
4812cf228971 Include <stdlib.h> and <unistd.h> if available.
Andreas Schwab <schwab@suse.de>
parents: 19582
diff changeset
159
16030
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
160 struct option longopts[] =
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
161 {
16146
a649abfefbb1 (longopts): Change nowait to no-wait.
Richard M. Stallman <rms@gnu.org>
parents: 16074
diff changeset
162 { "no-wait", no_argument, NULL, 'n' },
47647
5498210ad40d Remove SYSV support.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47515
diff changeset
163 { "eval", no_argument, NULL, 'e' },
16030
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
164 { "help", no_argument, NULL, 'H' },
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
165 { "version", no_argument, NULL, 'V' },
82994
44ffe551079c Fix longopts option name for --tty.
Karoly Lorentey <lorentey@elte.hu>
parents: 82991
diff changeset
166 { "tty", no_argument, NULL, 't' },
98676
d63a9c87e0ac (longopts, print_help_and_exit): Add -nw.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98245
diff changeset
167 { "nw", no_argument, NULL, 't' },
84667
f2c11a35b0e3 (current_frame): Change the default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83666
diff changeset
168 { "create-frame", no_argument, NULL, 'c' },
47515
6ee937dcfe16 (quote_file_name): Quote \n.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42412
diff changeset
169 { "alternate-editor", required_argument, NULL, 'a' },
73765
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
170 #ifndef NO_SOCKETS_IN_FILE_SYSTEM
52479
bc2610a13fbf (socket_name): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 52401
diff changeset
171 { "socket-name", required_argument, NULL, 's' },
73765
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
172 #endif
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
173 { "server-file", required_argument, NULL, 'f' },
87724
e89ccaac023a (decode_options) [WINDOWSNT]: Don't use the value of DISPLAY in the
Eli Zaretskii <eliz@gnu.org>
parents: 87669
diff changeset
174 #ifndef WINDOWSNT
47647
5498210ad40d Remove SYSV support.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47515
diff changeset
175 { "display", required_argument, NULL, 'd' },
87724
e89ccaac023a (decode_options) [WINDOWSNT]: Don't use the value of DISPLAY in the
Eli Zaretskii <eliz@gnu.org>
parents: 87669
diff changeset
176 #endif
108828
87dad1e1c860 Add --parent-id argument to emacsclient.
Chong Yidong <cyd@stupidchicken.com>
parents: 107737
diff changeset
177 { "parent-id", required_argument, NULL, 'p' },
47647
5498210ad40d Remove SYSV support.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47515
diff changeset
178 { 0, 0, 0, 0 }
16030
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
179 };
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
180
79232
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
181
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
182 /* Like malloc but get fatal error if memory is exhausted. */
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
183
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
184 long *
109111
52b76722152a Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108828
diff changeset
185 xmalloc (unsigned int size)
79232
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
186 {
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
187 long *result = (long *) malloc (size);
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
188 if (result == NULL)
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
189 {
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
190 perror ("malloc");
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
191 exit (EXIT_FAILURE);
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
192 }
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
193 return result;
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
194 }
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
195
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83065
diff changeset
196 /* Like strdup but get a fatal error if memory is exhausted. */
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83065
diff changeset
197
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83065
diff changeset
198 char *
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83065
diff changeset
199 xstrdup (const char *s)
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83065
diff changeset
200 {
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83065
diff changeset
201 char *result = strdup (s);
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83065
diff changeset
202 if (result == NULL)
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83065
diff changeset
203 {
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83065
diff changeset
204 perror ("strdup");
83121
84cafe5c268f Merged in changes from CVS trunk.
Karoly Lorentey <lorentey@elte.hu>
parents: 83107 55442
diff changeset
205 exit (EXIT_FAILURE);
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83065
diff changeset
206 }
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83065
diff changeset
207 return result;
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83065
diff changeset
208 }
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83065
diff changeset
209
83499
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
210 /* From sysdep.c */
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
211 #if !defined (HAVE_GET_CURRENT_DIR_NAME) || defined (BROKEN_GET_CURRENT_DIR_NAME)
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
212
84681
f44a6d77db08 (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84677
diff changeset
213 /* From lisp.h */
f44a6d77db08 (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84677
diff changeset
214 #ifndef DIRECTORY_SEP
f44a6d77db08 (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84677
diff changeset
215 #define DIRECTORY_SEP '/'
f44a6d77db08 (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84677
diff changeset
216 #endif
f44a6d77db08 (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84677
diff changeset
217 #ifndef IS_DIRECTORY_SEP
f44a6d77db08 (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84677
diff changeset
218 #define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP)
f44a6d77db08 (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84677
diff changeset
219 #endif
f44a6d77db08 (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84677
diff changeset
220 #ifndef IS_DEVICE_SEP
f44a6d77db08 (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84677
diff changeset
221 #ifndef DEVICE_SEP
f44a6d77db08 (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84677
diff changeset
222 #define IS_DEVICE_SEP(_c_) 0
f44a6d77db08 (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84677
diff changeset
223 #else
f44a6d77db08 (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84677
diff changeset
224 #define IS_DEVICE_SEP(_c_) ((_c_) == DEVICE_SEP)
f44a6d77db08 (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84677
diff changeset
225 #endif
f44a6d77db08 (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84677
diff changeset
226 #endif
f44a6d77db08 (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84677
diff changeset
227 #ifndef IS_ANY_SEP
f44a6d77db08 (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84677
diff changeset
228 #define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_))
f44a6d77db08 (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84677
diff changeset
229 #endif
f44a6d77db08 (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84677
diff changeset
230
f44a6d77db08 (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84677
diff changeset
231
83499
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
232 /* Return the current working directory. Returns NULL on errors.
87965
e66c061f4966 (set_tcp_socket): Don't send a "\n" after the authentication string;
Juanma Barranquero <lekktu@gmail.com>
parents: 87724
diff changeset
233 Any other returned value must be freed with free. This is used
83499
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
234 only when get_current_dir_name is not defined on the system. */
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
235 char*
109480
d12162869c07 Convert some more functions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109315
diff changeset
236 get_current_dir_name (void)
83499
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
237 {
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
238 char *buf;
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
239 char *pwd;
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
240 struct stat dotstat, pwdstat;
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
241 /* If PWD is accurate, use it instead of calling getwd. PWD is
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
242 sometimes a nicer name, and using it may avoid a fatal error if a
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
243 parent directory is searchable but not readable. */
85680
a927843fe12d Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 85116
diff changeset
244 if ((pwd = egetenv ("PWD")) != 0
83499
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
245 && (IS_DIRECTORY_SEP (*pwd) || (*pwd && IS_DEVICE_SEP (pwd[1])))
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
246 && stat (pwd, &pwdstat) == 0
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
247 && stat (".", &dotstat) == 0
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
248 && dotstat.st_ino == pwdstat.st_ino
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
249 && dotstat.st_dev == pwdstat.st_dev
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
250 #ifdef MAXPATHLEN
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
251 && strlen (pwd) < MAXPATHLEN
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
252 #endif
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
253 )
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
254 {
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
255 buf = (char *) xmalloc (strlen (pwd) + 1);
83499
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
256 if (!buf)
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
257 return NULL;
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
258 strcpy (buf, pwd);
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
259 }
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
260 #ifdef HAVE_GETCWD
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
261 else
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
262 {
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
263 size_t buf_size = 1024;
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
264 buf = (char *) xmalloc (buf_size);
83499
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
265 if (!buf)
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
266 return NULL;
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
267 for (;;)
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
268 {
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
269 if (getcwd (buf, buf_size) == buf)
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
270 break;
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
271 if (errno != ERANGE)
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
272 {
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
273 int tmp_errno = errno;
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
274 free (buf);
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
275 errno = tmp_errno;
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
276 return NULL;
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
277 }
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
278 buf_size *= 2;
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
279 buf = (char *) realloc (buf, buf_size);
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
280 if (!buf)
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
281 return NULL;
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
282 }
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
283 }
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
284 #else
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
285 else
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
286 {
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
287 /* We need MAXPATHLEN here. */
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
288 buf = (char *) xmalloc (MAXPATHLEN + 1);
83499
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
289 if (!buf)
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
290 return NULL;
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
291 if (getwd (buf) == NULL)
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
292 {
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
293 int tmp_errno = errno;
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
294 free (buf);
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
295 errno = tmp_errno;
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
296 return NULL;
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
297 }
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
298 }
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
299 #endif
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
300 return buf;
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
301 }
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
302 #endif
74118
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
303
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
304 #ifdef WINDOWSNT
79232
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
305
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
306 #define REG_ROOT "SOFTWARE\\GNU\\Emacs"
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
307
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
308 /* Retrieve an environment variable from the Emacs subkeys of the registry.
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
309 Return NULL if the variable was not found, or it was empty.
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
310 This code is based on w32_get_resource (w32.c). */
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
311 char *
109480
d12162869c07 Convert some more functions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109315
diff changeset
312 w32_get_resource (HKEY predefined, char *key, LPDWORD type)
79232
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
313 {
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
314 HKEY hrootkey = NULL;
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
315 char *result = NULL;
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
316 DWORD cbData;
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
317
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
318 if (RegOpenKeyEx (predefined, REG_ROOT, 0, KEY_READ, &hrootkey) == ERROR_SUCCESS)
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
319 {
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
320 if (RegQueryValueEx (hrootkey, key, NULL, NULL, NULL, &cbData) == ERROR_SUCCESS)
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
321 {
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
322 result = (char *) xmalloc (cbData);
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
323
99215
e0e326adf3bc * emacsclient.c (EXTRA_SPACE): New macro.
Juanma Barranquero <lekktu@gmail.com>
parents: 99209
diff changeset
324 if ((RegQueryValueEx (hrootkey, key, NULL, type, result, &cbData) != ERROR_SUCCESS)
e0e326adf3bc * emacsclient.c (EXTRA_SPACE): New macro.
Juanma Barranquero <lekktu@gmail.com>
parents: 99209
diff changeset
325 || (*result == 0))
79232
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
326 {
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
327 free (result);
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
328 result = NULL;
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
329 }
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
330 }
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
331
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
332 RegCloseKey (hrootkey);
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
333 }
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
334
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
335 return result;
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
336 }
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
337
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
338 /*
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
339 getenv wrapper for Windows
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
340
106818
a3da62473e24 Fix typos in comments and ChangeLogs.
Juanma Barranquero <lekktu@gmail.com>
parents: 106815
diff changeset
341 This is needed to duplicate Emacs's behavior, which is to look for environment
79232
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
342 variables in the registry if they don't appear in the environment.
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
343 */
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
344 char *
109480
d12162869c07 Convert some more functions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109315
diff changeset
345 w32_getenv (char *envvar)
79232
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
346 {
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
347 char *value;
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
348 DWORD dwType;
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
349
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
350 if (value = getenv (envvar))
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
351 /* Found in the environment. */
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
352 return value;
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
353
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
354 if (! (value = w32_get_resource (HKEY_CURRENT_USER, envvar, &dwType)) &&
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
355 ! (value = w32_get_resource (HKEY_LOCAL_MACHINE, envvar, &dwType)))
99311
9e2c3c623db2 (main) [WINDOWSNT]: Don't ifdef away the call to `ttyname'.
Eli Zaretskii <eliz@gnu.org>
parents: 99297
diff changeset
356 {
9e2c3c623db2 (main) [WINDOWSNT]: Don't ifdef away the call to `ttyname'.
Eli Zaretskii <eliz@gnu.org>
parents: 99297
diff changeset
357 /* "w32console" is what Emacs on Windows uses for tty-type under -nw. */
9e2c3c623db2 (main) [WINDOWSNT]: Don't ifdef away the call to `ttyname'.
Eli Zaretskii <eliz@gnu.org>
parents: 99297
diff changeset
358 if (strcmp (envvar, "TERM") == 0)
9e2c3c623db2 (main) [WINDOWSNT]: Don't ifdef away the call to `ttyname'.
Eli Zaretskii <eliz@gnu.org>
parents: 99297
diff changeset
359 return xstrdup ("w32console");
9e2c3c623db2 (main) [WINDOWSNT]: Don't ifdef away the call to `ttyname'.
Eli Zaretskii <eliz@gnu.org>
parents: 99297
diff changeset
360 /* Found neither in the environment nor in the registry. */
9e2c3c623db2 (main) [WINDOWSNT]: Don't ifdef away the call to `ttyname'.
Eli Zaretskii <eliz@gnu.org>
parents: 99297
diff changeset
361 return NULL;
9e2c3c623db2 (main) [WINDOWSNT]: Don't ifdef away the call to `ttyname'.
Eli Zaretskii <eliz@gnu.org>
parents: 99297
diff changeset
362 }
79232
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
363
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
364 if (dwType == REG_SZ)
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
365 /* Registry; no need to expand. */
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
366 return value;
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
367
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
368 if (dwType == REG_EXPAND_SZ)
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
369 {
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
370 DWORD size;
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
371
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
372 if (size = ExpandEnvironmentStrings (value, NULL, 0))
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
373 {
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
374 char *buffer = (char *) xmalloc (size);
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
375 if (ExpandEnvironmentStrings (value, buffer, size))
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
376 {
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
377 /* Found and expanded. */
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
378 free (value);
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
379 return buffer;
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
380 }
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
381
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
382 /* Error expanding. */
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
383 free (buffer);
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
384 }
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
385 }
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
386
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
387 /* Not the right type, or not correctly expanded. */
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
388 free (value);
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
389 return NULL;
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
390 }
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
391
103641
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
392 void
109480
d12162869c07 Convert some more functions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109315
diff changeset
393 w32_set_user_model_id (void)
103641
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
394 {
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
395 HMODULE shell;
103716
7bad97f82eb6 * w32term.c (w32_initialize): Use standard types.
Jason Rumney <jasonr@gnu.org>
parents: 103641
diff changeset
396 HRESULT (WINAPI * set_user_model) (wchar_t * id);
103641
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
397
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
398 /* On Windows 7 and later, we need to set the user model ID
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
399 to associate emacsclient launched files with Emacs frames
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
400 in the UI. */
109516
68ca98ae70fb Make building under stricter warning flags somewhat cleaner.
Juanma Barranquero <lekktu@gmail.com>
parents: 109511
diff changeset
401 shell = LoadLibrary ("shell32.dll");
103641
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
402 if (shell)
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
403 {
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
404 set_user_model
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
405 = (void *) GetProcAddress (shell,
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
406 "SetCurrentProcessExplicitAppUserModelID");
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
407 /* If the function is defined, then we are running on Windows 7
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
408 or newer, and the UI uses this to group related windows
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
409 together. Since emacs, runemacs, emacsclient are related, we
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
410 want them grouped even though the executables are different,
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
411 so we need to set a consistent ID between them. */
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
412 if (set_user_model)
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
413 set_user_model (L"GNU.Emacs");
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
414
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
415 FreeLibrary (shell);
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
416 }
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
417 }
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
418
74118
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
419 int
109480
d12162869c07 Convert some more functions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109315
diff changeset
420 w32_window_app (void)
74118
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
421 {
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
422 static int window_app = -1;
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
423 char szTitle[MAX_PATH];
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
424
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
425 if (window_app < 0)
78904
5025525d6c9d (w32_window_app): Init common controls when windowed.
Jason Rumney <jasonr@gnu.org>
parents: 78257
diff changeset
426 {
5025525d6c9d (w32_window_app): Init common controls when windowed.
Jason Rumney <jasonr@gnu.org>
parents: 78257
diff changeset
427 /* Checking for STDOUT does not work; it's a valid handle also in
5025525d6c9d (w32_window_app): Init common controls when windowed.
Jason Rumney <jasonr@gnu.org>
parents: 78257
diff changeset
428 nonconsole apps. Testing for the console title seems to work. */
5025525d6c9d (w32_window_app): Init common controls when windowed.
Jason Rumney <jasonr@gnu.org>
parents: 78257
diff changeset
429 window_app = (GetConsoleTitleA (szTitle, MAX_PATH) == 0);
5025525d6c9d (w32_window_app): Init common controls when windowed.
Jason Rumney <jasonr@gnu.org>
parents: 78257
diff changeset
430 if (window_app)
109516
68ca98ae70fb Make building under stricter warning flags somewhat cleaner.
Juanma Barranquero <lekktu@gmail.com>
parents: 109511
diff changeset
431 InitCommonControls ();
78904
5025525d6c9d (w32_window_app): Init common controls when windowed.
Jason Rumney <jasonr@gnu.org>
parents: 78257
diff changeset
432 }
74118
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
433
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
434 return window_app;
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
435 }
83600
9aa8a3a78f9e * emacsclient.c (s): Restore.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 83590
diff changeset
436
9aa8a3a78f9e * emacsclient.c (s): Restore.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 83590
diff changeset
437 /*
84681
f44a6d77db08 (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84677
diff changeset
438 execvp wrapper for Windows. Quotes arguments with embedded spaces.
83600
9aa8a3a78f9e * emacsclient.c (s): Restore.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 83590
diff changeset
439
9aa8a3a78f9e * emacsclient.c (s): Restore.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 83590
diff changeset
440 This is necessary due to the broken implementation of exec* routines in
9aa8a3a78f9e * emacsclient.c (s): Restore.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 83590
diff changeset
441 the Microsoft libraries: they concatenate the arguments together without
9aa8a3a78f9e * emacsclient.c (s): Restore.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 83590
diff changeset
442 quoting special characters, and pass the result to CreateProcess, with
109480
d12162869c07 Convert some more functions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109315
diff changeset
443 predictably bad results. By contrast, POSIX execvp passes the arguments
83600
9aa8a3a78f9e * emacsclient.c (s): Restore.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 83590
diff changeset
444 directly into the argv array of the child process.
9aa8a3a78f9e * emacsclient.c (s): Restore.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 83590
diff changeset
445 */
9aa8a3a78f9e * emacsclient.c (s): Restore.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 83590
diff changeset
446 int
109480
d12162869c07 Convert some more functions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109315
diff changeset
447 w32_execvp (const char *path, char **argv)
83600
9aa8a3a78f9e * emacsclient.c (s): Restore.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 83590
diff changeset
448 {
9aa8a3a78f9e * emacsclient.c (s): Restore.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 83590
diff changeset
449 int i;
74118
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
450
83600
9aa8a3a78f9e * emacsclient.c (s): Restore.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 83590
diff changeset
451 /* Required to allow a .BAT script as alternate editor. */
9aa8a3a78f9e * emacsclient.c (s): Restore.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 83590
diff changeset
452 argv[0] = (char *) alternate_editor;
9aa8a3a78f9e * emacsclient.c (s): Restore.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 83590
diff changeset
453
9aa8a3a78f9e * emacsclient.c (s): Restore.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 83590
diff changeset
454 for (i = 0; argv[i]; i++)
9aa8a3a78f9e * emacsclient.c (s): Restore.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 83590
diff changeset
455 if (strchr (argv[i], ' '))
9aa8a3a78f9e * emacsclient.c (s): Restore.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 83590
diff changeset
456 {
9aa8a3a78f9e * emacsclient.c (s): Restore.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 83590
diff changeset
457 char *quoted = alloca (strlen (argv[i]) + 3);
9aa8a3a78f9e * emacsclient.c (s): Restore.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 83590
diff changeset
458 sprintf (quoted, "\"%s\"", argv[i]);
9aa8a3a78f9e * emacsclient.c (s): Restore.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 83590
diff changeset
459 argv[i] = quoted;
9aa8a3a78f9e * emacsclient.c (s): Restore.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 83590
diff changeset
460 }
9aa8a3a78f9e * emacsclient.c (s): Restore.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 83590
diff changeset
461
9aa8a3a78f9e * emacsclient.c (s): Restore.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 83590
diff changeset
462 return execvp (path, argv);
9aa8a3a78f9e * emacsclient.c (s): Restore.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 83590
diff changeset
463 }
9aa8a3a78f9e * emacsclient.c (s): Restore.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 83590
diff changeset
464
9aa8a3a78f9e * emacsclient.c (s): Restore.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 83590
diff changeset
465 #undef execvp
9aa8a3a78f9e * emacsclient.c (s): Restore.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 83590
diff changeset
466 #define execvp w32_execvp
9aa8a3a78f9e * emacsclient.c (s): Restore.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 83590
diff changeset
467
99311
9e2c3c623db2 (main) [WINDOWSNT]: Don't ifdef away the call to `ttyname'.
Eli Zaretskii <eliz@gnu.org>
parents: 99297
diff changeset
468 /* Emulation of ttyname for Windows. */
9e2c3c623db2 (main) [WINDOWSNT]: Don't ifdef away the call to `ttyname'.
Eli Zaretskii <eliz@gnu.org>
parents: 99297
diff changeset
469 char *
9e2c3c623db2 (main) [WINDOWSNT]: Don't ifdef away the call to `ttyname'.
Eli Zaretskii <eliz@gnu.org>
parents: 99297
diff changeset
470 ttyname (int fd)
9e2c3c623db2 (main) [WINDOWSNT]: Don't ifdef away the call to `ttyname'.
Eli Zaretskii <eliz@gnu.org>
parents: 99297
diff changeset
471 {
9e2c3c623db2 (main) [WINDOWSNT]: Don't ifdef away the call to `ttyname'.
Eli Zaretskii <eliz@gnu.org>
parents: 99297
diff changeset
472 return "CONOUT$";
9e2c3c623db2 (main) [WINDOWSNT]: Don't ifdef away the call to `ttyname'.
Eli Zaretskii <eliz@gnu.org>
parents: 99297
diff changeset
473 }
9e2c3c623db2 (main) [WINDOWSNT]: Don't ifdef away the call to `ttyname'.
Eli Zaretskii <eliz@gnu.org>
parents: 99297
diff changeset
474
83600
9aa8a3a78f9e * emacsclient.c (s): Restore.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 83590
diff changeset
475 #endif /* WINDOWSNT */
74118
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
476
85691
153740aec87c Comment change.
Juanma Barranquero <lekktu@gmail.com>
parents: 85688
diff changeset
477 /* Display a normal or error message.
153740aec87c Comment change.
Juanma Barranquero <lekktu@gmail.com>
parents: 85688
diff changeset
478 On Windows, use a message box if compiled as a Windows app. */
74118
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
479 void
109744
fdbd24f8d999 Fix warnings produced by compiling with -Wwrite_strings (i.e. use const char *).
Jan D <jan.h.d@swipnet.se>
parents: 109652
diff changeset
480 message (int is_error, const char *message, ...)
74118
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
481 {
109516
68ca98ae70fb Make building under stricter warning flags somewhat cleaner.
Juanma Barranquero <lekktu@gmail.com>
parents: 109511
diff changeset
482 char msg[2048];
74118
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
483 va_list args;
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
484
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
485 va_start (args, message);
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
486 vsprintf (msg, message, args);
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
487 va_end (args);
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
488
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
489 #ifdef WINDOWSNT
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
490 if (w32_window_app ())
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
491 {
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
492 if (is_error)
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
493 MessageBox (NULL, msg, "Emacsclient ERROR", MB_ICONERROR);
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
494 else
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
495 MessageBox (NULL, msg, "Emacsclient", MB_ICONINFORMATION);
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
496 }
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
497 else
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
498 #endif
74341
32079f79e240 (message): Make sure the message is properly written even if it contains printf
Juanma Barranquero <lekktu@gmail.com>
parents: 74176
diff changeset
499 {
32079f79e240 (message): Make sure the message is properly written even if it contains printf
Juanma Barranquero <lekktu@gmail.com>
parents: 74176
diff changeset
500 FILE *f = is_error ? stderr : stdout;
32079f79e240 (message): Make sure the message is properly written even if it contains printf
Juanma Barranquero <lekktu@gmail.com>
parents: 74176
diff changeset
501
32079f79e240 (message): Make sure the message is properly written even if it contains printf
Juanma Barranquero <lekktu@gmail.com>
parents: 74176
diff changeset
502 fputs (msg, f);
32079f79e240 (message): Make sure the message is properly written even if it contains printf
Juanma Barranquero <lekktu@gmail.com>
parents: 74176
diff changeset
503 fflush (f);
32079f79e240 (message): Make sure the message is properly written even if it contains printf
Juanma Barranquero <lekktu@gmail.com>
parents: 74176
diff changeset
504 }
74118
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
505 }
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
506
16030
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
507 /* Decode the options from argv and argc.
16061
a1290c4159b5 (quote_file_name): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16030
diff changeset
508 The global variable `optind' will say how many arguments we used up. */
16030
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
509
16061
a1290c4159b5 (quote_file_name): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16030
diff changeset
510 void
109111
52b76722152a Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108828
diff changeset
511 decode_options (int argc, char **argv)
16030
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
512 {
79232
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
513 alternate_editor = egetenv ("ALTERNATE_EDITOR");
88014
e830695cdb7f (decode_options): Default to a NULL display, as Emacs-22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87965
diff changeset
514
16030
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
515 while (1)
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
516 {
98676
d63a9c87e0ac (longopts, print_help_and_exit): Add -nw.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98245
diff changeset
517 int opt = getopt_long_only (argc, argv,
73765
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
518 #ifndef NO_SOCKETS_IN_FILE_SYSTEM
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
519 "VHnea:s:f:d:tc",
73765
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
520 #else
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
521 "VHnea:f:d:tc",
73765
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
522 #endif
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
523 longopts, 0);
16030
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
524
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
525 if (opt == EOF)
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
526 break;
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
527
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
528 switch (opt)
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
529 {
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
530 case 0:
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
531 /* If getopt returns 0, then it has already processed a
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
532 long-named option. We should do nothing. */
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
533 break;
42176
1f5dbeefa536 Include "config.h", not <../src/config.h>.
Pavel Janík <Pavel@Janik.cz>
parents: 39723
diff changeset
534
27305
4161adef5fd3 Add option -a EDITOR and environment variable
Gerd Moellmann <gerd@gnu.org>
parents: 26083
diff changeset
535 case 'a':
4161adef5fd3 Add option -a EDITOR and environment variable
Gerd Moellmann <gerd@gnu.org>
parents: 26083
diff changeset
536 alternate_editor = optarg;
4161adef5fd3 Add option -a EDITOR and environment variable
Gerd Moellmann <gerd@gnu.org>
parents: 26083
diff changeset
537 break;
42176
1f5dbeefa536 Include "config.h", not <../src/config.h>.
Pavel Janík <Pavel@Janik.cz>
parents: 39723
diff changeset
538
73765
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
539 #ifndef NO_SOCKETS_IN_FILE_SYSTEM
52479
bc2610a13fbf (socket_name): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 52401
diff changeset
540 case 's':
bc2610a13fbf (socket_name): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 52401
diff changeset
541 socket_name = optarg;
bc2610a13fbf (socket_name): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 52401
diff changeset
542 break;
73765
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
543 #endif
52479
bc2610a13fbf (socket_name): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 52401
diff changeset
544
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
545 case 'f':
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
546 server_file = optarg;
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
547 break;
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
548
88014
e830695cdb7f (decode_options): Default to a NULL display, as Emacs-22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87965
diff changeset
549 /* We used to disallow this argument in w32, but it seems better
e830695cdb7f (decode_options): Default to a NULL display, as Emacs-22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87965
diff changeset
550 to allow it, for the occasional case where the user is
e830695cdb7f (decode_options): Default to a NULL display, as Emacs-22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87965
diff changeset
551 connecting with a w32 client to a server compiled with X11
e830695cdb7f (decode_options): Default to a NULL display, as Emacs-22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87965
diff changeset
552 support. */
47647
5498210ad40d Remove SYSV support.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47515
diff changeset
553 case 'd':
5498210ad40d Remove SYSV support.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47515
diff changeset
554 display = optarg;
5498210ad40d Remove SYSV support.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47515
diff changeset
555 break;
5498210ad40d Remove SYSV support.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47515
diff changeset
556
16030
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
557 case 'n':
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
558 nowait = 1;
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
559 break;
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
560
47647
5498210ad40d Remove SYSV support.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47515
diff changeset
561 case 'e':
5498210ad40d Remove SYSV support.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47515
diff changeset
562 eval = 1;
5498210ad40d Remove SYSV support.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47515
diff changeset
563 break;
5498210ad40d Remove SYSV support.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47515
diff changeset
564
16030
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
565 case 'V':
74118
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
566 message (FALSE, "emacsclient %s\n", VERSION);
55442
a47704955f8d Throughout, replace 0 destined for `exit' arg with `EXIT_SUCCESS'.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 53813
diff changeset
567 exit (EXIT_SUCCESS);
16030
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
568 break;
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
569
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
570 case 't':
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
571 tty = 1;
84715
e872fac85e8c (decode_options): -t implies -c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84681
diff changeset
572 current_frame = 0;
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
573 break;
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
574
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
575 case 'c':
84667
f2c11a35b0e3 (current_frame): Change the default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83666
diff changeset
576 current_frame = 0;
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
577 break;
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
578
108828
87dad1e1c860 Add --parent-id argument to emacsclient.
Chong Yidong <cyd@stupidchicken.com>
parents: 107737
diff changeset
579 case 'p':
87dad1e1c860 Add --parent-id argument to emacsclient.
Chong Yidong <cyd@stupidchicken.com>
parents: 107737
diff changeset
580 parent_id = optarg;
87dad1e1c860 Add --parent-id argument to emacsclient.
Chong Yidong <cyd@stupidchicken.com>
parents: 107737
diff changeset
581 current_frame = 0;
87dad1e1c860 Add --parent-id argument to emacsclient.
Chong Yidong <cyd@stupidchicken.com>
parents: 107737
diff changeset
582 break;
87dad1e1c860 Add --parent-id argument to emacsclient.
Chong Yidong <cyd@stupidchicken.com>
parents: 107737
diff changeset
583
16030
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
584 case 'H':
50101
e5f56d47b52c (print_help_and_exit): Print to stdout. Exit successfully. Added some blank
Juanma Barranquero <lekktu@gmail.com>
parents: 48627
diff changeset
585 print_help_and_exit ();
e5f56d47b52c (print_help_and_exit): Print to stdout. Exit successfully. Added some blank
Juanma Barranquero <lekktu@gmail.com>
parents: 48627
diff changeset
586 break;
e5f56d47b52c (print_help_and_exit): Print to stdout. Exit successfully. Added some blank
Juanma Barranquero <lekktu@gmail.com>
parents: 48627
diff changeset
587
16030
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
588 default:
74118
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
589 message (TRUE, "Try `%s --help' for more information\n", progname);
55442
a47704955f8d Throughout, replace 0 destined for `exit' arg with `EXIT_SUCCESS'.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 53813
diff changeset
590 exit (EXIT_FAILURE);
50101
e5f56d47b52c (print_help_and_exit): Print to stdout. Exit successfully. Added some blank
Juanma Barranquero <lekktu@gmail.com>
parents: 48627
diff changeset
591 break;
16030
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
592 }
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
593 }
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
594
99333
a999ab783eff (window_system): Delete redundant variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 99311
diff changeset
595 /* If the -c option is used (without -t) and no --display argument
a999ab783eff (window_system): Delete redundant variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 99311
diff changeset
596 is provided, try $DISPLAY.
a999ab783eff (window_system): Delete redundant variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 99311
diff changeset
597 Without the -c option, we used to set `display' to $DISPLAY by
a999ab783eff (window_system): Delete redundant variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 99311
diff changeset
598 default, but this changed the default behavior and is sometimes
a999ab783eff (window_system): Delete redundant variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 99311
diff changeset
599 inconvenient. So we force users to use "--display $DISPLAY" if
a999ab783eff (window_system): Delete redundant variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 99311
diff changeset
600 they want Emacs to connect to their current display. */
91664
cb25fa691429 (decode_options): Fix last change so as not to override an explicit -display.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91663
diff changeset
601 if (!current_frame && !tty && !display)
101397
b4aa70dece55 * emacsclient.c (decode_options): Use a dummy display name under NS/Cocoa.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 100958
diff changeset
602 {
b4aa70dece55 * emacsclient.c (decode_options): Use a dummy display name under NS/Cocoa.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 100958
diff changeset
603 display = egetenv ("DISPLAY");
b4aa70dece55 * emacsclient.c (decode_options): Use a dummy display name under NS/Cocoa.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 100958
diff changeset
604 #ifdef NS_IMPL_COCOA
b4aa70dece55 * emacsclient.c (decode_options): Use a dummy display name under NS/Cocoa.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 100958
diff changeset
605 /* Under Cocoa, we don't really use displays the same way as in X,
b4aa70dece55 * emacsclient.c (decode_options): Use a dummy display name under NS/Cocoa.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 100958
diff changeset
606 so provide a dummy. */
b4aa70dece55 * emacsclient.c (decode_options): Use a dummy display name under NS/Cocoa.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 100958
diff changeset
607 if (!display || strlen (display) == 0)
b4aa70dece55 * emacsclient.c (decode_options): Use a dummy display name under NS/Cocoa.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 100958
diff changeset
608 display = "ns";
b4aa70dece55 * emacsclient.c (decode_options): Use a dummy display name under NS/Cocoa.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 100958
diff changeset
609 #endif
b4aa70dece55 * emacsclient.c (decode_options): Use a dummy display name under NS/Cocoa.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 100958
diff changeset
610 }
91663
2b045ea84cf9 (decode_options): Pass --display implicitly if -c
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 88014
diff changeset
611
99333
a999ab783eff (window_system): Delete redundant variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 99311
diff changeset
612 /* A null-string display is invalid. */
88014
e830695cdb7f (decode_options): Default to a NULL display, as Emacs-22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87965
diff changeset
613 if (display && strlen (display) == 0)
e830695cdb7f (decode_options): Default to a NULL display, as Emacs-22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87965
diff changeset
614 display = NULL;
e830695cdb7f (decode_options): Default to a NULL display, as Emacs-22.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87965
diff changeset
615
99333
a999ab783eff (window_system): Delete redundant variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 99311
diff changeset
616 /* If no display is available, new frames are tty frames. */
a999ab783eff (window_system): Delete redundant variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 99311
diff changeset
617 if (!current_frame && !display)
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
618 tty = 1;
83624
3b1222f7b28a (print_help_and_exit): Restore and adapt trunk change from 2006-11-23 which was
Juanma Barranquero <lekktu@gmail.com>
parents: 83620
diff changeset
619
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
620 /* --no-wait implies --current-frame on ttys when there are file
99333
a999ab783eff (window_system): Delete redundant variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 99311
diff changeset
621 arguments or expressions given. */
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
622 if (nowait && tty && argc - optind > 0)
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
623 current_frame = 1;
100318
00d91c609c41 (EMACS_DAEMON): Remove definition.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100314
diff changeset
624
00d91c609c41 (EMACS_DAEMON): Remove definition.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100314
diff changeset
625 #ifdef WINDOWSNT
100321
ebafebeca927 (decode_options): Fix typo.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100318
diff changeset
626 if (alternate_editor && alternate_editor[0] == '\0')
100318
00d91c609c41 (EMACS_DAEMON): Remove definition.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100314
diff changeset
627 {
00d91c609c41 (EMACS_DAEMON): Remove definition.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100314
diff changeset
628 message (TRUE, "--alternate-editor argument or ALTERNATE_EDITOR variable cannot be\n\
00d91c609c41 (EMACS_DAEMON): Remove definition.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100314
diff changeset
629 an empty string");
00d91c609c41 (EMACS_DAEMON): Remove definition.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100314
diff changeset
630 exit (EXIT_FAILURE);
00d91c609c41 (EMACS_DAEMON): Remove definition.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100314
diff changeset
631 }
00d91c609c41 (EMACS_DAEMON): Remove definition.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100314
diff changeset
632 #endif /* WINDOWSNT */
16030
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
633 }
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
634
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
635
21387
4812cf228971 Include <stdlib.h> and <unistd.h> if available.
Andreas Schwab <schwab@suse.de>
parents: 19582
diff changeset
636 void
109111
52b76722152a Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108828
diff changeset
637 print_help_and_exit (void)
16030
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
638 {
83624
3b1222f7b28a (print_help_and_exit): Restore and adapt trunk change from 2006-11-23 which was
Juanma Barranquero <lekktu@gmail.com>
parents: 83620
diff changeset
639 /* Spaces and tabs are significant in this message; they're chosen so the
3b1222f7b28a (print_help_and_exit): Restore and adapt trunk change from 2006-11-23 which was
Juanma Barranquero <lekktu@gmail.com>
parents: 83620
diff changeset
640 message aligns properly both in a tty and in a Windows message box.
3b1222f7b28a (print_help_and_exit): Restore and adapt trunk change from 2006-11-23 which was
Juanma Barranquero <lekktu@gmail.com>
parents: 83620
diff changeset
641 Please try to preserve them; otherwise the output is very hard to read
3b1222f7b28a (print_help_and_exit): Restore and adapt trunk change from 2006-11-23 which was
Juanma Barranquero <lekktu@gmail.com>
parents: 83620
diff changeset
642 when using emacsclientw. */
74118
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
643 message (FALSE,
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
644 "Usage: %s [OPTIONS] FILE...\n\
47647
5498210ad40d Remove SYSV support.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47515
diff changeset
645 Tell the Emacs server to visit the specified files.\n\
5498210ad40d Remove SYSV support.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47515
diff changeset
646 Every FILE can be either just a FILENAME or [+LINE[:COLUMN]] FILENAME.\n\
50101
e5f56d47b52c (print_help_and_exit): Print to stdout. Exit successfully. Added some blank
Juanma Barranquero <lekktu@gmail.com>
parents: 48627
diff changeset
647 \n\
47647
5498210ad40d Remove SYSV support.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47515
diff changeset
648 The following OPTIONS are accepted:\n\
74127
46dc2e041725 (print_help_and_exit): Tweak message contents and tabs/spaces
Juanma Barranquero <lekktu@gmail.com>
parents: 74118
diff changeset
649 -V, --version Just print version info and return\n\
83624
3b1222f7b28a (print_help_and_exit): Restore and adapt trunk change from 2006-11-23 which was
Juanma Barranquero <lekktu@gmail.com>
parents: 83620
diff changeset
650 -H, --help Print this usage information message\n\
98676
d63a9c87e0ac (longopts, print_help_and_exit): Add -nw.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98245
diff changeset
651 -nw, -t, --tty Open a new Emacs frame on the current terminal\n\
85116
5f8a9bf276b9 (print_help_and_exit): Fix space to improve alignment in output messages.
Juanma Barranquero <lekktu@gmail.com>
parents: 85114
diff changeset
652 -c, --create-frame Create a new frame instead of trying to\n\
103026
9265a8db20b3 * emacsclient.c (print_help_and_exit): Fix typo and tabify (careful
Juanma Barranquero <lekktu@gmail.com>
parents: 103025
diff changeset
653 use the current Emacs frame\n\
83624
3b1222f7b28a (print_help_and_exit): Restore and adapt trunk change from 2006-11-23 which was
Juanma Barranquero <lekktu@gmail.com>
parents: 83620
diff changeset
654 -e, --eval Evaluate the FILE arguments as ELisp expressions\n\
91852
e05f6258e35f (print_help_and_exit): Show -d option on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 91664
diff changeset
655 -n, --no-wait Don't wait for the server to return\n\
103025
fdccf299eae0 * emacsclient.c (print_help_and_exit): Clarify argument placement
Chong Yidong <cyd@stupidchicken.com>
parents: 102823
diff changeset
656 -d DISPLAY, --display=DISPLAY\n\
108828
87dad1e1c860 Add --parent-id argument to emacsclient.
Chong Yidong <cyd@stupidchicken.com>
parents: 107737
diff changeset
657 Visit the file in the given display\n\
87dad1e1c860 Add --parent-id argument to emacsclient.
Chong Yidong <cyd@stupidchicken.com>
parents: 107737
diff changeset
658 --parent-id=ID Open in parent window ID, via XEmbed\n"
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
659 #ifndef NO_SOCKETS_IN_FILE_SYSTEM
103025
fdccf299eae0 * emacsclient.c (print_help_and_exit): Clarify argument placement
Chong Yidong <cyd@stupidchicken.com>
parents: 102823
diff changeset
660 "-s SOCKET, --socket-name=SOCKET\n\
103026
9265a8db20b3 * emacsclient.c (print_help_and_exit): Fix typo and tabify (careful
Juanma Barranquero <lekktu@gmail.com>
parents: 103025
diff changeset
661 Set filename of the UNIX socket for communication\n"
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
662 #endif
103025
fdccf299eae0 * emacsclient.c (print_help_and_exit): Clarify argument placement
Chong Yidong <cyd@stupidchicken.com>
parents: 102823
diff changeset
663 "-f SERVER, --server-file=SERVER\n\
103026
9265a8db20b3 * emacsclient.c (print_help_and_exit): Fix typo and tabify (careful
Juanma Barranquero <lekktu@gmail.com>
parents: 103025
diff changeset
664 Set filename of the TCP authentication file\n\
103025
fdccf299eae0 * emacsclient.c (print_help_and_exit): Clarify argument placement
Chong Yidong <cyd@stupidchicken.com>
parents: 102823
diff changeset
665 -a EDITOR, --alternate-editor=EDITOR\n\
103026
9265a8db20b3 * emacsclient.c (print_help_and_exit): Fix typo and tabify (careful
Juanma Barranquero <lekktu@gmail.com>
parents: 103025
diff changeset
666 Editor to fallback to if the server is not running\n"
102823
3b582fef386d (print_help_and_exit): Fix typo.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102474
diff changeset
667 #ifndef WINDOWSNT
100314
9c9346f62ad8 * emacsclient.c [!WINDOWSNT] (EMACS_DAEMON): New define.
Juanma Barranquero <lekktu@gmail.com>
parents: 100312
diff changeset
668 " If EDITOR is the empty string, start Emacs in daemon\n\
9c9346f62ad8 * emacsclient.c [!WINDOWSNT] (EMACS_DAEMON): New define.
Juanma Barranquero <lekktu@gmail.com>
parents: 100312
diff changeset
669 mode and try connecting again\n"
102823
3b582fef386d (print_help_and_exit): Fix typo.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102474
diff changeset
670 #endif /* not WINDOWSNT */
100314
9c9346f62ad8 * emacsclient.c [!WINDOWSNT] (EMACS_DAEMON): New define.
Juanma Barranquero <lekktu@gmail.com>
parents: 100312
diff changeset
671 "\n\
105608
1af242c07461 (print_help_and_exit): Fix bug report instructions.
Glenn Morris <rgm@gnu.org>
parents: 103716
diff changeset
672 Report bugs with M-x report-emacs-bug.\n", progname);
55442
a47704955f8d Throughout, replace 0 destined for `exit' arg with `EXIT_SUCCESS'.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 53813
diff changeset
673 exit (EXIT_SUCCESS);
16030
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
674 }
16061
a1290c4159b5 (quote_file_name): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16030
diff changeset
675
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
676 /*
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
677 Try to run a different command, or --if no alternate editor is
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
678 defined-- exit with an errorcode.
84681
f44a6d77db08 (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84677
diff changeset
679 Uses argv, but gets it from the global variable main_argv.
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
680 */
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
681 void
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
682 fail (void)
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
683 {
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
684 if (alternate_editor)
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
685 {
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
686 int i = optind - 1;
74637
fe8bd1af34c4 (w32_execvp): New function; wrapper for `execvp'.
Juanma Barranquero <lekktu@gmail.com>
parents: 74342
diff changeset
687
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
688 execvp (alternate_editor, main_argv + i);
74118
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
689 message (TRUE, "%s: error executing alternate editor \"%s\"\n",
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
690 progname, alternate_editor);
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
691 }
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
692 exit (EXIT_FAILURE);
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
693 }
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
694
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
695
73617
7af864af10b6 [WINDOWSNT]: Define HAVE_INET_SOCKETS.
Juanma Barranquero <lekktu@gmail.com>
parents: 73601
diff changeset
696 #if !defined (HAVE_SOCKETS) || !defined (HAVE_INET_SOCKETS)
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
697
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
698 int
109652
eb720d8ea1c6 emacsclient.c cleanups.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109517
diff changeset
699 main (int argc, char **argv)
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
700 {
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
701 main_argv = argv;
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
702 progname = argv[0];
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
703 message (TRUE, "%s: Sorry, the Emacs server is supported only\n"
83624
3b1222f7b28a (print_help_and_exit): Restore and adapt trunk change from 2006-11-23 which was
Juanma Barranquero <lekktu@gmail.com>
parents: 83620
diff changeset
704 "on systems with Berkeley sockets.\n",
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
705 argv[0]);
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
706 fail ();
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
707 }
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
708
73617
7af864af10b6 [WINDOWSNT]: Define HAVE_INET_SOCKETS.
Juanma Barranquero <lekktu@gmail.com>
parents: 73601
diff changeset
709 #else /* HAVE_SOCKETS && HAVE_INET_SOCKETS */
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
710
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
711 #define AUTH_KEY_LENGTH 64
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
712 #define SEND_BUFFER_SIZE 4096
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
713
109111
52b76722152a Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108828
diff changeset
714 extern char *strerror (int);
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
715
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
716 /* Buffer to accumulate data to send in TCP connections. */
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
717 char send_buffer[SEND_BUFFER_SIZE + 1];
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
718 int sblen = 0; /* Fill pointer for the send buffer. */
83601
8365dbf64d14 (emacs_socket): Rename from s.
Jason Rumney <jasonr@gnu.org>
parents: 83600
diff changeset
719 /* Socket used to communicate with the Emacs server process. */
8365dbf64d14 (emacs_socket): Rename from s.
Jason Rumney <jasonr@gnu.org>
parents: 83600
diff changeset
720 HSOCKET emacs_socket = 0;
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
721
79226
8919d6b286e1 (sock_err_message): New function.
Jason Rumney <jasonr@gnu.org>
parents: 78904
diff changeset
722 /* On Windows, the socket library was historically separate from the standard
8919d6b286e1 (sock_err_message): New function.
Jason Rumney <jasonr@gnu.org>
parents: 78904
diff changeset
723 C library, so errors are handled differently. */
8919d6b286e1 (sock_err_message): New function.
Jason Rumney <jasonr@gnu.org>
parents: 78904
diff changeset
724 void
109744
fdbd24f8d999 Fix warnings produced by compiling with -Wwrite_strings (i.e. use const char *).
Jan D <jan.h.d@swipnet.se>
parents: 109652
diff changeset
725 sock_err_message (const char *function_name)
79226
8919d6b286e1 (sock_err_message): New function.
Jason Rumney <jasonr@gnu.org>
parents: 78904
diff changeset
726 {
8919d6b286e1 (sock_err_message): New function.
Jason Rumney <jasonr@gnu.org>
parents: 78904
diff changeset
727 #ifdef WINDOWSNT
8919d6b286e1 (sock_err_message): New function.
Jason Rumney <jasonr@gnu.org>
parents: 78904
diff changeset
728 char* msg = NULL;
8919d6b286e1 (sock_err_message): New function.
Jason Rumney <jasonr@gnu.org>
parents: 78904
diff changeset
729
8919d6b286e1 (sock_err_message): New function.
Jason Rumney <jasonr@gnu.org>
parents: 78904
diff changeset
730 FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM
8919d6b286e1 (sock_err_message): New function.
Jason Rumney <jasonr@gnu.org>
parents: 78904
diff changeset
731 | FORMAT_MESSAGE_ALLOCATE_BUFFER
8919d6b286e1 (sock_err_message): New function.
Jason Rumney <jasonr@gnu.org>
parents: 78904
diff changeset
732 | FORMAT_MESSAGE_ARGUMENT_ARRAY,
8919d6b286e1 (sock_err_message): New function.
Jason Rumney <jasonr@gnu.org>
parents: 78904
diff changeset
733 NULL, WSAGetLastError (), 0, (LPTSTR)&msg, 0, NULL);
8919d6b286e1 (sock_err_message): New function.
Jason Rumney <jasonr@gnu.org>
parents: 78904
diff changeset
734
8919d6b286e1 (sock_err_message): New function.
Jason Rumney <jasonr@gnu.org>
parents: 78904
diff changeset
735 message (TRUE, "%s: %s: %s\n", progname, function_name, msg);
8919d6b286e1 (sock_err_message): New function.
Jason Rumney <jasonr@gnu.org>
parents: 78904
diff changeset
736
8919d6b286e1 (sock_err_message): New function.
Jason Rumney <jasonr@gnu.org>
parents: 78904
diff changeset
737 LocalFree (msg);
8919d6b286e1 (sock_err_message): New function.
Jason Rumney <jasonr@gnu.org>
parents: 78904
diff changeset
738 #else
8919d6b286e1 (sock_err_message): New function.
Jason Rumney <jasonr@gnu.org>
parents: 78904
diff changeset
739 message (TRUE, "%s: %s: %s\n", progname, function_name, strerror (errno));
8919d6b286e1 (sock_err_message): New function.
Jason Rumney <jasonr@gnu.org>
parents: 78904
diff changeset
740 #endif
8919d6b286e1 (sock_err_message): New function.
Jason Rumney <jasonr@gnu.org>
parents: 78904
diff changeset
741 }
8919d6b286e1 (sock_err_message): New function.
Jason Rumney <jasonr@gnu.org>
parents: 78904
diff changeset
742
8919d6b286e1 (sock_err_message): New function.
Jason Rumney <jasonr@gnu.org>
parents: 78904
diff changeset
743
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
744 /* Let's send the data to Emacs when either
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
745 - the data ends in "\n", or
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
746 - the buffer is full (but this shouldn't happen)
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
747 Otherwise, we just accumulate it. */
73765
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
748 void
109744
fdbd24f8d999 Fix warnings produced by compiling with -Wwrite_strings (i.e. use const char *).
Jan D <jan.h.d@swipnet.se>
parents: 109652
diff changeset
749 send_to_emacs (HSOCKET s, const char *data)
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
750 {
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
751 while (data)
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
752 {
110746
5c1a707ab452 Fix compilation warnings.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 110706
diff changeset
753 size_t dlen = strlen (data);
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
754 if (dlen + sblen >= SEND_BUFFER_SIZE)
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
755 {
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
756 int part = SEND_BUFFER_SIZE - sblen;
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
757 strncpy (&send_buffer[sblen], data, part);
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
758 data += part;
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
759 sblen = SEND_BUFFER_SIZE;
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
760 }
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
761 else if (dlen)
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
762 {
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
763 strcpy (&send_buffer[sblen], data);
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
764 data = NULL;
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
765 sblen += dlen;
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
766 }
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
767 else
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
768 break;
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
769
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
770 if (sblen == SEND_BUFFER_SIZE
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
771 || (sblen > 0 && send_buffer[sblen-1] == '\n'))
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
772 {
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
773 int sent = send (s, send_buffer, sblen, 0);
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
774 if (sent != sblen)
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
775 strcpy (send_buffer, &send_buffer[sent]);
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
776 sblen -= sent;
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
777 }
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
778 }
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
779 }
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
780
83499
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
781
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
782 /* In STR, insert a & before each &, each space, each newline, and
52848
5c74e66d6c36 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 52635
diff changeset
783 any initial -. Change spaces to underscores, too, so that the
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
784 return value never contains a space.
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
785
109115
71150397fb59 Fix prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 109111
diff changeset
786 Does not change the string. Outputs the result to S. */
52635
9963e9da5850 (quote_file_name): Print the result instead of
Eli Zaretskii <eliz@gnu.org>
parents: 52532
diff changeset
787 void
109744
fdbd24f8d999 Fix warnings produced by compiling with -Wwrite_strings (i.e. use const char *).
Jan D <jan.h.d@swipnet.se>
parents: 109652
diff changeset
788 quote_argument (HSOCKET s, const char *str)
16061
a1290c4159b5 (quote_file_name): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16030
diff changeset
789 {
83103
efc0b56b83d9 Another server.el overhaul.
Karoly Lorentey <lorentey@elte.hu>
parents: 83065
diff changeset
790 char *copy = (char *) xmalloc (strlen (str) * 2 + 1);
109744
fdbd24f8d999 Fix warnings produced by compiling with -Wwrite_strings (i.e. use const char *).
Jan D <jan.h.d@swipnet.se>
parents: 109652
diff changeset
791 const char *p;
fdbd24f8d999 Fix warnings produced by compiling with -Wwrite_strings (i.e. use const char *).
Jan D <jan.h.d@swipnet.se>
parents: 109652
diff changeset
792 char *q;
16061
a1290c4159b5 (quote_file_name): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16030
diff changeset
793
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
794 p = str;
16061
a1290c4159b5 (quote_file_name): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16030
diff changeset
795 q = copy;
a1290c4159b5 (quote_file_name): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16030
diff changeset
796 while (*p)
a1290c4159b5 (quote_file_name): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16030
diff changeset
797 {
a1290c4159b5 (quote_file_name): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16030
diff changeset
798 if (*p == ' ')
a1290c4159b5 (quote_file_name): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16030
diff changeset
799 {
16074
25cfff7ffced (quote_file_name): Quote with &, not \.
Richard M. Stallman <rms@gnu.org>
parents: 16061
diff changeset
800 *q++ = '&';
16061
a1290c4159b5 (quote_file_name): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16030
diff changeset
801 *q++ = '_';
a1290c4159b5 (quote_file_name): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16030
diff changeset
802 p++;
a1290c4159b5 (quote_file_name): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16030
diff changeset
803 }
47515
6ee937dcfe16 (quote_file_name): Quote \n.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42412
diff changeset
804 else if (*p == '\n')
6ee937dcfe16 (quote_file_name): Quote \n.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42412
diff changeset
805 {
6ee937dcfe16 (quote_file_name): Quote \n.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42412
diff changeset
806 *q++ = '&';
6ee937dcfe16 (quote_file_name): Quote \n.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42412
diff changeset
807 *q++ = 'n';
6ee937dcfe16 (quote_file_name): Quote \n.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42412
diff changeset
808 p++;
6ee937dcfe16 (quote_file_name): Quote \n.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42412
diff changeset
809 }
16061
a1290c4159b5 (quote_file_name): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16030
diff changeset
810 else
a1290c4159b5 (quote_file_name): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16030
diff changeset
811 {
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
812 if (*p == '&' || (*p == '-' && p == str))
16074
25cfff7ffced (quote_file_name): Quote with &, not \.
Richard M. Stallman <rms@gnu.org>
parents: 16061
diff changeset
813 *q++ = '&';
16061
a1290c4159b5 (quote_file_name): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16030
diff changeset
814 *q++ = *p++;
a1290c4159b5 (quote_file_name): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16030
diff changeset
815 }
a1290c4159b5 (quote_file_name): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16030
diff changeset
816 }
16074
25cfff7ffced (quote_file_name): Quote with &, not \.
Richard M. Stallman <rms@gnu.org>
parents: 16061
diff changeset
817 *q++ = 0;
16061
a1290c4159b5 (quote_file_name): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16030
diff changeset
818
83603
54df157e987d (emacs_socket): Rename from s.
Jason Rumney <jasonr@gnu.org>
parents: 83601
diff changeset
819 send_to_emacs (s, copy);
52635
9963e9da5850 (quote_file_name): Print the result instead of
Eli Zaretskii <eliz@gnu.org>
parents: 52532
diff changeset
820
9963e9da5850 (quote_file_name): Print the result instead of
Eli Zaretskii <eliz@gnu.org>
parents: 52532
diff changeset
821 free (copy);
16061
a1290c4159b5 (quote_file_name): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16030
diff changeset
822 }
18701
9c7e0c926ed5 [C_ALLOCA] (xmalloc): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16218
diff changeset
823
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
824
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
825 /* The inverse of quote_argument. Removes quoting in string STR by
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
826 modifying the string in place. Returns STR. */
18701
9c7e0c926ed5 [C_ALLOCA] (xmalloc): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16218
diff changeset
827
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
828 char *
109111
52b76722152a Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108828
diff changeset
829 unquote_argument (char *str)
18701
9c7e0c926ed5 [C_ALLOCA] (xmalloc): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16218
diff changeset
830 {
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
831 char *p, *q;
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
832
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
833 if (! str)
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
834 return str;
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
835
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
836 p = str;
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
837 q = str;
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
838 while (*p)
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
839 {
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
840 if (*p == '&')
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
841 {
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
842 p++;
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
843 if (*p == '&')
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
844 *p = '&';
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
845 else if (*p == '_')
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
846 *p = ' ';
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
847 else if (*p == 'n')
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
848 *p = '\n';
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
849 else if (*p == '-')
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
850 *p = '-';
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
851 }
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
852 *q++ = *p++;
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
853 }
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
854 *q = 0;
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
855 return str;
18701
9c7e0c926ed5 [C_ALLOCA] (xmalloc): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16218
diff changeset
856 }
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
857
16030
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
858
73765
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
859 int
109111
52b76722152a Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108828
diff changeset
860 file_name_absolute_p (const unsigned char *filename)
73765
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
861 {
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
862 /* Sanity check, it shouldn't happen. */
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
863 if (! filename) return FALSE;
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
864
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
865 /* /xxx is always an absolute path. */
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
866 if (filename[0] == '/') return TRUE;
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
867
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
868 /* Empty filenames (which shouldn't happen) are relative. */
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
869 if (filename[0] == '\0') return FALSE;
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
870
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
871 #ifdef WINDOWSNT
75956
6ef0c279b18c Comment changes and clarifications.
Juanma Barranquero <lekktu@gmail.com>
parents: 75348
diff changeset
872 /* X:\xxx is always absolute. */
74176
6eee550d3bda (file_name_absolute_p) [WINDOWSNT]: Use isalpha().
Jason Rumney <jasonr@gnu.org>
parents: 74172
diff changeset
873 if (isalpha (filename[0])
74172
cbda0982f77c (file_name_absolute_p) [WINDOWSNT]: Support absolute file names with forward
Eli Zaretskii <eliz@gnu.org>
parents: 74145
diff changeset
874 && filename[1] == ':' && (filename[2] == '\\' || filename[2] == '/'))
73765
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
875 return TRUE;
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
876
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
877 /* Both \xxx and \\xxx\yyy are absolute. */
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
878 if (filename[0] == '\\') return TRUE;
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
879 #endif
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
880
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
881 return FALSE;
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
882 }
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
883
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
884 #ifdef WINDOWSNT
74645
aa3039743d63 Comment and whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 74644
diff changeset
885 /* Wrapper to make WSACleanup a cdecl, as required by atexit. */
109480
d12162869c07 Convert some more functions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109315
diff changeset
886 void __cdecl
d12162869c07 Convert some more functions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109315
diff changeset
887 close_winsock (void)
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
888 {
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
889 WSACleanup ();
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
890 }
18701
9c7e0c926ed5 [C_ALLOCA] (xmalloc): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16218
diff changeset
891
73765
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
892 /* Initialize the WinSock2 library. */
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
893 void
109480
d12162869c07 Convert some more functions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109315
diff changeset
894 initialize_sockets (void)
18701
9c7e0c926ed5 [C_ALLOCA] (xmalloc): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16218
diff changeset
895 {
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
896 WSADATA wsaData;
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
897
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
898 if (WSAStartup (MAKEWORD (2, 0), &wsaData))
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
899 {
87669
b8b050fde307 Add missing final newlines to message calls.
Glenn Morris <rgm@gnu.org>
parents: 87668
diff changeset
900 message (TRUE, "%s: error initializing WinSock2\n", progname);
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
901 exit (EXIT_FAILURE);
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
902 }
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
903
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
904 atexit (close_winsock);
73578
e193b6a3f379 Fixes to emacsclient.c for GNU/Linux.
Juanma Barranquero <lekktu@gmail.com>
parents: 73562
diff changeset
905 }
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
906 #endif /* WINDOWSNT */
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
907
16030
fb38057473c8 (decode_options): New function.
Richard M. Stallman <rms@gnu.org>
parents: 15995
diff changeset
908
27305
4161adef5fd3 Add option -a EDITOR and environment variable
Gerd Moellmann <gerd@gnu.org>
parents: 26083
diff changeset
909 /*
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
910 * Read the information needed to set up a TCP comm channel with
110660
4b5aaeebe785 lisp/server.el: Use just one way to pass the Emacs PID to emacsclient.
Juanma Barranquero <lekktu@gmail.com>
parents: 110643
diff changeset
911 * the Emacs server: host, port, and authentication string.
74729
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
912 */
73765
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
913 int
109111
52b76722152a Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108828
diff changeset
914 get_server_config (struct sockaddr_in *server, char *authentication)
27305
4161adef5fd3 Add option -a EDITOR and environment variable
Gerd Moellmann <gerd@gnu.org>
parents: 26083
diff changeset
915 {
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
916 char dotted[32];
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
917 char *port;
73765
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
918 FILE *config = NULL;
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
919
73765
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
920 if (file_name_absolute_p (server_file))
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
921 config = fopen (server_file, "rb");
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
922 else
27305
4161adef5fd3 Add option -a EDITOR and environment variable
Gerd Moellmann <gerd@gnu.org>
parents: 26083
diff changeset
923 {
79232
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
924 char *home = egetenv ("HOME");
73809
cbc1f46b6590 (get_server_config) [WINDOWSNT]: Search the server file on APPDATA
Juanma Barranquero <lekktu@gmail.com>
parents: 73806
diff changeset
925
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
926 if (home)
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
927 {
99215
e0e326adf3bc * emacsclient.c (EXTRA_SPACE): New macro.
Juanma Barranquero <lekktu@gmail.com>
parents: 99209
diff changeset
928 char *path = alloca (strlen (home) + strlen (server_file)
e0e326adf3bc * emacsclient.c (EXTRA_SPACE): New macro.
Juanma Barranquero <lekktu@gmail.com>
parents: 99209
diff changeset
929 + EXTRA_SPACE);
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
930 sprintf (path, "%s/.emacs.d/server/%s", home, server_file);
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
931 config = fopen (path, "rb");
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
932 }
73809
cbc1f46b6590 (get_server_config) [WINDOWSNT]: Search the server file on APPDATA
Juanma Barranquero <lekktu@gmail.com>
parents: 73806
diff changeset
933 #ifdef WINDOWSNT
79232
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
934 if (!config && (home = egetenv ("APPDATA")))
73809
cbc1f46b6590 (get_server_config) [WINDOWSNT]: Search the server file on APPDATA
Juanma Barranquero <lekktu@gmail.com>
parents: 73806
diff changeset
935 {
99215
e0e326adf3bc * emacsclient.c (EXTRA_SPACE): New macro.
Juanma Barranquero <lekktu@gmail.com>
parents: 99209
diff changeset
936 char *path = alloca (strlen (home) + strlen (server_file)
e0e326adf3bc * emacsclient.c (EXTRA_SPACE): New macro.
Juanma Barranquero <lekktu@gmail.com>
parents: 99209
diff changeset
937 + EXTRA_SPACE);
73809
cbc1f46b6590 (get_server_config) [WINDOWSNT]: Search the server file on APPDATA
Juanma Barranquero <lekktu@gmail.com>
parents: 73806
diff changeset
938 sprintf (path, "%s/.emacs.d/server/%s", home, server_file);
cbc1f46b6590 (get_server_config) [WINDOWSNT]: Search the server file on APPDATA
Juanma Barranquero <lekktu@gmail.com>
parents: 73806
diff changeset
939 config = fopen (path, "rb");
cbc1f46b6590 (get_server_config) [WINDOWSNT]: Search the server file on APPDATA
Juanma Barranquero <lekktu@gmail.com>
parents: 73806
diff changeset
940 }
cbc1f46b6590 (get_server_config) [WINDOWSNT]: Search the server file on APPDATA
Juanma Barranquero <lekktu@gmail.com>
parents: 73806
diff changeset
941 #endif
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
942 }
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
943
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
944 if (! config)
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
945 return FALSE;
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
946
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
947 if (fgets (dotted, sizeof dotted, config)
110660
4b5aaeebe785 lisp/server.el: Use just one way to pass the Emacs PID to emacsclient.
Juanma Barranquero <lekktu@gmail.com>
parents: 110643
diff changeset
948 && (port = strchr (dotted, ':')))
4b5aaeebe785 lisp/server.el: Use just one way to pass the Emacs PID to emacsclient.
Juanma Barranquero <lekktu@gmail.com>
parents: 110643
diff changeset
949 *port++ = '\0';
27305
4161adef5fd3 Add option -a EDITOR and environment variable
Gerd Moellmann <gerd@gnu.org>
parents: 26083
diff changeset
950 else
4161adef5fd3 Add option -a EDITOR and environment variable
Gerd Moellmann <gerd@gnu.org>
parents: 26083
diff changeset
951 {
87669
b8b050fde307 Add missing final newlines to message calls.
Glenn Morris <rgm@gnu.org>
parents: 87668
diff changeset
952 message (TRUE, "%s: invalid configuration info\n", progname);
55442
a47704955f8d Throughout, replace 0 destined for `exit' arg with `EXIT_SUCCESS'.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 53813
diff changeset
953 exit (EXIT_FAILURE);
27305
4161adef5fd3 Add option -a EDITOR and environment variable
Gerd Moellmann <gerd@gnu.org>
parents: 26083
diff changeset
954 }
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
955
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
956 server->sin_family = AF_INET;
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
957 server->sin_addr.s_addr = inet_addr (dotted);
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
958 server->sin_port = htons (atoi (port));
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
959
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
960 if (! fread (authentication, AUTH_KEY_LENGTH, 1, config))
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
961 {
87669
b8b050fde307 Add missing final newlines to message calls.
Glenn Morris <rgm@gnu.org>
parents: 87668
diff changeset
962 message (TRUE, "%s: cannot read authentication info\n", progname);
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
963 exit (EXIT_FAILURE);
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
964 }
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
965
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
966 fclose (config);
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
967
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
968 return TRUE;
27305
4161adef5fd3 Add option -a EDITOR and environment variable
Gerd Moellmann <gerd@gnu.org>
parents: 26083
diff changeset
969 }
4161adef5fd3 Add option -a EDITOR and environment variable
Gerd Moellmann <gerd@gnu.org>
parents: 26083
diff changeset
970
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
971 HSOCKET
109111
52b76722152a Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108828
diff changeset
972 set_tcp_socket (void)
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
973 {
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
974 HSOCKET s;
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
975 struct sockaddr_in server;
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
976 struct linger l_arg = {1, 1};
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
977 char auth_string[AUTH_KEY_LENGTH + 1];
27305
4161adef5fd3 Add option -a EDITOR and environment variable
Gerd Moellmann <gerd@gnu.org>
parents: 26083
diff changeset
978
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
979 if (! get_server_config (&server, auth_string))
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
980 return INVALID_SOCKET;
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
981
73765
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
982 if (server.sin_addr.s_addr != inet_addr ("127.0.0.1"))
74341
32079f79e240 (message): Make sure the message is properly written even if it contains printf
Juanma Barranquero <lekktu@gmail.com>
parents: 74176
diff changeset
983 message (FALSE, "%s: connected to remote socket at %s\n",
73765
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
984 progname, inet_ntoa (server.sin_addr));
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
985
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
986 /*
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
987 * Open up an AF_INET socket
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
988 */
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
989 if ((s = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
990 {
79226
8919d6b286e1 (sock_err_message): New function.
Jason Rumney <jasonr@gnu.org>
parents: 78904
diff changeset
991 sock_err_message ("socket");
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
992 return INVALID_SOCKET;
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
993 }
412
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
994
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
995 /*
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
996 * Set up the socket
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
997 */
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
998 if (connect (s, (struct sockaddr *) &server, sizeof server) < 0)
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
999 {
79226
8919d6b286e1 (sock_err_message): New function.
Jason Rumney <jasonr@gnu.org>
parents: 78904
diff changeset
1000 sock_err_message ("connect");
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1001 return INVALID_SOCKET;
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1002 }
27305
4161adef5fd3 Add option -a EDITOR and environment variable
Gerd Moellmann <gerd@gnu.org>
parents: 26083
diff changeset
1003
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1004 setsockopt (s, SOL_SOCKET, SO_LINGER, (char *) &l_arg, sizeof l_arg);
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1005
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1006 /*
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1007 * Send the authentication
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1008 */
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1009 auth_string[AUTH_KEY_LENGTH] = '\0';
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1010
83603
54df157e987d (emacs_socket): Rename from s.
Jason Rumney <jasonr@gnu.org>
parents: 83601
diff changeset
1011 send_to_emacs (s, "-auth ");
54df157e987d (emacs_socket): Rename from s.
Jason Rumney <jasonr@gnu.org>
parents: 83601
diff changeset
1012 send_to_emacs (s, auth_string);
87965
e66c061f4966 (set_tcp_socket): Don't send a "\n" after the authentication string;
Juanma Barranquero <lekktu@gmail.com>
parents: 87724
diff changeset
1013 send_to_emacs (s, " ");
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1014
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1015 return s;
412
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1016 }
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1017
83590
dab011361c2a (s): Remove.
Jason Rumney <jasonr@gnu.org>
parents: 83556
diff changeset
1018
dab011361c2a (s): Remove.
Jason Rumney <jasonr@gnu.org>
parents: 83556
diff changeset
1019 /* Returns 1 if PREFIX is a prefix of STRING. */
dab011361c2a (s): Remove.
Jason Rumney <jasonr@gnu.org>
parents: 83556
diff changeset
1020 static int
109744
fdbd24f8d999 Fix warnings produced by compiling with -Wwrite_strings (i.e. use const char *).
Jan D <jan.h.d@swipnet.se>
parents: 109652
diff changeset
1021 strprefix (const char *prefix, const char *string)
83590
dab011361c2a (s): Remove.
Jason Rumney <jasonr@gnu.org>
parents: 83556
diff changeset
1022 {
84681
f44a6d77db08 (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84677
diff changeset
1023 return !strncmp (prefix, string, strlen (prefix));
83590
dab011361c2a (s): Remove.
Jason Rumney <jasonr@gnu.org>
parents: 83556
diff changeset
1024 }
dab011361c2a (s): Remove.
Jason Rumney <jasonr@gnu.org>
parents: 83556
diff changeset
1025
99334
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1026 /* Get tty name and type. If successful, return the type in TTY_TYPE
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1027 and the name in TTY_NAME, and return 1. Otherwise, fail if NOABORT
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1028 is zero, or return 0 if NOABORT is non-zero. */
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1029
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1030 int
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1031 find_tty (char **tty_type, char **tty_name, int noabort)
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1032 {
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1033 char *type = egetenv ("TERM");
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1034 char *name = ttyname (fileno (stdout));
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1035
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1036 if (!name)
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1037 {
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1038 if (noabort)
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1039 return 0;
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1040 else
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1041 {
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1042 message (TRUE, "%s: could not get terminal name\n", progname);
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1043 fail ();
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1044 }
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1045 }
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1046
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1047 if (!type)
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1048 {
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1049 if (noabort)
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1050 return 0;
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1051 else
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1052 {
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1053 message (TRUE, "%s: please set the TERM variable to your terminal type\n",
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1054 progname);
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1055 fail ();
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1056 }
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1057 }
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1058
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1059 if (strcmp (type, "eterm") == 0)
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1060 {
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1061 if (noabort)
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1062 return 0;
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1063 else
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1064 {
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1065 /* This causes nasty, MULTI_KBOARD-related input lockouts. */
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1066 message (TRUE, "%s: opening a frame in an Emacs term buffer"
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1067 " is not supported\n", progname);
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1068 fail ();
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1069 }
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1070 }
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1071
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1072 *tty_name = name;
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1073 *tty_type = type;
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1074 return 1;
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1075 }
e6ec0b2ebf47 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 99333
diff changeset
1076
83590
dab011361c2a (s): Remove.
Jason Rumney <jasonr@gnu.org>
parents: 83556
diff changeset
1077
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1078 #if !defined (NO_SOCKETS_IN_FILE_SYSTEM)
412
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1079
27474
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1080 /* Three possibilities:
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1081 2 - can't be `stat'ed (sets errno)
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1082 1 - isn't owned by us
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1083 0 - success: none of the above */
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1084
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1085 static int
109111
52b76722152a Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108828
diff changeset
1086 socket_status (char *socket_name)
27474
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1087 {
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1088 struct stat statbfr;
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1089
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1090 if (stat (socket_name, &statbfr) == -1)
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1091 return 2;
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1092
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1093 if (statbfr.st_uid != geteuid ())
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1094 return 1;
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1095
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1096 return 0;
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1097 }
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1098
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1099
83025
c66ebcc29777 Removed %T in mode-line-format. Trivial documentation changes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83019
diff changeset
1100 /* A signal handler that passes the signal to the Emacs process.
c66ebcc29777 Removed %T in mode-line-format. Trivial documentation changes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83019
diff changeset
1101 Useful for SIGWINCH. */
c66ebcc29777 Removed %T in mode-line-format. Trivial documentation changes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83019
diff changeset
1102
53229
33c3c7c16e13 lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents: 52848
diff changeset
1103 SIGTYPE
83004
7900111db01c Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82995
diff changeset
1104 pass_signal_to_emacs (int signalnum)
53229
33c3c7c16e13 lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents: 52848
diff changeset
1105 {
33c3c7c16e13 lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents: 52848
diff changeset
1106 int old_errno = errno;
33c3c7c16e13 lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents: 52848
diff changeset
1107
82995
039bd6989d29 Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents: 82994
diff changeset
1108 if (emacs_pid)
83004
7900111db01c Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82995
diff changeset
1109 kill (emacs_pid, signalnum);
53229
33c3c7c16e13 lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents: 52848
diff changeset
1110
83004
7900111db01c Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82995
diff changeset
1111 signal (signalnum, pass_signal_to_emacs);
53229
33c3c7c16e13 lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents: 52848
diff changeset
1112 errno = old_errno;
33c3c7c16e13 lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents: 52848
diff changeset
1113 }
33c3c7c16e13 lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents: 52848
diff changeset
1114
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1115 /* Signal handler for SIGCONT; notify the Emacs process that it can
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1116 now resume our tty frame. */
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1117
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1118 SIGTYPE
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1119 handle_sigcont (int signalnum)
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1120 {
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1121 int old_errno = errno;
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1122
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1123 if (tcgetpgrp (1) == getpgrp ())
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1124 {
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1125 /* We are in the foreground. */
83603
54df157e987d (emacs_socket): Rename from s.
Jason Rumney <jasonr@gnu.org>
parents: 83601
diff changeset
1126 send_to_emacs (emacs_socket, "-resume \n");
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1127 }
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1128 else
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1129 {
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1130 /* We are in the background; cancel the continue. */
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1131 kill (getpid (), SIGSTOP);
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1132 }
83348
afade4ccd30c Fix broken emacsclient resume on Solaris (by Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents: 83332
diff changeset
1133
afade4ccd30c Fix broken emacsclient resume on Solaris (by Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents: 83332
diff changeset
1134 signal (signalnum, handle_sigcont);
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1135 errno = old_errno;
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1136 }
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1137
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1138 /* Signal handler for SIGTSTP; notify the Emacs process that we are
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1139 going to sleep. Normally the suspend is initiated by Emacs via
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1140 server-handle-suspend-tty, but if the server gets out of sync with
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1141 reality, we may get a SIGTSTP on C-z. Handling this signal and
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1142 notifying Emacs about it should get things under control again. */
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1143
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1144 SIGTYPE
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1145 handle_sigtstp (int signalnum)
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1146 {
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1147 int old_errno = errno;
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1148 sigset_t set;
83624
3b1222f7b28a (print_help_and_exit): Restore and adapt trunk change from 2006-11-23 which was
Juanma Barranquero <lekktu@gmail.com>
parents: 83620
diff changeset
1149
83611
a5651b79b31b * emacsclient.c (handle_sigtstp): Use the new name for the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 83607
diff changeset
1150 if (emacs_socket)
83603
54df157e987d (emacs_socket): Rename from s.
Jason Rumney <jasonr@gnu.org>
parents: 83601
diff changeset
1151 send_to_emacs (emacs_socket, "-suspend \n");
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1152
87965
e66c061f4966 (set_tcp_socket): Don't send a "\n" after the authentication string;
Juanma Barranquero <lekktu@gmail.com>
parents: 87724
diff changeset
1153 /* Unblock this signal and call the default handler by temporarily
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1154 changing the handler and resignalling. */
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1155 sigprocmask (SIG_BLOCK, NULL, &set);
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1156 sigdelset (&set, signalnum);
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1157 signal (signalnum, SIG_DFL);
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1158 kill (getpid (), signalnum);
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1159 sigprocmask (SIG_SETMASK, &set, NULL); /* Let's the above signal through. */
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1160 signal (signalnum, handle_sigtstp);
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1161
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1162 errno = old_errno;
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1163 }
99333
a999ab783eff (window_system): Delete redundant variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 99311
diff changeset
1164
a999ab783eff (window_system): Delete redundant variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 99311
diff changeset
1165
83025
c66ebcc29777 Removed %T in mode-line-format. Trivial documentation changes.
Karoly Lorentey <lorentey@elte.hu>
parents: 83019
diff changeset
1166 /* Set up signal handlers before opening a frame on the current tty. */
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1167
82995
039bd6989d29 Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents: 82994
diff changeset
1168 void
039bd6989d29 Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents: 82994
diff changeset
1169 init_signals (void)
53229
33c3c7c16e13 lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents: 52848
diff changeset
1170 {
33c3c7c16e13 lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents: 52848
diff changeset
1171 /* Set up signal handlers. */
83004
7900111db01c Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82995
diff changeset
1172 signal (SIGWINCH, pass_signal_to_emacs);
83012
4aa172a45af1 Fix C-g handling with multiple ttys.
Karoly Lorentey <lorentey@elte.hu>
parents: 83010
diff changeset
1173
4aa172a45af1 Fix C-g handling with multiple ttys.
Karoly Lorentey <lorentey@elte.hu>
parents: 83010
diff changeset
1174 /* Don't pass SIGINT and SIGQUIT to Emacs, because it has no way of
4aa172a45af1 Fix C-g handling with multiple ttys.
Karoly Lorentey <lorentey@elte.hu>
parents: 83010
diff changeset
1175 deciding which terminal the signal came from. C-g is now a
4aa172a45af1 Fix C-g handling with multiple ttys.
Karoly Lorentey <lorentey@elte.hu>
parents: 83010
diff changeset
1176 normal input event on secondary terminals. */
4aa172a45af1 Fix C-g handling with multiple ttys.
Karoly Lorentey <lorentey@elte.hu>
parents: 83010
diff changeset
1177 #if 0
83004
7900111db01c Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82995
diff changeset
1178 signal (SIGINT, pass_signal_to_emacs);
7900111db01c Converted display hooks to be display-local. Plus many bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82995
diff changeset
1179 signal (SIGQUIT, pass_signal_to_emacs);
83012
4aa172a45af1 Fix C-g handling with multiple ttys.
Karoly Lorentey <lorentey@elte.hu>
parents: 83010
diff changeset
1180 #endif
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1181
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1182 signal (SIGCONT, handle_sigcont);
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1183 signal (SIGTSTP, handle_sigtstp);
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1184 signal (SIGTTOU, handle_sigtstp);
53229
33c3c7c16e13 lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents: 52848
diff changeset
1185 }
27305
4161adef5fd3 Add option -a EDITOR and environment variable
Gerd Moellmann <gerd@gnu.org>
parents: 26083
diff changeset
1186
412
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1187
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1188 HSOCKET
109111
52b76722152a Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108828
diff changeset
1189 set_local_socket (void)
412
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1190 {
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1191 HSOCKET s;
412
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1192 struct sockaddr_un server;
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1193
42176
1f5dbeefa536 Include "config.h", not <../src/config.h>.
Pavel Janík <Pavel@Janik.cz>
parents: 39723
diff changeset
1194 /*
412
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1195 * Open up an AF_UNIX socket in this person's home directory
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1196 */
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1197
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1198 if ((s = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1199 {
74118
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
1200 message (TRUE, "%s: socket: %s\n", progname, strerror (errno));
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1201 return INVALID_SOCKET;
412
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1202 }
42176
1f5dbeefa536 Include "config.h", not <../src/config.h>.
Pavel Janík <Pavel@Janik.cz>
parents: 39723
diff changeset
1203
412
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1204 server.sun_family = AF_UNIX;
25261
89be69860eeb (main): Move the dynamic allocation of
Karl Heuer <kwzh@gnu.org>
parents: 24652
diff changeset
1205
493
8b101799ff37 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 478
diff changeset
1206 {
27474
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1207 int sock_status = 0;
53646
8c55b1b400d5 (main): Stop if socket name too long.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53543
diff changeset
1208 int default_sock = !socket_name;
83010
82554ed1aed8 Merged in changes from CVS HEAD
Karoly Lorentey <lorentey@elte.hu>
parents: 83005 53543
diff changeset
1209 int saved_errno = 0;
109744
fdbd24f8d999 Fix warnings produced by compiling with -Wwrite_strings (i.e. use const char *).
Jan D <jan.h.d@swipnet.se>
parents: 109652
diff changeset
1210 const char *server_name = "server";
fdbd24f8d999 Fix warnings produced by compiling with -Wwrite_strings (i.e. use const char *).
Jan D <jan.h.d@swipnet.se>
parents: 109652
diff changeset
1211 const char *tmpdir;
53734
132739917566 (main): Don't use the hostname in the socket name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53693
diff changeset
1212
109315
8f3464b85afb Use strchr, strrchr instead of index, rindex
Andreas Schwab <schwab@linux-m68k.org>
parents: 109115
diff changeset
1213 if (socket_name && !strchr (socket_name, '/')
8f3464b85afb Use strchr, strrchr instead of index, rindex
Andreas Schwab <schwab@linux-m68k.org>
parents: 109115
diff changeset
1214 && !strchr (socket_name, '\\'))
8f3464b85afb Use strchr, strrchr instead of index, rindex
Andreas Schwab <schwab@linux-m68k.org>
parents: 109115
diff changeset
1215 {
8f3464b85afb Use strchr, strrchr instead of index, rindex
Andreas Schwab <schwab@linux-m68k.org>
parents: 109115
diff changeset
1216 /* socket_name is a file name component. */
83031
1d2f73785d9d Merged in changes from CVS HEAD
Karoly Lorentey <lorentey@elte.hu>
parents: 83030 53734
diff changeset
1217 server_name = socket_name;
1d2f73785d9d Merged in changes from CVS HEAD
Karoly Lorentey <lorentey@elte.hu>
parents: 83030 53734
diff changeset
1218 socket_name = NULL;
1d2f73785d9d Merged in changes from CVS HEAD
Karoly Lorentey <lorentey@elte.hu>
parents: 83030 53734
diff changeset
1219 default_sock = 1; /* Try both UIDs. */
53734
132739917566 (main): Don't use the hostname in the socket name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53693
diff changeset
1220 }
24084
c0b0893dd5a6 (main): Eliminate arbitrary limit on length of system_name.
Richard M. Stallman <rms@gnu.org>
parents: 23412
diff changeset
1221
53646
8c55b1b400d5 (main): Stop if socket name too long.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53543
diff changeset
1222 if (default_sock)
52479
bc2610a13fbf (socket_name): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 52401
diff changeset
1223 {
99209
01e8c1513572 * server.el, emacsclient.c: Use TMPDIR (default /tmp) instead of hardcoded /tmp.
Juanma Barranquero <lekktu@gmail.com>
parents: 98676
diff changeset
1224 tmpdir = egetenv ("TMPDIR");
01e8c1513572 * server.el, emacsclient.c: Use TMPDIR (default /tmp) instead of hardcoded /tmp.
Juanma Barranquero <lekktu@gmail.com>
parents: 98676
diff changeset
1225 if (!tmpdir)
110833
5481007b7ce9 Close bug#3992.
Glenn Morris <rgm@gnu.org>
parents: 106818
diff changeset
1226 {
5481007b7ce9 Close bug#3992.
Glenn Morris <rgm@gnu.org>
parents: 106818
diff changeset
1227 #ifdef DARWIN_OS
111598
66622c9fb890 Add fall-back definition of _CS_DARWIN_USER_TEMP_DIR (fix last failed check-in).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 110833
diff changeset
1228 #ifndef _CS_DARWIN_USER_TEMP_DIR
66622c9fb890 Add fall-back definition of _CS_DARWIN_USER_TEMP_DIR (fix last failed check-in).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 110833
diff changeset
1229 #define _CS_DARWIN_USER_TEMP_DIR 65537
66622c9fb890 Add fall-back definition of _CS_DARWIN_USER_TEMP_DIR (fix last failed check-in).
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 110833
diff changeset
1230 #endif
110833
5481007b7ce9 Close bug#3992.
Glenn Morris <rgm@gnu.org>
parents: 106818
diff changeset
1231 size_t n = confstr (_CS_DARWIN_USER_TEMP_DIR, NULL, (size_t) 0);
5481007b7ce9 Close bug#3992.
Glenn Morris <rgm@gnu.org>
parents: 106818
diff changeset
1232 if (n > 0)
5481007b7ce9 Close bug#3992.
Glenn Morris <rgm@gnu.org>
parents: 106818
diff changeset
1233 {
5481007b7ce9 Close bug#3992.
Glenn Morris <rgm@gnu.org>
parents: 106818
diff changeset
1234 tmpdir = alloca (n);
5481007b7ce9 Close bug#3992.
Glenn Morris <rgm@gnu.org>
parents: 106818
diff changeset
1235 confstr (_CS_DARWIN_USER_TEMP_DIR, tmpdir, n);
5481007b7ce9 Close bug#3992.
Glenn Morris <rgm@gnu.org>
parents: 106818
diff changeset
1236 }
5481007b7ce9 Close bug#3992.
Glenn Morris <rgm@gnu.org>
parents: 106818
diff changeset
1237 else
5481007b7ce9 Close bug#3992.
Glenn Morris <rgm@gnu.org>
parents: 106818
diff changeset
1238 #endif
5481007b7ce9 Close bug#3992.
Glenn Morris <rgm@gnu.org>
parents: 106818
diff changeset
1239 tmpdir = "/tmp";
5481007b7ce9 Close bug#3992.
Glenn Morris <rgm@gnu.org>
parents: 106818
diff changeset
1240 }
99215
e0e326adf3bc * emacsclient.c (EXTRA_SPACE): New macro.
Juanma Barranquero <lekktu@gmail.com>
parents: 99209
diff changeset
1241 socket_name = alloca (strlen (tmpdir) + strlen (server_name)
e0e326adf3bc * emacsclient.c (EXTRA_SPACE): New macro.
Juanma Barranquero <lekktu@gmail.com>
parents: 99209
diff changeset
1242 + EXTRA_SPACE);
99209
01e8c1513572 * server.el, emacsclient.c: Use TMPDIR (default /tmp) instead of hardcoded /tmp.
Juanma Barranquero <lekktu@gmail.com>
parents: 98676
diff changeset
1243 sprintf (socket_name, "%s/emacs%d/%s",
01e8c1513572 * server.el, emacsclient.c: Use TMPDIR (default /tmp) instead of hardcoded /tmp.
Juanma Barranquero <lekktu@gmail.com>
parents: 98676
diff changeset
1244 tmpdir, (int) geteuid (), server_name);
52479
bc2610a13fbf (socket_name): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 52401
diff changeset
1245 }
bc2610a13fbf (socket_name): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 52401
diff changeset
1246
bc2610a13fbf (socket_name): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 52401
diff changeset
1247 if (strlen (socket_name) < sizeof (server.sun_path))
bc2610a13fbf (socket_name): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 52401
diff changeset
1248 strcpy (server.sun_path, socket_name);
bc2610a13fbf (socket_name): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 52401
diff changeset
1249 else
53646
8c55b1b400d5 (main): Stop if socket name too long.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53543
diff changeset
1250 {
87669
b8b050fde307 Add missing final newlines to message calls.
Glenn Morris <rgm@gnu.org>
parents: 87668
diff changeset
1251 message (TRUE, "%s: socket-name %s too long\n",
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1252 progname, socket_name);
82988
f82e3a6f5ccb A few more bugfixes and new features.
Karoly Lorentey <lorentey@elte.hu>
parents: 82987
diff changeset
1253 fail ();
53646
8c55b1b400d5 (main): Stop if socket name too long.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53543
diff changeset
1254 }
412
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1255
27474
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1256 /* See if the socket exists, and if it's owned by us. */
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1257 sock_status = socket_status (server.sun_path);
53543
fec82b542db2 (main): Save errno from socket_status.
Andreas Schwab <schwab@suse.de>
parents: 53497
diff changeset
1258 saved_errno = errno;
53646
8c55b1b400d5 (main): Stop if socket name too long.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53543
diff changeset
1259 if (sock_status && default_sock)
493
8b101799ff37 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 478
diff changeset
1260 {
27474
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1261 /* Failing that, see if LOGNAME or USER exist and differ from
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1262 our euid. If so, look for a socket based on the UID
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1263 associated with the name. This is reminiscent of the logic
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1264 that init_editfns uses to set the global Vuser_full_name. */
42176
1f5dbeefa536 Include "config.h", not <../src/config.h>.
Pavel Janík <Pavel@Janik.cz>
parents: 39723
diff changeset
1265
79232
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
1266 char *user_name = (char *) egetenv ("LOGNAME");
53693
04e9ebd16fcd (main): Restore errno from saved_errno,
Richard M. Stallman <rms@gnu.org>
parents: 53646
diff changeset
1267
27474
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1268 if (!user_name)
79232
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
1269 user_name = (char *) egetenv ("USER");
42176
1f5dbeefa536 Include "config.h", not <../src/config.h>.
Pavel Janík <Pavel@Janik.cz>
parents: 39723
diff changeset
1270
27474
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1271 if (user_name)
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1272 {
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1273 struct passwd *pw = getpwnam (user_name);
53693
04e9ebd16fcd (main): Restore errno from saved_errno,
Richard M. Stallman <rms@gnu.org>
parents: 53646
diff changeset
1274
27474
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1275 if (pw && (pw->pw_uid != geteuid ()))
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1276 {
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1277 /* We're running under su, apparently. */
99215
e0e326adf3bc * emacsclient.c (EXTRA_SPACE): New macro.
Juanma Barranquero <lekktu@gmail.com>
parents: 99209
diff changeset
1278 socket_name = alloca (strlen (tmpdir) + strlen (server_name)
e0e326adf3bc * emacsclient.c (EXTRA_SPACE): New macro.
Juanma Barranquero <lekktu@gmail.com>
parents: 99209
diff changeset
1279 + EXTRA_SPACE);
99209
01e8c1513572 * server.el, emacsclient.c: Use TMPDIR (default /tmp) instead of hardcoded /tmp.
Juanma Barranquero <lekktu@gmail.com>
parents: 98676
diff changeset
1280 sprintf (socket_name, "%s/emacs%d/%s",
01e8c1513572 * server.el, emacsclient.c: Use TMPDIR (default /tmp) instead of hardcoded /tmp.
Juanma Barranquero <lekktu@gmail.com>
parents: 98676
diff changeset
1281 tmpdir, (int) pw->pw_uid, server_name);
53646
8c55b1b400d5 (main): Stop if socket name too long.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53543
diff changeset
1282
8c55b1b400d5 (main): Stop if socket name too long.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53543
diff changeset
1283 if (strlen (socket_name) < sizeof (server.sun_path))
8c55b1b400d5 (main): Stop if socket name too long.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53543
diff changeset
1284 strcpy (server.sun_path, socket_name);
8c55b1b400d5 (main): Stop if socket name too long.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53543
diff changeset
1285 else
8c55b1b400d5 (main): Stop if socket name too long.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53543
diff changeset
1286 {
87669
b8b050fde307 Add missing final newlines to message calls.
Glenn Morris <rgm@gnu.org>
parents: 87668
diff changeset
1287 message (TRUE, "%s: socket-name %s too long\n",
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1288 progname, socket_name);
55442
a47704955f8d Throughout, replace 0 destined for `exit' arg with `EXIT_SUCCESS'.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 53813
diff changeset
1289 exit (EXIT_FAILURE);
53646
8c55b1b400d5 (main): Stop if socket name too long.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53543
diff changeset
1290 }
8c55b1b400d5 (main): Stop if socket name too long.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53543
diff changeset
1291
27474
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1292 sock_status = socket_status (server.sun_path);
83010
82554ed1aed8 Merged in changes from CVS HEAD
Karoly Lorentey <lorentey@elte.hu>
parents: 83005 53543
diff changeset
1293 saved_errno = errno;
27474
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1294 }
53693
04e9ebd16fcd (main): Restore errno from saved_errno,
Richard M. Stallman <rms@gnu.org>
parents: 53646
diff changeset
1295 else
04e9ebd16fcd (main): Restore errno from saved_errno,
Richard M. Stallman <rms@gnu.org>
parents: 53646
diff changeset
1296 errno = saved_errno;
27474
ed3668c0295a (socket_status): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27305
diff changeset
1297 }
493
8b101799ff37 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 478
diff changeset
1298 }
42176
1f5dbeefa536 Include "config.h", not <../src/config.h>.
Pavel Janík <Pavel@Janik.cz>
parents: 39723
diff changeset
1299
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1300 switch (sock_status)
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1301 {
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1302 case 1:
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1303 /* There's a socket, but it isn't owned by us. This is OK if
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1304 we are root. */
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1305 if (0 != geteuid ())
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1306 {
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1307 message (TRUE, "%s: Invalid socket owner\n", progname);
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1308 return INVALID_SOCKET;
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1309 }
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1310 break;
42176
1f5dbeefa536 Include "config.h", not <../src/config.h>.
Pavel Janík <Pavel@Janik.cz>
parents: 39723
diff changeset
1311
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1312 case 2:
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1313 /* `stat' failed */
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1314 if (saved_errno == ENOENT)
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1315 message (TRUE,
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1316 "%s: can't find socket; have you started the server?\n\
48627
c91408365d35 (main): Tell user how to start server within Emacs if socket could not
Stephen Eglen <stephen@gnu.org>
parents: 48617
diff changeset
1317 To start the server in Emacs, type \"M-x server-start\".\n",
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1318 progname);
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1319 else
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1320 message (TRUE, "%s: can't stat %s: %s\n",
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1321 progname, server.sun_path, strerror (saved_errno));
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1322 return INVALID_SOCKET;
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1323 }
493
8b101799ff37 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 478
diff changeset
1324 }
412
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1325
3595
e10f7473d2e3 * emacsserver.c (main): When we're passing a `struct sockaddr_un'
Jim Blandy <jimb@redhat.com>
parents: 1031
diff changeset
1326 if (connect (s, (struct sockaddr *) &server, strlen (server.sun_path) + 2)
e10f7473d2e3 * emacsserver.c (main): When we're passing a `struct sockaddr_un'
Jim Blandy <jimb@redhat.com>
parents: 1031
diff changeset
1327 < 0)
412
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1328 {
74118
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
1329 message (TRUE, "%s: connect: %s\n", progname, strerror (errno));
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1330 return INVALID_SOCKET;
412
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1331 }
15758
7e712d42d371 (main) [HAVE_SOCKETS]: Use two separate stdio
Richard M. Stallman <rms@gnu.org>
parents: 14610
diff changeset
1332
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1333 return s;
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1334 }
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1335 #endif /* ! NO_SOCKETS_IN_FILE_SYSTEM */
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1336
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1337 HSOCKET
100312
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1338 set_socket (int no_exit_if_error)
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1339 {
73765
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1340 HSOCKET s;
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1341
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1342 INITIALIZE ();
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1343
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1344 #ifndef NO_SOCKETS_IN_FILE_SYSTEM
73765
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1345 /* Explicit --socket-name argument. */
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1346 if (socket_name)
412
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1347 {
73765
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1348 s = set_local_socket ();
100312
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1349 if ((s != INVALID_SOCKET) || no_exit_if_error)
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1350 return s;
87668
98943cbe28fb Daniel Hackney <dan at haxney.org> (tiny change)
Glenn Morris <rgm@gnu.org>
parents: 87649
diff changeset
1351 message (TRUE, "%s: error accessing socket \"%s\"\n",
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1352 progname, socket_name);
73765
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1353 exit (EXIT_FAILURE);
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1354 }
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1355 #endif
73765
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1356
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1357 /* Explicit --server-file arg or EMACS_SERVER_FILE variable. */
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1358 if (!server_file)
79232
7970215aa6e5 Add a wrapper for getenv so it also checks the registry on Windows.
Juanma Barranquero <lekktu@gmail.com>
parents: 79226
diff changeset
1359 server_file = egetenv ("EMACS_SERVER_FILE");
73765
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1360
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1361 if (server_file)
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1362 {
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1363 s = set_tcp_socket ();
100312
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1364 if ((s != INVALID_SOCKET) || no_exit_if_error)
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1365 return s;
73765
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1366
87669
b8b050fde307 Add missing final newlines to message calls.
Glenn Morris <rgm@gnu.org>
parents: 87668
diff changeset
1367 message (TRUE, "%s: error accessing server file \"%s\"\n",
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1368 progname, server_file);
73765
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1369 exit (EXIT_FAILURE);
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1370 }
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1371
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1372 #ifndef NO_SOCKETS_IN_FILE_SYSTEM
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1373 /* Implicit local socket. */
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1374 s = set_local_socket ();
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1375 if (s != INVALID_SOCKET)
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1376 return s;
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1377 #endif
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1378
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1379 /* Implicit server file. */
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1380 server_file = "server";
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1381 s = set_tcp_socket ();
100312
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1382 if ((s != INVALID_SOCKET) || no_exit_if_error)
73765
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1383 return s;
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1384
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1385 /* No implicit or explicit socket, and no alternate editor. */
74118
bee73d83d967 Include <stdarg.h>.
Juanma Barranquero <lekktu@gmail.com>
parents: 73978
diff changeset
1386 message (TRUE, "%s: No socket or alternate editor. Please use:\n\n"
73765
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1387 #ifndef NO_SOCKETS_IN_FILE_SYSTEM
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1388 "\t--socket-name\n"
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1389 #endif
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1390 "\t--server-file (or environment variable EMACS_SERVER_FILE)\n\
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1391 \t--alternate-editor (or environment variable ALTERNATE_EDITOR)\n",
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1392 progname);
bcb5c0f9a466 (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show option --socket-name.
Juanma Barranquero <lekktu@gmail.com>
parents: 73657
diff changeset
1393 exit (EXIT_FAILURE);
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1394 }
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1395
74729
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1396 #ifdef WINDOWSNT
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1397 FARPROC set_fg; /* Pointer to AllowSetForegroundWindow. */
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1398 FARPROC get_wc; /* Pointer to RealGetWindowClassA. */
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1399
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1400 BOOL CALLBACK
109480
d12162869c07 Convert some more functions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109315
diff changeset
1401 w32_find_emacs_process (HWND hWnd, LPARAM lParam)
74729
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1402 {
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1403 DWORD pid;
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1404 char class[6];
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1405
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1406 /* Reject any window not of class "Emacs". */
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1407 if (! get_wc (hWnd, class, sizeof (class))
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1408 || strcmp (class, "Emacs"))
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1409 return TRUE;
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1410
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1411 /* We only need the process id, not the thread id. */
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1412 (void) GetWindowThreadProcessId (hWnd, &pid);
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1413
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1414 /* Not the one we're looking for. */
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1415 if (pid != (DWORD) emacs_pid) return TRUE;
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1416
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1417 /* OK, let's raise it. */
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1418 set_fg (emacs_pid);
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1419
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1420 /* Stop enumeration. */
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1421 return FALSE;
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1422 }
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1423
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1424 /*
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1425 * Search for a window of class "Emacs" and owned by a process with
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1426 * process id = emacs_pid. If found, allow it to grab the focus.
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1427 */
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1428 void
109480
d12162869c07 Convert some more functions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109315
diff changeset
1429 w32_give_focus (void)
74729
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1430 {
103641
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
1431 HANDLE user32;
74729
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1432
75956
6ef0c279b18c Comment changes and clarifications.
Juanma Barranquero <lekktu@gmail.com>
parents: 75348
diff changeset
1433 /* It shouldn't happen when dealing with TCP sockets. */
74729
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1434 if (!emacs_pid) return;
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1435
103641
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
1436 user32 = GetModuleHandle ("user32.dll");
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
1437
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
1438 if (!user32)
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
1439 return;
74729
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1440
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1441 /* Modern Windows restrict which processes can set the foreground window.
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1442 emacsclient can allow Emacs to grab the focus by calling the function
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1443 AllowSetForegroundWindow. Unfortunately, older Windows (W95, W98 and
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1444 NT) lack this function, so we have to check its availability. */
103641
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
1445 if ((set_fg = GetProcAddress (user32, "AllowSetForegroundWindow"))
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
1446 && (get_wc = GetProcAddress (user32, "RealGetWindowClassA")))
74729
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1447 EnumWindows (w32_find_emacs_process, (LPARAM) 0);
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1448 }
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1449 #endif
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1450
100312
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1451 /* Start the emacs daemon and try to connect to it. */
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1452
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1453 void
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1454 start_daemon_and_retry_set_socket (void)
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1455 {
100318
00d91c609c41 (EMACS_DAEMON): Remove definition.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100314
diff changeset
1456 #ifndef WINDOWSNT
100312
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1457 pid_t dpid;
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1458 int status;
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1459
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1460 dpid = fork ();
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1461
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1462 if (dpid > 0)
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1463 {
100485
fd10c7ef5447 * emacs.c (main): Print and error and exit when no data is read
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100418
diff changeset
1464 pid_t w;
fd10c7ef5447 * emacs.c (main): Print and error and exit when no data is read
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100418
diff changeset
1465 w = waitpid (dpid, &status, WUNTRACED | WCONTINUED);
100312
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1466
109516
68ca98ae70fb Make building under stricter warning flags somewhat cleaner.
Juanma Barranquero <lekktu@gmail.com>
parents: 109511
diff changeset
1467 if ((w == -1) || !WIFEXITED (status) || WEXITSTATUS (status))
100485
fd10c7ef5447 * emacs.c (main): Print and error and exit when no data is read
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100418
diff changeset
1468 {
fd10c7ef5447 * emacs.c (main): Print and error and exit when no data is read
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100418
diff changeset
1469 message (TRUE, "Error: Could not start the Emacs daemon\n");
fd10c7ef5447 * emacs.c (main): Print and error and exit when no data is read
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100418
diff changeset
1470 exit (EXIT_FAILURE);
fd10c7ef5447 * emacs.c (main): Print and error and exit when no data is read
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100418
diff changeset
1471 }
fd10c7ef5447 * emacs.c (main): Print and error and exit when no data is read
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100418
diff changeset
1472
fd10c7ef5447 * emacs.c (main): Print and error and exit when no data is read
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100418
diff changeset
1473 /* Try connecting, the daemon should have started by now. */
fd10c7ef5447 * emacs.c (main): Print and error and exit when no data is read
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100418
diff changeset
1474 message (TRUE, "Emacs daemon should have started, trying to connect again\n");
100312
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1475 if ((emacs_socket = set_socket (1)) == INVALID_SOCKET)
100485
fd10c7ef5447 * emacs.c (main): Print and error and exit when no data is read
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100418
diff changeset
1476 {
fd10c7ef5447 * emacs.c (main): Print and error and exit when no data is read
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100418
diff changeset
1477 message (TRUE, "Error: Cannot connect even after starting the Emacs daemon\n");
fd10c7ef5447 * emacs.c (main): Print and error and exit when no data is read
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100418
diff changeset
1478 exit (EXIT_FAILURE);
fd10c7ef5447 * emacs.c (main): Print and error and exit when no data is read
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100418
diff changeset
1479 }
100312
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1480 }
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1481 else if (dpid < 0)
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1482 {
100485
fd10c7ef5447 * emacs.c (main): Print and error and exit when no data is read
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100418
diff changeset
1483 fprintf (stderr, "Error: Cannot fork!\n");
110643
12f445671c17 * emacsclient.c (main): Remove unused variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 109744
diff changeset
1484 exit (EXIT_FAILURE);
100312
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1485 }
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1486 else
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1487 {
109744
fdbd24f8d999 Fix warnings produced by compiling with -Wwrite_strings (i.e. use const char *).
Jan D <jan.h.d@swipnet.se>
parents: 109652
diff changeset
1488 char emacs[] = "emacs";
fdbd24f8d999 Fix warnings produced by compiling with -Wwrite_strings (i.e. use const char *).
Jan D <jan.h.d@swipnet.se>
parents: 109652
diff changeset
1489 char daemon[] = "--daemon";
fdbd24f8d999 Fix warnings produced by compiling with -Wwrite_strings (i.e. use const char *).
Jan D <jan.h.d@swipnet.se>
parents: 109652
diff changeset
1490 char *d_argv[] = {emacs, daemon, 0 };
100312
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1491 if (socket_name != NULL)
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1492 {
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1493 /* Pass --daemon=socket_name as argument. */
109744
fdbd24f8d999 Fix warnings produced by compiling with -Wwrite_strings (i.e. use const char *).
Jan D <jan.h.d@swipnet.se>
parents: 109652
diff changeset
1494 const char *deq = "--daemon=";
100312
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1495 char *daemon_arg = alloca (strlen (deq)
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1496 + strlen (socket_name) + 1);
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1497 strcpy (daemon_arg, deq);
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1498 strcat (daemon_arg, socket_name);
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1499 d_argv[1] = daemon_arg;
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1500 }
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1501 execvp ("emacs", d_argv);
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1502 message (TRUE, "%s: error starting emacs daemon\n", progname);
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1503 }
100318
00d91c609c41 (EMACS_DAEMON): Remove definition.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100314
diff changeset
1504 #endif /* WINDOWSNT */
100312
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1505 }
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1506
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1507 int
109111
52b76722152a Convert function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108828
diff changeset
1508 main (int argc, char **argv)
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1509 {
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1510 int i, rl, needlf = 0;
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1511 char *cwd, *str;
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1512 char string[BUFSIZ+1];
100318
00d91c609c41 (EMACS_DAEMON): Remove definition.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100314
diff changeset
1513 int null_socket_name, null_server_file, start_daemon_if_needed;
110706
ab3815920cc5 * emacsclient.c (main): Return EXIT_FAILURE if Emacs sends us an error string
Chong Yidong <cyd@stupidchicken.com>
parents: 110660
diff changeset
1514 int exit_status = EXIT_SUCCESS;
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1515
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1516 main_argv = argv;
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1517 progname = argv[0];
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1518
103641
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
1519 #ifdef WINDOWSNT
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
1520 /* On Windows 7 and later, we need to explicitly associate emacsclient
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
1521 with emacs so the UI behaves sensibly. */
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
1522 w32_set_user_model_id ();
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
1523 #endif
48d529d3a5a4 bug#1849 - Windows 7 Taskbar Support
Jason Rumney <jasonr@gnu.org>
parents: 103026
diff changeset
1524
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1525 /* Process options. */
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1526 decode_options (argc, argv);
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1527
99333
a999ab783eff (window_system): Delete redundant variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 99311
diff changeset
1528 if ((argc - optind < 1) && !eval && current_frame)
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1529 {
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1530 message (TRUE, "%s: file name or argument required\n"
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1531 "Try `%s --help' for more information\n",
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1532 progname, progname);
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1533 exit (EXIT_FAILURE);
412
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1534 }
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1535
100312
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1536 /* If alternate_editor is the empty string, start the emacs daemon
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1537 in case of failure to connect. */
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1538 start_daemon_if_needed = (alternate_editor
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1539 && (alternate_editor[0] == '\0'));
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1540 if (start_daemon_if_needed)
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1541 {
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1542 /* set_socket changes the values for socket_name and
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1543 server_file, we need to reset them, if they were NULL before
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1544 for the second call to set_socket. */
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1545 null_socket_name = (socket_name == NULL);
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1546 null_server_file = (server_file == NULL);
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1547 }
15758
7e712d42d371 (main) [HAVE_SOCKETS]: Use two separate stdio
Richard M. Stallman <rms@gnu.org>
parents: 14610
diff changeset
1548
100312
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1549 if ((emacs_socket = set_socket (alternate_editor
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1550 || start_daemon_if_needed)) == INVALID_SOCKET)
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1551 if (start_daemon_if_needed)
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1552 {
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1553 /* Reset socket_name and server_file if they were NULL
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1554 before the set_socket call. */
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1555 if (null_socket_name)
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1556 socket_name = NULL;
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1557 if (null_server_file)
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1558 server_file = NULL;
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1559
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1560 start_daemon_and_retry_set_socket ();
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1561 }
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1562 else
6da82f7dfa67 * misc.texi (emacsclient Options): Describe what an empty string
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100154
diff changeset
1563 fail ();
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1564
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1565 cwd = get_current_dir_name ();
412
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1566 if (cwd == 0)
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1567 {
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1568 /* getwd puts message in STRING if it fails. */
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1569 message (TRUE, "%s: %s\n", progname,
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1570 "Cannot get current working directory");
82988
f82e3a6f5ccb A few more bugfixes and new features.
Karoly Lorentey <lorentey@elte.hu>
parents: 82987
diff changeset
1571 fail ();
412
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1572 }
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1573
74342
c6cb776ffbb7 (emacs_pid): New variable.
Juanma Barranquero <lekktu@gmail.com>
parents: 74341
diff changeset
1574 #ifdef WINDOWSNT
74729
303099bc66d9 [WINDOWSNT] (set_fg, get_wc): New variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 74645
diff changeset
1575 w32_give_focus ();
74342
c6cb776ffbb7 (emacs_pid): New variable.
Juanma Barranquero <lekktu@gmail.com>
parents: 74341
diff changeset
1576 #endif
c6cb776ffbb7 (emacs_pid): New variable.
Juanma Barranquero <lekktu@gmail.com>
parents: 74341
diff changeset
1577
99333
a999ab783eff (window_system): Delete redundant variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 99311
diff changeset
1578 /* Send over our environment and current directory. */
83403
51eb0aa362f3 Store client's environment in terminal parameters, not server parameters.
Karoly Lorentey <lorentey@elte.hu>
parents: 83371
diff changeset
1579 if (!current_frame)
51eb0aa362f3 Store client's environment in terminal parameters, not server parameters.
Karoly Lorentey <lorentey@elte.hu>
parents: 83371
diff changeset
1580 {
51eb0aa362f3 Store client's environment in terminal parameters, not server parameters.
Karoly Lorentey <lorentey@elte.hu>
parents: 83371
diff changeset
1581 extern char **environ;
51eb0aa362f3 Store client's environment in terminal parameters, not server parameters.
Karoly Lorentey <lorentey@elte.hu>
parents: 83371
diff changeset
1582 int i;
51eb0aa362f3 Store client's environment in terminal parameters, not server parameters.
Karoly Lorentey <lorentey@elte.hu>
parents: 83371
diff changeset
1583 for (i = 0; environ[i]; i++)
51eb0aa362f3 Store client's environment in terminal parameters, not server parameters.
Karoly Lorentey <lorentey@elte.hu>
parents: 83371
diff changeset
1584 {
83603
54df157e987d (emacs_socket): Rename from s.
Jason Rumney <jasonr@gnu.org>
parents: 83601
diff changeset
1585 send_to_emacs (emacs_socket, "-env ");
54df157e987d (emacs_socket): Rename from s.
Jason Rumney <jasonr@gnu.org>
parents: 83601
diff changeset
1586 quote_argument (emacs_socket, environ[i]);
54df157e987d (emacs_socket): Rename from s.
Jason Rumney <jasonr@gnu.org>
parents: 83601
diff changeset
1587 send_to_emacs (emacs_socket, " ");
83403
51eb0aa362f3 Store client's environment in terminal parameters, not server parameters.
Karoly Lorentey <lorentey@elte.hu>
parents: 83371
diff changeset
1588 }
83499
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
1589 }
102471
02f766280fad * server.el (server-process-filter): Use expand-file-name rather than
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101397
diff changeset
1590 send_to_emacs (emacs_socket, "-dir ");
02f766280fad * server.el (server-process-filter): Use expand-file-name rather than
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101397
diff changeset
1591 quote_argument (emacs_socket, cwd);
02f766280fad * server.el (server-process-filter): Use expand-file-name rather than
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101397
diff changeset
1592 send_to_emacs (emacs_socket, "/");
02f766280fad * server.el (server-process-filter): Use expand-file-name rather than
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 101397
diff changeset
1593 send_to_emacs (emacs_socket, " ");
83499
0fe580113f72 Set `default-directory' in *scratch* to the current directory of emacsclient.
Karoly Lorentey <lorentey@elte.hu>
parents: 83468
diff changeset
1594
83246
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83165
diff changeset
1595 retry:
16061
a1290c4159b5 (quote_file_name): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16030
diff changeset
1596 if (nowait)
83603
54df157e987d (emacs_socket): Rename from s.
Jason Rumney <jasonr@gnu.org>
parents: 83601
diff changeset
1597 send_to_emacs (emacs_socket, "-nowait ");
16061
a1290c4159b5 (quote_file_name): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16030
diff changeset
1598
83367
2b5fb28780be Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner cases in Emacs server.
Karoly Lorentey <lorentey@elte.hu>
parents: 83353
diff changeset
1599 if (current_frame)
83603
54df157e987d (emacs_socket): Rename from s.
Jason Rumney <jasonr@gnu.org>
parents: 83601
diff changeset
1600 send_to_emacs (emacs_socket, "-current-frame ");
47647
5498210ad40d Remove SYSV support.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47515
diff changeset
1601
5498210ad40d Remove SYSV support.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47515
diff changeset
1602 if (display)
412
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1603 {
83603
54df157e987d (emacs_socket): Rename from s.
Jason Rumney <jasonr@gnu.org>
parents: 83601
diff changeset
1604 send_to_emacs (emacs_socket, "-display ");
54df157e987d (emacs_socket): Rename from s.
Jason Rumney <jasonr@gnu.org>
parents: 83601
diff changeset
1605 quote_argument (emacs_socket, display);
54df157e987d (emacs_socket): Rename from s.
Jason Rumney <jasonr@gnu.org>
parents: 83601
diff changeset
1606 send_to_emacs (emacs_socket, " ");
52635
9963e9da5850 (quote_file_name): Print the result instead of
Eli Zaretskii <eliz@gnu.org>
parents: 52532
diff changeset
1607 }
9963e9da5850 (quote_file_name): Print the result instead of
Eli Zaretskii <eliz@gnu.org>
parents: 52532
diff changeset
1608
108828
87dad1e1c860 Add --parent-id argument to emacsclient.
Chong Yidong <cyd@stupidchicken.com>
parents: 107737
diff changeset
1609 if (parent_id)
87dad1e1c860 Add --parent-id argument to emacsclient.
Chong Yidong <cyd@stupidchicken.com>
parents: 107737
diff changeset
1610 {
87dad1e1c860 Add --parent-id argument to emacsclient.
Chong Yidong <cyd@stupidchicken.com>
parents: 107737
diff changeset
1611 send_to_emacs (emacs_socket, "-parent-id ");
87dad1e1c860 Add --parent-id argument to emacsclient.
Chong Yidong <cyd@stupidchicken.com>
parents: 107737
diff changeset
1612 quote_argument (emacs_socket, parent_id);
87dad1e1c860 Add --parent-id argument to emacsclient.
Chong Yidong <cyd@stupidchicken.com>
parents: 107737
diff changeset
1613 send_to_emacs (emacs_socket, " ");
87dad1e1c860 Add --parent-id argument to emacsclient.
Chong Yidong <cyd@stupidchicken.com>
parents: 107737
diff changeset
1614 }
87dad1e1c860 Add --parent-id argument to emacsclient.
Chong Yidong <cyd@stupidchicken.com>
parents: 107737
diff changeset
1615
99254
8cade16f7427 (main): If using the current frame, send tty information to Emacs in
Chong Yidong <cyd@stupidchicken.com>
parents: 99215
diff changeset
1616 /* If using the current frame, send tty information to Emacs anyway.
8cade16f7427 (main): If using the current frame, send tty information to Emacs in
Chong Yidong <cyd@stupidchicken.com>
parents: 99215
diff changeset
1617 In daemon mode, Emacs may need to occupy this tty if no other
8cade16f7427 (main): If using the current frame, send tty information to Emacs in
Chong Yidong <cyd@stupidchicken.com>
parents: 99215
diff changeset
1618 frame is available. */
99297
4069e1395eca (main): Don't force sending tty when in eval mode.
Andreas Schwab <schwab@suse.de>
parents: 99254
diff changeset
1619 if (tty || (current_frame && !eval))
53229
33c3c7c16e13 lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents: 52848
diff changeset
1620 {
99333
a999ab783eff (window_system): Delete redundant variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 99311
diff changeset
1621 char *tty_type, *tty_name;
83064
e7e9448cb3a0 Make emacsclient refuse to create a frame inside an Emacs term buffer.
Karoly Lorentey <lorentey@elte.hu>
parents: 83052
diff changeset
1622
99333
a999ab783eff (window_system): Delete redundant variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 99311
diff changeset
1623 if (find_tty (&tty_type, &tty_name, !tty))
a999ab783eff (window_system): Delete redundant variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 99311
diff changeset
1624 {
83590
dab011361c2a (s): Remove.
Jason Rumney <jasonr@gnu.org>
parents: 83556
diff changeset
1625 #if !defined (NO_SOCKETS_IN_FILE_SYSTEM)
99333
a999ab783eff (window_system): Delete redundant variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 99311
diff changeset
1626 init_signals ();
83590
dab011361c2a (s): Remove.
Jason Rumney <jasonr@gnu.org>
parents: 83556
diff changeset
1627 #endif
99333
a999ab783eff (window_system): Delete redundant variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 99311
diff changeset
1628 send_to_emacs (emacs_socket, "-tty ");
a999ab783eff (window_system): Delete redundant variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 99311
diff changeset
1629 quote_argument (emacs_socket, tty_name);
a999ab783eff (window_system): Delete redundant variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 99311
diff changeset
1630 send_to_emacs (emacs_socket, " ");
a999ab783eff (window_system): Delete redundant variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 99311
diff changeset
1631 quote_argument (emacs_socket, tty_type);
a999ab783eff (window_system): Delete redundant variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 99311
diff changeset
1632 send_to_emacs (emacs_socket, " ");
a999ab783eff (window_system): Delete redundant variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 99311
diff changeset
1633 }
53229
33c3c7c16e13 lib-src/emacsclient.c: Implemented --here option (open a new Emacs tty). Needs more work.
Karoly Lorentey <lorentey@elte.hu>
parents: 52848
diff changeset
1634 }
83043
78a785f205ea Added -w option to emacsclient for opening a new X frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83037
diff changeset
1635
99333
a999ab783eff (window_system): Delete redundant variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 99311
diff changeset
1636 if (!current_frame && !tty)
83603
54df157e987d (emacs_socket): Rename from s.
Jason Rumney <jasonr@gnu.org>
parents: 83601
diff changeset
1637 send_to_emacs (emacs_socket, "-window-system ");
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1638
52635
9963e9da5850 (quote_file_name): Print the result instead of
Eli Zaretskii <eliz@gnu.org>
parents: 52532
diff changeset
1639 if ((argc - optind > 0))
9963e9da5850 (quote_file_name): Print the result instead of
Eli Zaretskii <eliz@gnu.org>
parents: 52532
diff changeset
1640 {
9963e9da5850 (quote_file_name): Print the result instead of
Eli Zaretskii <eliz@gnu.org>
parents: 52532
diff changeset
1641 for (i = optind; i < argc; i++)
412
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1642 {
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1643
52635
9963e9da5850 (quote_file_name): Print the result instead of
Eli Zaretskii <eliz@gnu.org>
parents: 52532
diff changeset
1644 if (eval)
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1645 {
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1646 /* Don't prepend cwd or anything like that. */
83603
54df157e987d (emacs_socket): Rename from s.
Jason Rumney <jasonr@gnu.org>
parents: 83601
diff changeset
1647 send_to_emacs (emacs_socket, "-eval ");
54df157e987d (emacs_socket): Rename from s.
Jason Rumney <jasonr@gnu.org>
parents: 83601
diff changeset
1648 quote_argument (emacs_socket, argv[i]);
54df157e987d (emacs_socket): Rename from s.
Jason Rumney <jasonr@gnu.org>
parents: 83601
diff changeset
1649 send_to_emacs (emacs_socket, " ");
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1650 continue;
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1651 }
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1652
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1653 if (*argv[i] == '+')
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1654 {
52635
9963e9da5850 (quote_file_name): Print the result instead of
Eli Zaretskii <eliz@gnu.org>
parents: 52532
diff changeset
1655 char *p = argv[i] + 1;
9963e9da5850 (quote_file_name): Print the result instead of
Eli Zaretskii <eliz@gnu.org>
parents: 52532
diff changeset
1656 while (isdigit ((unsigned char) *p) || *p == ':') p++;
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1657 if (*p == 0)
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1658 {
83603
54df157e987d (emacs_socket): Rename from s.
Jason Rumney <jasonr@gnu.org>
parents: 83601
diff changeset
1659 send_to_emacs (emacs_socket, "-position ");
54df157e987d (emacs_socket): Rename from s.
Jason Rumney <jasonr@gnu.org>
parents: 83601
diff changeset
1660 quote_argument (emacs_socket, argv[i]);
54df157e987d (emacs_socket): Rename from s.
Jason Rumney <jasonr@gnu.org>
parents: 83601
diff changeset
1661 send_to_emacs (emacs_socket, " ");
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1662 continue;
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1663 }
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1664 }
102474
10dc40769985 * emacsclient.c (main): Revert part of last change,
Juanma Barranquero <lekktu@gmail.com>
parents: 102471
diff changeset
1665 #ifdef WINDOWSNT
10dc40769985 * emacsclient.c (main): Revert part of last change,
Juanma Barranquero <lekktu@gmail.com>
parents: 102471
diff changeset
1666 else if (! file_name_absolute_p (argv[i])
10dc40769985 * emacsclient.c (main): Revert part of last change,
Juanma Barranquero <lekktu@gmail.com>
parents: 102471
diff changeset
1667 && (isalpha (argv[i][0]) && argv[i][1] == ':'))
10dc40769985 * emacsclient.c (main): Revert part of last change,
Juanma Barranquero <lekktu@gmail.com>
parents: 102471
diff changeset
1668 /* Windows can have a different default directory for each
10dc40769985 * emacsclient.c (main): Revert part of last change,
Juanma Barranquero <lekktu@gmail.com>
parents: 102471
diff changeset
1669 drive, so the cwd passed via "-dir" is not sufficient
10dc40769985 * emacsclient.c (main): Revert part of last change,
Juanma Barranquero <lekktu@gmail.com>
parents: 102471
diff changeset
1670 to account for that.
10dc40769985 * emacsclient.c (main): Revert part of last change,
Juanma Barranquero <lekktu@gmail.com>
parents: 102471
diff changeset
1671 If the user uses <drive>:<relpath>, we hence need to be
10dc40769985 * emacsclient.c (main): Revert part of last change,
Juanma Barranquero <lekktu@gmail.com>
parents: 102471
diff changeset
1672 careful to expand <relpath> with the default directory
10dc40769985 * emacsclient.c (main): Revert part of last change,
Juanma Barranquero <lekktu@gmail.com>
parents: 102471
diff changeset
1673 corresponding to <drive>. */
10dc40769985 * emacsclient.c (main): Revert part of last change,
Juanma Barranquero <lekktu@gmail.com>
parents: 102471
diff changeset
1674 {
10dc40769985 * emacsclient.c (main): Revert part of last change,
Juanma Barranquero <lekktu@gmail.com>
parents: 102471
diff changeset
1675 char *filename = (char *) xmalloc (MAX_PATH);
10dc40769985 * emacsclient.c (main): Revert part of last change,
Juanma Barranquero <lekktu@gmail.com>
parents: 102471
diff changeset
1676 DWORD size;
10dc40769985 * emacsclient.c (main): Revert part of last change,
Juanma Barranquero <lekktu@gmail.com>
parents: 102471
diff changeset
1677
10dc40769985 * emacsclient.c (main): Revert part of last change,
Juanma Barranquero <lekktu@gmail.com>
parents: 102471
diff changeset
1678 size = GetFullPathName (argv[i], MAX_PATH, filename, NULL);
10dc40769985 * emacsclient.c (main): Revert part of last change,
Juanma Barranquero <lekktu@gmail.com>
parents: 102471
diff changeset
1679 if (size > 0 && size < MAX_PATH)
10dc40769985 * emacsclient.c (main): Revert part of last change,
Juanma Barranquero <lekktu@gmail.com>
parents: 102471
diff changeset
1680 argv[i] = filename;
10dc40769985 * emacsclient.c (main): Revert part of last change,
Juanma Barranquero <lekktu@gmail.com>
parents: 102471
diff changeset
1681 else
10dc40769985 * emacsclient.c (main): Revert part of last change,
Juanma Barranquero <lekktu@gmail.com>
parents: 102471
diff changeset
1682 free (filename);
10dc40769985 * emacsclient.c (main): Revert part of last change,
Juanma Barranquero <lekktu@gmail.com>
parents: 102471
diff changeset
1683 }
10dc40769985 * emacsclient.c (main): Revert part of last change,
Juanma Barranquero <lekktu@gmail.com>
parents: 102471
diff changeset
1684 #endif
52635
9963e9da5850 (quote_file_name): Print the result instead of
Eli Zaretskii <eliz@gnu.org>
parents: 52532
diff changeset
1685
83603
54df157e987d (emacs_socket): Rename from s.
Jason Rumney <jasonr@gnu.org>
parents: 83601
diff changeset
1686 send_to_emacs (emacs_socket, "-file ");
54df157e987d (emacs_socket): Rename from s.
Jason Rumney <jasonr@gnu.org>
parents: 83601
diff changeset
1687 quote_argument (emacs_socket, argv[i]);
54df157e987d (emacs_socket): Rename from s.
Jason Rumney <jasonr@gnu.org>
parents: 83601
diff changeset
1688 send_to_emacs (emacs_socket, " ");
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1689 }
412
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1690 }
99333
a999ab783eff (window_system): Delete redundant variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 99311
diff changeset
1691 else if (eval)
52635
9963e9da5850 (quote_file_name): Print the result instead of
Eli Zaretskii <eliz@gnu.org>
parents: 52532
diff changeset
1692 {
99333
a999ab783eff (window_system): Delete redundant variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 99311
diff changeset
1693 /* Read expressions interactively. */
a999ab783eff (window_system): Delete redundant variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 99311
diff changeset
1694 while ((str = fgets (string, BUFSIZ, stdin)))
a999ab783eff (window_system): Delete redundant variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 99311
diff changeset
1695 {
a999ab783eff (window_system): Delete redundant variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 99311
diff changeset
1696 send_to_emacs (emacs_socket, "-eval ");
a999ab783eff (window_system): Delete redundant variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 99311
diff changeset
1697 quote_argument (emacs_socket, str);
a999ab783eff (window_system): Delete redundant variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 99311
diff changeset
1698 }
a999ab783eff (window_system): Delete redundant variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 99311
diff changeset
1699 send_to_emacs (emacs_socket, " ");
52635
9963e9da5850 (quote_file_name): Print the result instead of
Eli Zaretskii <eliz@gnu.org>
parents: 52532
diff changeset
1700 }
55442
a47704955f8d Throughout, replace 0 destined for `exit' arg with `EXIT_SUCCESS'.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 53813
diff changeset
1701
83603
54df157e987d (emacs_socket): Rename from s.
Jason Rumney <jasonr@gnu.org>
parents: 83601
diff changeset
1702 send_to_emacs (emacs_socket, "\n");
412
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1703
83165
ed82e09208c9 Fix --no-wait in emacsclient (reported by Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents: 83121
diff changeset
1704 /* Wait for an answer. */
ed82e09208c9 Fix --no-wait in emacsclient (reported by Dan Nicolaescu).
Karoly Lorentey <lorentey@elte.hu>
parents: 83121
diff changeset
1705 if (!eval && !tty && !nowait)
47647
5498210ad40d Remove SYSV support.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47515
diff changeset
1706 {
5498210ad40d Remove SYSV support.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47515
diff changeset
1707 printf ("Waiting for Emacs...");
5498210ad40d Remove SYSV support.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47515
diff changeset
1708 needlf = 2;
5498210ad40d Remove SYSV support.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47515
diff changeset
1709 }
412
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1710 fflush (stdout);
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1711 fsync (1);
412
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1712
47515
6ee937dcfe16 (quote_file_name): Quote \n.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42412
diff changeset
1713 /* Now, wait for an answer and print any messages. */
110706
ab3815920cc5 * emacsclient.c (main): Return EXIT_FAILURE if Emacs sends us an error string
Chong Yidong <cyd@stupidchicken.com>
parents: 110660
diff changeset
1714 while (exit_status == EXIT_SUCCESS
ab3815920cc5 * emacsclient.c (main): Return EXIT_FAILURE if Emacs sends us an error string
Chong Yidong <cyd@stupidchicken.com>
parents: 110660
diff changeset
1715 && (rl = recv (emacs_socket, string, BUFSIZ, 0)) > 0)
47515
6ee937dcfe16 (quote_file_name): Quote \n.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42412
diff changeset
1716 {
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1717 char *p;
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1718 string[rl] = '\0';
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1719
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1720 p = string + strlen (string) - 1;
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1721 while (p > string && *p == '\n')
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1722 *p-- = 0;
412
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1723
84667
f2c11a35b0e3 (current_frame): Change the default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83666
diff changeset
1724 if (strprefix ("-emacs-pid ", string))
83043
78a785f205ea Added -w option to emacsclient for opening a new X frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83037
diff changeset
1725 {
83246
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83165
diff changeset
1726 /* -emacs-pid PID: The process id of the Emacs process. */
83043
78a785f205ea Added -w option to emacsclient for opening a new X frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83037
diff changeset
1727 emacs_pid = strtol (string + strlen ("-emacs-pid"), NULL, 10);
78a785f205ea Added -w option to emacsclient for opening a new X frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83037
diff changeset
1728 }
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1729 else if (strprefix ("-window-system-unsupported ", string))
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1730 {
83246
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83165
diff changeset
1731 /* -window-system-unsupported: Emacs was compiled without X
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83165
diff changeset
1732 support. Try again on the terminal. */
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83165
diff changeset
1733 nowait = 0;
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83165
diff changeset
1734 tty = 1;
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83165
diff changeset
1735 goto retry;
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83165
diff changeset
1736 }
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1737 else if (strprefix ("-print ", string))
82995
039bd6989d29 Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents: 82994
diff changeset
1738 {
83246
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83165
diff changeset
1739 /* -print STRING: Print STRING on the terminal. */
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1740 str = unquote_argument (string + strlen ("-print "));
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1741 if (needlf)
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1742 printf ("\n");
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1743 printf ("%s", str);
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1744 needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n';
83043
78a785f205ea Added -w option to emacsclient for opening a new X frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83037
diff changeset
1745 }
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1746 else if (strprefix ("-error ", string))
83043
78a785f205ea Added -w option to emacsclient for opening a new X frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83037
diff changeset
1747 {
83246
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83165
diff changeset
1748 /* -error DESCRIPTION: Signal an error on the terminal. */
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1749 str = unquote_argument (string + strlen ("-error "));
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1750 if (needlf)
83043
78a785f205ea Added -w option to emacsclient for opening a new X frame.
Karoly Lorentey <lorentey@elte.hu>
parents: 83037
diff changeset
1751 printf ("\n");
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1752 fprintf (stderr, "*ERROR*: %s", str);
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1753 needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n';
110706
ab3815920cc5 * emacsclient.c (main): Return EXIT_FAILURE if Emacs sends us an error string
Chong Yidong <cyd@stupidchicken.com>
parents: 110660
diff changeset
1754 exit_status = EXIT_FAILURE;
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1755 }
84677
421e6c54ace8 (main) [SIGSTOP]: Change conditional from WINDOWSNT.
Jason Rumney <jasonr@gnu.org>
parents: 84667
diff changeset
1756 #ifdef SIGSTOP
83551
d9dc7e67ad3f Fix various suspend-related bugs in emacsclient. (Report & patch by Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents: 83550
diff changeset
1757 else if (strprefix ("-suspend ", string))
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1758 {
83246
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83165
diff changeset
1759 /* -suspend: Suspend this terminal, i.e., stop the process. */
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1760 if (needlf)
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1761 printf ("\n");
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1762 needlf = 0;
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1763 kill (0, SIGSTOP);
82995
039bd6989d29 Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents: 82994
diff changeset
1764 }
83590
dab011361c2a (s): Remove.
Jason Rumney <jasonr@gnu.org>
parents: 83556
diff changeset
1765 #endif
82995
039bd6989d29 Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents: 82994
diff changeset
1766 else
039bd6989d29 Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents: 82994
diff changeset
1767 {
83246
5bc762f84335 Prevent emacsclient errors when Emacs is compiled without X support.
Karoly Lorentey <lorentey@elte.hu>
parents: 83165
diff changeset
1768 /* Unknown command. */
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1769 if (needlf)
82995
039bd6989d29 Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents: 82994
diff changeset
1770 printf ("\n");
83548
c71725faff1a Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!
Karoly Lorentey <lorentey@elte.hu>
parents: 83533 74342
diff changeset
1771 printf ("*ERROR*: Unknown message: %s", string);
110706
ab3815920cc5 * emacsclient.c (main): Return EXIT_FAILURE if Emacs sends us an error string
Chong Yidong <cyd@stupidchicken.com>
parents: 110660
diff changeset
1772 needlf = string[0]
ab3815920cc5 * emacsclient.c (main): Return EXIT_FAILURE if Emacs sends us an error string
Chong Yidong <cyd@stupidchicken.com>
parents: 110660
diff changeset
1773 == '\0' ? needlf : string[strlen (string) - 1] != '\n';
82995
039bd6989d29 Portability fixes (now it compiles & runs fine on Solaris).
Karoly Lorentey <lorentey@elte.hu>
parents: 82994
diff changeset
1774 }
47515
6ee937dcfe16 (quote_file_name): Quote \n.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42412
diff changeset
1775 }
42176
1f5dbeefa536 Include "config.h", not <../src/config.h>.
Pavel Janík <Pavel@Janik.cz>
parents: 39723
diff changeset
1776
47515
6ee937dcfe16 (quote_file_name): Quote \n.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42412
diff changeset
1777 if (needlf)
6ee937dcfe16 (quote_file_name): Quote \n.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42412
diff changeset
1778 printf ("\n");
6ee937dcfe16 (quote_file_name): Quote \n.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 42412
diff changeset
1779 fflush (stdout);
83065
a871be7b26a5 Implemented suspending of emacsclient frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 83064
diff changeset
1780 fsync (1);
42176
1f5dbeefa536 Include "config.h", not <../src/config.h>.
Pavel Janík <Pavel@Janik.cz>
parents: 39723
diff changeset
1781
110706
ab3815920cc5 * emacsclient.c (main): Return EXIT_FAILURE if Emacs sends us an error string
Chong Yidong <cyd@stupidchicken.com>
parents: 110660
diff changeset
1782 if (rl < 0)
ab3815920cc5 * emacsclient.c (main): Return EXIT_FAILURE if Emacs sends us an error string
Chong Yidong <cyd@stupidchicken.com>
parents: 110660
diff changeset
1783 exit_status = EXIT_FAILURE;
ab3815920cc5 * emacsclient.c (main): Return EXIT_FAILURE if Emacs sends us an error string
Chong Yidong <cyd@stupidchicken.com>
parents: 110660
diff changeset
1784
83601
8365dbf64d14 (emacs_socket): Rename from s.
Jason Rumney <jasonr@gnu.org>
parents: 83600
diff changeset
1785 CLOSE_SOCKET (emacs_socket);
110706
ab3815920cc5 * emacsclient.c (main): Return EXIT_FAILURE if Emacs sends us an error string
Chong Yidong <cyd@stupidchicken.com>
parents: 110660
diff changeset
1786 return exit_status;
412
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1787 }
3cc2c5136064 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1788
73617
7af864af10b6 [WINDOWSNT]: Define HAVE_INET_SOCKETS.
Juanma Barranquero <lekktu@gmail.com>
parents: 73601
diff changeset
1789 #endif /* HAVE_SOCKETS && HAVE_INET_SOCKETS */
73562
368665ce6f35 Add support for TCP sockets.
Juanma Barranquero <lekktu@gmail.com>
parents: 72005
diff changeset
1790
5527
51451a050975 [! HAVE_STRERROR] (strerror): Define the function.
Roland McGrath <roland@gnu.org>
parents: 5522
diff changeset
1791
51451a050975 [! HAVE_STRERROR] (strerror): Define the function.
Roland McGrath <roland@gnu.org>
parents: 5522
diff changeset
1792 #ifndef HAVE_STRERROR
51451a050975 [! HAVE_STRERROR] (strerror): Define the function.
Roland McGrath <roland@gnu.org>
parents: 5522
diff changeset
1793 char *
51451a050975 [! HAVE_STRERROR] (strerror): Define the function.
Roland McGrath <roland@gnu.org>
parents: 5522
diff changeset
1794 strerror (errnum)
51451a050975 [! HAVE_STRERROR] (strerror): Define the function.
Roland McGrath <roland@gnu.org>
parents: 5522
diff changeset
1795 int errnum;
51451a050975 [! HAVE_STRERROR] (strerror): Define the function.
Roland McGrath <roland@gnu.org>
parents: 5522
diff changeset
1796 {
51451a050975 [! HAVE_STRERROR] (strerror): Define the function.
Roland McGrath <roland@gnu.org>
parents: 5522
diff changeset
1797 extern char *sys_errlist[];
51451a050975 [! HAVE_STRERROR] (strerror): Define the function.
Roland McGrath <roland@gnu.org>
parents: 5522
diff changeset
1798 extern int sys_nerr;
51451a050975 [! HAVE_STRERROR] (strerror): Define the function.
Roland McGrath <roland@gnu.org>
parents: 5522
diff changeset
1799
51451a050975 [! HAVE_STRERROR] (strerror): Define the function.
Roland McGrath <roland@gnu.org>
parents: 5522
diff changeset
1800 if (errnum >= 0 && errnum < sys_nerr)
51451a050975 [! HAVE_STRERROR] (strerror): Define the function.
Roland McGrath <roland@gnu.org>
parents: 5522
diff changeset
1801 return sys_errlist[errnum];
51451a050975 [! HAVE_STRERROR] (strerror): Define the function.
Roland McGrath <roland@gnu.org>
parents: 5522
diff changeset
1802 return (char *) "Unknown error";
51451a050975 [! HAVE_STRERROR] (strerror): Define the function.
Roland McGrath <roland@gnu.org>
parents: 5522
diff changeset
1803 }
51451a050975 [! HAVE_STRERROR] (strerror): Define the function.
Roland McGrath <roland@gnu.org>
parents: 5522
diff changeset
1804
51451a050975 [! HAVE_STRERROR] (strerror): Define the function.
Roland McGrath <roland@gnu.org>
parents: 5522
diff changeset
1805 #endif /* ! HAVE_STRERROR */
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52069
diff changeset
1806
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52069
diff changeset
1807 /* arch-tag: f39bb9c4-73eb-477e-896d-50832e2ca9a7
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52069
diff changeset
1808 (do not change this comment) */
55442
a47704955f8d Throughout, replace 0 destined for `exit' arg with `EXIT_SUCCESS'.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 53813
diff changeset
1809
a47704955f8d Throughout, replace 0 destined for `exit' arg with `EXIT_SUCCESS'.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 53813
diff changeset
1810 /* emacsclient.c ends here */