Mercurial > emacs
comparison lib-src/emacsclient.c @ 109315:8f3464b85afb
Use strchr, strrchr instead of index, rindex
* callint.c (Fcall_interactively): Use strchr, strrchr instead of
index, rindex.
* doc.c (get_doc_string, Fsnarf_documentation): Likewise.
* editfns.c (Fuser_full_name, Fformat): Likewise.
* emacs.c (argmatch, sort_args, decode_env_path): Likewise.
* fileio.c (Ffile_symlink_p): Likewise.
* filelock.c (current_lock_owner): Likewise.
* font.c (font_parse_name, font_parse_family_registry): Likewise.
* fontset.c (fontset_pattern_regexp): Likewise.
* lread.c (read1): Likewise.
* sysdep.c (init_system_name): Likewise.
* xfns.c (select_visual): Likewise.
* s/hpux10-20.h (index, rindex): Don't define.
* s/ms-w32.h (index): Likewise.
* s/usg5-4.h: Likewise.
* sed2v2.inp (HAVE_INDEX, HAVE_RINDEX): Don't edit.
(HAVE_STRCHR, HAVE_STRRCHR): Edit to 1.
* emacsclient.c (set_local_socket): Use strchr, strrchr instead of
index, rindex.
* movemail.c (mail_spool_name, popmail): Likewise.
* pop.c (pop_list): Likewise.
* CPP-DEFINES (HAVE_INDEX, HAVE_RINDEX): Remove.
* configure.in: Don't check for index and rindex, check for strchr
and strrchr. Define strchr and strrchr as index and rindex,
resp., in src/config.h if not available.
author | Andreas Schwab <schwab@linux-m68k.org> |
---|---|
date | Sun, 11 Jul 2010 12:31:10 +0200 |
parents | 71150397fb59 |
children | d12162869c07 |
comparison
equal
deleted
inserted
replaced
109314:b7a866c9460c | 109315:8f3464b85afb |
---|---|
1232 int default_sock = !socket_name; | 1232 int default_sock = !socket_name; |
1233 int saved_errno = 0; | 1233 int saved_errno = 0; |
1234 char *server_name = "server"; | 1234 char *server_name = "server"; |
1235 char *tmpdir; | 1235 char *tmpdir; |
1236 | 1236 |
1237 if (socket_name && !index (socket_name, '/') && !index (socket_name, '\\')) | 1237 if (socket_name && !strchr (socket_name, '/') |
1238 { /* socket_name is a file name component. */ | 1238 && !strchr (socket_name, '\\')) |
1239 { | |
1240 /* socket_name is a file name component. */ | |
1239 server_name = socket_name; | 1241 server_name = socket_name; |
1240 socket_name = NULL; | 1242 socket_name = NULL; |
1241 default_sock = 1; /* Try both UIDs. */ | 1243 default_sock = 1; /* Try both UIDs. */ |
1242 } | 1244 } |
1243 | 1245 |