Mercurial > emacs
comparison src/fileio.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 | 8cfee7d2955f |
children | 228a5fa4eda0 |
comparison
equal
deleted
inserted
replaced
109314:b7a866c9460c | 109315:8f3464b85afb |
---|---|
1453 else /* ~user/filename */ | 1453 else /* ~user/filename */ |
1454 { | 1454 { |
1455 /* Get past ~ to user */ | 1455 /* Get past ~ to user */ |
1456 unsigned char *user = nm + 1; | 1456 unsigned char *user = nm + 1; |
1457 /* Find end of name. */ | 1457 /* Find end of name. */ |
1458 unsigned char *ptr = (unsigned char *) index (user, '/'); | 1458 unsigned char *ptr = (unsigned char *) strchr (user, '/'); |
1459 int len = ptr ? ptr - user : strlen (user); | 1459 int len = ptr ? ptr - user : strlen (user); |
1460 /* Copy the user name into temp storage. */ | 1460 /* Copy the user name into temp storage. */ |
1461 o = (unsigned char *) alloca (len + 1); | 1461 o = (unsigned char *) alloca (len + 1); |
1462 memcpy (o, user, len); | 1462 memcpy (o, user, len); |
1463 o[len] = 0; | 1463 o[len] = 0; |
2727 } | 2727 } |
2728 } | 2728 } |
2729 while (valsize >= bufsize); | 2729 while (valsize >= bufsize); |
2730 | 2730 |
2731 val = make_string (buf, valsize); | 2731 val = make_string (buf, valsize); |
2732 if (buf[0] == '/' && index (buf, ':')) | 2732 if (buf[0] == '/' && strchr (buf, ':')) |
2733 val = concat2 (build_string ("/:"), val); | 2733 val = concat2 (build_string ("/:"), val); |
2734 xfree (buf); | 2734 xfree (buf); |
2735 val = DECODE_FILE (val); | 2735 val = DECODE_FILE (val); |
2736 return val; | 2736 return val; |
2737 } | 2737 } |