BusyBox
/
busybox
mirror of https://github.com/mirror/busybox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply post-1.17.3 fixes, bump version to 1.17.4 

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
1_17_stable 1_17_4
Denys Vlasenko 2010-11-22 21:26:53 +01:00
parent 468c326d6a
commit db4171d842
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,6 +1,6 @@
VERSION = 1
PATCHLEVEL = 17
SUBLEVEL = 3
SUBLEVEL = 4
EXTRAVERSION =
NAME = Unnamed

6
coreutils/ls.c
View File

@ -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,

2
coreutils/sort.c
View File

@ -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++)

2
libbb/unicode.c
View File

@ -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;
}

2
networking/dnsd.c
View File

@ -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);

2
networking/libiproute/iproute.c
View File

@ -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) {