Apply post-1.19.1 patches, bump version to 1.19.21_19_2

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

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)
 
                 /* write out temp file and replace hist_file atomically */
                 new_name = xasprintf("%s.%u.new", state->hist_file, (int) getpid());
-                fd = open(state->hist_file, O_WRONLY | O_CREAT | O_TRUNC, 0600);
+                fd = open(new_name, O_WRONLY | O_CREAT | O_TRUNC, 0600);
                 if (fd >= 0) {
                         FILE *fp;
                         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 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
-#ifdef HAVE_MNTENT_H
-
 #include "libbb.h"
 
+#ifdef HAVE_MNTENT_H
+
 int FAST_FUNC match_fstype(const struct mntent *mt, const char *t_fstype)
 {
         int match = 1;