Merge branch 'busybox' into mergemerge

Signed-off-by: Ron Yorston <rmy@pobox.com>

50 files changed, 511 insertions, 208 deletions

diff --git a/archival/ar.c b/archival/ar.c
index 16bb33227..0780548d6 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -211,8 +211,9 @@ static int write_ar_archive(archive_handle_t *handle)
 }
 #endif /* FEATURE_AR_CREATE */
 
-static void FAST_FUNC header_verbose_list_ar(const file_header_t *file_header)
+static void FAST_FUNC header_verbose_list_ar(archive_handle_t *archive_handle)
 {
+        const file_header_t *file_header = archive_handle->file_header;
         char mode[12];
         char *mtime;
 
diff --git a/archival/libarchive/get_header_ar.c b/archival/libarchive/get_header_ar.c
index 6bd897392..8106ccb4d 100644
--- a/archival/libarchive/get_header_ar.c
+++ b/archival/libarchive/get_header_ar.c
@@ -124,7 +124,7 @@ char FAST_FUNC get_header_ar(archive_handle_t *archive_handle)
         typed->name[strcspn(typed->name, " /")] = '\0';
 
         if (archive_handle->filter(archive_handle) == EXIT_SUCCESS) {
-                archive_handle->action_header(typed);
+                archive_handle->action_header(archive_handle);
 #if ENABLE_DPKG || ENABLE_DPKG_DEB
                 if (archive_handle->dpkg__sub_archive) {
                         struct archive_handle_t *sa = archive_handle->dpkg__sub_archive;
diff --git a/archival/libarchive/get_header_cpio.c b/archival/libarchive/get_header_cpio.c
index 9ad0557c2..63a0b6d8a 100644
--- a/archival/libarchive/get_header_cpio.c
+++ b/archival/libarchive/get_header_cpio.c
@@ -125,7 +125,7 @@ char FAST_FUNC get_header_cpio(archive_handle_t *archive_handle)
 //cpio: etc/hosts not created: newer or same age file exists
 //etc/hosts  <-- should NOT show it
 //2 blocks <-- should say "0 blocks"
-                archive_handle->action_header(file_header);
+                archive_handle->action_header(archive_handle);
         } else {
                 data_skip(archive_handle);
         }
diff --git a/archival/libarchive/get_header_tar.c b/archival/libarchive/get_header_tar.c
index b83523fb2..56a81d093 100644
--- a/archival/libarchive/get_header_tar.c
+++ b/archival/libarchive/get_header_tar.c
@@ -474,7 +474,7 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
         cp = last_char_is(file_header->name, '/');
 
         if (archive_handle->filter(archive_handle) == EXIT_SUCCESS) {
-                archive_handle->action_header(/*archive_handle->*/ file_header);
+                archive_handle->action_header(archive_handle);
                 /* Note that we kill the '/' only after action_header() */
                 /* (like GNU tar 1.15.1: verbose mode outputs "dir/dir/") */
                 if (cp)
diff --git a/archival/libarchive/header_list.c b/archival/libarchive/header_list.c
index 9490b3635..28ac831d5 100644
--- a/archival/libarchive/header_list.c
+++ b/archival/libarchive/header_list.c
@@ -5,8 +5,13 @@
 #include "libbb.h"
 #include "bb_archive.h"
 
-void FAST_FUNC header_list(const file_header_t *file_header)
+void FAST_FUNC header_list(archive_handle_t *archive_handle)
 {
 //TODO: cpio -vp DIR should output "DIR/NAME", not just "NAME" */
-        puts(printable_string(file_header->name));
+
+        const file_header_t *file_header = archive_handle->file_header;
+        /* "tar xvOf TARFILE >OUTFILE" should use stderr for file list output: */
+        FILE *fp = (archive_handle->action_data == data_extract_to_stdout) ? stderr : stdout;
+
+        fprintf(fp, "%s\n", printable_string(file_header->name));
 }
diff --git a/archival/libarchive/header_skip.c b/archival/libarchive/header_skip.c
index f5987bfe2..e7691534e 100644
--- a/archival/libarchive/header_skip.c
+++ b/archival/libarchive/header_skip.c
@@ -5,6 +5,6 @@
 #include "libbb.h"
 #include "bb_archive.h"
 
-void FAST_FUNC header_skip(const file_header_t *file_header UNUSED_PARAM)
+void FAST_FUNC header_skip(archive_handle_t *archive_handle UNUSED_PARAM)
 {
 }
diff --git a/archival/libarchive/header_verbose_list.c b/archival/libarchive/header_verbose_list.c
index e7a09430d..0cd477de7 100644
--- a/archival/libarchive/header_verbose_list.c
+++ b/archival/libarchive/header_verbose_list.c
@@ -5,11 +5,14 @@
 #include "libbb.h"
 #include "bb_archive.h"
 
-void FAST_FUNC header_verbose_list(const file_header_t *file_header)
+void FAST_FUNC header_verbose_list(archive_handle_t *archive_handle)
 {
+        const file_header_t *file_header = archive_handle->file_header;
         struct tm tm_time;
         struct tm *ptm = &tm_time; //localtime(&file_header->mtime);
         char modestr[12];
+        /* "tar xvvOf TARFILE >OUTFILE" should use stderr for file list output: */
+        FILE *fp = (archive_handle->action_data == data_extract_to_stdout) ? stderr : stdout;
 
 #if ENABLE_FEATURE_TAR_UNAME_GNAME
         char uid[sizeof(int)*3 + 2];
@@ -29,7 +32,7 @@ void FAST_FUNC header_verbose_list(const file_header_t *file_header)
                 /*sprintf(gid, "%u", (unsigned)file_header->gid);*/
                 group = utoa(file_header->gid);
         }
-        printf("%s %s/%s %9"OFF_FMT"u %4u-%02u-%02u %02u:%02u:%02u %s",
+        fprintf(fp, "%s %s/%s %9"OFF_FMT"u %4u-%02u-%02u %02u:%02u:%02u %s",
                 bb_mode_string(modestr, file_header->mode),
                 user,
                 group,
@@ -40,13 +43,13 @@ void FAST_FUNC header_verbose_list(const file_header_t *file_header)
                 ptm->tm_hour,
                 ptm->tm_min,
                 ptm->tm_sec,
-                file_header->name);
+                printable_string(file_header->name));
 
 #else /* !FEATURE_TAR_UNAME_GNAME */
 
         localtime_r(&file_header->mtime, ptm);
 
-        printf("%s %u/%u %9"OFF_FMT"u %4u-%02u-%02u %02u:%02u:%02u %s",
+        fprintf(fp, "%s %u/%u %9"OFF_FMT"u %4u-%02u-%02u %02u:%02u:%02u %s",
                 bb_mode_string(modestr, file_header->mode),
                 (unsigned)file_header->uid,
                 (unsigned)file_header->gid,
@@ -63,7 +66,7 @@ void FAST_FUNC header_verbose_list(const file_header_t *file_header)
 
         /* NB: GNU tar shows "->" for symlinks and "link to" for hardlinks */
         if (file_header->link_target) {
-                printf(" -> %s", printable_string(file_header->link_target));
+                fprintf(fp, " -> %s", printable_string(file_header->link_target));
         }
-        bb_putchar('\n');
+        putc('\n', fp);
 }
diff --git a/archival/rpm.c b/archival/rpm.c
index 81b3248d1..5c287378a 100644
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -550,9 +550,9 @@ int rpm2cpio_main(int argc UNUSED_PARAM, char **argv)
         //      /* We need to know whether child (gzip/bzip/etc) exits abnormally */
         //      signal(SIGCHLD, check_errors_in_children);
 
-        str = NULL;
+        str = rpm_getstr0(TAG_PAYLOADCOMPRESSOR);
         if (ENABLE_FEATURE_SEAMLESS_LZMA
-         && (str = rpm_getstr0(TAG_PAYLOADCOMPRESSOR)) != NULL
+         && str != NULL
          && strcmp(str, "lzma") == 0
         ) {
                 // lzma compression can't be detected
diff --git a/archival/tar.c b/archival/tar.c
index 382c7733c..2b8b368ad 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -433,7 +433,7 @@ static int writeTarHeader(struct TarBallInfo *tbInfo,
                 /* GNU "tar cvvf" prints "extended" listing a-la "ls -l" */
                 /* We don't have such excesses here: for us "v" == "vv" */
                 /* '/' is probably a GNUism */
-                fprintf(vbFd, "%s%s\n", header_name,
+                fprintf(vbFd, "%s%s\n", printable_string(header_name),
                                 S_ISDIR(statbuf->st_mode) ? "/" : "");
         }
 
diff --git a/coreutils/cp.c b/coreutils/cp.c
index 961de5b42..85af104e6 100644
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -29,6 +29,11 @@
 //config:       bool "Enable --reflink[=auto]"
 //config:       default y
 //config:       depends on FEATURE_CP_LONG_OPTIONS
+//config:
+//config:config FEATURE_CP_SPARSE
+//config:       bool "Enable --sparse=WHEN"
+//config:       default y
+//config:       depends on FEATURE_CP_LONG_OPTIONS
 
 //applet:IF_CP(APPLET_NOEXEC(cp, cp, BB_DIR_BIN, BB_SUID_DROP, cp))
 /* NOEXEC despite cases when it can be a "runner" (cp -r LARGE_DIR NEW_DIR) */
@@ -108,6 +113,8 @@
 #include "libbb.h"
 #include "libcoreutils/coreutils.h"
 
+#define DBG_OPTION_PARSING 0
+
 /* This is a NOEXEC applet. Be very careful! */
 
 int cp_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -130,6 +137,9 @@ int cp_main(int argc, char **argv)
 # if ENABLE_FEATURE_CP_REFLINK
         char *reflink = NULL;
 # endif
+# if ENABLE_FEATURE_CP_SPARSE
+        char *sparse = NULL;
+# endif
         flags = getopt32long(argv, "^"
                 FILEUTILS_CP_OPTSTR
                 "\0"
@@ -159,11 +169,19 @@ int cp_main(int argc, char **argv)
 # if ENABLE_FEATURE_CP_REFLINK
                 "reflink\0"        Optional_argument "\xfd"
 # endif
+# if ENABLE_FEATURE_CP_SPARSE
+                "sparse\0"         Required_argument "\xfc"
+# endif
                 , &last
 # if ENABLE_FEATURE_CP_REFLINK
                 , &reflink
 # endif
+# if ENABLE_FEATURE_CP_SPARSE
+                // NOP for now
+                , &sparse
+# endif
         );
+
 # if ENABLE_FEATURE_CP_REFLINK
         BUILD_BUG_ON((int)OPT_reflink != (int)FILEUTILS_REFLINK);
         if (flags & FILEUTILS_REFLINK) {
@@ -175,6 +193,16 @@ int cp_main(int argc, char **argv)
                         bb_show_usage();
         }
 # endif
+# if DBG_OPTION_PARSING
+        bb_error_msg("flags: 0x%08x", flags);
+#  define showopt(o) bb_error_msg("flags & %s(%x):\t%x", #o, o, flags & o);
+        showopt(FILEUTILS_RMDEST        );
+        showopt(OPT_parents             );
+        showopt(OPT_reflink             );
+        showopt(FILEUTILS_REFLINK_ALWAYS);
+        return 0;
+#  undef showopt
+# endif
 #else
         flags = getopt32(argv, "^"
                 FILEUTILS_CP_OPTSTR
diff --git a/coreutils/id.c b/coreutils/id.c
index 0e1286294..050487ecc 100644
--- a/coreutils/id.c
+++ b/coreutils/id.c
@@ -158,7 +158,7 @@ int id_main(int argc UNUSED_PARAM, char **argv)
         const char *prefix;
         const char *username;
 #if ENABLE_SELINUX
-        security_context_t scontext = NULL;
+        char *scontext = NULL;
 #endif
 
         if (ENABLE_GROUPS && (!ENABLE_ID || applet_name[0] == 'g')) {
diff --git a/coreutils/install.c b/coreutils/install.c
index 00f8be87e..728ea7126 100644
--- a/coreutils/install.c
+++ b/coreutils/install.c
@@ -73,7 +73,7 @@ static const char install_longopts[] ALIGN1 =
 static void setdefaultfilecon(const char *path)
 {
         struct stat s;
-        security_context_t scontext = NULL;
+        char *scontext = NULL;
 
         if (!is_selinux_enabled()) {
                 return;
@@ -119,7 +119,7 @@ int install_main(int argc, char **argv)
         int ret = EXIT_SUCCESS;
         int isdir;
 #if ENABLE_SELINUX
-        security_context_t scontext;
+        char *scontext;
         bool use_default_selinux_context = 1;
 #endif
         enum {
diff --git a/coreutils/libcoreutils/getopt_mk_fifo_nod.c b/coreutils/libcoreutils/getopt_mk_fifo_nod.c
index dafe70edf..938adef18 100644
--- a/coreutils/libcoreutils/getopt_mk_fifo_nod.c
+++ b/coreutils/libcoreutils/getopt_mk_fifo_nod.c
@@ -26,7 +26,7 @@ mode_t FAST_FUNC getopt_mk_fifo_nod(char **argv)
         mode_t mode = 0666;
         char *smode = NULL;
 #if ENABLE_SELINUX
-        security_context_t scontext;
+        char *scontext;
 #endif
         int opt;
         opt = getopt32(argv, "m:" IF_SELINUX("Z:"), &smode IF_SELINUX(,&scontext));
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 2fed317c6..20385bd32 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -319,7 +319,7 @@ struct dnode {
         const char *name;       /* usually basename, but think "ls -l dir/file" */
         const char *fullname;   /* full name (usable for stat etc) */
         struct dnode *dn_next;  /* for linked list */
-        IF_SELINUX(security_context_t sid;)
+        IF_SELINUX(char *sid;)
         smallint fname_allocated;
 
         /* Used to avoid re-doing [l]stat at printout stage
diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index e074c3561..6ba4141d3 100644
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -57,7 +57,7 @@ int mkdir_main(int argc UNUSED_PARAM, char **argv)
         unsigned opt;
         char *smode;
 #if ENABLE_SELINUX
-        security_context_t scontext;
+        char *scontext;
 #endif
 
         opt = getopt32long(argv, "m:pv" IF_SELINUX("Z:"),
diff --git a/coreutils/sort.c b/coreutils/sort.c
index 949948203..0ed62770b 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -168,13 +168,18 @@ static char *get_key(char *str, struct sort_key *key, int flags)
                 /* Loop through fields */
                 else {
                         unsigned char ch = 0;
+                        /* -kSTART,N.ENDCHAR: stop at the start of field N instead
+                         * of its end, ENDCHAR below is an offset from there */
+                        unsigned fields = key->range[2*j] + j;
+                        if (j && key->range[3])
+                                fields--;
 
                         end = 0;
-                        for (i = 1; i < key->range[2*j] + j; i++) {
+                        for (i = 1; i < fields; i++) {
                                 if (key_separator) {
                                         /* Skip body of key and separator */
                                         while ((ch = str[end]) != '\0') {
-                                                        end++;
+                                                end++;
                                                 if (ch == key_separator)
                                                         break;
                                         }
@@ -191,9 +196,9 @@ static char *get_key(char *str, struct sort_key *key, int flags)
                                 }
                         }
                         /* Remove last delim: "abc:def:" => "abc:def" */
-                        if (j && ch) {
+                        if (j && ch && !key->range[3]) {
                                 //if (str[end-1] != key_separator)
-                                //  bb_error_msg(_and_die("BUG! "
+                                //  bb_error_msg_and_die("BUG! "
                                 //  "str[start:%d,end:%d]:'%.*s'",
                                 //  start, end, (int)(end-start), &str[start]);
                                 end--;
@@ -208,9 +213,11 @@ static char *get_key(char *str, struct sort_key *key, int flags)
         /* Strip trailing whitespace if necessary */
         if (flags & FLAG_bb)
                 while (end > start && isspace(str[end-1])) end--;
-        /* -kSTART,N.ENDCHAR: honor ENDCHAR (1-based) */
+        /* -kSTART,N.ENDCHAR: honor ENDCHAR (1-based), counted from the
+         * start of field N, which the loop above stopped at
+         */
         if (key->range[3]) {
-                end = key->range[3];
+                end += key->range[3];
                 if (end > len) end = len;
         }
         /* -kN.STARTCHAR[,...]: honor STARTCHAR (1-based) */
diff --git a/coreutils/stat.c b/coreutils/stat.c
index fc9597ddb..c2f5b1ca1 100644
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -249,53 +249,84 @@ static void strcatc(char *str, char c)
         str[len] = '\0';
 }
 
-static void printfs(char *pformat, const char *msg)
+/* printf is a vararg function, on some arches varargs
+ * require more code, increasing code size win
+ * from factoring out common uses of printf into
+ * non-vararg functions.
+ */
+static void printf_s(char *pformat, const char *msg)
 {
         strcatc(pformat, 's');
         printf(pformat, msg);
 }
 
+static void printf_lu(char *pformat, unsigned long v)
+{
+        strcat(pformat, "lu");
+        printf(pformat, v);
+}
+
+static void printf_llu(char *pformat, unsigned long long v)
+{
+        strcat(pformat, "llu");
+        printf(pformat, v);
+}
+
+static void printf_lx(char *pformat, unsigned long v)
+{
+        strcat(pformat, "lx");
+        printf(pformat, v);
+}
+
+static void printf_llx(char *pformat, unsigned long long v)
+{
+        strcat(pformat, "llx");
+        printf(pformat, v);
+}
+
+static void printf_time_t(char *pformat, time_t val)
+{
+#define TYPE_SIGNED(t) ((t) -1 < (t) 0)
+        if (TYPE_SIGNED(time_t)) {
+                strcat(pformat, "lld");
+                printf(pformat, (long long) val);
+        } else {
+                printf_llu(pformat, val);
+        }
+}
+
 #if ENABLE_FEATURE_STAT_FILESYSTEM
 /* print statfs info */
 static void FAST_FUNC print_statfs(char *pformat, const char m,
                 const char *const filename, const void *data
-                IF_SELINUX(, security_context_t scontext))
+                IF_SELINUX(, char *scontext))
 {
         const struct statfs *statfsbuf = data;
         if (m == 'n') {
-                printfs(pformat, filename);
+                printf_s(pformat, filename);
         } else if (m == 'i') {
-                strcat(pformat, "llx");
-                printf(pformat, get_f_fsid(statfsbuf));
+                printf_llx(pformat, get_f_fsid(statfsbuf));
         } else if (m == 'l') {
-                strcat(pformat, "lu");
-                printf(pformat, (unsigned long) statfsbuf->f_namelen);
+                printf_lu(pformat, statfsbuf->f_namelen);
         } else if (m == 't') {
-                strcat(pformat, "lx");
-                printf(pformat, (unsigned long) statfsbuf->f_type); /* no equiv */
+                printf_lx(pformat, statfsbuf->f_type); /* no equiv */
         } else if (m == 'T') {
-                printfs(pformat, human_fstype(statfsbuf->f_type));
+                printf_s(pformat, human_fstype(statfsbuf->f_type));
         } else if (m == 'b') {
-                strcat(pformat, "llu");
-                printf(pformat, (unsigned long long) statfsbuf->f_blocks);
+                printf_llu(pformat, statfsbuf->f_blocks);
         } else if (m == 'f') {
-                strcat(pformat, "llu");
-                printf(pformat, (unsigned long long) statfsbuf->f_bfree);
+                printf_llu(pformat, statfsbuf->f_bfree);
         } else if (m == 'a') {
-                strcat(pformat, "llu");
-                printf(pformat, (unsigned long long) statfsbuf->f_bavail);
+                printf_llu(pformat, statfsbuf->f_bavail);
         } else if (m == 's' || m == 'S') {
-                strcat(pformat, "lu");
-                printf(pformat, (unsigned long) statfsbuf->f_bsize);
+                printf_lu(pformat, statfsbuf->f_bsize);
         } else if (m == 'c') {
-                strcat(pformat, "llu");
-                printf(pformat, (unsigned long long) statfsbuf->f_files);
+                printf_llu(pformat, statfsbuf->f_files);
         } else if (m == 'd') {
-                strcat(pformat, "llu");
-                printf(pformat, (unsigned long long) statfsbuf->f_ffree);
+                printf_llu(pformat, statfsbuf->f_ffree);
 # if ENABLE_SELINUX
         } else if (m == 'C' && (option_mask32 & OPT_SELINUX)) {
-                printfs(pformat, scontext);
+                printf_s(pformat, scontext);
 # endif
         } else {
                 strcatc(pformat, 'c');
@@ -307,15 +338,14 @@ static void FAST_FUNC print_statfs(char *pformat, const char m,
 /* print stat info */
 static void FAST_FUNC print_stat(char *pformat, const char m,
                 const char *const filename, const void *data
-                IF_SELINUX(, security_context_t scontext))
+                IF_SELINUX(, char *scontext))
 {
-#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
         struct stat *statbuf = (struct stat *) data;
         struct passwd *pw_ent;
         struct group *gw_ent;
 
         if (m == 'n') {
-                printfs(pformat, filename);
+                printf_s(pformat, filename);
         } else if (m == 'N') {
                 strcatc(pformat, 's');
                 if (S_ISLNK(statbuf->st_mode)) {
@@ -328,78 +358,60 @@ static void FAST_FUNC print_stat(char *pformat, const char m,
                         printf(pformat, filename);
                 }
         } else if (m == 'd') {
-                strcat(pformat, "llu");
-                printf(pformat, (unsigned long long) statbuf->st_dev);
+                printf_llu(pformat, statbuf->st_dev);
         } else if (m == 'D') {
-                strcat(pformat, "llx");
-                printf(pformat, (unsigned long long) statbuf->st_dev);
+                printf_llx(pformat, statbuf->st_dev);
         } else if (m == 'i') {
-                strcat(pformat, "llu");
-                printf(pformat, (unsigned long long) statbuf->st_ino);
+                printf_llu(pformat, statbuf->st_ino);
         } else if (m == 'a') {
                 strcat(pformat, "lo");
                 printf(pformat, (unsigned long) (statbuf->st_mode & (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)));
         } else if (m == 'A') {
                 char modestr[12];
-                printfs(pformat, bb_mode_string(modestr, statbuf->st_mode));
+                printf_s(pformat, bb_mode_string(modestr, statbuf->st_mode));
         } else if (m == 'f') {
-                strcat(pformat, "lx");
-                printf(pformat, (unsigned long) statbuf->st_mode);
+                printf_lx(pformat, statbuf->st_mode);
         } else if (m == 'F') {
-                printfs(pformat, file_type(statbuf));
+                printf_s(pformat, file_type(statbuf));
         } else if (m == 'h') {
-                strcat(pformat, "lu");
-                printf(pformat, (unsigned long) statbuf->st_nlink);
+                printf_lu(pformat, statbuf->st_nlink);
         } else if (m == 'u') {
-                strcat(pformat, "lu");
-                printf(pformat, (unsigned long) statbuf->st_uid);
+                printf_lu(pformat, statbuf->st_uid);
         } else if (m == 'U') {
                 pw_ent = getpwuid(statbuf->st_uid);
-                printfs(pformat, (pw_ent != NULL) ? pw_ent->pw_name : "UNKNOWN");
+                printf_s(pformat, (pw_ent != NULL) ? pw_ent->pw_name : "UNKNOWN");
         } else if (m == 'g') {
-                strcat(pformat, "lu");
-                printf(pformat, (unsigned long) statbuf->st_gid);
+                printf_lu(pformat, statbuf->st_gid);
         } else if (m == 'G') {
                 gw_ent = getgrgid(statbuf->st_gid);
-                printfs(pformat, (gw_ent != NULL) ? gw_ent->gr_name : "UNKNOWN");
+                printf_s(pformat, (gw_ent != NULL) ? gw_ent->gr_name : "UNKNOWN");
         } else if (m == 't') {
-                strcat(pformat, "lx");
-                printf(pformat, (unsigned long) major(statbuf->st_rdev));
+                printf_lx(pformat, major(statbuf->st_rdev));
         } else if (m == 'T') {
-                strcat(pformat, "lx");
-                printf(pformat, (unsigned long) minor(statbuf->st_rdev));
+                printf_lx(pformat, minor(statbuf->st_rdev));
         } else if (m == 's') {
-                strcat(pformat, "llu");
-                printf(pformat, (unsigned long long) statbuf->st_size);
+                printf_llu(pformat, statbuf->st_size);
         } else if (m == 'B') {
-                strcat(pformat, "lu");
-                printf(pformat, (unsigned long) 512); //ST_NBLOCKSIZE
+                printf_lu(pformat, 512); //ST_NBLOCKSIZE
         } else if (m == 'b') {
-                strcat(pformat, "llu");
-                printf(pformat, (unsigned long long) statbuf->st_blocks);
+                printf_llu(pformat, statbuf->st_blocks);
         } else if (m == 'o') {
-                strcat(pformat, "lu");
-                printf(pformat, (unsigned long) statbuf->st_blksize);
+                printf_lu(pformat, statbuf->st_blksize);
         } else if (m == 'x') {
-                printfs(pformat, human_time(&statbuf->st_atim));
+                printf_s(pformat, human_time(&statbuf->st_atim));
         } else if (m == 'X') {
-                strcat(pformat, TYPE_SIGNED(time_t) ? "ld" : "lu");
-                /* note: (unsigned long) would be wrong:
-                 * imagine (unsigned long64)int32 */
-                printf(pformat, (long) statbuf->st_atime);
+                printf_time_t(pformat, statbuf->st_atime);
         } else if (m == 'y') {
-                printfs(pformat, human_time(&statbuf->st_mtim));
+                printf_s(pformat, human_time(&statbuf->st_mtim));
         } else if (m == 'Y') {
-                strcat(pformat, TYPE_SIGNED(time_t) ? "ld" : "lu");
-                printf(pformat, (long) statbuf->st_mtime);
+                printf_time_t(pformat, statbuf->st_mtime);
         } else if (m == 'z') {
-                printfs(pformat, human_time(&statbuf->st_ctim));
+                printf_s(pformat, human_time(&statbuf->st_ctim));
         } else if (m == 'Z') {
-                strcat(pformat, TYPE_SIGNED(time_t) ? "ld" : "lu");
-                printf(pformat, (long) statbuf->st_ctime);
+                printf_time_t(pformat, statbuf->st_ctime);
 # if ENABLE_SELINUX
         } else if (m == 'C' && (option_mask32 & OPT_SELINUX)) {
-                printfs(pformat, scontext);
+                printf_s(pformat, scontext);
 # endif
         } else {
                 strcatc(pformat, 'c');
@@ -409,9 +421,9 @@ static void FAST_FUNC print_stat(char *pformat, const char m,
 
 static void print_it(const char *masterformat,
                 const char *filename,
-                void FAST_FUNC (*print_func)(char*, char, const char*, const void* IF_SELINUX(, security_context_t scontext)),
+                void FAST_FUNC (*print_func)(char*, char, const char*, const void* IF_SELINUX(, char *scontext)),
                 const void *data
-                IF_SELINUX(, security_context_t scontext))
+                IF_SELINUX(, char *scontext))
 {
         /* Create a working copy of the format string */
         char *format = xstrdup(masterformat);
@@ -476,7 +488,7 @@ static bool do_statfs(const char *filename, const char *format)
         const char *format;
 #endif
 #if ENABLE_SELINUX
-        security_context_t scontext = NULL;
+        char *scontext = NULL;
 
         if (option_mask32 & OPT_SELINUX) {
                 if ((option_mask32 & OPT_DEREFERENCE
@@ -591,7 +603,7 @@ static bool do_stat(const char *filename, const char *format)
 {
         struct stat statbuf;
 #if ENABLE_SELINUX
-        security_context_t scontext = NULL;
+        char *scontext = NULL;
 
         if (option_mask32 & OPT_SELINUX) {
                 if ((option_mask32 & OPT_DEREFERENCE
diff --git a/editors/awk.c b/editors/awk.c
index 8ad7f9745..89a46488f 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -890,24 +890,30 @@ static char *nextword(char **s)
         return p;
 }
 
+/* Note: will NOT stop at NUL (either on <NUL> or \<newline><NUL>):
+ * *s will be advanced past NUL!
+ * Make sure you always check NUL return before continuing.
+ */
 static char nextchar(char **s)
 {
-        char c, *pps;
+        char c;
  again:
         c = *(*s)++;
-        pps = *s;
-        if (c == '\\')
+
+        if (c == '\\') {
+                char *pps = *s;
                 c = bb_process_escape_sequence((const char**)s);
-        /* Example awk statement:
-         * s = "abc\"def"
-         * we must treat \" as "
-         */
-        if (c == '\\' && *s == pps) { /* unrecognized \z? */
-                c = *(*s); /* yes, fetch z */
-                if (c) { /* advance unless z = NUL */
-                        (*s)++;
-                        if (c == '\n') /* \<newline>? eat it */
-                                goto again;
+                /* Example awk statement:
+                 * s = "abc\"def"
+                 * we must treat \" as "
+                 */
+                if (c == '\\' && *s == pps) { /* unrecognized \z? */
+                        c = *(*s); /* yes, fetch z */
+                        if (c) { /* advance unless z = NUL */
+                                (*s)++;
+                                if (c == '\n') /* \<newline>? eat it */
+                                        goto again;
+                        }
                 }
         }
         return c;
@@ -961,20 +967,64 @@ static double my_strtod_or_hexoct(char **pp)
 
 /* -------- working with variables (set/get/copy/etc) -------- */
 
+/* Perform OFMT or CONVFMT float-to-string conversion.
+ * According to POSIX, awk's behavior is undefined if OFMT
+ * contains anything but a floating-point conversion specification.
+ * However, GNU awk 5.3.0 allows prefix and suffix: "N:%.1f!"
+ * integer formats (%d et al), %s formats.
+ * It even allows %c, but we don't implement this.
+ * GNU awk also supports %ld, %lx, we don't (yet). GNU awk doesn't support %lld.
+ */
 static const char *fmt_num(const char *format, double n)
 {
-        if (n == (long long)n) {
-                snprintf(g_buf, MAXVARFMT, "%"LL_FMT"d", (long long)n);
+        if (n == trunc(n)) {
+                /* No fractionals? Try: awk -v OFMT='R:%d!' 'BEGIN { print 2**128 }' */
+                snprintf(g_buf, MAXVARFMT, "%.0f", n);
         } else {
                 const char *s = format;
                 char c;
 
-                do { c = *s; } while (c && *++s);
+                /* Find %SPEC in format string */
+                for (;;) {
+                        s = strchr(s, '%');
+                        if (!s)
+                                goto print_verbatim;
+                        if (s[1] != '%')
+                                break;
+                        s += 2;  /* skip "%%" */
+                }
+                if (strchr(s + 1, '%') != NULL)
+//TODO: allow "%%"s in the suffix too?
+                        goto INV_FMT; /* more than one %SPEC */
+
+//TODO: factor out awk_printf machinery to make %d print large numbers too. Example:
+// awk -v OFMT='R:%d!' 'BEGIN { print 184467440737095.1 }'
+// R:184467440737095!
+                /* Find the format letter */
+                for (;;) {
+                        c = *++s;
+                        if (!c) /* unterminated "....%SPEC" */
+                                goto print_verbatim;
+                        if (c == '*')
+                                goto INV_FMT; /* CONVFMT/OFMT='%*f' is not allowed */
+                        if (isalpha(c))
+                                break;
+                }
+
                 if (strchr("diouxX", c)) {
                         snprintf(g_buf, MAXVARFMT, format, (int)n);
                 } else if (strchr("eEfFgGaA", c)) {
+ print_verbatim:
                         snprintf(g_buf, MAXVARFMT, format, n);
+                } else if (c == 's') {
+                        /* GNU awk OFMT="%..s" formats number through "%.6g",
+                         * then prints string through %s:
+                         */
+                        char nbuf[sizeof(n)*3 + 12]; /* +5 should do? +12 is paranoia */
+                        sprintf(nbuf, "%.6g", n);
+                        snprintf(g_buf, MAXVARFMT, format, nbuf);
                 } else {
+ INV_FMT:
                         syntax_error(EMSG_INV_FMT);
                 }
         }
@@ -1205,11 +1255,22 @@ static uint32_t next_token(uint32_t expected)
                         /* it's a string */
                         char *s = t_string = ++p;
                         while (*p != '"') {
-                                char *pp;
-                                if (*p == '\0' || *p == '\n')
+                                char c, *pp;
+
+                                /* Since we need to handle \<newline><NUL>
+                                 * below, we can handle ordinary NUL there as well,
+                                 * instead of here. Thus commented out.
+                                 */
+                                if (/* *p == '\0' || */ *p == '\n')
                                         syntax_error(EMSG_UNEXP_EOS);
                                 pp = p;
-                                *s++ = nextchar(&pp);
+                                c = *s++ = nextchar(&pp);
+                                /* awk 'BEGIN { print "unterminated\
+                                 * '
+                                 * results in NUL here after nextchar() eats \<newline>
+                                 */
+                                if (c == '\0')
+                                        syntax_error(EMSG_UNEXP_EOS);
                                 p = pp;
                         }
                         p++;
@@ -2490,6 +2551,7 @@ static char *awk_printf(node *n, size_t *len)
                                 }
                                 goto tail; /* append remaining string, exit loop */
                         }
+//TODO: GNU awk 5.3.0 also supports %ld, %lx, we don't (yet). It does not support %lld.
                         if (isalpha(c))
                                 break;
                         starred |= (c == '*');
@@ -3313,8 +3375,7 @@ static var *evaluate(node *op, var *res)
                                         for (;;) {
                                                 var *v = evaluate(nextarg(&op1), TMPVAR0);
                                                 if (v->type & VF_NUMBER) {
-                                                        fputs(fmt_num(getvar_s(intvar[OFMT]), getvar_i(v)),
-                                                                F);
+                                                        fputs(fmt_num(getvar_s(intvar[OFMT]), getvar_i(v)), F);
                                                 } else {
                                                         fputs(getvar_s(v), F);
                                                 }
diff --git a/editors/patch.c b/editors/patch.c
index 8837d1751..ee0ccd384 100644
--- a/editors/patch.c
+++ b/editors/patch.c
@@ -57,9 +57,7 @@ struct double_list {
         struct double_list *next;
         struct double_list *prev;
         char *data;
-#if ENABLE_PLATFORM_MINGW32
         int no_newline;
-#endif
 };
 
 // Free all the elements of a linked list
@@ -79,11 +77,7 @@ static void dlist_free(struct double_list *list, void (*freeit)(void *data))
 static struct double_list *dlist_add(struct double_list **list, char *data)
 {
         struct double_list *llist;
-#if ENABLE_PLATFORM_MINGW32
         struct double_list *line = xzalloc(sizeof(*line));
-#else
-        struct double_list *line = xmalloc(sizeof(*line));
-#endif
 
         line->data = data;
         llist = *list;
@@ -147,10 +141,8 @@ static void do_line(void *data)
 
         if (TT.state > 1 && *dlist->data != TT.state)
                 fdprintf(TT.state == 2 ? 2 : TT.fileout,
-#if ENABLE_PLATFORM_MINGW32
-                        dlist->no_newline && TT.state != 2 ? "%s" :
-#endif
-                        "%s\n", dlist->data + (TT.state > 3 ? 1 : 0));
+                        dlist->no_newline && TT.state != 2 ? "%s" : "%s\n",
+                        dlist->data + (TT.state > 3 ? 1 : 0));
 
         if (PATCH_DEBUG) fdprintf(2, "DO %d: %s\n", TT.state, dlist->data);
 
@@ -443,7 +435,6 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
 
                 // Are we assembling a hunk?
                 if (state >= 2) {
-#if ENABLE_PLATFORM_MINGW32
                         switch (*patchline) {
                         case '\\':
                                 // '\ No newline at end of file' detected, mark
@@ -455,9 +446,6 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
                         case ' ':
                         case '+':
                         case '-':
-#else
-                if (*patchline == ' ' || *patchline == '+' || *patchline == '-') {
-#endif
                                 dlist_add(&TT.current_hunk, patchline);
 
                                 if (*patchline != '+') oldlen--;
@@ -469,9 +457,9 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
 
                                 // If we've consumed all expected hunk lines, apply the hunk.
 
-#if ENABLE_PLATFORM_MINGW32
                                 if (!oldlen && !newlen) {
-                                        // Peek ahead for '\ No newline at end of file'
+                                        // Peek ahead for '\ No newline at end of file', mark
+                                        // previous line, if it exists.
                                         int c = getchar();
                                         ungetc(c, stdin);
                                         if (c == '\\') {
@@ -483,9 +471,6 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
                                         }
                                         state = apply_one_hunk();
                                 }
-#else
-                                if (!oldlen && !newlen) state = apply_one_hunk();
-#endif
                                 continue;
                         }
                         fail_hunk();
diff --git a/editors/vi.c b/editors/vi.c
index e3ad120f6..5c0c5c30b 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -2842,21 +2842,25 @@ static void setops(char *args, int flg_no)
 static char *expand_args(char *args)
 {
         char *s;
-        const char *replace;
 
         args = xstrdup(args);
         for (s = args; *s; s++) {
+                const char *replace;
                 unsigned n;
 
+//NB: vim 9.2 replaces "\%" with "%" _over entire string_,
+//then replaces "\c" with "c". Result:
+// "\%" is "%" (ok),
+// "\\" is "\" (ok),
+// "\\%" is "\%" (!!!), not "\CURFILE" as you would think.
+//We don't do that. Should we?
                 if (*s == '%') {
                         replace = current_filename;
                 } else if (*s == '#') {
                         replace = alt_filename;
                 } else {
                         if (*s == '\\' && s[1] != '\0') {
-                                char *t;
-                                for (t = s; *t; t++)
-                                        *t = t[1];
+                                overlapping_strcpy(s, s + 1);
                                 s++;
                         }
                         continue;
diff --git a/findutils/find.c b/findutils/find.c
index 0a8a82e6c..b29ca234d 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -467,7 +467,7 @@ IF_FEATURE_FIND_INUM(   ACTS(inum,  ino_t inode_num;))
 IF_FEATURE_FIND_SAMEFILE(ACTS(samefile, ino_t inode_num; dev_t device;))
 IF_FEATURE_FIND_USER(   ACTS(user,  uid_t uid;))
 IF_FEATURE_FIND_SIZE(   ACTS(size,  char size_char; off_t size;))
-IF_FEATURE_FIND_CONTEXT(ACTS(context, security_context_t context;))
+IF_FEATURE_FIND_CONTEXT(ACTS(context, char *context;))
 IF_FEATURE_FIND_PAREN(  ACTS(paren, action ***subexpr;))
 IF_FEATURE_FIND_PRUNE(  ACTS(prune))
 IF_FEATURE_FIND_QUIT(   ACTS(quit))
@@ -983,7 +983,7 @@ ACTF(empty)
 #if ENABLE_FEATURE_FIND_CONTEXT
 ACTF(context)
 {
-        security_context_t con;
+        char *con;
         int rc;
 
         if (G.recurse_flags & ACTION_FOLLOWLINKS) {
diff --git a/findutils/grep.c b/findutils/grep.c
index f6d0a73f4..99220f603 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -73,10 +73,10 @@
 //usage:     "\n        -c      Show only count of matching lines"
 //usage:     "\n        -o      Show only the matching part of line"
 //usage:     "\n        -q      Quiet. Return 0 if PATTERN is found, 1 otherwise"
-//usage:     "\n        -v      Select non-matching lines"
 //usage:     "\n        -s      Suppress open and read errors"
 //usage:     "\n        -r      Recurse"
 //usage:     "\n        -R      Recurse and dereference symlinks"
+//usage:     "\n        -v      Select non-matching lines"
 //usage:     "\n        -i      Ignore case"
 //usage:     "\n        -w      Match whole words only"
 //usage:     "\n        -x      Match whole lines only"
@@ -105,6 +105,58 @@
 //usage:#define fgrep_trivial_usage NOUSAGE_STR
 //usage:#define fgrep_full_usage ""
 
+// GNU grep 3.7 options:
+// s:short option supported by our code
+// S:short option "supported" by ignoring it
+// l:long option supported
+// .:not supported
+// s. | -E, --extended-regexp
+// s. | -F, --fixed-strings
+// .. | -G, --basic-regexp: Interpret PATTERNS as basic regular expressions (this is the default)
+// .. | -P, --perl-regexp
+// s. | -e PATTERNS, --regexp=PATTERNS
+// s. | -f FILE, --file=FILE
+// s. | -i, --ignore-case (-y is an obsolete synonym)
+//  . | --no-ignore-case
+// s. | -v, --invert-match
+// s. | -w, --word-regexp
+// s. | -x, --line-regexp
+// s. | -c, --count
+// l. | --color[=WHEN], --colour[=WHEN]
+// s. | -L, --files-without-match
+// s. | -l, --files-with-matches
+// s. | -m NUM, --max-count=NUM
+// s. | -o, --only-matching
+// sl.| -q, --quiet, --silent
+// s. | -s, --no-messages
+// .. | -b, --byte-offset
+// s. | -H, --with-filename
+// s. | -h, --no-filename
+//  . | --label=LABEL: Display input coming from standard input as input coming from file LABEL
+// s. | -n, --line-number
+// .. | -T, --initial-tab
+// .. | -Z, --null: Output zero byte (the ASCII NUL character) instead of the character that normally follows filename
+// s. | -A NUM, --after-context=NUM
+// s. | -B NUM, --before-context=NUM
+// s. | -C NUM, --context=NUM
+// .  | -NUM: same as -C NUM
+//  . | --group-separator=SEP: When -A, -B, or -C are in use, print SEP instead of -- between groups of lines
+//  . | --no-group-separator: When -A, -B, or -C are in use, do not print a separator between groups of lines
+// s. | -a, --text
+//  . | --binary-files=TYPE
+// S  | -I: Process binary files as if they did not contain matching data (equivalent to --binary-files=without-match)
+// .. | -D ACTION, --devices=ACTION
+// .. | -d ACTION, --directories=ACTION
+//  . | --exclude=GLOB: Skip any file with a name suffix that matches the pattern GLOB
+//  . | --exclude-from=FILE: Skip files whose base name matches any of the file-name globs read from FILE
+//  . | --exclude-dir=GLOB: Skip any directory with a name suffix that matches the pattern GLOB
+//  . | --include=GLOB: Search only files whose base name matches GLOB
+// s. | -r, --recursive
+// s. | -R, --dereference-recursive
+//  . | --line-buffered
+// .. | -U, --binary
+// s. | -z, --null-data
+
 /* -e,-f are lists; -m,-A,-B,-C have numeric param */
 #define OPTSTR_GREP \
         "lnqvscFiHhe:*f:*LorRm:+wx" \
@@ -713,22 +765,30 @@ int grep_main(int argc UNUSED_PARAM, char **argv)
 #if ENABLE_FEATURE_GREP_CONTEXT
         int Copt, opts;
 #endif
+#if ENABLE_LONG_OPTS
+        static const char grep_longopts[] ALIGN1 =
+                "quiet\0" No_argument       "q"
+                "color\0" Optional_argument "\xff"
+        ;
+# define GETOPT32 getopt32long
+#else
+# define GETOPT32 getopt32
+#endif
         INIT_G();
 
         /* For grep, exitcode of 1 is "not found". Other errors are 2: */
         xfunc_error_retval = 2;
 
-        /* do normal option parsing */
 #if ENABLE_FEATURE_GREP_CONTEXT
         /* -H unsets -h; -C unsets -A,-B */
-        opts = getopt32long(argv, "^"
+        opts = GETOPT32(argv, "^"
                 OPTSTR_GREP
                         "\0"
                         "H-h:C-AB",
-                "color\0" Optional_argument "\xff",
+                IF_LONG_OPTS(grep_longopts,)
                 &pattern_head, &fopt, &max_matches,
                 &lines_after, &lines_before, &Copt
-                , NULL
+                IF_LONG_OPTS(, NULL)
         );
 
         if (opts & OPT_C) {
@@ -753,8 +813,11 @@ int grep_main(int argc UNUSED_PARAM, char **argv)
         }
 #else
         /* with auto sanity checks */
-        getopt32(argv, "^" OPTSTR_GREP "\0" "H-h:c-n:q-n:l-n:", // why trailing ":"?
-                &pattern_head, &fopt, &max_matches);
+        GETOPT32(argv, "^" OPTSTR_GREP "\0" "H-h:c-n:q-n:l-n",
+                IF_LONG_OPTS(grep_longopts,)
+                &pattern_head, &fopt, &max_matches
+                IF_LONG_OPTS(, NULL)
+        );
 #endif
         invert_search = ((option_mask32 & OPT_v) != 0); /* 0 | 1 */
 
diff --git a/include/bb_archive.h b/include/bb_archive.h
index 54e3eb6c3..c34faaf79 100644
--- a/include/bb_archive.h
+++ b/include/bb_archive.h
@@ -78,7 +78,7 @@ typedef struct archive_handle_t {
         llist_t *link_placeholders;
 
         /* Process the header component, e.g. tar -t */
-        void FAST_FUNC (*action_header)(const file_header_t *);
+        void FAST_FUNC (*action_header)(struct archive_handle_t *);
 
         /* Process the data component, e.g. extract to filesystem */
         void FAST_FUNC (*action_data)(struct archive_handle_t *);
@@ -197,9 +197,9 @@ void data_extract_all(archive_handle_t *archive_handle) FAST_FUNC;
 void data_extract_to_stdout(archive_handle_t *archive_handle) FAST_FUNC;
 void data_extract_to_command(archive_handle_t *archive_handle) FAST_FUNC;
 
-void header_skip(const file_header_t *file_header) FAST_FUNC;
-void header_list(const file_header_t *file_header) FAST_FUNC;
-void header_verbose_list(const file_header_t *file_header) FAST_FUNC;
+void header_skip(archive_handle_t *archive_handle) FAST_FUNC;
+void header_list(archive_handle_t *archive_handle) FAST_FUNC;
+void header_verbose_list(archive_handle_t *archive_handle) FAST_FUNC;
 
 char get_header_ar(archive_handle_t *archive_handle) FAST_FUNC;
 char get_header_cpio(archive_handle_t *archive_handle) FAST_FUNC;
diff --git a/include/libbb.h b/include/libbb.h
index 044a7c81d..8ba71946f 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -554,16 +554,17 @@ enum {	/* cp.c, mv.c, install.c depend on these values. CAREFUL when changing th
 #endif
 #define FILEUTILS_CP_OPTSTR "pdRfinlsLHarPvuTt:" IF_SELINUX("c")
 /* How many bits in FILEUTILS_CP_OPTSTR? */
-        FILEUTILS_CP_OPTBITS      = 18 - !ENABLE_SELINUX,
+        FILEUTILS_CP_OPTBITS      = (18 - !ENABLE_SELINUX),
 
-        FILEUTILS_RMDEST          = 1 << (19 - !ENABLE_SELINUX), /* cp --remove-destination */
-        /* bit 18 skipped for "cp --parents" */
+        FILEUTILS_RMDEST          = 1 << (18 - !ENABLE_SELINUX), /* cp --remove-destination */
+        /* bit 19 is used in cp for "cp --parents" */
         FILEUTILS_REFLINK         = 1 << (20 - !ENABLE_SELINUX), /* cp --reflink=auto */
-        FILEUTILS_REFLINK_ALWAYS  = 1 << (21 - !ENABLE_SELINUX), /* cp --reflink[=always] */
+        /* bit 21 is used in cp for "cp --sparse=... */
         /*
          * Hole. cp may have some bits set here,
          * they should not affect remove_file()/copy_file()
          */
+        FILEUTILS_REFLINK_ALWAYS  = 1 << 29, /* cp --reflink, --reflink=always */
 #if ENABLE_SELINUX
         FILEUTILS_SET_SECURITY_CONTEXT = 1 << 30,
 #endif
@@ -2011,10 +2012,10 @@ void getcaps(void *caps) FAST_FUNC;
 
 #if ENABLE_SELINUX
 extern void renew_current_security_context(void) FAST_FUNC;
-extern void set_current_security_context(security_context_t sid) FAST_FUNC;
-extern context_t set_security_context_component(security_context_t cur_context,
+extern void set_current_security_context(char *sid) FAST_FUNC;
+extern context_t set_security_context_component(char *cur_context,
                                                 char *user, char *role, char *type, char *range) FAST_FUNC;
-extern void setfscreatecon_or_die(security_context_t scontext) FAST_FUNC;
+extern void setfscreatecon_or_die(char *scontext) FAST_FUNC;
 extern void selinux_preserve_fcontext(int fdesc) FAST_FUNC;
 #else
 #define selinux_preserve_fcontext(fdesc) ((void)0)
diff --git a/include/platform.h b/include/platform.h
index f46569f0f..7f516dd77 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -165,6 +165,21 @@
 # endif
 #endif
 
+/* Somewhere after gcc-9, it stopped recognizing "int var = var;" initializer
+ * as the "this variable is intentionally not initialized, don't warn" idiom.
+ */
+#if !__GNUC_PREREQ(10,0)
+# define UNINITIALIZED_VAR(var,zero) var = var
+#else
+# define UNINITIALIZED_VAR(var,zero) var = zero
+/* NB: in case newer gcc is able to see that the variable
+ * is never used before initialization on all possible code paths,
+ * you can use int UNINITIALIZED_VAR(var,var);
+ * instead of  int UNINITIALIZED_VAR(var,0);
+ * and avoid having extra zeroing instruction.
+ */
+#endif
+
 
 /* ---- Endian Detection ------------------------------------ */
 
diff --git a/libbb/copy_file.c b/libbb/copy_file.c
index c0928a5a8..e764deb60 100644
--- a/libbb/copy_file.c
+++ b/libbb/copy_file.c
@@ -124,10 +124,10 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
 
 #if ENABLE_SELINUX
         if ((flags & FILEUTILS_PRESERVE_SECURITY_CONTEXT) && is_selinux_enabled() > 0) {
-                security_context_t con;
+                char *con;
                 if (lgetfilecon(source, &con) >= 0) {
                         if (setfscreatecon(con) < 0) {
-                                bb_perror_msg("can't set setfscreatecon %s", con);
+                                bb_perror_msg("can't setfscreatecon %s", con);
                                 freecon(con);
                                 return -1;
                         }
@@ -333,7 +333,7 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
                 if ((flags & (FILEUTILS_PRESERVE_SECURITY_CONTEXT|FILEUTILS_SET_SECURITY_CONTEXT))
                  && is_selinux_enabled() > 0
                 ) {
-                        security_context_t con;
+                        char *con;
                         if (getfscreatecon(&con) == -1) {
                                 bb_simple_perror_msg("getfscreatecon");
                                 return -1;
diff --git a/libbb/run_shell.c b/libbb/run_shell.c
index c22bba87b..1c366d069 100644
--- a/libbb/run_shell.c
+++ b/libbb/run_shell.c
@@ -33,14 +33,14 @@
 #endif
 
 #if ENABLE_SELINUX
-static security_context_t current_sid;
+static char *current_sid;
 
 void FAST_FUNC renew_current_security_context(void)
 {
         freecon(current_sid);  /* Release old context  */
         getcon(&current_sid);  /* update */
 }
-void FAST_FUNC set_current_security_context(security_context_t sid)
+void FAST_FUNC set_current_security_context(char *sid)
 {
         freecon(current_sid);  /* Release old context  */
         current_sid = sid;
diff --git a/libbb/selinux_common.c b/libbb/selinux_common.c
index f917a1c6a..8f00f2db5 100644
--- a/libbb/selinux_common.c
+++ b/libbb/selinux_common.c
@@ -9,7 +9,7 @@
 #include "libbb.h"
 #include <selinux/context.h>
 
-context_t FAST_FUNC set_security_context_component(security_context_t cur_context,
+context_t FAST_FUNC set_security_context_component(char *cur_context,
                         char *user, char *role, char *type, char *range)
 {
         context_t con = context_new(cur_context);
@@ -31,7 +31,7 @@ error:
         return NULL;
 }
 
-void FAST_FUNC setfscreatecon_or_die(security_context_t scontext)
+void FAST_FUNC setfscreatecon_or_die(char *scontext)
 {
         if (setfscreatecon(scontext) < 0) {
                 /* Can be NULL. All known printf implementations
@@ -43,7 +43,7 @@ void FAST_FUNC setfscreatecon_or_die(security_context_t scontext)
 
 void FAST_FUNC selinux_preserve_fcontext(int fdesc)
 {
-        security_context_t context;
+        char *context;
 
         if (fgetfilecon(fdesc, &context) < 0) {
                 if (errno == ENODATA || errno == ENOTSUP)
diff --git a/libbb/update_passwd.c b/libbb/update_passwd.c
index a228075cc..b8a47dc5a 100644
--- a/libbb/update_passwd.c
+++ b/libbb/update_passwd.c
@@ -18,7 +18,7 @@
 #if ENABLE_SELINUX
 static void check_selinux_update_passwd(const char *username)
 {
-        security_context_t seuser;
+        char *seuser;
         char *p;
 
         if (getuid() != (uid_t)0 || is_selinux_enabled() == 0)
diff --git a/loginutils/login.c b/loginutils/login.c
index 301be4a34..16e009496 100644
--- a/loginutils/login.c
+++ b/loginutils/login.c
@@ -181,9 +181,9 @@ static void die_if_nologin(void)
 
 #if ENABLE_SELINUX
 static void initselinux(char *username, char *full_tty,
-                                                security_context_t *user_sid)
+                                                char **user_sid)
 {
-        security_context_t old_tty_sid, new_tty_sid;
+        char *old_tty_sid, *new_tty_sid;
 
         if (!is_selinux_enabled())
                 return;
@@ -333,7 +333,7 @@ int login_main(int argc UNUSED_PARAM, char **argv)
         char *opt_user = opt_user; /* for compiler */
         char *full_tty;
         char *short_tty;
-        IF_SELINUX(security_context_t user_sid = NULL;)
+        IF_SELINUX(char *user_sid = NULL;)
 #if ENABLE_PAM
         int pamret;
         pam_handle_t *pamh;
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index d57691414..e6f01eb6a 100644
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -1016,9 +1016,9 @@ static void restore(char *spath, struct stat source_stat, int rootlen)
         dest_stat.st_mode = 0;
         dpath = concat_path_file(mount_point, spath + rootlen);
         lstat(dpath, &dest_stat);
-        free(dpath);
         if (S_ISLNK(source_stat.st_mode) || (source_stat.st_mode & S_ISVTX))
                 copy_inode(dpath, &dest_stat, (source_stat.st_mode & ~S_ISVTX), spath, &source_stat);
+        free(dpath);
 
         if (S_ISDIR(source_stat.st_mode))
                 dir_operation(RESTORE, spath, rootlen, NULL);
@@ -1271,7 +1271,7 @@ static void dir_operation(int type, const char * dir_name, int var, unsigned lon
 
         while ((de = readdir(dp)) != NULL) {
 
-                if (de->d_name && DOT_OR_DOTDOT(de->d_name))
+                if (DOT_OR_DOTDOT(de->d_name))
                         continue;
                 path = concat_path_file(dir_name, de->d_name);
                 if (lstat(path, &statbuf) == 0) {
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index 8b844717f..e07ee6398 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -552,7 +552,7 @@ static void print_ascii(const char *p, int length)
 
         length *= 2;
         /* find first non-space & print it */
-        while (length && p[ofs] != ' ') {
+        while (length && p[ofs] == ' ') {
                 p++;
                 LE_ONLY(ofs = -ofs;)
                 length--;
diff --git a/miscutils/less.c b/miscutils/less.c
index e81130988..521792f2e 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -477,7 +477,8 @@ static int at_end(void)
  */
 static void read_lines(void)
 {
-        int ndelay_set, eagain, fdflags;
+        int ndelay_set, eagain;
+        int UNINITIALIZED_VAR(fdflags, fdflags);
         char *current_line, *p;
         int w = width;
         char last_terminated = terminated;
@@ -509,16 +510,16 @@ static void read_lines(void)
         // Consider these cases:
         // "less FILE": can set O_NONBLOCK on open.
         // "true | less": can't.
-        // " { less; cat; } <FILE": can't. And must not confuse cat.
+        // "{ less; cat; } <FILE": can't. And must not confuse cat.
         ndelay_set = -1; // "don't know whether stdin is nonblocking"
         eagain = 0;
 
-        while (1) { /* read lines until we reach cur_fline or wanted_match */
+        while (1) { // read lines until we reach cur_fline or wanted_match
                 *p = '\0';
                 terminated = 0;
-                while (1) { /* read chars until we have a line */
+                while (1) { // read chars until we have a line
                         char c;
-                        /* if no unprocessed chars left, eat more */
+                        // if no unprocessed chars left, eat more
                         if (readpos >= read_size) {
                                 // Read stdin, temporarily make it nonblocking (if it's not already)
                                 if (ndelay_set < 0) {
diff --git a/networking/inetd.c b/networking/inetd.c
index 6220a08e3..75b1b2ea5 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -1043,7 +1043,7 @@ static void reread_config_file(int sig UNUSED_PARAM)
                         portno = bb_strtou(sep->se_service, NULL, 10);
 #if ENABLE_FEATURE_INETD_RPC
                         if (is_rpc_service(sep)) {
-                                sep->se_rpcprog = n;
+                                sep->se_rpcprog = portno;
                                 if (errno) { /* se_service is not numeric */
                                         struct rpcent *rp = getrpcbyname(sep->se_service);
                                         if (rp == NULL) {
diff --git a/networking/tftp.c b/networking/tftp.c
index b698a9288..e13223d1d 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -883,7 +883,7 @@ int tftpd_main(int argc UNUSED_PARAM, char **argv)
         len_and_sockaddr *our_lsa;
         len_and_sockaddr *peer_lsa;
         char *mode, *user_opt;
-        char *local_file = local_file;
+        char *UNINITIALIZED_VAR(local_file, NULL);
         const char *error_msg;
         int opt, result, opcode;
         IF_FEATURE_TFTP_BLOCKSIZE(int blksize = TFTP_BLKSIZE_DEFAULT;)
diff --git a/selinux/chcon.c b/selinux/chcon.c
index e1778a36a..9543de120 100644
--- a/selinux/chcon.c
+++ b/selinux/chcon.c
@@ -67,8 +67,8 @@ static int FAST_FUNC change_filedir_context(struct recursive_state *state UNUSED
                 struct stat *stbuf UNUSED_PARAM)
 {
         context_t context = NULL;
-        security_context_t file_context = NULL;
-        security_context_t context_string;
+        char *file_context = NULL;
+        const char *context_string;
         int rc = FALSE;
         int status = 0;
 
diff --git a/selinux/matchpathcon.c b/selinux/matchpathcon.c
index 6945a0295..456209bbd 100644
--- a/selinux/matchpathcon.c
+++ b/selinux/matchpathcon.c
@@ -80,7 +80,7 @@ int matchpathcon_main(int argc UNUSED_PARAM, char **argv)
         }
 
         while ((path = *argv++) != NULL) {
-                security_context_t con;
+                char *con;
                 int rc;
 
                 if (!(opts & OPT_VERIFY)) {
diff --git a/selinux/runcon.c b/selinux/runcon.c
index bc4fa23e0..343b6563d 100644
--- a/selinux/runcon.c
+++ b/selinux/runcon.c
@@ -62,13 +62,13 @@ static context_t runcon_compute_new_context(char *user, char *role, char *type,
                         char *command, int compute_trans)
 {
         context_t con;
-        security_context_t cur_context;
+        char *cur_context;
 
         if (getcon(&cur_context))
                 bb_simple_error_msg_and_die("can't get current context");
 
         if (compute_trans) {
-                security_context_t file_context, new_context;
+                char *file_context, *new_context;
 
                 if (getfilecon(command, &file_context) < 0)
                         bb_error_msg_and_die("can't retrieve attributes of '%s'",
diff --git a/selinux/sestatus.c b/selinux/sestatus.c
index cf664cc18..4a82338fb 100644
--- a/selinux/sestatus.c
+++ b/selinux/sestatus.c
@@ -92,7 +92,7 @@ static void read_config(char **pc, int npc, char **fc, int nfc)
 
 static void display_verbose(void)
 {
-        security_context_t con, _con;
+        char *con, *_con;
         char *fc[50], *pc[50], *cterm;
         pid_t *pidList;
         int i;
diff --git a/shell/ash_test/ash-read/read_n.right b/shell/ash_test/ash-read/read_n.right
index 1f81af0bc..bd29f8ca3 100644
--- a/shell/ash_test/ash-read/read_n.right
+++ b/shell/ash_test/ash-read/read_n.right
@@ -1,3 +1,5 @@
 test
 tes
 tes
+12
+\1
diff --git a/shell/ash_test/ash-read/read_n.tests b/shell/ash_test/ash-read/read_n.tests
index 12423ba6e..fde3d8954 100755
--- a/shell/ash_test/ash-read/read_n.tests
+++ b/shell/ash_test/ash-read/read_n.tests
@@ -1,3 +1,5 @@
 echo 'test' | (read reply; echo "$reply")
 echo 'test' | (read -n 3 reply; echo "$reply")
 echo 'test' | (read -n3 reply; echo "$reply")
+echo '\1\2' | (read -n 2 reply; echo "$reply")
+echo '\1\2' | (read -r -n 2 reply; echo "$reply")
diff --git a/shell/hush.c b/shell/hush.c
index d1e954485..bc8d1e7f7 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -3295,7 +3295,7 @@ static void o_addqchr(o_string *o, int ch)
         /* '-' is included because of this case:
          * >filename0 >filename1 >filename9; v='-'; echo filename[0"$v"9]
          */
-        char *found = strchr("*?[-\\" MAYBE_BRACES, ch);
+        const char *found = strchr("*?[-\\" MAYBE_BRACES, ch);
         if (found)
                 sz++;
         o_grow_by(o, sz);
@@ -7183,9 +7183,9 @@ static NOINLINE int expand_one_var(o_string *output, int n, char *arg, char **pp
         char *p;
         char *var;
         char exp_op;
-        char exp_save = exp_save; /* for compiler */
+        char UNINITIALIZED_VAR(exp_savech, exp_savech); /* for compiler */
         char *exp_saveptr; /* points to expansion operator */
-        char *exp_word = exp_word; /* for compiler */
+        char *UNINITIALIZED_VAR(exp_word, NULL);  /* for compiler */
         char arg0;
 
         val = NULL;
@@ -7193,13 +7193,13 @@ static NOINLINE int expand_one_var(o_string *output, int n, char *arg, char **pp
         p = *pp;
         *p = '\0'; /* replace trailing SPECIAL_VAR_SYMBOL */
         var = arg;
-        exp_saveptr = arg[1] ? strchr(VAR_ENCODED_SUBST_OPS, arg[1]) : NULL;
+        exp_saveptr = arg[1] ? (char*)strchr(VAR_ENCODED_SUBST_OPS, arg[1]) : NULL;
         arg0 = arg[0];
         arg[0] = (arg0 & 0x7f);
         exp_op = 0;
 
         if (arg[0] == '#' && arg[1] /* ${#...} but not ${#} */
-         && (!exp_saveptr               /* and ( not(${#<op_char>...}) */
+         && (!exp_saveptr               /* and ( not ${#<op_char>...} */
             || (arg[2] == '\0' && strchr(SPECIAL_VARS_STR, arg[1])) /* or ${#C} "len of $C" ) */
             )           /* NB: skipping ^^^specvar check mishandles ${#::2} */
         ) {
@@ -7217,7 +7217,7 @@ static NOINLINE int expand_one_var(o_string *output, int n, char *arg, char **pp
                         /* ${?}, ${var}, ${var:0}, ${var[:]%0} etc */
                         exp_saveptr = var+1 + strcspn(var+1, VAR_ENCODED_SUBST_OPS);
                 }
-                exp_op = exp_save = *exp_saveptr;
+                exp_op = exp_savech = *exp_saveptr;
                 if (exp_op) {
                         exp_word = exp_saveptr + 1;
                         if (exp_op == ':') {
@@ -7514,11 +7514,11 @@ static NOINLINE int expand_one_var(o_string *output, int n, char *arg, char **pp
                          * $ x=; f "${x:-'x y' z}"
                          * |'x y' z|
                          */
-                        int use_word = (!val || ((exp_save == ':') && !val[0]));
+                        int use_word = (!val || ((exp_savech == ':') && !val[0]));
                         if (exp_op == '+')
                                 use_word = !use_word;
                         debug_printf_expand("expand: op:%c (null:%s) test:%i\n", exp_op,
-                                        (exp_save == ':') ? "true" : "false", use_word);
+                                        (exp_savech == ':') ? "true" : "false", use_word);
                         if (use_word) {
                                 if (exp_op == '+' || exp_op == '-') {
                                         /* ${var+word} - use alternative value */
@@ -7545,7 +7545,7 @@ static NOINLINE int expand_one_var(o_string *output, int n, char *arg, char **pp
                                                         ? exp_word
                                                         : "parameter null or not set"
                                                         /* ash has more specific messages, a-la: */
-                                                        /*: (exp_save == ':' ? "parameter null or not set" : "parameter not set")*/
+                                                        /*: (exp_savech == ':' ? "parameter null or not set" : "parameter not set")*/
                                                 );
 //TODO: how interactive bash aborts expansion mid-command?
 //It aborts the entire line, returns to prompt:
@@ -7571,7 +7571,7 @@ static NOINLINE int expand_one_var(o_string *output, int n, char *arg, char **pp
                         }
                 } /* one of "-=+?" */
 
-                *exp_saveptr = exp_save;
+                *exp_saveptr = exp_savech;
         } /* if (exp_op) */
 
         arg[0] = arg0;
diff --git a/shell/hush_test/hush-read/read_n.right b/shell/hush_test/hush-read/read_n.right
index 1f81af0bc..bd29f8ca3 100644
--- a/shell/hush_test/hush-read/read_n.right
+++ b/shell/hush_test/hush-read/read_n.right
@@ -1,3 +1,5 @@
 test
 tes
 tes
+12
+\1
diff --git a/shell/hush_test/hush-read/read_n.tests b/shell/hush_test/hush-read/read_n.tests
index 12423ba6e..fde3d8954 100755
--- a/shell/hush_test/hush-read/read_n.tests
+++ b/shell/hush_test/hush-read/read_n.tests
@@ -1,3 +1,5 @@
 echo 'test' | (read reply; echo "$reply")
 echo 'test' | (read -n 3 reply; echo "$reply")
 echo 'test' | (read -n3 reply; echo "$reply")
+echo '\1\2' | (read -n 2 reply; echo "$reply")
+echo '\1\2' | (read -r -n 2 reply; echo "$reply")
diff --git a/shell/shell_common.c b/shell/shell_common.c
index 031182ff4..87290783d 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -280,7 +280,7 @@ shell_builtin_read(struct builtin_read_params *params)
                                 break;
                         }
                         retval = (const char *)(uintptr_t)1;
-                        goto ret;
+                        break;
                 }
                 if (read(fd, &buffer[bufpos], 1) != 1) {
                         err = errno;
@@ -363,7 +363,7 @@ shell_builtin_read(struct builtin_read_params *params)
                 }
  put:
                 bufpos++;
-        } while (IF_PLATFORM_MINGW32(backslash ||) --nchars);
+        } while (backslash || --nchars);
 
         if (argv[0]) {
                 /* Remove trailing space $IFS chars */
@@ -416,7 +416,6 @@ shell_builtin_read(struct builtin_read_params *params)
                 params->setvar("REPLY", buffer);
         }
 
- ret:
         free(buffer);
 #if !ENABLE_PLATFORM_MINGW32
         if (read_flags & BUILTIN_READ_SILENT)
diff --git a/testsuite/awk.tests b/testsuite/awk.tests
index ef7c4497f..1238ba6c4 100755
--- a/testsuite/awk.tests
+++ b/testsuite/awk.tests
@@ -75,7 +75,7 @@ testing "awk %.3d 99999999999999000.1234" \
 testing "awk %.*d 3 99999999999999000.1234" \
 "awk 'BEGIN { printf \"%.*d\n\", 3, 99999999999999000.1234; }'" "99999999999999008\n" "" ""
 
-# fractioals are rounded towards 0
+# fractionals are rounded towards 0
 testing "awk %d -1.9" \
 "awk 'BEGIN { printf \"%d\n\", -1.9; }'" "-1\n" "" ""
 testing "awk %u -1.9" \
@@ -85,6 +85,31 @@ testing "awk %x -1.9" \
 testing "awk %o -1.9" \
 "awk 'BEGIN { printf \"%o\n\", -1.9; }'" "1777777777777777777777\n" "" ""
 
+# OFMT can contain literals before and after %SPEC:
+testing "awk OFMT='R%%:%f!' -1.9" \
+"awk -v OFMT='R%%:%f!' 'BEGIN { print -1.9; }'" "R%:-1.900000!\n" "" ""
+
+# OFMT is ignored if the value has no fractionals (even if it does not fit into uint64)
+testing "awk OFMT='R%%:%f!' 2**128" \
+"awk -v OFMT='R%%:%f!' 'BEGIN { print 2**128; }'" "340282366920938463463374607431768211456\n" "" ""
+testing "awk OFMT='R%%:%f!' 2**128" \
+"awk -v OFMT='R%%:%f!' 'BEGIN { print -2**129; }'" "-680564733841876926926749214863536422912\n" "" ""
+
+# OFMT can contain no %SPEC (be a literal):
+testing "awk OFMT='No formats, %% allowed!'" \
+"awk -v OFMT='No formats, %% allowed!' 'BEGIN { print -1.9; }'" "No formats, % allowed!\n" "" ""
+
+# OFMT can't have more than one %SPEC:
+testing "awk OFMT='%f%s' is not allowed" \
+"awk -v OFMT='R%%:%f!%s!' 'BEGIN { print -1.9; }' 2>&1" \
+"awk: cmd. line:1: Invalid format specifier\n" "" ""
+
+# OFMT %s:
+testing "awk OFMT='%-22s' -1.9" \
+"awk -v OFMT='R:%-22s!' 'BEGIN { print -1.9; }'" \
+"R:-1.9                  !\n" "" ""
+
+
 # 4294967295 = 0xffffffff
 testing "awk bitwise op" "awk '{ print or(4294967295,1) }'" "4294967295\n" "" "\n"
 
diff --git a/testsuite/hdparm.tests b/testsuite/hdparm.tests
new file mode 100755
index 000000000..e029d3d42
--- /dev/null
+++ b/testsuite/hdparm.tests
@@ -0,0 +1,51 @@
+#!/bin/sh
+# Copyright 2026 by Romain Guyard <foss@romainguyard.com>
+# Licensed under GPLv2, see file LICENSE in this source tree.
+
+. ./testing.sh
+
+# testing "test name" "commands" "expected result" "file input" "stdin"
+
+# With no device argument and a non-tty stdin, hdparm parses a hex IDENTIFY
+# DEVICE block from stdin (identify_from_stdin) and prints it the way
+# "hdparm -I" does. That makes the ASCII field decoding testable without
+# a disk.
+#
+# The block below carries:
+#       words  10-19  serial number    "SN0123456789ABCDEF"  (no embedded space)
+#       words  23-26  firmware rev     "FW1234"
+#       words  27-46  model number     "EXAMPLE SSD 256GB"   (has one)
+#       words 176-195 media serial     "   MEDIASN00001"     (leading spaces)
+#
+# ATA strings are left-justified and space-padded. print_ascii() must skip
+# leading *spaces* only. It used to skip the leading run of *non-space*
+# characters instead, which emptied every field with no embedded space
+# (serial number, firmware revision) and truncated the model number at its
+# first space.
+
+testing "hdparm -I decodes ASCII fields" \
+        "hdparm | grep -E 'Number:|Revision:|Serial Num:' | sed 's/[[:space:]]*\$//'" \
+"\
+\tModel Number:       EXAMPLE SSD 256GB
+\tSerial Number:      SN0123456789ABCDEF
+\tFirmware Revision:  FW1234
+\tMedia Serial Num:   MEDIASN00001
+" \
+        "" \
+"\
+0040000000000000000000000000000000000000534e3031323334353637383941424344454620200000000000004657\
+3132333420204558414d504c452053534420323536474220202020202020202020202020202020202020202020200000\
+000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+000000000000000000000000000000002020204d45444941534e30303030312020202020202020202020202020202020\
+202020202020202000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+00000000000000000000000000000000000000000000000000000000000000a500000000000000000000000000000000\
+000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\
+00000000000000000000000000000000"
+
+exit $FAILCOUNT
diff --git a/testsuite/sort.tests b/testsuite/sort.tests
index 8dbadbdae..6d12eb6f4 100755
--- a/testsuite/sort.tests
+++ b/testsuite/sort.tests
@@ -114,6 +114,16 @@ aa.2
 ab.1
 " ""
 
+testing "sort with ENDCHAR on a later field" "sort -t: -k2.1,2.1 input" "\
+a:aa
+b:aa
+a:ba
+" "\
+b:aa
+a:ba
+a:aa
+" ""
+
 testing "glibc build sort" "sort -t. -k 1,1 -k 2n,2n -k 3 input" "\
 GLIBC_2.1
 GLIBC_2.1.1
diff --git a/testsuite/tar.tests b/testsuite/tar.tests
index 1f8c9cff3..83c8c2edf 100755
--- a/testsuite/tar.tests
+++ b/testsuite/tar.tests
@@ -206,6 +206,30 @@ SKIP=
 cd .. || exit 1; rm -rf tar.tempdir 2>/dev/null
 
 mkdir tar.tempdir && cd tar.tempdir || exit 1
+optional FEATURE_TAR_CREATE
+testing "tar xvO sends file list to stderr" '\
+echo "data1" >file1.txt
+echo "data2" >file2.txt
+echo "data3" >file3.txt
+tar cf test.tar file1.txt file2.txt file3.txt
+tar xvOf test.tar >out 2>err
+echo OUT:; cat out
+echo ERR:; cat err
+' "\
+OUT:
+data1
+data2
+data3
+ERR:
+file1.txt
+file2.txt
+file3.txt
+" \
+"" ""
+SKIP=
+cd .. || exit 1; rm -rf tar.tempdir 2>/dev/null
+
+mkdir tar.tempdir && cd tar.tempdir || exit 1
 # Had a bug where on extract autodetect first "switched off" -z
 # and then failed to recognize .tgz extension
 optional FEATURE_TAR_CREATE FEATURE_SEAMLESS_GZ GUNZIP
diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c
index bca3de199..0c2e12951 100644
--- a/util-linux/mkswap.c
+++ b/util-linux/mkswap.c
@@ -49,8 +49,8 @@ static void mkswap_selinux_setcontext(int fd, const char *path)
 
         xfstat(fd, &stbuf, path);
         if (S_ISREG(stbuf.st_mode)) {
-                security_context_t newcon;
-                security_context_t oldcon = NULL;
+                const char *newcon;
+                char *oldcon = NULL;
                 context_t context;
 
                 if (fgetfilecon(fd, &oldcon) < 0) {