diff options
| -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 @@ | |||
| 1 | VERSION = 1 | 1 | VERSION = 1 |
| 2 | PATCHLEVEL = 19 | 2 | PATCHLEVEL = 19 |
| 3 | SUBLEVEL = 3 | 3 | SUBLEVEL = 4 |
| 4 | EXTRAVERSION = | 4 | EXTRAVERSION = |
| 5 | NAME = Unnamed | 5 | NAME = Unnamed |
| 6 | 6 | ||
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) | |||
| 271 | #ifdef CMSPAR | 271 | #ifdef CMSPAR |
| 272 | | CMSPAR /* mark or space parity */ | 272 | | CMSPAR /* mark or space parity */ |
| 273 | #endif | 273 | #endif |
| 274 | #ifdef CBAUD | ||
| 274 | | CBAUD /* (output) baud rate */ | 275 | | CBAUD /* (output) baud rate */ |
| 276 | #endif | ||
| 275 | #ifdef CBAUDEX | 277 | #ifdef CBAUDEX |
| 276 | | CBAUDEX /* (output) baud rate */ | 278 | | CBAUDEX /* (output) baud rate */ |
| 277 | #endif | 279 | #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 @@ | |||
| 13 | //config:config MODINFO | 13 | //config:config MODINFO |
| 14 | //config: bool "modinfo" | 14 | //config: bool "modinfo" |
| 15 | //config: default y | 15 | //config: default y |
| 16 | //config: select PLATFORM_LINUX | ||
| 16 | //config: help | 17 | //config: help |
| 17 | //config: Show information about a Linux Kernel module | 18 | //config: Show information about a Linux Kernel module |
| 18 | 19 | ||
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) | |||
| 552 | FILE *dfp; /* socket to ftp server (data) */ | 552 | FILE *dfp; /* socket to ftp server (data) */ |
| 553 | char *proxy = NULL; | 553 | char *proxy = NULL; |
| 554 | char *fname_out_alloc; | 554 | char *fname_out_alloc; |
| 555 | char *redirected_path = NULL; | ||
| 555 | struct host_info server; | 556 | struct host_info server; |
| 556 | struct host_info target; | 557 | struct host_info target; |
| 557 | 558 | ||
| @@ -794,8 +795,8 @@ However, in real world it was observed that some web servers | |||
| 794 | bb_error_msg_and_die("too many redirections"); | 795 | bb_error_msg_and_die("too many redirections"); |
| 795 | fclose(sfp); | 796 | fclose(sfp); |
| 796 | if (str[0] == '/') { | 797 | if (str[0] == '/') { |
| 797 | free(target.allocated); | 798 | free(redirected_path); |
| 798 | target.path = target.allocated = xstrdup(str+1); | 799 | target.path = redirected_path = xstrdup(str+1); |
| 799 | /* lsa stays the same: it's on the same server */ | 800 | /* lsa stays the same: it's on the same server */ |
| 800 | } else { | 801 | } else { |
| 801 | parse_url(str, &target); | 802 | parse_url(str, &target); |
| @@ -850,6 +851,7 @@ However, in real world it was observed that some web servers | |||
| 850 | free(server.allocated); | 851 | free(server.allocated); |
| 851 | free(target.allocated); | 852 | free(target.allocated); |
| 852 | free(fname_out_alloc); | 853 | free(fname_out_alloc); |
| 854 | free(redirected_path); | ||
| 853 | } | 855 | } |
| 854 | 856 | ||
| 855 | int wget_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 857 | 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) | |||
| 610 | int seqlen; | 610 | int seqlen; |
| 611 | char seqbuf[sizeof(int)*3 + 2]; | 611 | char seqbuf[sizeof(int)*3 + 2]; |
| 612 | 612 | ||
| 613 | seqlen = open_read_close("mdev.seq", seqbuf, sizeof(seqbuf-1)); | 613 | seqlen = open_read_close("mdev.seq", seqbuf, sizeof(seqbuf) - 1); |
| 614 | if (seqlen < 0) { | 614 | if (seqlen < 0) { |
| 615 | seq = NULL; | 615 | seq = NULL; |
| 616 | break; | 616 | break; |
