Error reporting fix for sulogin, plus remove help entries for options we never
implemented. (Plus a bit more of bbsh leaking in from my tree, but it
shouldn't hurt anything and I'm lazy...)
diff --git a/include/usage.h b/include/usage.h
index a1ba0a2..7ebd660 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -265,6 +265,12 @@
#define bbconfig_full_usage \
"Print the config file which built busybox"
+#define bbsh_trivial_usage \
+ "[FILE]...\n" \
+ "or: bbsh -c command [args]..."
+#define bbsh_full_usage \
+ "The bbsh shell (command interpreter)"
+
#define cp_trivial_usage \
"[OPTION]... SOURCE DEST"
#define cp_full_usage \
@@ -2811,9 +2817,7 @@
#define sulogin_full_usage \
"Single user login\n" \
"Options:\n" \
- "\t-f\tDo not authenticate (user already authenticated)\n" \
- "\t-h\tName of the remote host for this login\n" \
- "\t-p\tPreserve environment"
+ "\t-t\tTimeout"
#define sum_trivial_usage \
"[rs] [files...]"
diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c
index fef3760..a2238d4 100644
--- a/loginutils/sulogin.c
+++ b/loginutils/sulogin.c
@@ -55,8 +55,8 @@
if (argv[optind]) {
close(0);
close(1);
- close(2);
dup(xopen(argv[optind], O_RDWR));
+ close(2);
dup(0);
}