Merge branch 'origin/master' (early part)

4 files changed, 7 insertions, 7 deletions

diff --git a/coreutils/head.c b/coreutils/head.c
index 75189eda8..cc2837411 100644
--- a/coreutils/head.c
+++ b/coreutils/head.c
@@ -27,7 +27,7 @@ static const struct suffix_mult head_suffixes[] = {
         { "", 0 }
 };
 
-static const char header_fmt_str[] ALIGN1 = "\n==> %s <==\n";
+#define header_fmt_str "\n==> %s <==\n"
 
 int head_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int head_main(int argc, char **argv)
diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index cb97ff8c5..4c6b64d5e 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -509,7 +509,7 @@ check_and_close(void)
         }
 
         if (ferror(stdout)) {
-                bb_error_msg("write error");
+                bb_error_msg(bb_msg_write_error);
                 ioerror = 1;
         }
 }
diff --git a/coreutils/tail.c b/coreutils/tail.c
index 8fc22f562..6397702a0 100644
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -66,7 +66,7 @@ static ssize_t tail_read(int fd, char *buf, size_t count)
         return r;
 }
 
-static const char header_fmt[] ALIGN1 = "\n==> %s <==\n";
+#define header_fmt_str "\n==> %s <==\n"
 
 static unsigned eat_num(const char *p)
 {
@@ -166,7 +166,7 @@ int tail_main(int argc, char **argv)
         tailbuf = xmalloc(tailbufsize);
 
         /* tail the files */
-        fmt = header_fmt + 1; /* skip header leading newline on first output */
+        fmt = header_fmt_str + 1; /* skip header leading newline on first output */
         i = 0;
         do {
                 char *buf;
@@ -181,7 +181,7 @@ int tail_main(int argc, char **argv)
 
                 if (nfiles > header_threshhold) {
                         tail_xprint_header(fmt, argv[i]);
-                        fmt = header_fmt;
+                        fmt = header_fmt_str;
                 }
 
                 if (!from_top) {
@@ -333,7 +333,7 @@ int tail_main(int argc, char **argv)
                         if (ENABLE_FEATURE_FANCY_TAIL && fd < 0)
                                 continue;
                         if (nfiles > header_threshhold) {
-                                fmt = header_fmt;
+                                fmt = header_fmt_str;
                         }
                         while ((nread = tail_read(fd, tailbuf, BUFSIZ)) > 0) {
                                 if (fmt) {
diff --git a/coreutils/test.c b/coreutils/test.c
index 3115ce6e7..0b9322316 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -393,7 +393,7 @@ static number_t getn(const char *s)
         if (errno != 0)
                 syntax(s, "out of range");
 
-        if (*(skip_whitespace(p)))
+        if (p == s || *(skip_whitespace(p)) != '\0')
                 syntax(s, "bad number");
 
         return r;