[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
23.0.50; emacsclient --eval new behaviour
|
From: |
Gian Uberto Lauri |
|
Subject: |
23.0.50; emacsclient --eval new behaviour |
|
Date: |
Fri, 14 Sep 2007 15:38:09 +0200 |
Please write in English if possible, because the Emacs maintainers
usually do not have translators to read other languages for them.
Your bug report will be posted to the address@hidden mailing list.
Please describe exactly what actions triggered the bug
and the precise symptoms of the bug:
emacsclient -c option (and subsequently emacsclient new default
behaviour) may "break" compatibility with pre-existent user utilities
and settings when used together with -e to trigger an emacs function
from outside.
One example: someone configure mozex so that iceweasel - using
emacsclient --eval - fires some (mailto-manager to cc-field bcc-field
subject body) function whenever a mailto: hyperlink is clicked ad I
did with this clumsy shell script:
#! /bin/bash
emacsclient --eval "( mailto-manager \"$1\" \"$2\" \"$3\" \"$4\" \"$5\")"
With Emacs 22 the emacsclient process fired the function and exited.
With Emacs 23.0.50.1 the emacsclient process fires the function (as
before), creates another frame (new behaviour) and hangs until the
frame is destroyed (new behaviour) even if the function was completly
evaluated.
I noticed that I can work around this changing -e option in -ce, but I
had to chase all the emacsclient --eval strings I placed here and
there in years of building my Emacs+Windowmaker desktop environment.
The --no-wait option has no effect on the frame creation.
I think that this behaviour is highly undesirable and that a better
implementation could be to have --eval imply --current-frame and maybe
add a --force-new-frame option to trigger this new behaviour even if
there's --eval on the command line.
Attached there are my patched emacsclient.c and emacsclient.1
If Emacs crashed, and you have the Emacs process in the gdb debugger,
please include the output from the following gdb commands:
`bt full' and `xbacktrace'.
If you would like to further debug the crash, please read the file
/usr/local/share/emacs/23.0.50/etc/DEBUG for instructions.
In GNU Emacs 23.0.50.1 (i686-pc-linux-gnu, GTK+ Version 2.10.13)
of 2007-09-11 on gastone
Windowing system distributor `The X.Org Foundation', version 11.0.10300000
configured using `configure '--with-gtk' '--with-gif''
Important settings:
value of $LC_ALL: nil
value of $LC_COLLATE: nil
value of $LC_CTYPE: nil
value of $LC_MESSAGES: nil
value of $LC_MONETARY: nil
value of $LC_NUMERIC: nil
value of $LC_TIME: nil
value of $LANG: C
locale-coding-system: nil
default-enable-multibyte-characters: t
Major mode: Fundamental
Minor modes in effect:
display-time-mode: t
whitespace-global-mode: t
global-hl-line-mode: t
show-paren-mode: t
shell-dirtrack-mode: t
tooltip-mode: t
mouse-wheel-mode: t
menu-bar-mode: t
file-name-shadow-mode: t
global-font-lock-mode: t
unify-8859-on-encoding-mode: t
utf-translate-cjk-mode: t
auto-compression-mode: t
size-indication-mode: t
column-number-mode: t
line-number-mode: t
Recent input:
<switch-frame> <switch-frame> <help-echo> <help-echo>
<help-echo> <help-echo> <help-echo> <help-echo> <help-echo>
<help-echo> <help-echo> <help-echo> <help-echo> <help-echo>
<help-echo> <help-echo> <help-echo> <help-echo> <help-echo>
<help-echo> <help-echo> <help-echo> <help-echo> <help-echo>
<help-echo> <help-echo> <help-echo> <help-echo> <help-echo>
<menu-bar> <help-menu> <emacs-news> C-x k <return>
M-x b u <tab> <backspace> <backspace> r e <tab> p <tab>
o <tab> o <backspace> r <tab> <return>
Recent messages:
Note: file is write protected
Loading outline...
Loading easy-mmode...done
Loading outline...done
Truncate long lines enabled
View mode: type C-h for help, h for commands, q to quit.
Making completion list...
Loading eieio-opt...done
Making completion list... [3 times]
Loading emacsbug...done
--
/\ ___
/___/\_|_|\_|__|___Gian Uberto Lauri_____
//--\| | \| | Integralista GNUslamico
\/ e coltivatore diretto di Software
/* Client process that communicates with GNU Emacs acting as server.
Copyright (C) 1986, 1987, 1994, 1999, 2000, 2001, 2002, 2003, 2004,
2005, 2006, 2007 Free Software Foundation, Inc.
This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */
#define NO_SHORTNAMES
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifdef WINDOWSNT
/* config.h defines these, which disables sockets altogether! */
# undef _WINSOCKAPI_
# undef _WINSOCK_H
# include <malloc.h>
# include <stdlib.h>
# include <windows.h>
# define NO_SOCKETS_IN_FILE_SYSTEM
# define HSOCKET SOCKET
# define CLOSE_SOCKET closesocket
# define INITIALIZE() (initialize_sockets ())
#else /* !WINDOWSNT */
# include <sys/types.h>
# ifdef HAVE_INET_SOCKETS
# include <netinet/in.h>
# endif
# define INVALID_SOCKET -1
# define HSOCKET int
# define CLOSE_SOCKET close
# define INITIALIZE()
#endif /* !WINDOWSNT */
#undef signal
#include <stdarg.h>
#include <ctype.h>
#include <stdio.h>
#include "getopt.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef VMS
# include "vms-pwd.h"
#else /* not VMS */
#ifdef WINDOWSNT
# include <io.h>
#else /* not WINDOWSNT */
# include <pwd.h>
#endif /* not WINDOWSNT */
#endif /* not VMS */
#include <sys/stat.h>
#include <signal.h>
#include <errno.h>
/* From lisp.h */
#ifndef DIRECTORY_SEP
#define DIRECTORY_SEP '/'
#endif
#ifndef IS_DIRECTORY_SEP
#define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP)
#endif
#ifndef IS_DEVICE_SEP
#ifndef DEVICE_SEP
#define IS_DEVICE_SEP(_c_) 0
#else
#define IS_DEVICE_SEP(_c_) ((_c_) == DEVICE_SEP)
#endif
#endif
#ifndef IS_ANY_SEP
#define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_))
#endif
char *getenv (), *getwd ();
char *(getcwd) ();
#ifndef VERSION
#define VERSION "unspecified"
#endif
#ifndef EXIT_SUCCESS
#define EXIT_SUCCESS 0
#endif
#ifndef EXIT_FAILURE
#define EXIT_FAILURE 1
#endif
#ifndef FALSE
#define FALSE 0
#endif
#ifndef TRUE
#define TRUE 1
#endif
#ifndef NO_RETURN
#define NO_RETURN
#endif
/* Name used to invoke this program. */
char *progname;
/* The first argument to main. */
int main_argc;
/* The second argument to main. */
char **main_argv;
/* Nonzero means don't wait for a response from Emacs. --no-wait. */
int nowait = 0;
/* Nonzero means args are expressions to be evaluated. --eval. */
int eval = 0;
/* Nonzero means don't open a new frame. --current-frame. */
int current_frame = 0;
/* Nonzero means open a new graphical frame. */
int window_system = 0;
/* The display on which Emacs should work. --display. */
char *display = NULL;
/* Nonzero means open a new Emacs frame on the current terminal. */
int tty = 0;
/* If non-NULL, the name of an editor to fallback to if the server
is not running. --alternate-editor. */
const char *alternate_editor = NULL;
/* If non-NULL, the filename of the UNIX socket. */
char *socket_name = NULL;
/* If non-NULL, the filename of the authentication file. */
char *server_file = NULL;
/* PID of the Emacs server process. */
int emacs_pid = 0;
/* nonzero means to create a frame even when eval is nonzero, zero
means do not create a new frame when eval is nonzero */
int force_new_frame = 0;
void print_help_and_exit () NO_RETURN;
struct option longopts[] =
{
{ "no-wait", no_argument, NULL, 'n' },
{ "eval", no_argument, NULL, 'e' },
{ "help", no_argument, NULL, 'H' },
{ "version", no_argument, NULL, 'V' },
{ "tty", no_argument, NULL, 't' },
{ "current-frame", no_argument, NULL, 'c' },
{ "alternate-editor", required_argument, NULL, 'a' },
#ifndef NO_SOCKETS_IN_FILE_SYSTEM
{ "socket-name", required_argument, NULL, 's' },
#endif
{ "server-file", required_argument, NULL, 'f' },
{ "display", required_argument, NULL, 'd' },
{ "force-new-frame", no_argument, NULL, 'F' },
{ 0, 0, 0, 0 }
};
/* Like malloc but get fatal error if memory is exhausted. */
long *
xmalloc (size)
unsigned int size;
{
long *result = (long *) malloc (size);
if (result == NULL)
{
perror ("malloc");
exit (EXIT_FAILURE);
}
return result;
}
/* Like strdup but get a fatal error if memory is exhausted. */
char *
xstrdup (const char *s)
{
char *result = strdup (s);
if (result == NULL)
{
perror ("strdup");
exit (EXIT_FAILURE);
}
return result;
}
/* From sysdep.c */
#if !defined (HAVE_GET_CURRENT_DIR_NAME) || defined
(BROKEN_GET_CURRENT_DIR_NAME)
/* Return the current working directory. Returns NULL on errors.
Any other returned value must be freed with free. This is used
only when get_current_dir_name is not defined on the system. */
char*
get_current_dir_name ()
{
char *buf;
char *pwd;
struct stat dotstat, pwdstat;
/* If PWD is accurate, use it instead of calling getwd. PWD is
sometimes a nicer name, and using it may avoid a fatal error if a
parent directory is searchable but not readable. */
if ((pwd = getenv ("PWD")) != 0
&& (IS_DIRECTORY_SEP (*pwd) || (*pwd && IS_DEVICE_SEP (pwd[1])))
&& stat (pwd, &pwdstat) == 0
&& stat (".", &dotstat) == 0
&& dotstat.st_ino == pwdstat.st_ino
&& dotstat.st_dev == pwdstat.st_dev
#ifdef MAXPATHLEN
&& strlen (pwd) < MAXPATHLEN
#endif
)
{
buf = (char *) xmalloc (strlen (pwd) + 1);
if (!buf)
return NULL;
strcpy (buf, pwd);
}
#ifdef HAVE_GETCWD
else
{
size_t buf_size = 1024;
buf = (char *) xmalloc (buf_size);
if (!buf)
return NULL;
for (;;)
{
if (getcwd (buf, buf_size) == buf)
break;
if (errno != ERANGE)
{
int tmp_errno = errno;
free (buf);
errno = tmp_errno;
return NULL;
}
buf_size *= 2;
buf = (char *) realloc (buf, buf_size);
if (!buf)
return NULL;
}
}
#else
else
{
/* We need MAXPATHLEN here. */
buf = (char *) xmalloc (MAXPATHLEN + 1);
if (!buf)
return NULL;
if (getwd (buf) == NULL)
{
int tmp_errno = errno;
free (buf);
errno = tmp_errno;
return NULL;
}
}
#endif
return buf;
}
#endif
/* Message functions. */
#ifdef WINDOWSNT
int
w32_window_app ()
{
static int window_app = -1;
char szTitle[MAX_PATH];
if (window_app < 0)
/* Checking for STDOUT does not work; it's a valid handle also in
nonconsole apps. Testing for the console title seems to work. */
window_app = (GetConsoleTitleA (szTitle, MAX_PATH) == 0);
return window_app;
}
/*
execvp wrapper for Windows. Quotes arguments with embedded spaces.
This is necessary due to the broken implementation of exec* routines in
the Microsoft libraries: they concatenate the arguments together without
quoting special characters, and pass the result to CreateProcess, with
predictably bad results. By contrast, Posix execvp passes the arguments
directly into the argv array of the child process.
*/
int
w32_execvp (path, argv)
char *path;
char **argv;
{
int i;
/* Required to allow a .BAT script as alternate editor. */
argv[0] = (char *) alternate_editor;
for (i = 0; argv[i]; i++)
if (strchr (argv[i], ' '))
{
char *quoted = alloca (strlen (argv[i]) + 3);
sprintf (quoted, "\"%s\"", argv[i]);
argv[i] = quoted;
}
return execvp (path, argv);
}
#undef execvp
#define execvp w32_execvp
#endif /* WINDOWSNT */
void
message (int is_error, char *message, ...)
{
char msg [2048];
va_list args;
va_start (args, message);
vsprintf (msg, message, args);
va_end (args);
#ifdef WINDOWSNT
if (w32_window_app ())
{
if (is_error)
MessageBox (NULL, msg, "Emacsclient ERROR", MB_ICONERROR);
else
MessageBox (NULL, msg, "Emacsclient", MB_ICONINFORMATION);
}
else
#endif
{
FILE *f = is_error ? stderr : stdout;
fputs (msg, f);
fflush (f);
}
}
/* Decode the options from argv and argc.
The global variable `optind' will say how many arguments we used up. */
void
decode_options (argc, argv)
int argc;
char **argv;
{
alternate_editor = getenv ("ALTERNATE_EDITOR");
display = getenv ("DISPLAY");
if (display && strlen (display) == 0)
display = NULL;
while (1)
{
int opt = getopt_long (argc, argv,
#ifndef NO_SOCKETS_IN_FILE_SYSTEM
"VHnea:s:f:d:tcF",
#else
"VHnea:f:d:tcF",
#endif
longopts, 0);
if (opt == EOF)
break;
switch (opt)
{
case 0:
/* If getopt returns 0, then it has already processed a
long-named option. We should do nothing. */
break;
case 'a':
alternate_editor = optarg;
break;
#ifndef NO_SOCKETS_IN_FILE_SYSTEM
case 's':
socket_name = optarg;
break;
#endif
case 'f':
server_file = optarg;
break;
case 'd':
display = optarg;
break;
case 'n':
nowait = 1;
break;
case 'e':
eval = 1;
break;
case 'V':
message (FALSE, "emacsclient %s\n", VERSION);
exit (EXIT_SUCCESS);
break;
case 't':
tty = 1;
break;
case 'c':
current_frame = 1;
break;
case 'H':
print_help_and_exit ();
break;
case 'F':
force_new_frame = 1;
break;
default:
message (TRUE, "Try `%s --help' for more information\n", progname);
exit (EXIT_FAILURE);
break;
}
}
if (!tty && display)
window_system = 1;
#if !defined (WINDOWSNT) && !defined (HAVE_CARBON)
else
tty = 1;
#endif
/* --no-wait implies --current-frame on ttys when there are file
arguments or expressions given. */
if (nowait && tty && argc - optind > 0)
current_frame = 1;
/* --eval implies --current frame on window systems unless the
--force-new-frame option is given. In this latter case --nowait
is implied */
if (eval && window_system)
{
if (force_new_frame)
{
nowait = 1;
current_frame = 0;
}
else
current_frame = 1;
}
if (current_frame)
{
tty = 0;
window_system = 0;
}
if (tty)
window_system = 0;
}
void
print_help_and_exit ()
{
/* Spaces and tabs are significant in this message; they're chosen so the
message aligns properly both in a tty and in a Windows message box.
Please try to preserve them; otherwise the output is very hard to read
when using emacsclientw. */
message (FALSE,
"Usage: %s [OPTIONS] FILE...\n\
Tell the Emacs server to visit the specified files.\n\
Every FILE can be either just a FILENAME or [+LINE[:COLUMN]] FILENAME.\n\
\n\
The following OPTIONS are accepted:\n\
-V, --version Just print version info and return\n\
-H, --help Print this usage information message\n\
-t, --tty Open a new Emacs frame on the current terminal\n\
-c, --current-frame Do not create a new frame;\n\
use the current Emacs frame\n\
-e, --eval Evaluate the FILE arguments as ELisp expressions\n\
-n, --no-wait Don't wait for the server to return\n\
-d, --display=DISPLAY Visit the file in the given display\n"
#ifndef NO_SOCKETS_IN_FILE_SYSTEM
"-s, --socket-name=FILENAME\n\
Set filename of the UNIX socket for communication\n"
#endif
"-f, --server-file=FILENAME\n\
Set filename of the TCP authentication file\n\
-a, --alternate-editor=EDITOR\n\
Editor to fallback to if the server is not running\n\
-F, --force-new-frame Create a new frame even with --eval option\n\
\n\
Report bugs to address@hidden", progname);
exit (EXIT_SUCCESS);
}
/*
Try to run a different command, or --if no alternate editor is
defined-- exit with an errorcode.
*/
void
fail (void)
{
if (alternate_editor)
{
int i = optind - 1;
execvp (alternate_editor, main_argv + i);
message (TRUE, "%s: error executing alternate editor \"%s\"\n",
progname, alternate_editor);
}
exit (EXIT_FAILURE);
}
#if !defined (HAVE_SOCKETS) || !defined (HAVE_INET_SOCKETS)
int
main (argc, argv)
int argc;
char **argv;
{
main_argc = argc;
main_argv = argv;
progname = argv[0];
message (TRUE, "%s: Sorry, the Emacs server is supported only\n"
"on systems with Berkeley sockets.\n",
argv[0]);
fail ();
}
#else /* HAVE_SOCKETS && HAVE_INET_SOCKETS */
#ifdef WINDOWSNT
# include <winsock2.h>
#else
# include <sys/types.h>
# include <sys/socket.h>
# include <sys/un.h>
#endif
#define AUTH_KEY_LENGTH 64
#define SEND_BUFFER_SIZE 4096
extern char *strerror ();
extern int errno;
/* Buffer to accumulate data to send in TCP connections. */
char send_buffer[SEND_BUFFER_SIZE + 1];
int sblen = 0; /* Fill pointer for the send buffer. */
/* Socket used to communicate with the Emacs server process. */
HSOCKET emacs_socket = 0;
/* Let's send the data to Emacs when either
- the data ends in "\n", or
- the buffer is full (but this shouldn't happen)
Otherwise, we just accumulate it. */
void
send_to_emacs (s, data)
HSOCKET s;
char *data;
{
while (data)
{
int dlen = strlen (data);
if (dlen + sblen >= SEND_BUFFER_SIZE)
{
int part = SEND_BUFFER_SIZE - sblen;
strncpy (&send_buffer[sblen], data, part);
data += part;
sblen = SEND_BUFFER_SIZE;
}
else if (dlen)
{
strcpy (&send_buffer[sblen], data);
data = NULL;
sblen += dlen;
}
else
break;
if (sblen == SEND_BUFFER_SIZE
|| (sblen > 0 && send_buffer[sblen-1] == '\n'))
{
int sent = send (s, send_buffer, sblen, 0);
if (sent != sblen)
strcpy (send_buffer, &send_buffer[sent]);
sblen -= sent;
}
}
}
/* In STR, insert a & before each &, each space, each newline, and
any initial -. Change spaces to underscores, too, so that the
return value never contains a space.
Does not change the string. Outputs the result to STREAM. */
void
quote_argument (s, str)
HSOCKET s;
char *str;
{
char *copy = (char *) xmalloc (strlen (str) * 2 + 1);
char *p, *q;
p = str;
q = copy;
while (*p)
{
if (*p == ' ')
{
*q++ = '&';
*q++ = '_';
p++;
}
else if (*p == '\n')
{
*q++ = '&';
*q++ = 'n';
p++;
}
else
{
if (*p == '&' || (*p == '-' && p == str))
*q++ = '&';
*q++ = *p++;
}
}
*q++ = 0;
send_to_emacs (s, copy);
free (copy);
}
/* The inverse of quote_argument. Removes quoting in string STR by
modifying the string in place. Returns STR. */
char *
unquote_argument (str)
char *str;
{
char *p, *q;
if (! str)
return str;
p = str;
q = str;
while (*p)
{
if (*p == '&')
{
p++;
if (*p == '&')
*p = '&';
else if (*p == '_')
*p = ' ';
else if (*p == 'n')
*p = '\n';
else if (*p == '-')
*p = '-';
}
*q++ = *p++;
}
*q = 0;
return str;
}
int
file_name_absolute_p (filename)
const unsigned char *filename;
{
/* Sanity check, it shouldn't happen. */
if (! filename) return FALSE;
/* /xxx is always an absolute path. */
if (filename[0] == '/') return TRUE;
/* Empty filenames (which shouldn't happen) are relative. */
if (filename[0] == '\0') return FALSE;
#ifdef WINDOWSNT
/* X:\xxx is always absolute. */
if (isalpha (filename[0])
&& filename[1] == ':' && (filename[2] == '\\' || filename[2] == '/'))
return TRUE;
/* Both \xxx and \\xxx\yyy are absolute. */
if (filename[0] == '\\') return TRUE;
/*
FIXME: There's a corner case not dealt with, "x:y", where:
1) x is a valid drive designation (usually a letter in the A-Z range)
and y is a path, relative to the current directory on drive x. This
is absolute, *after* fixing the y part to include the current
directory in x.
2) x is a relative file name, and y is an NTFS stream name. This is a
correct relative path, but it is very unusual.
The trouble is that first case items are also valid examples of the
second case, i.e., "c:test" can be understood as drive:path or as
file:stream.
The "right" fix would involve checking whether
- the current drive/partition is NTFS,
- x is a valid (and accesible) drive designator,
- x:y already exists as a file:stream in the current directory,
- y already exists on the current directory of drive x,
- the auspices are favorable,
and then taking an "informed decision" based on the above.
Whatever the result, Emacs currently does a very bad job of dealing
with NTFS file:streams: it cannot visit them, and the only way to
create one is by setting `buffer-file-name' to point to it (either
manually or with emacsclient). So perhaps resorting to 1) and ignoring
2) for now is the right thing to do.
Anyway, something to decide After the Release.
*/
#endif
return FALSE;
}
#ifdef WINDOWSNT
/* Wrapper to make WSACleanup a cdecl, as required by atexit. */
void
__cdecl close_winsock ()
{
WSACleanup ();
}
/* Initialize the WinSock2 library. */
void
initialize_sockets ()
{
WSADATA wsaData;
if (WSAStartup (MAKEWORD (2, 0), &wsaData))
{
message (TRUE, "%s: error initializing WinSock2", progname);
exit (EXIT_FAILURE);
}
atexit (close_winsock);
}
#endif /* WINDOWSNT */
/*
* Read the information needed to set up a TCP comm channel with
* the Emacs server: host, port, pid and authentication string.
*/
int
get_server_config (server, authentication)
struct sockaddr_in *server;
char *authentication;
{
char dotted[32];
char *port;
char *pid;
FILE *config = NULL;
if (file_name_absolute_p (server_file))
config = fopen (server_file, "rb");
else
{
char *home = getenv ("HOME");
if (home)
{
char *path = alloca (32 + strlen (home) + strlen (server_file));
sprintf (path, "%s/.emacs.d/server/%s", home, server_file);
config = fopen (path, "rb");
}
#ifdef WINDOWSNT
if (!config && (home = getenv ("APPDATA")))
{
char *path = alloca (32 + strlen (home) + strlen (server_file));
sprintf (path, "%s/.emacs.d/server/%s", home, server_file);
config = fopen (path, "rb");
}
#endif
}
if (! config)
return FALSE;
if (fgets (dotted, sizeof dotted, config)
&& (port = strchr (dotted, ':'))
&& (pid = strchr (port, ' ')))
{
*port++ = '\0';
*pid++ = '\0';
}
else
{
message (TRUE, "%s: invalid configuration info", progname);
exit (EXIT_FAILURE);
}
server->sin_family = AF_INET;
server->sin_addr.s_addr = inet_addr (dotted);
server->sin_port = htons (atoi (port));
if (! fread (authentication, AUTH_KEY_LENGTH, 1, config))
{
message (TRUE, "%s: cannot read authentication info", progname);
exit (EXIT_FAILURE);
}
fclose (config);
emacs_pid = atoi (pid);
return TRUE;
}
HSOCKET
set_tcp_socket ()
{
HSOCKET s;
struct sockaddr_in server;
struct linger l_arg = {1, 1};
char auth_string[AUTH_KEY_LENGTH + 1];
if (! get_server_config (&server, auth_string))
return INVALID_SOCKET;
if (server.sin_addr.s_addr != inet_addr ("127.0.0.1"))
message (FALSE, "%s: connected to remote socket at %s\n",
progname, inet_ntoa (server.sin_addr));
/*
* Open up an AF_INET socket
*/
if ((s = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
{
message (TRUE, "%s: socket: %s\n", progname, strerror (errno));
return INVALID_SOCKET;
}
/*
* Set up the socket
*/
if (connect (s, (struct sockaddr *) &server, sizeof server) < 0)
{
message (TRUE, "%s: connect: %s\n", progname, strerror (errno));
return INVALID_SOCKET;
}
setsockopt (s, SOL_SOCKET, SO_LINGER, (char *) &l_arg, sizeof l_arg);
/*
* Send the authentication
*/
auth_string[AUTH_KEY_LENGTH] = '\0';
send_to_emacs (s, "-auth ");
send_to_emacs (s, auth_string);
send_to_emacs (s, "\n");
return s;
}
/* Returns 1 if PREFIX is a prefix of STRING. */
static int
strprefix (char *prefix, char *string)
{
int i;
if (! prefix)
return 1;
if (!string)
return 0;
for (i = 0; prefix[i]; i++)
if (!string[i] || string[i] != prefix[i])
return 0;
return 1;
}
#if !defined (NO_SOCKETS_IN_FILE_SYSTEM)
/* Three possibilities:
2 - can't be `stat'ed (sets errno)
1 - isn't owned by us
0 - success: none of the above */
static int
socket_status (socket_name)
char *socket_name;
{
struct stat statbfr;
if (stat (socket_name, &statbfr) == -1)
return 2;
if (statbfr.st_uid != geteuid ())
return 1;
return 0;
}
/* A signal handler that passes the signal to the Emacs process.
Useful for SIGWINCH. */
SIGTYPE
pass_signal_to_emacs (int signalnum)
{
int old_errno = errno;
if (emacs_pid)
kill (emacs_pid, signalnum);
signal (signalnum, pass_signal_to_emacs);
errno = old_errno;
}
/* Signal handler for SIGCONT; notify the Emacs process that it can
now resume our tty frame. */
SIGTYPE
handle_sigcont (int signalnum)
{
int old_errno = errno;
if (tcgetpgrp (1) == getpgrp ())
{
/* We are in the foreground. */
send_to_emacs (emacs_socket, "-resume \n");
}
else
{
/* We are in the background; cancel the continue. */
kill (getpid (), SIGSTOP);
}
signal (signalnum, handle_sigcont);
errno = old_errno;
}
/* Signal handler for SIGTSTP; notify the Emacs process that we are
going to sleep. Normally the suspend is initiated by Emacs via
server-handle-suspend-tty, but if the server gets out of sync with
reality, we may get a SIGTSTP on C-z. Handling this signal and
notifying Emacs about it should get things under control again. */
SIGTYPE
handle_sigtstp (int signalnum)
{
int old_errno = errno;
sigset_t set;
if (emacs_socket)
send_to_emacs (emacs_socket, "-suspend \n");
/* Unblock this signal and call the default handler by temprarily
changing the handler and resignalling. */
sigprocmask (SIG_BLOCK, NULL, &set);
sigdelset (&set, signalnum);
signal (signalnum, SIG_DFL);
kill (getpid (), signalnum);
sigprocmask (SIG_SETMASK, &set, NULL); /* Let's the above signal through. */
signal (signalnum, handle_sigtstp);
errno = old_errno;
}
/* Set up signal handlers before opening a frame on the current tty. */
void
init_signals (void)
{
/* Set up signal handlers. */
signal (SIGWINCH, pass_signal_to_emacs);
/* Don't pass SIGINT and SIGQUIT to Emacs, because it has no way of
deciding which terminal the signal came from. C-g is now a
normal input event on secondary terminals. */
#if 0
signal (SIGINT, pass_signal_to_emacs);
signal (SIGQUIT, pass_signal_to_emacs);
#endif
signal (SIGCONT, handle_sigcont);
signal (SIGTSTP, handle_sigtstp);
signal (SIGTTOU, handle_sigtstp);
}
HSOCKET
set_local_socket ()
{
HSOCKET s;
struct sockaddr_un server;
/*
* Open up an AF_UNIX socket in this person's home directory
*/
if ((s = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
{
message (TRUE, "%s: socket: %s\n", progname, strerror (errno));
return INVALID_SOCKET;
}
server.sun_family = AF_UNIX;
{
int sock_status = 0;
int default_sock = !socket_name;
int saved_errno = 0;
char *server_name = "server";
if (socket_name && !index (socket_name, '/') && !index (socket_name, '\\'))
{ /* socket_name is a file name component. */
server_name = socket_name;
socket_name = NULL;
default_sock = 1; /* Try both UIDs. */
}
if (default_sock)
{
socket_name = alloca (100 + strlen (server_name));
sprintf (socket_name, "/tmp/emacs%d/%s",
(int) geteuid (), server_name);
}
if (strlen (socket_name) < sizeof (server.sun_path))
strcpy (server.sun_path, socket_name);
else
{
message (TRUE, "%s: socket-name %s too long",
progname, socket_name);
fail ();
}
/* See if the socket exists, and if it's owned by us. */
sock_status = socket_status (server.sun_path);
saved_errno = errno;
if (sock_status && default_sock)
{
/* Failing that, see if LOGNAME or USER exist and differ from
our euid. If so, look for a socket based on the UID
associated with the name. This is reminiscent of the logic
that init_editfns uses to set the global Vuser_full_name. */
char *user_name = (char *) getenv ("LOGNAME");
if (!user_name)
user_name = (char *) getenv ("USER");
if (user_name)
{
struct passwd *pw = getpwnam (user_name);
if (pw && (pw->pw_uid != geteuid ()))
{
/* We're running under su, apparently. */
socket_name = alloca (100 + strlen (server_name));
sprintf (socket_name, "/tmp/emacs%d/%s",
(int) pw->pw_uid, server_name);
if (strlen (socket_name) < sizeof (server.sun_path))
strcpy (server.sun_path, socket_name);
else
{
message (TRUE, "%s: socket-name %s too long",
progname, socket_name);
exit (EXIT_FAILURE);
}
sock_status = socket_status (server.sun_path);
saved_errno = errno;
}
else
errno = saved_errno;
}
}
switch (sock_status)
{
case 1:
/* There's a socket, but it isn't owned by us. This is OK if
we are root. */
if (0 != geteuid ())
{
message (TRUE, "%s: Invalid socket owner\n", progname);
return INVALID_SOCKET;
}
break;
case 2:
/* `stat' failed */
if (saved_errno == ENOENT)
message (TRUE,
"%s: can't find socket; have you started the server?\n\
To start the server in Emacs, type \"M-x server-start\".\n",
progname);
else
message (TRUE, "%s: can't stat %s: %s\n",
progname, server.sun_path, strerror (saved_errno));
return INVALID_SOCKET;
}
}
if (connect (s, (struct sockaddr *) &server, strlen (server.sun_path) + 2)
< 0)
{
message (TRUE, "%s: connect: %s\n", progname, strerror (errno));
return INVALID_SOCKET;
}
return s;
}
#endif /* ! NO_SOCKETS_IN_FILE_SYSTEM */
HSOCKET
set_socket ()
{
HSOCKET s;
INITIALIZE ();
#ifndef NO_SOCKETS_IN_FILE_SYSTEM
/* Explicit --socket-name argument. */
if (socket_name)
{
s = set_local_socket ();
if ((s != INVALID_SOCKET) || alternate_editor)
return s;
message (TRUE, "%s: error accessing socket \"%s\"",
progname, socket_name);
exit (EXIT_FAILURE);
}
#endif
/* Explicit --server-file arg or EMACS_SERVER_FILE variable. */
if (!server_file)
server_file = getenv ("EMACS_SERVER_FILE");
if (server_file)
{
s = set_tcp_socket ();
if ((s != INVALID_SOCKET) || alternate_editor)
return s;
message (TRUE, "%s: error accessing server file \"%s\"",
progname, server_file);
exit (EXIT_FAILURE);
}
#ifndef NO_SOCKETS_IN_FILE_SYSTEM
/* Implicit local socket. */
s = set_local_socket ();
if (s != INVALID_SOCKET)
return s;
#endif
/* Implicit server file. */
server_file = "server";
s = set_tcp_socket ();
if ((s != INVALID_SOCKET) || alternate_editor)
return s;
/* No implicit or explicit socket, and no alternate editor. */
message (TRUE, "%s: No socket or alternate editor. Please use:\n\n"
#ifndef NO_SOCKETS_IN_FILE_SYSTEM
"\t--socket-name\n"
#endif
"\t--server-file (or environment variable EMACS_SERVER_FILE)\n\
\t--alternate-editor (or environment variable ALTERNATE_EDITOR)\n",
progname);
exit (EXIT_FAILURE);
}
#ifdef WINDOWSNT
FARPROC set_fg; /* Pointer to AllowSetForegroundWindow. */
FARPROC get_wc; /* Pointer to RealGetWindowClassA. */
BOOL CALLBACK
w32_find_emacs_process (hWnd, lParam)
HWND hWnd;
LPARAM lParam;
{
DWORD pid;
char class[6];
/* Reject any window not of class "Emacs". */
if (! get_wc (hWnd, class, sizeof (class))
|| strcmp (class, "Emacs"))
return TRUE;
/* We only need the process id, not the thread id. */
(void) GetWindowThreadProcessId (hWnd, &pid);
/* Not the one we're looking for. */
if (pid != (DWORD) emacs_pid) return TRUE;
/* OK, let's raise it. */
set_fg (emacs_pid);
/* Stop enumeration. */
return FALSE;
}
/*
* Search for a window of class "Emacs" and owned by a process with
* process id = emacs_pid. If found, allow it to grab the focus.
*/
void
w32_give_focus ()
{
HMODULE hUser32;
/* It shouldn't happen when dealing with TCP sockets. */
if (!emacs_pid) return;
if (!(hUser32 = LoadLibrary ("user32.dll"))) return;
/* Modern Windows restrict which processes can set the foreground window.
emacsclient can allow Emacs to grab the focus by calling the function
AllowSetForegroundWindow. Unfortunately, older Windows (W95, W98 and
NT) lack this function, so we have to check its availability. */
if ((set_fg = GetProcAddress (hUser32, "AllowSetForegroundWindow"))
&& (get_wc = GetProcAddress (hUser32, "RealGetWindowClassA")))
EnumWindows (w32_find_emacs_process, (LPARAM) 0);
FreeLibrary (hUser32);
}
#endif
int
main (argc, argv)
int argc;
char **argv;
{
int i, rl, needlf = 0;
char *cwd, *str;
char string[BUFSIZ+1];
main_argc = argc;
main_argv = argv;
progname = argv[0];
/* Process options. */
decode_options (argc, argv);
if ((argc - optind < 1) && !eval && !tty && !window_system)
{
message (TRUE, "%s: file name or argument required\n"
"Try `%s --help' for more information\n",
progname, progname);
exit (EXIT_FAILURE);
}
if ((emacs_socket = set_socket ()) == INVALID_SOCKET)
fail ();
cwd = get_current_dir_name ();
if (cwd == 0)
{
/* getwd puts message in STRING if it fails. */
message (TRUE, "%s: %s\n", progname,
"Cannot get current working directory");
fail ();
}
#ifdef WINDOWSNT
w32_give_focus ();
#endif
/* First of all, send our version number for verification. */
send_to_emacs (emacs_socket, "-version ");
send_to_emacs (emacs_socket, VERSION);
send_to_emacs (emacs_socket, " ");
/* Send over our environment. */
if (!current_frame)
{
extern char **environ;
int i;
for (i = 0; environ[i]; i++)
{
char *name = xstrdup (environ[i]);
char *value = strchr (name, '=');
send_to_emacs (emacs_socket, "-env ");
quote_argument (emacs_socket, environ[i]);
send_to_emacs (emacs_socket, " ");
}
}
/* Send over our current directory. */
if (!current_frame)
{
send_to_emacs (emacs_socket, "-dir ");
quote_argument (emacs_socket, cwd);
send_to_emacs (emacs_socket, "/");
send_to_emacs (emacs_socket, " ");
}
retry:
if (nowait)
send_to_emacs (emacs_socket, "-nowait ");
if (current_frame)
send_to_emacs (emacs_socket, "-current-frame ");
if (display)
{
send_to_emacs (emacs_socket, "-display ");
quote_argument (emacs_socket, display);
send_to_emacs (emacs_socket, " ");
}
if (tty)
{
char *type = getenv ("TERM");
char *tty_name = NULL;
#ifndef WINDOWSNT
tty_name = ttyname (fileno (stdin));
#endif
if (! tty_name)
{
message (TRUE, "%s: could not get terminal name\n", progname);
fail ();
}
if (! type)
{
message (TRUE, "%s: please set the TERM variable to your terminal
type\n",
progname);
fail ();
}
if (! strcmp (type, "eterm"))
{
/* This causes nasty, MULTI_KBOARD-related input lockouts. */
message (TRUE, "%s: opening a frame in an Emacs term buffer"
" is not supported\n", progname);
fail ();
}
#if !defined (NO_SOCKETS_IN_FILE_SYSTEM)
init_signals ();
#endif
send_to_emacs (emacs_socket, "-tty ");
quote_argument (emacs_socket, tty_name);
send_to_emacs (emacs_socket, " ");
quote_argument (emacs_socket, type);
send_to_emacs (emacs_socket, " ");
}
if (window_system)
send_to_emacs (emacs_socket, "-window-system ");
if ((argc - optind > 0))
{
for (i = optind; i < argc; i++)
{
int relative = 0;
if (eval)
{
/* Don't prepend cwd or anything like that. */
send_to_emacs (emacs_socket, "-eval ");
quote_argument (emacs_socket, argv[i]);
send_to_emacs (emacs_socket, " ");
continue;
}
if (*argv[i] == '+')
{
char *p = argv[i] + 1;
while (isdigit ((unsigned char) *p) || *p == ':') p++;
if (*p == 0)
{
send_to_emacs (emacs_socket, "-position ");
quote_argument (emacs_socket, argv[i]);
send_to_emacs (emacs_socket, " ");
continue;
}
else
relative = 1;
}
else if (! file_name_absolute_p (argv[i]))
relative = 1;
send_to_emacs (emacs_socket, "-file ");
if (relative)
{
quote_argument (emacs_socket, cwd);
send_to_emacs (emacs_socket, "/");
}
quote_argument (emacs_socket, argv[i]);
send_to_emacs (emacs_socket, " ");
}
}
else
{
if (!tty && !window_system)
{
while ((str = fgets (string, BUFSIZ, stdin)))
{
if (eval)
send_to_emacs (emacs_socket, "-eval ");
else
send_to_emacs (emacs_socket, "-file ");
quote_argument (emacs_socket, str);
}
send_to_emacs (emacs_socket, " ");
}
}
send_to_emacs (emacs_socket, "\n");
/* Wait for an answer. */
if (!eval && !tty && !nowait)
{
printf ("Waiting for Emacs...");
needlf = 2;
}
fflush (stdout);
fsync (1);
/* Now, wait for an answer and print any messages. */
while ((rl = recv (emacs_socket, string, BUFSIZ, 0)) > 0)
{
char *p;
string[rl] = '\0';
p = string + strlen (string) - 1;
while (p > string && *p == '\n')
*p-- = 0;
if (strprefix ("-good-version ", string))
{
/* -good-version: The versions match. */
}
else if (strprefix ("-emacs-pid ", string))
{
/* -emacs-pid PID: The process id of the Emacs process. */
emacs_pid = strtol (string + strlen ("-emacs-pid"), NULL, 10);
}
else if (strprefix ("-window-system-unsupported ", string))
{
/* -window-system-unsupported: Emacs was compiled without X
support. Try again on the terminal. */
window_system = 0;
nowait = 0;
tty = 1;
goto retry;
}
else if (strprefix ("-print ", string))
{
/* -print STRING: Print STRING on the terminal. */
str = unquote_argument (string + strlen ("-print "));
if (needlf)
printf ("\n");
printf ("%s", str);
needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n';
}
else if (strprefix ("-error ", string))
{
/* -error DESCRIPTION: Signal an error on the terminal. */
str = unquote_argument (string + strlen ("-error "));
if (needlf)
printf ("\n");
fprintf (stderr, "*ERROR*: %s", str);
needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n';
}
#ifndef WINDOWSNT
else if (strprefix ("-suspend ", string))
{
/* -suspend: Suspend this terminal, i.e., stop the process. */
if (needlf)
printf ("\n");
needlf = 0;
kill (0, SIGSTOP);
}
#endif
else
{
/* Unknown command. */
if (needlf)
printf ("\n");
printf ("*ERROR*: Unknown message: %s", string);
needlf = string[0] == '\0' ? needlf : string[strlen (string) - 1] !=
'\n';
}
}
if (needlf)
printf ("\n");
fflush (stdout);
fsync (1);
CLOSE_SOCKET (emacs_socket);
return EXIT_SUCCESS;
}
#endif /* HAVE_SOCKETS && HAVE_INET_SOCKETS */
#ifndef HAVE_STRERROR
char *
strerror (errnum)
int errnum;
{
extern char *sys_errlist[];
extern int sys_nerr;
if (errnum >= 0 && errnum < sys_nerr)
return sys_errlist[errnum];
return (char *) "Unknown error";
}
#endif /* ! HAVE_STRERROR */
/* arch-tag: f39bb9c4-73eb-477e-896d-50832e2ca9a7
(do not change this comment) */
/* emacsclient.c ends here */
emacsclient.1
Description: Binary data
- 23.0.50; emacsclient --eval new behaviour,
Gian Uberto Lauri <=