svn commit: trunk/busybox: include loginutils

[landley at busybox.net]

Author: landley
Date: 2006-09-10 17:34:01 -0700 (Sun, 10 Sep 2006)
New Revision: 16097

Log:
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...)


Modified:
   trunk/busybox/include/usage.h
   trunk/busybox/loginutils/sulogin.c


Changeset:
Modified: trunk/busybox/include/usage.h
===================================================================
--- trunk/busybox/include/usage.h	2006-09-10 18:48:16 UTC (rev 16096)
+++ trunk/busybox/include/usage.h	2006-09-11 00:34:01 UTC (rev 16097)
@@ -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...]"

Modified: trunk/busybox/loginutils/sulogin.c
===================================================================
--- trunk/busybox/loginutils/sulogin.c	2006-09-10 18:48:16 UTC (rev 16096)
+++ trunk/busybox/loginutils/sulogin.c	2006-09-11 00:34:01 UTC (rev 16097)
@@ -55,8 +55,8 @@
 	if (argv[optind]) {
 		close(0);
 		close(1);
+		dup(xopen(argv[optind], O_RDWR));
 		close(2);
-		dup(xopen(argv[optind], O_RDWR));
 		dup(0);
 	}