diff options
author | Ron Yorston <rmy@pobox.com> | 2020-07-09 13:10:58 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2020-07-09 13:10:58 +0100 |
commit | 9c0b2f7020d7c30b21a930ef54be632e092e533b (patch) | |
tree | b2187c40bd2fd9f49f73599fb08e52cb7a596de0 /miscutils | |
parent | a8c6e20e332a9e11a9d28cd6770eadb9c9d73cb7 (diff) | |
parent | d21a63f9fca8eb16f79de9b72d4a3484dfaec1fc (diff) | |
download | busybox-w32-9c0b2f7020d7c30b21a930ef54be632e092e533b.tar.gz busybox-w32-9c0b2f7020d7c30b21a930ef54be632e092e533b.tar.bz2 busybox-w32-9c0b2f7020d7c30b21a930ef54be632e092e533b.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'miscutils')
-rw-r--r-- | miscutils/bc.c | 2 | ||||
-rw-r--r-- | miscutils/devfsd.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/miscutils/bc.c b/miscutils/bc.c index c7246ea1a..4d987325e 100644 --- a/miscutils/bc.c +++ b/miscutils/bc.c | |||
@@ -2522,7 +2522,9 @@ static void xc_read_line(BcVec *vec, FILE *fp) | |||
2522 | 2522 | ||
2523 | #if ENABLE_FEATURE_BC_INTERACTIVE | 2523 | #if ENABLE_FEATURE_BC_INTERACTIVE |
2524 | if (G_interrupt) { // ^C was pressed | 2524 | if (G_interrupt) { // ^C was pressed |
2525 | # if ENABLE_FEATURE_EDITING | ||
2525 | intr: | 2526 | intr: |
2527 | # endif | ||
2526 | if (fp != stdin) { | 2528 | if (fp != stdin) { |
2527 | // ^C while running a script (bc SCRIPT): die. | 2529 | // ^C while running a script (bc SCRIPT): die. |
2528 | // We do not return to interactive prompt: | 2530 | // We do not return to interactive prompt: |
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c index f3d935b2e..d47ee4d47 100644 --- a/miscutils/devfsd.c +++ b/miscutils/devfsd.c | |||
@@ -353,6 +353,7 @@ static const char bb_msg_variable_not_found[] ALIGN1 = "variable: %s not found"; | |||
353 | #define error_logger_and_die(p, fmt, args...) bb_perror_msg_and_die(fmt, ## args) | 353 | #define error_logger_and_die(p, fmt, args...) bb_perror_msg_and_die(fmt, ## args) |
354 | #else | 354 | #else |
355 | #define info_logger(p, fmt, args...) | 355 | #define info_logger(p, fmt, args...) |
356 | #define simple_info_logger(p, msg) | ||
356 | #define msg_logger(p, fmt, args...) | 357 | #define msg_logger(p, fmt, args...) |
357 | #define simple_msg_logger(p, msg) | 358 | #define simple_msg_logger(p, msg) |
358 | #define msg_logger_and_die(p, fmt, args...) exit(EXIT_FAILURE) | 359 | #define msg_logger_and_die(p, fmt, args...) exit(EXIT_FAILURE) |