diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2023-06-15 11:55:56 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2023-06-15 11:55:56 +0200 |
| commit | 648f506949ded749e28186d0092b6e42085c897b (patch) | |
| tree | 049c72bc8149f41fc617d00f7d32f1d6384f8e2f /loginutils | |
| parent | 61a4959251667751e424e600c6cb75de39d6b1c3 (diff) | |
| download | busybox-w32-648f506949ded749e28186d0092b6e42085c897b.tar.gz busybox-w32-648f506949ded749e28186d0092b6e42085c897b.tar.bz2 busybox-w32-648f506949ded749e28186d0092b6e42085c897b.zip | |
libbb: code shrink: introduce and use [_]exit_FAILURE()
function old new delta
exit_FAILURE - 7 +7
_exit_FAILURE - 7 +7
run 198 199 +1
restore_state_and_exit 114 115 +1
xbsd_write_bootstrap 399 397 -2
vfork_compressor 209 207 -2
sig_handler 12 10 -2
serial_ctl 154 152 -2
parse_args 1169 1167 -2
onintr 21 19 -2
make_new_session 493 491 -2
login_main 988 986 -2
gotsig 35 33 -2
do_iplink 1315 1313 -2
addgroup_main 397 395 -2
inetd_main 1911 1908 -3
------------------------------------------------------------------------------
(add/remove: 2/0 grow/shrink: 2/12 up/down: 16/-25) Total: -9 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'loginutils')
| -rw-r--r-- | loginutils/addgroup.c | 2 | ||||
| -rw-r--r-- | loginutils/login.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/loginutils/addgroup.c b/loginutils/addgroup.c index 2a83c8a15..71d3a8db9 100644 --- a/loginutils/addgroup.c +++ b/loginutils/addgroup.c | |||
| @@ -102,7 +102,7 @@ static void new_group(char *group, gid_t gid) | |||
| 102 | /* add entry to group */ | 102 | /* add entry to group */ |
| 103 | p = xasprintf("x:%u:", (unsigned) gr.gr_gid); | 103 | p = xasprintf("x:%u:", (unsigned) gr.gr_gid); |
| 104 | if (update_passwd(bb_path_group_file, group, p, NULL) < 0) | 104 | if (update_passwd(bb_path_group_file, group, p, NULL) < 0) |
| 105 | exit(EXIT_FAILURE); | 105 | exit_FAILURE(); |
| 106 | if (ENABLE_FEATURE_CLEAN_UP) | 106 | if (ENABLE_FEATURE_CLEAN_UP) |
| 107 | free(p); | 107 | free(p); |
| 108 | #if ENABLE_FEATURE_SHADOWPASSWDS | 108 | #if ENABLE_FEATURE_SHADOWPASSWDS |
diff --git a/loginutils/login.c b/loginutils/login.c index 332238181..b02be2176 100644 --- a/loginutils/login.c +++ b/loginutils/login.c | |||
| @@ -173,7 +173,7 @@ static void die_if_nologin(void) | |||
| 173 | fflush_all(); | 173 | fflush_all(); |
| 174 | /* Users say that they do need this prior to exit: */ | 174 | /* Users say that they do need this prior to exit: */ |
| 175 | tcdrain(STDOUT_FILENO); | 175 | tcdrain(STDOUT_FILENO); |
| 176 | exit(EXIT_FAILURE); | 176 | exit_FAILURE(); |
| 177 | } | 177 | } |
| 178 | #else | 178 | #else |
| 179 | # define die_if_nologin() ((void)0) | 179 | # define die_if_nologin() ((void)0) |
| @@ -265,19 +265,19 @@ static void get_username_or_die(char *buf, int size_buf) | |||
| 265 | do { | 265 | do { |
| 266 | c = getchar(); | 266 | c = getchar(); |
| 267 | if (c == EOF) | 267 | if (c == EOF) |
| 268 | exit(EXIT_FAILURE); | 268 | exit_FAILURE(); |
| 269 | if (c == '\n') { | 269 | if (c == '\n') { |
| 270 | if (!--cntdown) | 270 | if (!--cntdown) |
| 271 | exit(EXIT_FAILURE); | 271 | exit_FAILURE(); |
| 272 | goto prompt; | 272 | goto prompt; |
| 273 | } | 273 | } |
| 274 | } while (isspace(c)); /* maybe isblank? */ | 274 | } while (isspace(c)); /* maybe isblank? */ |
| 275 | 275 | ||
| 276 | *buf++ = c; | 276 | *buf++ = c; |
| 277 | if (!fgets(buf, size_buf-2, stdin)) | 277 | if (!fgets(buf, size_buf-2, stdin)) |
| 278 | exit(EXIT_FAILURE); | 278 | exit_FAILURE(); |
| 279 | if (!strchr(buf, '\n')) | 279 | if (!strchr(buf, '\n')) |
| 280 | exit(EXIT_FAILURE); | 280 | exit_FAILURE(); |
| 281 | while ((unsigned char)*buf > ' ') | 281 | while ((unsigned char)*buf > ' ') |
| 282 | buf++; | 282 | buf++; |
| 283 | *buf = '\0'; | 283 | *buf = '\0'; |