summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko2007-10-16 10:47:27 +0000
committerDenis Vlasenko2007-10-16 10:47:27 +0000
commit008eda2c548045b4918ebb2e132940a790a84201 (patch)
tree4ee703c07ab5159321fb41e5f566138cd8391c54
parent2450c450ab8af271521c18b3c5e8e1b3c9041838 (diff)
downloadbusybox-008eda2c548045b4918ebb2e132940a790a84201.zip
busybox-008eda2c548045b4918ebb2e132940a790a84201.tar.gz
bzip2: make -s equivalent to -2 (compatible with standard bzip2)
telnetd: typo fix in comment
-rw-r--r--archival/bzip2.c1
-rw-r--r--networking/telnetd.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/archival/bzip2.c b/archival/bzip2.c
index e9a69c4..c750a05 100644
--- a/archival/bzip2.c
+++ b/archival/bzip2.c
@@ -182,6 +182,7 @@ int bzip2_main(int argc, char **argv)
* --best alias for -9
*/
+ opt_complementary = "s2"; /* -s means -2 (compatibility) */
/* Must match bbunzip's constants OPT_STDOUT, OPT_FORCE! */
opt = getopt32(argv, "cfv" USE_BUNZIP2("d") "123456789qzs" );
#if ENABLE_BUNZIP2 /* bunzip2_main may not be visible... */
diff --git a/networking/telnetd.c b/networking/telnetd.c
index 96620d9..eb37011 100644
--- a/networking/telnetd.c
+++ b/networking/telnetd.c
@@ -415,7 +415,7 @@ int telnetd_main(int argc, char **argv)
/*bb_error_msg("listening for connections");*/
if (!(opt & OPT_FOREGROUND)) {
/* DAEMON_CHDIR_ROOT was giving inconsistent
- * behavior with/wthout -F, -i */
+ * behavior with/without -F, -i */
bb_daemonize_or_rexec(0 /*DAEMON_CHDIR_ROOT*/, argv);
}
}