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

*: random code shrink

Browse Source 
function                                             old     new   delta
alarm_handler                                         50      46      -4
ask                                                  228     211     -17
rtcwake_main                                         474     455     -19

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2009-10-29 13:27:31 +01:00
parent 1f6d2307ba
commit 85ca327529
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
loginutils/login.c
View File

@ -263,7 +263,7 @@ static void alarm_handler(int sig UNUSED_PARAM)
* We don't want to block here */ * We don't want to block here */
ndelay_on(1); ndelay_on(1);
printf("\r\nLogin timed out after %d seconds\r\n", TIMEOUT); printf("\r\nLogin timed out after %d seconds\r\n", TIMEOUT);
fflush(stdout); fflush(NULL);
/* unix API is brain damaged regarding O_NONBLOCK, /* unix API is brain damaged regarding O_NONBLOCK,
* we should undo it, or else we can affect other processes */ * we should undo it, or else we can affect other processes */
ndelay_off(1); ndelay_off(1);

14
util-linux/fsck_minix.c
View File

@ -341,22 +341,24 @@ static int ask(const char *string, int def)
} }
printf(def ? "%s (y/n)? " : "%s (n/y)? ", string); printf(def ? "%s (y/n)? " : "%s (n/y)? ", string);
for (;;) { for (;;) {
fflush(stdout); fflush(NULL);
c = getchar(); c = getchar();
if (c == EOF) { if (c == EOF) {
if (!def) if (!def)
errors_uncorrected = 1; errors_uncorrected = 1;
return def; return def;
} }
c = toupper(c); if (c == '\n')
if (c == 'Y') { break;
c |= 0x20; /* tolower */
if (c == 'y') {
def = 1; def = 1;
break; break;
} else if (c == 'N') { }
if (c == 'n') {
def = 0; def = 0;
break; break;
} else if (c == ' ' || c == '\n') }
break;
} }
if (def) if (def)
printf("y\n"); printf("y\n");

6
util-linux/rtcwake.c
View File

@ -141,7 +141,7 @@ int rtcwake_main(int argc UNUSED_PARAM, char **argv)
seconds = xatoi(opt_seconds); seconds = xatoi(opt_seconds);
if (opt & RTCWAKE_OPT_TIME) if (opt & RTCWAKE_OPT_TIME)
/* alarm time, time_t (absolute, seconds since 1/1 1970 UTC) */ /* 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) if (!alarm_time && !seconds)
bb_error_msg_and_die("must provide wake time"); 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 */ /* relative or absolute alarm time, normalized to time_t */
sys_time = time(NULL); 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); rtc_time = rtc_read_time(fd, utc);
if (alarm_time) { if (alarm_time) {
@ -174,7 +172,7 @@ int rtcwake_main(int argc UNUSED_PARAM, char **argv)
sync(); sync();
printf("wakeup from \"%s\" at %s", suspend, ctime(&alarm_time)); printf("wakeup from \"%s\" at %s", suspend, ctime(&alarm_time));
fflush(stdout); fflush(NULL);
usleep(10 * 1000); usleep(10 * 1000);
if (strcmp(suspend, "on")) if (strcmp(suspend, "on"))