summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2012-02-04 18:55:27 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2012-02-04 18:55:27 (GMT)
commitf99811908419608e3ab81393d0177cc456101e4b (patch)
tree11793447075d012f20bcd4bb1a8291d86f94520a
parent1e98f3741c5a844c1d3d7966f20cd09dded05d0d (diff)
downloadbusybox-refs/heads/1_19_stable.tar.gz
busybox-refs/heads/1_19_stable.tar.bz2
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--Makefile2
-rw-r--r--loginutils/getty.c2
-rw-r--r--modutils/modinfo.c1
-rw-r--r--networking/wget.c6
-rw-r--r--util-linux/mdev.c2
5 files changed, 9 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 9648c9c..da0b04c 100644
--- a/Makefile
+++ b/Makefile
@@ -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 6245665..4c8dd91 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 410b6fb..c0910ff 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 6443705..fbb8a2e 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 7cabb1d..e0a527e 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;