diff options
| author | Ron Yorston <rmy@pobox.com> | 2022-01-06 07:46:38 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2022-01-06 07:46:38 +0000 |
| commit | b8751bbc9ac24e71fbe1e79c69074b4c87a134d8 (patch) | |
| tree | 336d653df8387b9b1d3c6e46caa373c00cb9b2b2 /util-linux | |
| parent | b15f68214da209b5b293039c09c00f490c0cc193 (diff) | |
| parent | 6062c0d19bc201cbeb61b8875598cdd7a14a5ae0 (diff) | |
| download | busybox-w32-b8751bbc9ac24e71fbe1e79c69074b4c87a134d8.tar.gz busybox-w32-b8751bbc9ac24e71fbe1e79c69074b4c87a134d8.tar.bz2 busybox-w32-b8751bbc9ac24e71fbe1e79c69074b4c87a134d8.zip | |
Merge busybox into merge
Fix merge conflict in miscutils/less.c.
Use exit_SUCCESS() where possible.
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/cal.c | 2 | ||||
| -rw-r--r-- | util-linux/chrt.c | 2 | ||||
| -rw-r--r-- | util-linux/fdisk.c | 4 | ||||
| -rw-r--r-- | util-linux/fdisk_osf.c | 4 | ||||
| -rw-r--r-- | util-linux/fsck_minix.c | 2 | ||||
| -rw-r--r-- | util-linux/hexdump_xxd.c | 2 | ||||
| -rw-r--r-- | util-linux/ipcs.c | 8 | ||||
| -rw-r--r-- | util-linux/last.c | 2 | ||||
| -rw-r--r-- | util-linux/last_fancy.c | 2 |
9 files changed, 14 insertions, 14 deletions
diff --git a/util-linux/cal.c b/util-linux/cal.c index 6ba6ebf98..522ab3476 100644 --- a/util-linux/cal.c +++ b/util-linux/cal.c | |||
| @@ -233,7 +233,7 @@ int cal_main(int argc UNUSED_PARAM, char **argv) | |||
| 233 | } | 233 | } |
| 234 | } | 234 | } |
| 235 | 235 | ||
| 236 | fflush_stdout_and_exit(EXIT_SUCCESS); | 236 | fflush_stdout_and_exit_SUCCESS(); |
| 237 | } | 237 | } |
| 238 | 238 | ||
| 239 | /* | 239 | /* |
diff --git a/util-linux/chrt.c b/util-linux/chrt.c index 6799abb2d..be96fa426 100644 --- a/util-linux/chrt.c +++ b/util-linux/chrt.c | |||
| @@ -110,7 +110,7 @@ int chrt_main(int argc UNUSED_PARAM, char **argv) | |||
| 110 | show_min_max(SCHED_RR); | 110 | show_min_max(SCHED_RR); |
| 111 | show_min_max(SCHED_BATCH); | 111 | show_min_max(SCHED_BATCH); |
| 112 | show_min_max(SCHED_IDLE); | 112 | show_min_max(SCHED_IDLE); |
| 113 | fflush_stdout_and_exit(EXIT_SUCCESS); | 113 | fflush_stdout_and_exit_SUCCESS(); |
| 114 | } | 114 | } |
| 115 | //if (opt & OPT_r) | 115 | //if (opt & OPT_r) |
| 116 | // policy = SCHED_RR; - default, already set | 116 | // policy = SCHED_RR; - default, already set |
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c index 1c2a7d683..9c393b8fc 100644 --- a/util-linux/fdisk.c +++ b/util-linux/fdisk.c | |||
| @@ -665,7 +665,7 @@ read_line(const char *prompt) | |||
| 665 | 665 | ||
| 666 | sz = read_line_input(NULL, prompt, line_buffer, sizeof(line_buffer)); | 666 | sz = read_line_input(NULL, prompt, line_buffer, sizeof(line_buffer)); |
| 667 | if (sz <= 0) | 667 | if (sz <= 0) |
| 668 | exit(EXIT_SUCCESS); /* Ctrl-D or Ctrl-C */ | 668 | exit_SUCCESS(); /* Ctrl-D or Ctrl-C */ |
| 669 | 669 | ||
| 670 | if (line_buffer[sz-1] == '\n') | 670 | if (line_buffer[sz-1] == '\n') |
| 671 | line_buffer[--sz] = '\0'; | 671 | line_buffer[--sz] = '\0'; |
| @@ -2855,7 +2855,7 @@ xselect(void) | |||
| 2855 | if (ENABLE_FEATURE_CLEAN_UP) | 2855 | if (ENABLE_FEATURE_CLEAN_UP) |
| 2856 | close_dev_fd(); | 2856 | close_dev_fd(); |
| 2857 | bb_putchar('\n'); | 2857 | bb_putchar('\n'); |
| 2858 | exit(EXIT_SUCCESS); | 2858 | exit_SUCCESS(); |
| 2859 | case 'r': | 2859 | case 'r': |
| 2860 | return; | 2860 | return; |
| 2861 | case 's': | 2861 | case 's': |
diff --git a/util-linux/fdisk_osf.c b/util-linux/fdisk_osf.c index 765740ff1..6c66c130d 100644 --- a/util-linux/fdisk_osf.c +++ b/util-linux/fdisk_osf.c | |||
| @@ -383,7 +383,7 @@ bsd_select(void) | |||
| 383 | 383 | ||
| 384 | if (xbsd_readlabel(NULL) == 0) | 384 | if (xbsd_readlabel(NULL) == 0) |
| 385 | if (xbsd_create_disklabel() == 0) | 385 | if (xbsd_create_disklabel() == 0) |
| 386 | exit(EXIT_SUCCESS); | 386 | exit_SUCCESS(); |
| 387 | 387 | ||
| 388 | #endif | 388 | #endif |
| 389 | 389 | ||
| @@ -411,7 +411,7 @@ bsd_select(void) | |||
| 411 | case 'q': | 411 | case 'q': |
| 412 | if (ENABLE_FEATURE_CLEAN_UP) | 412 | if (ENABLE_FEATURE_CLEAN_UP) |
| 413 | close_dev_fd(); | 413 | close_dev_fd(); |
| 414 | exit(EXIT_SUCCESS); | 414 | exit_SUCCESS(); |
| 415 | case 'r': | 415 | case 'r': |
| 416 | return; | 416 | return; |
| 417 | case 's': | 417 | case 's': |
diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c index 40b86d01b..dd2265c32 100644 --- a/util-linux/fsck_minix.c +++ b/util-linux/fsck_minix.c | |||
| @@ -423,7 +423,7 @@ static void check_mount(void) | |||
| 423 | cont = ask("Do you really want to continue", 0); | 423 | cont = ask("Do you really want to continue", 0); |
| 424 | if (!cont) { | 424 | if (!cont) { |
| 425 | puts("Check aborted"); | 425 | puts("Check aborted"); |
| 426 | exit(EXIT_SUCCESS); | 426 | exit_SUCCESS(); |
| 427 | } | 427 | } |
| 428 | } | 428 | } |
| 429 | } | 429 | } |
diff --git a/util-linux/hexdump_xxd.c b/util-linux/hexdump_xxd.c index 76dada983..4372ac770 100644 --- a/util-linux/hexdump_xxd.c +++ b/util-linux/hexdump_xxd.c | |||
| @@ -150,7 +150,7 @@ static void reverse(unsigned opt, const char *filename) | |||
| 150 | free(buf); | 150 | free(buf); |
| 151 | } | 151 | } |
| 152 | //fclose(fp); | 152 | //fclose(fp); |
| 153 | fflush_stdout_and_exit(EXIT_SUCCESS); | 153 | fflush_stdout_and_exit_SUCCESS(); |
| 154 | } | 154 | } |
| 155 | 155 | ||
| 156 | static void print_C_style(const char *p, const char *hdr) | 156 | static void print_C_style(const char *p, const char *hdr) |
diff --git a/util-linux/ipcs.c b/util-linux/ipcs.c index ef2529c05..5973cbf57 100644 --- a/util-linux/ipcs.c +++ b/util-linux/ipcs.c | |||
| @@ -600,15 +600,15 @@ int ipcs_main(int argc UNUSED_PARAM, char **argv) | |||
| 600 | id = xatoi(opt_i); | 600 | id = xatoi(opt_i); |
| 601 | if (opt & flag_shm) { | 601 | if (opt & flag_shm) { |
| 602 | print_shm(id); | 602 | print_shm(id); |
| 603 | fflush_stdout_and_exit(EXIT_SUCCESS); | 603 | fflush_stdout_and_exit_SUCCESS(); |
| 604 | } | 604 | } |
| 605 | if (opt & flag_sem) { | 605 | if (opt & flag_sem) { |
| 606 | print_sem(id); | 606 | print_sem(id); |
| 607 | fflush_stdout_and_exit(EXIT_SUCCESS); | 607 | fflush_stdout_and_exit_SUCCESS(); |
| 608 | } | 608 | } |
| 609 | if (opt & flag_msg) { | 609 | if (opt & flag_msg) { |
| 610 | print_msg(id); | 610 | print_msg(id); |
| 611 | fflush_stdout_and_exit(EXIT_SUCCESS); | 611 | fflush_stdout_and_exit_SUCCESS(); |
| 612 | } | 612 | } |
| 613 | bb_show_usage(); | 613 | bb_show_usage(); |
| 614 | } | 614 | } |
| @@ -633,5 +633,5 @@ int ipcs_main(int argc UNUSED_PARAM, char **argv) | |||
| 633 | do_sem(format); | 633 | do_sem(format); |
| 634 | bb_putchar('\n'); | 634 | bb_putchar('\n'); |
| 635 | } | 635 | } |
| 636 | fflush_stdout_and_exit(EXIT_SUCCESS); | 636 | fflush_stdout_and_exit_SUCCESS(); |
| 637 | } | 637 | } |
diff --git a/util-linux/last.c b/util-linux/last.c index 24ce7a8d8..63751ca45 100644 --- a/util-linux/last.c +++ b/util-linux/last.c | |||
| @@ -162,5 +162,5 @@ int last_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) | |||
| 162 | xlseek(file, pos, SEEK_SET); | 162 | xlseek(file, pos, SEEK_SET); |
| 163 | } | 163 | } |
| 164 | 164 | ||
| 165 | fflush_stdout_and_exit(EXIT_SUCCESS); | 165 | fflush_stdout_and_exit_SUCCESS(); |
| 166 | } | 166 | } |
diff --git a/util-linux/last_fancy.c b/util-linux/last_fancy.c index e56e0ba85..648236229 100644 --- a/util-linux/last_fancy.c +++ b/util-linux/last_fancy.c | |||
| @@ -296,5 +296,5 @@ int last_main(int argc UNUSED_PARAM, char **argv) | |||
| 296 | 296 | ||
| 297 | if (ENABLE_FEATURE_CLEAN_UP) | 297 | if (ENABLE_FEATURE_CLEAN_UP) |
| 298 | close(file); | 298 | close(file); |
| 299 | fflush_stdout_and_exit(EXIT_SUCCESS); | 299 | fflush_stdout_and_exit_SUCCESS(); |
| 300 | } | 300 | } |