0436b9f48
Mike Frysinger
2006-04-16
Subject
use strchr() not index()
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
coreutils/sort.c+2 -2
| @@ -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."); | |
loginutils/deluser.c+1 -1
| @@ -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; | |
scripts/config/lxdialog/util.c+2 -2
| @@ -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; | |
| } | |