diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-10-28 18:57:19 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-10-28 18:57:19 +0200 |
commit | e4dcba1c103dc28e927e004791e331aaf604383d (patch) | |
tree | a18094ecc54fcea2cb523a802e0c414c3e6f85bf /loginutils | |
parent | 776509544123c68bbc128c0fdb2f699062d294cf (diff) | |
download | busybox-w32-e4dcba1c103dc28e927e004791e331aaf604383d.tar.gz busybox-w32-e4dcba1c103dc28e927e004791e331aaf604383d.tar.bz2 busybox-w32-e4dcba1c103dc28e927e004791e331aaf604383d.zip |
*: whitespace fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'loginutils')
-rw-r--r-- | loginutils/chpasswd.c | 4 | ||||
-rw-r--r-- | loginutils/cryptpw.c | 2 | ||||
-rw-r--r-- | loginutils/getty.c | 4 | ||||
-rw-r--r-- | loginutils/login.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/loginutils/chpasswd.c b/loginutils/chpasswd.c index 101920c03..48cf9b130 100644 --- a/loginutils/chpasswd.c +++ b/loginutils/chpasswd.c | |||
@@ -14,8 +14,8 @@ static const char chpasswd_longopts[] ALIGN1 = | |||
14 | ; | 14 | ; |
15 | #endif | 15 | #endif |
16 | 16 | ||
17 | #define OPT_ENC 1 | 17 | #define OPT_ENC 1 |
18 | #define OPT_MD5 2 | 18 | #define OPT_MD5 2 |
19 | 19 | ||
20 | int chpasswd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 20 | int chpasswd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
21 | int chpasswd_main(int argc UNUSED_PARAM, char **argv) | 21 | int chpasswd_main(int argc UNUSED_PARAM, char **argv) |
diff --git a/loginutils/cryptpw.c b/loginutils/cryptpw.c index f32cbceb9..6c801f9fa 100644 --- a/loginutils/cryptpw.c +++ b/loginutils/cryptpw.c | |||
@@ -104,7 +104,7 @@ int cryptpw_main(int argc UNUSED_PARAM, char **argv) | |||
104 | xmove_fd(fd, STDIN_FILENO); | 104 | xmove_fd(fd, STDIN_FILENO); |
105 | 105 | ||
106 | puts(pw_encrypt( | 106 | puts(pw_encrypt( |
107 | argv[0] ? argv[0] : ( | 107 | argv[0] ? argv[0] : ( |
108 | /* Only mkpasswd, and only from tty, prompts. | 108 | /* Only mkpasswd, and only from tty, prompts. |
109 | * Otherwise it is a plain read. */ | 109 | * Otherwise it is a plain read. */ |
110 | (isatty(STDIN_FILENO) && applet_name[0] == 'm') | 110 | (isatty(STDIN_FILENO) && applet_name[0] == 'm') |
diff --git a/loginutils/getty.c b/loginutils/getty.c index ab55ea4b0..76b0de449 100644 --- a/loginutils/getty.c +++ b/loginutils/getty.c | |||
@@ -387,7 +387,7 @@ static char *get_logname(char *logname, unsigned size_logname, | |||
387 | struct options *op, struct chardata *cp) | 387 | struct options *op, struct chardata *cp) |
388 | { | 388 | { |
389 | char *bp; | 389 | char *bp; |
390 | char c; /* input character, full eight bits */ | 390 | char c; /* input character, full eight bits */ |
391 | char ascval; /* low 7 bits of input character */ | 391 | char ascval; /* low 7 bits of input character */ |
392 | int bits; /* # of "1" bits per character */ | 392 | int bits; /* # of "1" bits per character */ |
393 | int mask; /* mask with 1 bit up */ | 393 | int mask; /* mask with 1 bit up */ |
@@ -580,7 +580,7 @@ int getty_main(int argc UNUSED_PARAM, char **argv) | |||
580 | chardata = init_chardata; | 580 | chardata = init_chardata; |
581 | 581 | ||
582 | memset(&options, 0, sizeof(options)); | 582 | memset(&options, 0, sizeof(options)); |
583 | options.login = _PATH_LOGIN; /* default login program */ | 583 | options.login = _PATH_LOGIN; /* default login program */ |
584 | options.tty = "tty1"; /* default tty line */ | 584 | options.tty = "tty1"; /* default tty line */ |
585 | options.initstring = ""; /* modem init string */ | 585 | options.initstring = ""; /* modem init string */ |
586 | #ifdef ISSUE | 586 | #ifdef ISSUE |
diff --git a/loginutils/login.c b/loginutils/login.c index 3065eaa5b..9a624df9a 100644 --- a/loginutils/login.c +++ b/loginutils/login.c | |||
@@ -124,7 +124,7 @@ static void run_login_script(struct passwd *pw, char *full_tty) | |||
124 | xsetenv("LOGIN_UID", utoa(pw->pw_uid)); | 124 | xsetenv("LOGIN_UID", utoa(pw->pw_uid)); |
125 | xsetenv("LOGIN_GID", utoa(pw->pw_gid)); | 125 | xsetenv("LOGIN_GID", utoa(pw->pw_gid)); |
126 | xsetenv("LOGIN_SHELL", pw->pw_shell); | 126 | xsetenv("LOGIN_SHELL", pw->pw_shell); |
127 | spawn_and_wait(t_argv); /* NOMMU-friendly */ | 127 | spawn_and_wait(t_argv); /* NOMMU-friendly */ |
128 | unsetenv("LOGIN_TTY"); | 128 | unsetenv("LOGIN_TTY"); |
129 | unsetenv("LOGIN_USER"); | 129 | unsetenv("LOGIN_USER"); |
130 | unsetenv("LOGIN_UID"); | 130 | unsetenv("LOGIN_UID"); |
@@ -245,7 +245,7 @@ int login_main(int argc UNUSED_PARAM, char **argv) | |||
245 | 245 | ||
246 | /* Let's find out and memorize our tty */ | 246 | /* Let's find out and memorize our tty */ |
247 | if (!isatty(STDIN_FILENO) || !isatty(STDOUT_FILENO) || !isatty(STDERR_FILENO)) | 247 | if (!isatty(STDIN_FILENO) || !isatty(STDOUT_FILENO) || !isatty(STDERR_FILENO)) |
248 | return EXIT_FAILURE; /* Must be a terminal */ | 248 | return EXIT_FAILURE; /* Must be a terminal */ |
249 | full_tty = xmalloc_ttyname(STDIN_FILENO); | 249 | full_tty = xmalloc_ttyname(STDIN_FILENO); |
250 | if (!full_tty) | 250 | if (!full_tty) |
251 | full_tty = xstrdup("UNKNOWN"); | 251 | full_tty = xstrdup("UNKNOWN"); |