summaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorDenys Vlasenko2009-09-06 02:36:23 +0200
committerDenys Vlasenko2009-09-06 02:36:23 +0200
commit90a9904e9ef5f2fb70e1952cb1a68bd9213bcde3 (patch)
tree46fabe3a471368b0bcee393123539775346d3410 /libbb
parent1f7c167b23dfd5b03f386a657cb95867e1605e1b (diff)
downloadbusybox-90a9904e9ef5f2fb70e1952cb1a68bd9213bcde3.zip
busybox-90a9904e9ef5f2fb70e1952cb1a68bd9213bcde3.tar.gz
remove some GNUisms. by Dan Fandrich (dan AT coneharvesters.com)
function old new delta logdirs_reopen 1310 1308 -2 read_line_input 4757 4753 -4 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-6) Total: -6 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
-rw-r--r--libbb/lineedit.c3
-rw-r--r--libbb/loop.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 9a773b4..38c69c6 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -2037,7 +2037,8 @@ int FAST_FUNC read_line_input(const char *prompt, char *command, int maxsize, li
rewrite_line:
/* Rewrite the line with the selected history item */
/* change command */
- command_len = load_string(state->history[state->cur_history] ? : "", maxsize);
+ command_len = load_string(state->history[state->cur_history] ?
+ state->history[state->cur_history] : "", maxsize);
/* redraw and go to eol (bol, in vi) */
redraw(cmdedit_y, (state->flags & VI_MODE) ? 9999 : 0);
break;
diff --git a/libbb/loop.c b/libbb/loop.c
index 24dab1a..3fec7ad 100644
--- a/libbb/loop.c
+++ b/libbb/loop.c
@@ -105,7 +105,7 @@ int FAST_FUNC set_loop(char **device, const char *file, unsigned long long offse
}
/* Find a loop device. */
- try = *device ? : dev;
+ try = *device ? *device : dev;
for (i = 0; rc; i++) {
sprintf(dev, LOOP_FORMAT, i);