From 355a326e54a2b1e3982a93f26ec0146fa0816774 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 9 Jan 2008 04:36:57 +0000 Subject: Daniel Hackney (tiny change) (set_socket): Add trailing newline to socket error message. --- lib-src/emacsclient.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib-src') diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 9de812d1c73..ddb4ad10a2c 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -1266,7 +1266,7 @@ set_socket () s = set_local_socket (); if ((s != INVALID_SOCKET) || alternate_editor) return s; - message (TRUE, "%s: error accessing socket \"%s\"", + message (TRUE, "%s: error accessing socket \"%s\"\n", progname, socket_name); exit (EXIT_FAILURE); } -- cgit v1.2.1 From 78da39c6e7c532cc847367187c3c87ad92b25ef7 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 9 Jan 2008 04:40:14 +0000 Subject: Add missing final newlines to message calls. --- lib-src/ChangeLog | 8 ++++++++ lib-src/emacsclient.c | 12 ++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 8cdce18bd87..16cca0959b3 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,11 @@ +2008-01-09 Glenn Morris + + * emacsclient.c: Add missing final newlines to message calls. + +2008-01-09 Daniel Hackney (tiny change) + + * emacsclient.c (set_socket): Add final newline to socket error message. + 2008-01-04 Glenn Morris * ebrowse.c (version) : New variable. diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index ddb4ad10a2c..4fcd3398bd2 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -882,7 +882,7 @@ initialize_sockets () if (WSAStartup (MAKEWORD (2, 0), &wsaData)) { - message (TRUE, "%s: error initializing WinSock2", progname); + message (TRUE, "%s: error initializing WinSock2\n", progname); exit (EXIT_FAILURE); } @@ -939,7 +939,7 @@ get_server_config (server, authentication) } else { - message (TRUE, "%s: invalid configuration info", progname); + message (TRUE, "%s: invalid configuration info\n", progname); exit (EXIT_FAILURE); } @@ -949,7 +949,7 @@ get_server_config (server, authentication) if (! fread (authentication, AUTH_KEY_LENGTH, 1, config)) { - message (TRUE, "%s: cannot read authentication info", progname); + message (TRUE, "%s: cannot read authentication info\n", progname); exit (EXIT_FAILURE); } @@ -1167,7 +1167,7 @@ set_local_socket () strcpy (server.sun_path, socket_name); else { - message (TRUE, "%s: socket-name %s too long", + message (TRUE, "%s: socket-name %s too long\n", progname, socket_name); fail (); } @@ -1202,7 +1202,7 @@ set_local_socket () strcpy (server.sun_path, socket_name); else { - message (TRUE, "%s: socket-name %s too long", + message (TRUE, "%s: socket-name %s too long\n", progname, socket_name); exit (EXIT_FAILURE); } @@ -1282,7 +1282,7 @@ set_socket () if ((s != INVALID_SOCKET) || alternate_editor) return s; - message (TRUE, "%s: error accessing server file \"%s\"", + message (TRUE, "%s: error accessing server file \"%s\"\n", progname, server_file); exit (EXIT_FAILURE); } -- cgit v1.2.1 From 6eae3ad4eeb2cee3276091c9ef88f1f5f1882ae6 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Thu, 10 Jan 2008 15:31:25 +0000 Subject: * pop.c (pop_stat, pop_last): Check validity of string-to-integer conversion. Mistakes spotted by Nico Golde. --- lib-src/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 16cca0959b3..c7c6d3076cc 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2008-01-10 Chong Yidong + + * pop.c (pop_stat, pop_last): Check validity of string-to-integer + conversion. Mistakes spotted by Nico Golde. + 2008-01-09 Glenn Morris * emacsclient.c: Add missing final newlines to message calls. -- cgit v1.2.1 From 0b074993158942d393feebc2c237bfe6df1da31e Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Thu, 10 Jan 2008 15:33:52 +0000 Subject: (pop_stat, pop_last): Check validity of string-to-integer conversion. Mistakes spotted by Nico Golde. --- lib-src/pop.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) (limited to 'lib-src') diff --git a/lib-src/pop.c b/lib-src/pop.c index 61c90abe2bf..814575f06d5 100644 --- a/lib-src/pop.c +++ b/lib-src/pop.c @@ -352,6 +352,7 @@ pop_stat (server, count, size) int *size; { char *fromserver; + char *end_ptr; if (server->in_multi) { @@ -377,7 +378,15 @@ pop_stat (server, count, size) return (-1); } - *count = atoi (&fromserver[4]); + errno = 0; + *count = strtol (&fromserver[4], &end_ptr, 10); + /* Check validity of string-to-integer conversion. */ + if (fromserver[4] == 0 || *end_ptr != 0 || errno) + { + strcpy (pop_error, "Unexpected response from POP server in pop_stat"); + pop_trash (server); + return (-1); + } fromserver = index (&fromserver[4], ' '); if (! fromserver) @@ -388,7 +397,14 @@ pop_stat (server, count, size) return (-1); } - *size = atoi (fromserver + 1); + errno = 0; + *size = strtol (fromserver + 1, &end_ptr, 10); + if (*(fromserver + 1) == 0 || *end_ptr != 0 || errno) + { + strcpy (pop_error, "Unexpected response from POP server in pop_stat"); + pop_trash (server); + return (-1); + } return (0); } @@ -913,7 +929,17 @@ pop_last (server) } else { - return (atoi (&fromserver[4])); + char *end_ptr; + int count; + errno = 0; + count = strtol (&fromserver[4], &end_ptr, 10); + if (fromserver[4] == 0 || *end_ptr != 0 || errno) + { + strcpy (pop_error, "Unexpected response from server in pop_last"); + pop_trash (server); + return (-1); + } + return count; } } -- cgit v1.2.1 From 0ebec7d35c363197865d0d4ba7fdfb9eda221b3b Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 12 Jan 2008 15:50:33 +0000 Subject: (decode_options) [WINDOWSNT]: Don't use the value of DISPLAY in the environment. Don't support -d. (print_help_and_exit) [WINDOWSNT]: Don't show the --display option. (longopts) [WINDOWSNT]: Remove --display. --- lib-src/ChangeLog | 7 +++++++ lib-src/emacsclient.c | 12 ++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index c7c6d3076cc..07d73545468 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,10 @@ +2008-01-12 Eli Zaretskii + + * emacsclient.c (decode_options) [WINDOWSNT]: Don't use the value + of DISPLAY in the environment. Don't support -d. + (print_help_and_exit) [WINDOWSNT]: Don't show the --display option. + (longopts) [WINDOWSNT]: Remove --display. + 2008-01-10 Chong Yidong * pop.c (pop_stat, pop_last): Check validity of string-to-integer diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 4fcd3398bd2..568b6c18119 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -170,7 +170,9 @@ struct option longopts[] = { "socket-name", required_argument, NULL, 's' }, #endif { "server-file", required_argument, NULL, 'f' }, +#ifndef WINDOWSNT { "display", required_argument, NULL, 'd' }, +#endif { 0, 0, 0, 0 } }; @@ -477,9 +479,11 @@ decode_options (argc, argv) char **argv; { alternate_editor = egetenv ("ALTERNATE_EDITOR"); +#ifndef WINDOWSNT display = egetenv ("DISPLAY"); if (display && strlen (display) == 0) display = NULL; +#endif while (1) { @@ -515,9 +519,11 @@ decode_options (argc, argv) server_file = optarg; break; +#ifndef WINDOWSNT case 'd': display = optarg; break; +#endif case 'n': nowait = 1; @@ -594,8 +600,10 @@ The following OPTIONS are accepted:\n\ -c, --create-frame Create a new frame instead of trying to\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" +-n, --no-wait Don't wait for the server to return\n" +#ifndef WINDOWSNT +"-d, --display=DISPLAY Visit the file in the given display\n" +#endif #ifndef NO_SOCKETS_IN_FILE_SYSTEM "-s, --socket-name=FILENAME\n\ Set filename of the UNIX socket for communication\n" -- cgit v1.2.1 From e39a993cce3b5d82cb997e34200a5395c315e3a6 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Sun, 13 Jan 2008 00:43:55 +0000 Subject: * movemail.c: * make-docfile.c: Remove reference to symbols defined by systems not supported anymore: MAC_OS8, XENIX and STRIDE. * (src/m/mips.h): * (src/m/intel386.h): * callproc.c: * config.in: * ecrt0.c: * emacs.c: * fileio.c: * frame.c: * getpagesize.h: * keyboard.c: * lread.c: * process.c: * puresize.h: * sysdep.c: * systty.h: * syswait.h: * unexec.c: * xdisp.c: * alloc.c: Remove code containing references to symbols defined by unsupported systems. --- lib-src/ChangeLog | 6 ++++++ lib-src/make-docfile.c | 4 ---- lib-src/movemail.c | 6 ------ 3 files changed, 6 insertions(+), 10 deletions(-) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 07d73545468..bb28500d68d 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,9 @@ +2008-01-13 Dan Nicolaescu + + * movemail.c: + * make-docfile.c: Remove reference to symbols defined by systems + not supported anymore: MAC_OS8, XENIX and STRIDE. + 2008-01-12 Eli Zaretskii * emacsclient.c (decode_options) [WINDOWSNT]: Don't use the value diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c index 1564aca5bbe..6e22eb857e3 100644 --- a/lib-src/make-docfile.c +++ b/lib-src/make-docfile.c @@ -62,11 +62,7 @@ Boston, MA 02110-1301, USA. */ #endif /* not DOS_NT */ #ifndef DIRECTORY_SEP -#ifdef MAC_OS8 -#define DIRECTORY_SEP ':' -#else /* not MAC_OS8 */ #define DIRECTORY_SEP '/' -#endif /* not MAC_OS8 */ #endif #ifndef IS_DIRECTORY_SEP diff --git a/lib-src/movemail.c b/lib-src/movemail.c index 7c647676ff5..daf8c6166e6 100644 --- a/lib-src/movemail.c +++ b/lib-src/movemail.c @@ -503,13 +503,7 @@ main (argc, argv) #ifdef MAIL_USE_SYSTEM_LOCK if (! preserve_mail) { -#if defined (STRIDE) || defined (XENIX) - /* Stride, xenix have file locking, but no ftruncate. - This mess will do. */ - close (open (inname, O_CREAT | O_TRUNC | O_RDWR, 0666)); -#else ftruncate (indesc, 0L); -#endif /* STRIDE or XENIX */ } #endif /* MAIL_USE_SYSTEM_LOCK */ -- cgit v1.2.1 From 76ed5e0157c14cf9fcd075db08296bd692a43fc7 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Fri, 18 Jan 2008 15:15:07 +0000 Subject: * movemail.c: Remove references to XENIX. * m/intel386.h: Remove references to XENIX. --- lib-src/ChangeLog | 4 ++++ lib-src/movemail.c | 10 +++------- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index bb28500d68d..c0d0bbbf41b 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2008-01-18 Dan Nicolaescu + + * movemail.c: Remove references to XENIX. + 2008-01-13 Dan Nicolaescu * movemail.c: diff --git a/lib-src/movemail.c b/lib-src/movemail.c index daf8c6166e6..1f95735878d 100644 --- a/lib-src/movemail.c +++ b/lib-src/movemail.c @@ -113,7 +113,7 @@ Boston, MA 02110-1301, USA. */ #define R_OK 4 #endif -#if defined (XENIX) || defined (WINDOWSNT) +#ifdef WINDOWSNT #include #endif @@ -388,13 +388,13 @@ main (argc, argv) if (indesc < 0) pfatal_with_name (inname); -#if defined (BSD_SYSTEM) || defined (XENIX) +#ifdef BSD_SYSTEM /* In case movemail is setuid to root, make sure the user can read the output file. */ /* This is desirable for all systems but I don't want to assume all have the umask system call */ umask (umask (0) & 0333); -#endif /* BSD_SYSTEM || XENIX */ +#endif /* BSD_SYSTEM */ outdesc = open (outname, O_WRONLY | O_CREAT | O_EXCL, 0666); if (outdesc < 0) pfatal_with_name (outname); @@ -422,15 +422,11 @@ main (argc, argv) #ifdef MAIL_USE_LOCKF status = lockf (indesc, F_LOCK, 0); #else /* not MAIL_USE_LOCKF */ -#ifdef XENIX - status = locking (indesc, LK_RLCK, 0L); -#else #ifdef WINDOWSNT status = locking (indesc, LK_RLCK, -1L); #else status = flock (indesc, LOCK_EX); #endif -#endif #endif /* not MAIL_USE_LOCKF */ #endif /* MAIL_USE_SYSTEM_LOCK */ } -- cgit v1.2.1 From 702123a8235c5590d9b16365d6131b9bcc1f54a4 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Tue, 22 Jan 2008 15:38:40 +0000 Subject: * pop.c (pop_stat, pop_last): Fix last fix. --- lib-src/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index c0d0bbbf41b..05d8af126bb 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2008-01-22 Chong Yidong + + * pop.c (pop_stat, pop_last): Fix last fix. + 2008-01-18 Dan Nicolaescu * movemail.c: Remove references to XENIX. -- cgit v1.2.1 From 59a431d6ee62d1d30a737eeb0927ab00c7c5ff4b Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Tue, 22 Jan 2008 15:38:49 +0000 Subject: (pop_stat, pop_last): Fix last fix. --- lib-src/pop.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'lib-src') diff --git a/lib-src/pop.c b/lib-src/pop.c index 814575f06d5..f15a3fb23b6 100644 --- a/lib-src/pop.c +++ b/lib-src/pop.c @@ -381,25 +381,18 @@ pop_stat (server, count, size) errno = 0; *count = strtol (&fromserver[4], &end_ptr, 10); /* Check validity of string-to-integer conversion. */ - if (fromserver[4] == 0 || *end_ptr != 0 || errno) + if (fromserver + 4 == end_ptr || *end_ptr != ' ' || errno) { strcpy (pop_error, "Unexpected response from POP server in pop_stat"); pop_trash (server); return (-1); } - fromserver = index (&fromserver[4], ' '); - if (! fromserver) - { - strcpy (pop_error, - "Badly formatted response from server in pop_stat"); - pop_trash (server); - return (-1); - } + fromserver = end_ptr; errno = 0; *size = strtol (fromserver + 1, &end_ptr, 10); - if (*(fromserver + 1) == 0 || *end_ptr != 0 || errno) + if (fromserver + 1 == end_ptr || errno) { strcpy (pop_error, "Unexpected response from POP server in pop_stat"); pop_trash (server); @@ -933,7 +926,7 @@ pop_last (server) int count; errno = 0; count = strtol (&fromserver[4], &end_ptr, 10); - if (fromserver[4] == 0 || *end_ptr != 0 || errno) + if (fromserver + 4 == end_ptr || errno) { strcpy (pop_error, "Unexpected response from server in pop_last"); pop_trash (server); -- cgit v1.2.1 From 5ab73228619adb09dea84e4abf01a11cf5a6f024 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Fri, 25 Jan 2008 15:46:07 +0000 Subject: (set_tcp_socket): Don't send a "\n" after the authentication string; there's no need to haste. --- lib-src/ChangeLog | 5 +++++ lib-src/emacsclient.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 05d8af126bb..c1fb7e9293f 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2008-01-25 Juanma Barranquero + + * emacsclient.c (set_tcp_socket): Don't send "\n" after + the authentication string; there's no need to haste. + 2008-01-22 Chong Yidong * pop.c (pop_stat, pop_last): Fix last fix. diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 568b6c18119..b8ab19721ff 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -229,7 +229,7 @@ xstrdup (const char *s) /* Return the current working directory. Returns NULL on errors. - Any other returned value must be freed with free. This is used + 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 () @@ -1010,7 +1010,7 @@ set_tcp_socket () send_to_emacs (s, "-auth "); send_to_emacs (s, auth_string); - send_to_emacs (s, "\n"); + send_to_emacs (s, " "); return s; } @@ -1100,7 +1100,7 @@ handle_sigtstp (int signalnum) if (emacs_socket) send_to_emacs (emacs_socket, "-suspend \n"); - /* Unblock this signal and call the default handler by temprarily + /* Unblock this signal and call the default handler by temporarily changing the handler and resignalling. */ sigprocmask (SIG_BLOCK, NULL, &set); sigdelset (&set, signalnum); -- cgit v1.2.1 From 34a14ec974bca41fbc7a19d7365cfce000b79302 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Fri, 25 Jan 2008 15:52:08 +0000 Subject: *** empty log message *** --- lib-src/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index c1fb7e9293f..7409d136527 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -33,7 +33,7 @@ * emacsclient.c: Add missing final newlines to message calls. -2008-01-09 Daniel Hackney (tiny change) +2008-01-09 Daniel Hackney (tiny change) * emacsclient.c (set_socket): Add final newline to socket error message. -- cgit v1.2.1 From 0ea5797a183e5aaeb3be19ff8a95de0d28acd1c9 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sat, 26 Jan 2008 21:27:38 +0000 Subject: (decode_options): Default to a NULL display, as Emacs-22. Allow the -d option under w32 again, for those rare cases where it actually does make sense. --- lib-src/ChangeLog | 6 ++++++ lib-src/emacsclient.c | 19 +++++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 7409d136527..9ebfbc29ecd 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,9 @@ +2008-01-26 Stefan Monnier + + * emacsclient.c (decode_options): Default to a NULL display, as Emacs-22. + Allow the -d option under w32 again, for those rare cases where it + actually does make sense. + 2008-01-25 Juanma Barranquero * emacsclient.c (set_tcp_socket): Don't send "\n" after diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index b8ab19721ff..707be43b5f7 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -479,10 +479,14 @@ decode_options (argc, argv) char **argv; { alternate_editor = egetenv ("ALTERNATE_EDITOR"); -#ifndef WINDOWSNT + + /* We used to set `display' to $DISPLAY by default, but this changed the + default behavior and is sometimes inconvenient. So instead of forcing + users to say "--display ''" when they want to use Emacs's existing tty + or display connection, we force them to use "--display $DISPLAY" if + they want Emacs to connect to their current display. */ +#if 0 display = egetenv ("DISPLAY"); - if (display && strlen (display) == 0) - display = NULL; #endif while (1) @@ -519,7 +523,11 @@ decode_options (argc, argv) server_file = optarg; break; -#ifndef WINDOWSNT + /* We used to disallow this argument in w32, but it seems better + to allow it, for the occasional case where the user is + connecting with a w32 client to a server compiled with X11 + support. */ +#if 1 /* !defined WINDOWS */ case 'd': display = optarg; break; @@ -558,6 +566,9 @@ decode_options (argc, argv) } } + if (display && strlen (display) == 0) + display = NULL; + if (!tty && display) window_system = 1; #if !defined (WINDOWSNT) && !defined (HAVE_CARBON) -- cgit v1.2.1