aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--coreutils/sort.c4
-rw-r--r--loginutils/deluser.c2
-rw-r--r--scripts/config/lxdialog/util.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/coreutils/sort.c b/coreutils/sort.c
index 98cea7cd7..60fc95222 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -236,7 +236,7 @@ int sort_main(int argc, char **argv)
bb_default_error_retval = 2;
/* Parse command line options */
while((c=getopt(argc,argv,optlist))>0) {
- line=index(optlist,c);
+ line=strchr(optlist,c);
if(!line) bb_show_usage();
switch(*line) {
#ifdef CONFIG_FEATURE_SORT_BIG
@@ -267,7 +267,7 @@ int sort_main(int argc, char **argv)
break;
} /* no else needed: fall through to syntax error
because comma isn't in optlist */
- temp2=index(optlist,*temp);
+ temp2=strchr(optlist,*temp);
flag=(1<<(temp2-optlist));
if(!temp2 || (flag>FLAG_M && flag<FLAG_b))
bb_error_msg_and_die("Unknown key option.");
diff --git a/loginutils/deluser.c b/loginutils/deluser.c
index b647537d9..1b9bc4439 100644
--- a/loginutils/deluser.c
+++ b/loginutils/deluser.c
@@ -43,7 +43,7 @@ static inline Bounds boundary(const char *buffer, const char *login)
}
start++;
- stop = index(start, '\n'); /* index is a BSD-ism */
+ stop = strchr(start, '\n');
b.start = start - buffer;
b.stop = stop - buffer;
return b;
diff --git a/scripts/config/lxdialog/util.c b/scripts/config/lxdialog/util.c
index 47afa5e6a..1e4b662c0 100644
--- a/scripts/config/lxdialog/util.c
+++ b/scripts/config/lxdialog/util.c
@@ -221,7 +221,7 @@ print_autowrap (WINDOW * win, const char *prompt, int width, int y, int x)
newl = 1;
word = tempstr;
while (word && *word) {
- sp = index(word, ' ');
+ sp = strchr(word, ' ');
if (sp)
*sp++ = 0;
@@ -232,7 +232,7 @@ print_autowrap (WINDOW * win, const char *prompt, int width, int y, int x)
wlen = strlen(word);
if (wlen > room ||
(newl && wlen < 4 && sp && wlen+1+strlen(sp) > room
- && (!(sp2 = index(sp, ' ')) || wlen+1+(sp2-sp) > room))) {
+ && (!(sp2 = strchr(sp, ' ')) || wlen+1+(sp2-sp) > room))) {
cur_y++;
cur_x = x;
}