diff options
| author | Elliott Hughes <enh@google.com> | 2018-11-28 12:27:14 -0800 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2018-11-28 19:03:25 -0600 |
| commit | acfbb13661f425631ee7e7f01daa1eb2f3169945 (patch) | |
| tree | 143f82331e80e98fb20363eeb7c207f80dca88ca /toys | |
| parent | 687992df6a48a35df61ac515b29528c887ee6373 (diff) | |
| download | toybox-acfbb13661f425631ee7e7f01daa1eb2f3169945.tar.gz | |
macOS: replace local strnstr with strcasestr.
bionic, glibc, macOS, and musl all have strcasestr
(see http://man7.org/linux/man-pages/man3/strstr.3.html).
macOS (via BSD) has a strnstr that does what strnstr sounds like it
should do by analogy with strnlen and strncpy.
So we at least need to rename strnstr, but it probably makes more sense
just to switch to strcasestr instead.
Diffstat (limited to 'toys')
| -rw-r--r-- | toys/lsb/passwd.c | 4 | ||||
| -rw-r--r-- | toys/posix/grep.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/toys/lsb/passwd.c b/toys/lsb/passwd.c index 0f51c0c0..73024832 100644 --- a/toys/lsb/passwd.c +++ b/toys/lsb/passwd.c @@ -46,8 +46,8 @@ static void weak_check(char *new, char *old, char *user) if (strlen(new) < 6) msg = "too short"; if (*new) { - if (strnstr(new, user) || strnstr(user, new)) msg = "user"; - if (*old && (strnstr(new, old) || strnstr(old, new))) msg = "old"; + if (strcasestr(new, user) || strcasestr(user, new)) msg = "user"; + if (*old && (strcasestr(new, old) || strcasestr(old, new))) msg = "old"; } if (msg) xprintf("BAD PASSWORD: %s\n",msg); } diff --git a/toys/posix/grep.c b/toys/posix/grep.c index f0332cee..14cebf95 100644 --- a/toys/posix/grep.c +++ b/toys/posix/grep.c @@ -152,7 +152,7 @@ static void do_grep(int fd, char *name) fseek.arg = s = line; break; } - if (toys.optflags & FLAG_i) s = strnstr(line, seek->arg); + if (toys.optflags & FLAG_i) s = strcasestr(line, seek->arg); else s = strstr(line, seek->arg); if (s) break; } |