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

Apply post-1.19.3 patches, bump version to 1.19.4 

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
1_19_stable 1_19_4
Denys Vlasenko 2012-02-04 19:55:27 +01:00
parent 1e98f3741c
commit f998119084
5 changed files with 9 additions and 4 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 = 19
SUBLEVEL = 3
SUBLEVEL = 4
EXTRAVERSION =
NAME = Unnamed

2
loginutils/getty.c
View File

@ -271,7 +271,9 @@ static void termios_init(int speed)
#ifdef CMSPAR
| CMSPAR /* mark or space parity */
#endif
#ifdef CBAUD
| CBAUD /* (output) baud rate */
#endif
#ifdef CBAUDEX
| CBAUDEX /* (output) baud rate */
#endif

1
modutils/modinfo.c
View File

@ -13,6 +13,7 @@
//config:config MODINFO
//config: bool "modinfo"
//config: default y
//config: select PLATFORM_LINUX
//config: help
//config: Show information about a Linux Kernel module

6
networking/wget.c
View File

@ -552,6 +552,7 @@ static void download_one_url(const char *url)
FILE *dfp; /* socket to ftp server (data) */
char *proxy = NULL;
char *fname_out_alloc;
char *redirected_path = NULL;
struct host_info server;
struct host_info target;
@ -794,8 +795,8 @@ However, in real world it was observed that some web servers
bb_error_msg_and_die("too many redirections");
fclose(sfp);
if (str[0] == '/') {
free(target.allocated);
target.path = target.allocated = xstrdup(str+1);
free(redirected_path);
target.path = redirected_path = xstrdup(str+1);
/* lsa stays the same: it's on the same server */
} else {
parse_url(str, &target);
@ -850,6 +851,7 @@ However, in real world it was observed that some web servers
free(server.allocated);
free(target.allocated);
free(fname_out_alloc);
free(redirected_path);
}
int wget_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;

2
util-linux/mdev.c
View File

@ -610,7 +610,7 @@ int mdev_main(int argc UNUSED_PARAM, char **argv)
int seqlen;
char seqbuf[sizeof(int)*3 + 2];
seqlen = open_read_close("mdev.seq", seqbuf, sizeof(seqbuf-1));
seqlen = open_read_close("mdev.seq", seqbuf, sizeof(seqbuf) - 1);
if (seqlen < 0) {
seq = NULL;
break;