Apply post-1.17.3 fixes, bump version to 1.17.4

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

diff --git a/Makefile b/Makefile
index b6a9b15f87ecab159b59a5d6ca5a1cd452e25a3c..3562832e5f527b4cd764cebdc01683b275ca2e8c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 VERSION = 1
 PATCHLEVEL = 17
-SUBLEVEL = 3
+SUBLEVEL = 4
 EXTRAVERSION =
 NAME = Unnamed
 

diff --git a/coreutils/ls.c b/coreutils/ls.c
index 1197f7d715714202a98a69aa0d1ec1642832ba28..07bb6af92f9fae8cdb8766c838b1cd42c5ac483c 100644 (file)
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -184,7 +184,7 @@ static const unsigned opt_flags[] = {
        LIST_INO,                   /* i */
        LIST_LONG | STYLE_LONG,     /* l - remember LS_DISP_HR in mask! */
        LIST_SHORT | STYLE_SINGLE,  /* 1 */
-       0,                          /* g (don't show group) - handled via OPT_g */
+       0,                          /* g (don't show owner) - handled via OPT_g */
        LIST_ID_NUMERIC,            /* n */
        LIST_BLOCKS,                /* s */
        DISP_ROWS,                  /* x */
@@ -621,7 +621,7 @@ static NOINLINE unsigned list_single(const struct dnode *dn)
        if (all_fmt & LIST_ID_NAME) {
                if (option_mask32 & OPT_g) {
                        column += printf("%-8.8s ",
-                               get_cached_username(dn->dstat.st_uid));
+                               get_cached_groupname(dn->dstat.st_gid));
                } else {
                        column += printf("%-8.8s %-8.8s ",
                                get_cached_username(dn->dstat.st_uid),
@@ -631,7 +631,7 @@ static NOINLINE unsigned list_single(const struct dnode *dn)
 #endif
        if (all_fmt & LIST_ID_NUMERIC) {
                if (option_mask32 & OPT_g)
-                       column += printf("%-8u ", (int) dn->dstat.st_uid);
+                       column += printf("%-8u ", (int) dn->dstat.st_gid);
                else
                        column += printf("%-8u %-8u ",
                                        (int) dn->dstat.st_uid,

diff --git a/coreutils/sort.c b/coreutils/sort.c
index 5c3fa1a718e1cd14efa90c84b26540ca46f0d5b4..237ac083c10f41400395e6987c936527faca4a7a 100644 (file)
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -412,7 +412,7 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
 #if ENABLE_FEATURE_SORT_BIG
        /* Open output file _after_ we read all input ones */
        if (option_mask32 & FLAG_o)
-               xmove_fd(xopen3(str_o, O_WRONLY, 0666), STDOUT_FILENO);
+               xmove_fd(xopen3(str_o, O_WRONLY|O_CREAT|O_TRUNC, 0666), STDOUT_FILENO);
 #endif
        flag = (option_mask32 & FLAG_z) ? '\0' : '\n';
        for (i = 0; i < linecount; i++)

diff --git a/libbb/unicode.c b/libbb/unicode.c
index 5a657b2d73af63a6c74ff6f339bee5f50415c2ec..afa5a1b1fec62c647b793f765251b89eb93d7ebe 100644 (file)
--- a/libbb/unicode.c
+++ b/libbb/unicode.c
@@ -1006,7 +1006,7 @@ static char* FAST_FUNC unicode_conv_to_printable2(uni_stat_t *stats, const char
                        }
                }
                if (stats)
-                       stats->byte_count = stats->unicode_count = (d - dst);
+                       stats->byte_count = stats->unicode_count = stats->unicode_width = (d - dst);
                return dst;
        }
 

diff --git a/networking/dnsd.c b/networking/dnsd.c
index 1a99040ac203c999f82efa4531b99038fb79919a..81bc93922b833f72a82900cb70e27c96bd9fe361 100644 (file)
--- a/networking/dnsd.c
+++ b/networking/dnsd.c
@@ -388,7 +388,7 @@ static int process_packet(struct dns_entry *conf_data,
        query_len = strlen(query_string) + 1;
        /* may be unaligned! */
        unaligned_type_class = (void *)(query_string + query_len);
-       query_len += sizeof(unaligned_type_class);
+       query_len += sizeof(*unaligned_type_class);
        /* where to append answer block */
        answb = (void *)(unaligned_type_class + 1);
 

diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c
index d771a609b24b21abfc868379af7b39ed2f461790..7905a739915dfa1408b8e4bbe9a62621d549228a 100644 (file)
--- a/networking/libiproute/iproute.c
+++ b/networking/libiproute/iproute.c
@@ -791,8 +791,8 @@ static int iproute_get(char **argv)
                                }
                                req.r.rtm_dst_len = addr.bitlen;
                        }
-                       argv++;
                }
+               argv++;
        }
 
        if (req.r.rtm_dst_len == 0) {