diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-03 21:00:43 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-03 21:00:43 +0000 |
commit | 8f8f268cfdecb4cabeb2e649a73afc7a485aeff5 (patch) | |
tree | 8c555cc94aca9fabd177526e554d93bed4886642 /findutils | |
parent | 67b23e6043d8e2b30b0bf3bc105b8583c2a26db5 (diff) | |
download | busybox-w32-8f8f268cfdecb4cabeb2e649a73afc7a485aeff5.tar.gz busybox-w32-8f8f268cfdecb4cabeb2e649a73afc7a485aeff5.tar.bz2 busybox-w32-8f8f268cfdecb4cabeb2e649a73afc7a485aeff5.zip |
bb_applet_name -> applet_name
Diffstat (limited to 'findutils')
-rw-r--r-- | findutils/grep.c | 4 | ||||
-rw-r--r-- | findutils/xargs.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/findutils/grep.c b/findutils/grep.c index 35e6aff2d..ce975e771 100644 --- a/findutils/grep.c +++ b/findutils/grep.c | |||
@@ -356,14 +356,14 @@ int grep_main(int argc, char **argv) | |||
356 | if (opt & GREP_OPT_f) | 356 | if (opt & GREP_OPT_f) |
357 | load_regexes_from_file(fopt); | 357 | load_regexes_from_file(fopt); |
358 | 358 | ||
359 | if (ENABLE_FEATURE_GREP_FGREP_ALIAS && bb_applet_name[0] == 'f') | 359 | if (ENABLE_FEATURE_GREP_FGREP_ALIAS && applet_name[0] == 'f') |
360 | opt |= GREP_OPT_F; | 360 | opt |= GREP_OPT_F; |
361 | 361 | ||
362 | if (!(opt & GREP_OPT_o)) | 362 | if (!(opt & GREP_OPT_o)) |
363 | reflags = REG_NOSUB; | 363 | reflags = REG_NOSUB; |
364 | 364 | ||
365 | if (ENABLE_FEATURE_GREP_EGREP_ALIAS && | 365 | if (ENABLE_FEATURE_GREP_EGREP_ALIAS && |
366 | (bb_applet_name[0] == 'e' || (opt & GREP_OPT_E))) | 366 | (applet_name[0] == 'e' || (opt & GREP_OPT_E))) |
367 | reflags |= REG_EXTENDED; | 367 | reflags |= REG_EXTENDED; |
368 | 368 | ||
369 | if (opt & GREP_OPT_i) | 369 | if (opt & GREP_OPT_i) |
diff --git a/findutils/xargs.c b/findutils/xargs.c index 278382373..81997b6f6 100644 --- a/findutils/xargs.c +++ b/findutils/xargs.c | |||
@@ -523,12 +523,12 @@ int xargs_main(int argc, char **argv) | |||
523 | 523 | ||
524 | #ifdef TEST | 524 | #ifdef TEST |
525 | 525 | ||
526 | const char *bb_applet_name = "debug stuff usage"; | 526 | const char *applet_name = "debug stuff usage"; |
527 | 527 | ||
528 | void bb_show_usage(void) | 528 | void bb_show_usage(void) |
529 | { | 529 | { |
530 | fprintf(stderr, "Usage: %s [-p] [-r] [-t] -[x] [-n max_arg] [-s max_chars]\n", | 530 | fprintf(stderr, "Usage: %s [-p] [-r] [-t] -[x] [-n max_arg] [-s max_chars]\n", |
531 | bb_applet_name); | 531 | applet_name); |
532 | exit(1); | 532 | exit(1); |
533 | } | 533 | } |
534 | 534 | ||