diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2012-02-04 19:55:27 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2012-02-04 19:55:27 +0100 |
| commit | f99811908419608e3ab81393d0177cc456101e4b (patch) | |
| tree | 11793447075d012f20bcd4bb1a8291d86f94520a | |
| parent | 1e98f3741c5a844c1d3d7966f20cd09dded05d0d (diff) | |
| download | busybox-1_19_stable.tar.gz | |
Apply post-1.19.3 patches, bump version to 1.19.41_19_41_19_stable
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | loginutils/getty.c | 2 | ||||
| -rw-r--r-- | modutils/modinfo.c | 1 | ||||
| -rw-r--r-- | networking/wget.c | 6 | ||||
| -rw-r--r-- | util-linux/mdev.c | 2 |
5 files changed, 9 insertions, 4 deletions
@@ -1,6 +1,6 @@ VERSION = 1 PATCHLEVEL = 19 -SUBLEVEL = 3 +SUBLEVEL = 4 EXTRAVERSION = NAME = Unnamed diff --git a/loginutils/getty.c b/loginutils/getty.c index 62456651b..4c8dd91a2 100644 --- a/loginutils/getty.c +++ b/loginutils/getty.c @@ -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 diff --git a/modutils/modinfo.c b/modutils/modinfo.c index 410b6fbe4..c0910ffed 100644 --- a/modutils/modinfo.c +++ b/modutils/modinfo.c @@ -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 diff --git a/networking/wget.c b/networking/wget.c index 6443705fd..fbb8a2e12 100644 --- a/networking/wget.c +++ b/networking/wget.c @@ -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; diff --git a/util-linux/mdev.c b/util-linux/mdev.c index 7cabb1df6..e0a527e73 100644 --- a/util-linux/mdev.c +++ b/util-linux/mdev.c @@ -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; |