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

login: small simplification by Walter Harms. -10 bytes

Browse Source
This commit is contained in:
Denis Vlasenko 2009-02-02 00:15:57 +00:00
parent 4eff8efa59
commit 512c8ae053
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
loginutils/login.c
View File

@ -284,7 +284,7 @@ int login_main(int argc UNUSED_PARAM, char **argv)
struct passwd *pw; struct passwd *pw;
char *opt_host = opt_host; /* for compiler */ char *opt_host = opt_host; /* for compiler */
char *opt_user = opt_user; /* for compiler */ char *opt_user = opt_user; /* for compiler */
char full_tty[TTYNAME_SIZE]; char *full_tty;
USE_SELINUX(security_context_t user_sid = NULL;) USE_SELINUX(security_context_t user_sid = NULL;)
USE_FEATURE_UTMP(struct utmp utent;) USE_FEATURE_UTMP(struct utmp utent;)
#if ENABLE_PAM #if ENABLE_PAM
@ -296,7 +296,6 @@ int login_main(int argc UNUSED_PARAM, char **argv)
char pwdbuf[256]; char pwdbuf[256];
#endif #endif
short_tty = full_tty;
username[0] = '\0'; username[0] = '\0';
signal(SIGALRM, alarm_handler); signal(SIGALRM, alarm_handler);
alarm(TIMEOUT); alarm(TIMEOUT);
@ -322,15 +321,14 @@ int login_main(int argc UNUSED_PARAM, char **argv)
safe_strncpy(username, argv[0], sizeof(username)); safe_strncpy(username, argv[0], sizeof(username));
/* Let's find out and memorize our tty */ /* Let's find out and memorize our tty */
if (!isatty(0) || !isatty(1) || !isatty(2)) if (!isatty(STDIN_FILENO) || !isatty(STDOUT_FILENO) || !isatty(STDERR_FILENO))
return EXIT_FAILURE; /* Must be a terminal */ return EXIT_FAILURE; /* Must be a terminal */
safe_strncpy(full_tty, "UNKNOWN", sizeof(full_tty)); full_tty = xmalloc_ttyname(STDIN_FILENO);
tmp = xmalloc_ttyname(STDIN_FILENO); if (!full_tty)
if (tmp) { full_tty = xstrdup("UNKNOWN");
safe_strncpy(full_tty, tmp, sizeof(full_tty)); short_tty = full_tty;
if (strncmp(full_tty, "/dev/", 5) == 0) if (strncmp(full_tty, "/dev/", 5) == 0)
short_tty = full_tty + 5; short_tty += 5;
}
read_or_build_utent(&utent, run_by_root); read_or_build_utent(&utent, run_by_root);