85ca32752
Denys Vlasenko
2009-10-29
Subject
*: random code shrink
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
loginutils/login.c+1 -1
| @@ -263,7 +263,7 @@ static void alarm_handler(int sig UNUSED_PARAM) | |
| * We don't want to block here */ | |
| ndelay_on(1); | |
| printf("\r\nLogin timed out after %d seconds\r\n", TIMEOUT); | |
| - | fflush(stdout); |
| + | fflush(NULL); |
| /* unix API is brain damaged regarding O_NONBLOCK, | |
| * we should undo it, or else we can affect other processes */ | |
| ndelay_off(1); | |
util-linux/fsck_minix.c+8 -6
| @@ -341,22 +341,24 @@ static int ask(const char *string, int def) | |
| } | |
| printf(def ? "%s (y/n)? " : "%s (n/y)? ", string); | |
| for (;;) { | |
| - | fflush(stdout); |
| + | fflush(NULL); |
| c = getchar(); | |
| if (c == EOF) { | |
| if (!def) | |
| errors_uncorrected = 1; | |
| return def; | |
| } | |
| - | c = toupper(c); |
| - | if (c == 'Y') { |
| + | if (c == '\n') |
| + | break; |
| + | c |= 0x20; /* tolower */ |
| + | if (c == 'y') { |
| def = 1; | |
| break; | |
| - | } else if (c == 'N') { |
| + | } |
| + | if (c == 'n') { |
| def = 0; | |
| break; | |
| - | } else if (c == ' ' || c == '\n') |
| - | break; |
| + | } |
| } | |
| if (def) | |
| printf("y\n"); | |
util-linux/rtcwake.c+2 -4
| @@ -141,7 +141,7 @@ int rtcwake_main(int argc UNUSED_PARAM, char **argv) | |
| seconds = xatoi(opt_seconds); | |
| if (opt & RTCWAKE_OPT_TIME) | |
| /* alarm time, time_t (absolute, seconds since 1/1 1970 UTC) */ | |
| - | alarm_time = xatoi(opt_time); |
| + | alarm_time = xatol(opt_time); |
| if (!alarm_time && !seconds) | |
| bb_error_msg_and_die("must provide wake time"); | |
| @@ -160,8 +160,6 @@ int rtcwake_main(int argc UNUSED_PARAM, char **argv) | |
| /* relative or absolute alarm time, normalized to time_t */ | |
| sys_time = time(NULL); | |
| - | if (sys_time == (time_t)-1) |
| - | bb_perror_msg_and_die("read system time"); |
| rtc_time = rtc_read_time(fd, utc); | |
| if (alarm_time) { | |
| @@ -174,7 +172,7 @@ int rtcwake_main(int argc UNUSED_PARAM, char **argv) | |
| sync(); | |
| printf("wakeup from \"%s\" at %s", suspend, ctime(&alarm_time)); | |
| - | fflush(stdout); |
| + | fflush(NULL); |
| usleep(10 * 1000); | |
| if (strcmp(suspend, "on")) | |