emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sulogin: fix bug: -tNNN didn't work

Browse Source
This commit is contained in:
Denis Vlasenko 2006-09-03 17:11:34 +00:00
parent 1da6a21666
commit adff40e80d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
loginutils/sulogin.c
View File

@ -52,7 +52,7 @@ static void catchalarm(int ATTRIBUTE_UNUSED junk)
int sulogin_main(int argc, char **argv) int sulogin_main(int argc, char **argv)
{ {
char *cp; char *cp;
char *device = (char *) 0; char *device = NULL;
const char *name = "root"; const char *name = "root";
int timeout = 0; int timeout = 0;
@ -68,14 +68,15 @@ int sulogin_main(int argc, char **argv)
openlog("sulogin", LOG_PID | LOG_CONS | LOG_NOWAIT, LOG_AUTH); openlog("sulogin", LOG_PID | LOG_CONS | LOG_NOWAIT, LOG_AUTH);
if (argc > 1) { if (argc > 1) {
if (strncmp(argv[1], "-t", 2) == 0) { if (strncmp(argv[1], "-t", 2) == 0) {
if (strcmp(argv[1], "-t") == 0) { if (argv[1][2] == '\0') { /* -t NN */
if (argc > 2) { if (argc > 2) {
timeout = atoi(argv[2]); timeout = atoi(argv[2]);
if (argc > 3) { if (argc > 3) {
device = argv[3]; device = argv[3];
} }
} }
} else { } else { /* -tNNN */
timeout = atoi(&argv[1][2]);
if (argc > 2) { if (argc > 2) {
device = argv[2]; device = argv[2];
} }
@ -87,7 +88,7 @@ int sulogin_main(int argc, char **argv)
close(0); close(0);
close(1); close(1);
close(2); close(2);
if (open(device, O_RDWR) >= 0) { if (open(device, O_RDWR) == 0) {
dup(0); dup(0);
dup(0); dup(0);
} else { } else {