diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2011-09-06 04:31:16 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2011-09-06 04:31:16 +0200 |
commit | ed058016bf8fc98271de2e58bfb650de9e9d304d (patch) | |
tree | b6554880a7224a86c27429aaebfa6a5b16349b59 /libbb | |
parent | cc272b06eefb87030bb85b686abdbc22b5ed1c34 (diff) | |
download | busybox-w32-1_19_2.tar.gz busybox-w32-1_19_2.tar.bz2 busybox-w32-1_19_2.zip |
Apply post-1.19.1 patches, bump version to 1.19.21_19_2
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to '')
-rw-r--r-- | libbb/lineedit.c | 2 | ||||
-rw-r--r-- | libbb/match_fstype.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libbb/lineedit.c b/libbb/lineedit.c index 10265192e..2ea373c2c 100644 --- a/libbb/lineedit.c +++ b/libbb/lineedit.c | |||
@@ -1425,7 +1425,7 @@ static void save_history(char *str) | |||
1425 | 1425 | ||
1426 | /* write out temp file and replace hist_file atomically */ | 1426 | /* write out temp file and replace hist_file atomically */ |
1427 | new_name = xasprintf("%s.%u.new", state->hist_file, (int) getpid()); | 1427 | new_name = xasprintf("%s.%u.new", state->hist_file, (int) getpid()); |
1428 | fd = open(state->hist_file, O_WRONLY | O_CREAT | O_TRUNC, 0600); | 1428 | fd = open(new_name, O_WRONLY | O_CREAT | O_TRUNC, 0600); |
1429 | if (fd >= 0) { | 1429 | if (fd >= 0) { |
1430 | FILE *fp; | 1430 | FILE *fp; |
1431 | int i; | 1431 | int i; |
diff --git a/libbb/match_fstype.c b/libbb/match_fstype.c index c792d13b3..32c3d7f18 100644 --- a/libbb/match_fstype.c +++ b/libbb/match_fstype.c | |||
@@ -10,10 +10,10 @@ | |||
10 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 10 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
11 | */ | 11 | */ |
12 | 12 | ||
13 | #ifdef HAVE_MNTENT_H | ||
14 | |||
15 | #include "libbb.h" | 13 | #include "libbb.h" |
16 | 14 | ||
15 | #ifdef HAVE_MNTENT_H | ||
16 | |||
17 | int FAST_FUNC match_fstype(const struct mntent *mt, const char *t_fstype) | 17 | int FAST_FUNC match_fstype(const struct mntent *mt, const char *t_fstype) |
18 | { | 18 | { |
19 | int match = 1; | 19 | int match = 1; |