mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

emacsclient.c: file name component fixes

Browse source 
* lib-src/emacsclient.c: Include <dosname.h>.
(file_name_absolute_p): Remove, as a code duplicate.
All uses replaced by IS_ABSOLUTE_FILE_NAME.
(set_local_socket): Don’t treat \ as a file name separator
on GNU and POSIX hosts.
This commit is contained in:
Paul Eggert 2018-11-19 11:36:50 -08:00
parent 736f1b364f
commit 0e3b245862
1 changed files with 6 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

35
lib-src/emacsclient.c
View file

@ -81,6 +81,7 @@ char *w32_getenv (const char *);
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
#include <dosname.h>
#include <min-max.h> #include <min-max.h>
#include <unlocked-io.h> #include <unlocked-io.h>
@ -888,31 +889,6 @@ unquote_argument (char *str)
} }
static bool
file_name_absolute_p (const 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 ((unsigned char) filename[0])
&& filename[1] == ':' && (filename[2] == '\\' || filename[2] == '/'))
return true;
/* Both \xxx and \\xxx\yyy are absolute. */
if (filename[0] == '\\') return true;
# endif
return false;
}
# ifdef WINDOWSNT # ifdef WINDOWSNT
/* Wrapper to make WSACleanup a cdecl, as required by atexit. */ /* Wrapper to make WSACleanup a cdecl, as required by atexit. */
void __cdecl close_winsock (void); void __cdecl close_winsock (void);
@ -951,7 +927,7 @@ get_server_config (const char *config_file, struct sockaddr_in *server,
char *port; char *port;
FILE *config = NULL; FILE *config = NULL;
if (file_name_absolute_p (config_file)) if (IS_ABSOLUTE_FILE_NAME (config_file))
config = fopen (config_file, "rb"); config = fopen (config_file, "rb");
else else
{ {
@ -1241,7 +1217,8 @@ set_local_socket (const char *local_socket_name)
char *tmpdir_storage = NULL; char *tmpdir_storage = NULL;
char *socket_name_storage = NULL; char *socket_name_storage = NULL;
if (!strchr (local_socket_name, '/') && !strchr (local_socket_name, '\\')) if (! (strchr (local_socket_name, '/')
|| (ISSLASH ('\\') && strchr (local_socket_name, '\\'))))
{ {
/* socket_name is a file name component. */ /* socket_name is a file name component. */
long uid = geteuid (); long uid = geteuid ();
@ -1809,7 +1786,7 @@ main (int argc, char **argv)
} }
} }
# ifdef WINDOWSNT # ifdef WINDOWSNT
else if (! file_name_absolute_p (argv[i]) else if (! IS_ABSOLUTE_FILE_NAME (argv[i])
&& (isalpha (argv[i][0]) && argv[i][1] == ':')) && (isalpha (argv[i][0]) && argv[i][1] == ':'))
/* Windows can have a different default directory for each /* Windows can have a different default directory for each
drive, so the cwd passed via "-dir" is not sufficient drive, so the cwd passed via "-dir" is not sufficient
@ -1830,7 +1807,7 @@ main (int argc, char **argv)
# endif # endif
send_to_emacs (emacs_socket, "-file "); send_to_emacs (emacs_socket, "-file ");
if (tramp_prefix && file_name_absolute_p (argv[i])) if (tramp_prefix && IS_ABSOLUTE_FILE_NAME (argv[i]))
quote_argument (emacs_socket, tramp_prefix); quote_argument (emacs_socket, tramp_prefix);
quote_argument (emacs_socket, argv[i]); quote_argument (emacs_socket, argv[i]);
send_to_emacs (emacs_socket, " "); send_to_emacs (emacs_socket, " ");