diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-10-16 10:47:27 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-10-16 10:47:27 +0000 |
commit | 008eda2c548045b4918ebb2e132940a790a84201 (patch) | |
tree | 4ee703c07ab5159321fb41e5f566138cd8391c54 | |
parent | 2450c450ab8af271521c18b3c5e8e1b3c9041838 (diff) | |
download | busybox-w32-008eda2c548045b4918ebb2e132940a790a84201.tar.gz busybox-w32-008eda2c548045b4918ebb2e132940a790a84201.tar.bz2 busybox-w32-008eda2c548045b4918ebb2e132940a790a84201.zip |
bzip2: make -s equivalent to -2 (compatible with standard bzip2)
telnetd: typo fix in comment
-rw-r--r-- | archival/bzip2.c | 1 | ||||
-rw-r--r-- | networking/telnetd.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/archival/bzip2.c b/archival/bzip2.c index e9a69c458..c750a056f 100644 --- a/archival/bzip2.c +++ b/archival/bzip2.c | |||
@@ -182,6 +182,7 @@ int bzip2_main(int argc, char **argv) | |||
182 | * --best alias for -9 | 182 | * --best alias for -9 |
183 | */ | 183 | */ |
184 | 184 | ||
185 | opt_complementary = "s2"; /* -s means -2 (compatibility) */ | ||
185 | /* Must match bbunzip's constants OPT_STDOUT, OPT_FORCE! */ | 186 | /* Must match bbunzip's constants OPT_STDOUT, OPT_FORCE! */ |
186 | opt = getopt32(argv, "cfv" USE_BUNZIP2("d") "123456789qzs" ); | 187 | opt = getopt32(argv, "cfv" USE_BUNZIP2("d") "123456789qzs" ); |
187 | #if ENABLE_BUNZIP2 /* bunzip2_main may not be visible... */ | 188 | #if ENABLE_BUNZIP2 /* bunzip2_main may not be visible... */ |
diff --git a/networking/telnetd.c b/networking/telnetd.c index 96620d949..eb3701133 100644 --- a/networking/telnetd.c +++ b/networking/telnetd.c | |||
@@ -415,7 +415,7 @@ int telnetd_main(int argc, char **argv) | |||
415 | /*bb_error_msg("listening for connections");*/ | 415 | /*bb_error_msg("listening for connections");*/ |
416 | if (!(opt & OPT_FOREGROUND)) { | 416 | if (!(opt & OPT_FOREGROUND)) { |
417 | /* DAEMON_CHDIR_ROOT was giving inconsistent | 417 | /* DAEMON_CHDIR_ROOT was giving inconsistent |
418 | * behavior with/wthout -F, -i */ | 418 | * behavior with/without -F, -i */ |
419 | bb_daemonize_or_rexec(0 /*DAEMON_CHDIR_ROOT*/, argv); | 419 | bb_daemonize_or_rexec(0 /*DAEMON_CHDIR_ROOT*/, argv); |
420 | } | 420 | } |
421 | } | 421 | } |