diff options
author | Peter Korsgaard <jacmet@sunsite.dk> | 2008-07-11 22:19:21 +0000 |
---|---|---|
committer | Peter Korsgaard <jacmet@sunsite.dk> | 2008-07-11 22:19:21 +0000 |
commit | 4b586e6cda68a82dd143741199dfd10b981dc29c (patch) | |
tree | 2ac0eaff821fcac3b8c894680d69becdbf82edc3 /package/busybox/busybox-1.11.0-man.patch | |
parent | c66687591245aa578c8d6bd717bdb00f98b30f5f (diff) |
busybox: bump 1.11.x version
Diffstat (limited to 'package/busybox/busybox-1.11.0-man.patch')
-rw-r--r-- | package/busybox/busybox-1.11.0-man.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/package/busybox/busybox-1.11.0-man.patch b/package/busybox/busybox-1.11.0-man.patch deleted file mode 100644 index 0e29e61a4..000000000 --- a/package/busybox/busybox-1.11.0-man.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- busybox-1.11.0/miscutils/man.c Wed Jun 25 14:51:35 2008 -+++ busybox-1.11.0-man/miscutils/man.c Fri Jul 4 23:55:56 2008 -@@ -73,7 +73,7 @@ - char *sec_list; - char *cur_path, *cur_sect; - char *line, *value; -- int count_mp, alloc_mp, cur_mp; -+ int count_mp, cur_mp; - int opt; - - opt_complementary = "-1"; /* at least one argument */ -@@ -81,8 +81,8 @@ - argv += optind; - - sec_list = xstrdup("1:2:3:4:5:6:7:8:9"); -- alloc_mp = 10; -- man_path_list = xmalloc(10 * sizeof(man_path_list[0])); -+ /* Last valid man_path_list[] is [0x10] */ -+ man_path_list = xzalloc(0x11 * sizeof(man_path_list[0])); - count_mp = 0; - man_path_list[0] = xstrdup(getenv("MANPATH")); - if (man_path_list[0]) -@@ -107,11 +107,13 @@ - if (strcmp("MANPATH", line) == 0) { - man_path_list[count_mp] = xstrdup(value); - count_mp++; -- if (alloc_mp == count_mp) { -- alloc_mp += 10; -- man_path_list = xrealloc(man_path_list, alloc_mp * sizeof(man_path_list[0])); -+ /* man_path_list is NULL terminated */ -+ man_path_list[count_mp] = NULL; -+ if (!(count_mp & 0xf)) { /* 0x10, 0x20 etc */ -+ /* so that last valid man_path_list[] is [count_mp + 0x10] */ -+ man_path_list = xrealloc(man_path_list, -+ (count_mp + 0x11) * sizeof(man_path_list[0])); - } -- /* thus man_path_list is always NULL terminated */ - } - if (strcmp("MANSECT", line) == 0) { - free(sec_list); |