diff options
author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-03-11 10:10:58 +0000 |
---|---|---|
committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-03-11 10:10:58 +0000 |
commit | f6d14f30b24720440b01283982ab116f3a7dc240 (patch) | |
tree | 065f1cff44f1bf941f66bcfdc170e25e6fe4b905 /package/busybox/busybox-1.13.2-modprobe.patch | |
parent | 2395d4ccc509b45190fb60a0f1bb4545af0a84f3 (diff) |
busybox: bump 1.13.x version
Diffstat (limited to 'package/busybox/busybox-1.13.2-modprobe.patch')
-rw-r--r-- | package/busybox/busybox-1.13.2-modprobe.patch | 99 |
1 files changed, 0 insertions, 99 deletions
diff --git a/package/busybox/busybox-1.13.2-modprobe.patch b/package/busybox/busybox-1.13.2-modprobe.patch deleted file mode 100644 index 8fd7dc428..000000000 --- a/package/busybox/busybox-1.13.2-modprobe.patch +++ /dev/null @@ -1,99 +0,0 @@ ---- busybox-1.13.2/modutils/modutils-24.c Sat Nov 29 07:48:56 2008 -+++ busybox-1.13.2-modprobe/modutils/modutils-24.c Sun Feb 1 00:08:26 2009 -@@ -2150,7 +2150,7 @@ - sec->name = name; - sec->idx = newidx; - if (size) -- sec->contents = xmalloc(size); -+ sec->contents = xzalloc(size); - - obj_insert_section_load_order(f, sec); - -@@ -2165,7 +2165,7 @@ - int newidx = f->header.e_shnum++; - struct obj_section *sec; - -- f->sections = xrealloc(f->sections, (newidx + 1) * sizeof(sec)); -+ f->sections = xrealloc_vector(f->sections, 2, newidx); - f->sections[newidx] = sec = arch_new_section(); - - sec->header.sh_type = SHT_PROGBITS; -@@ -2175,7 +2175,7 @@ - sec->name = name; - sec->idx = newidx; - if (size) -- sec->contents = xmalloc(size); -+ sec->contents = xzalloc(size); - - sec->load_next = f->load_order; - f->load_order = sec; -@@ -2571,8 +2571,7 @@ - /* Collect the modules' symbols. */ - - if (nmod) { -- ext_modules = modules = xmalloc(nmod * sizeof(*modules)); -- memset(modules, 0, nmod * sizeof(*modules)); -+ ext_modules = modules = xzalloc(nmod * sizeof(*modules)); - for (i = 0, mn = module_names, m = modules; - i < nmod; ++i, ++m, mn += strlen(mn) + 1) { - struct new_module_info info; -@@ -2652,13 +2651,14 @@ - } - - --static void new_create_this_module(struct obj_file *f, const char *m_name) -+static void new_create_this_module(struct obj_file *f, const char *m_name) - { - struct obj_section *sec; - - sec = obj_create_alloced_section_first(f, ".this", tgt_sizeof_long, - sizeof(struct new_module)); -- memset(sec->contents, 0, sizeof(struct new_module)); -+ /* done by obj_create_alloced_section_first: */ -+ /*memset(sec->contents, 0, sizeof(struct new_module));*/ - - obj_add_symbol(f, SPFX "__this_module", -1, - ELF_ST_INFO(STB_LOCAL, STT_OBJECT), sec->idx, 0, -@@ -2965,9 +2965,9 @@ - if (i == f->header.e_shnum) { - struct obj_section *sec; - -+ f->header.e_shnum++; - f->sections = xrealloc_vector(f->sections, 2, i); - f->sections[i] = sec = arch_new_section(); -- f->header.e_shnum = i + 1; - - sec->header.sh_type = SHT_PROGBITS; - sec->header.sh_flags = SHF_WRITE | SHF_ALLOC; -@@ -3006,12 +3006,9 @@ - for (i = 0; i < f->header.e_shnum; ++i) { - struct obj_section *s = f->sections[i]; - if (s->header.sh_type == SHT_NOBITS) { -+ s->contents = NULL; - if (s->header.sh_size != 0) -- s->contents = memset(xmalloc(s->header.sh_size), -- 0, s->header.sh_size); -- else -- s->contents = NULL; -- -+ s->contents = xzalloc(s->header.sh_size); - s->header.sh_type = SHT_PROGBITS; - } - } -@@ -3275,14 +3272,13 @@ - case SHT_SYMTAB: - case SHT_STRTAB: - case SHT_RELM: -+ sec->contents = NULL; - if (sec->header.sh_size > 0) { -- sec->contents = xmalloc(sec->header.sh_size); -+ sec->contents = xzalloc(sec->header.sh_size); - fseek(fp, sec->header.sh_offset, SEEK_SET); - if (fread(sec->contents, sec->header.sh_size, 1, fp) != 1) { - bb_perror_msg_and_die("error reading ELF section data"); - } -- } else { -- sec->contents = NULL; - } - break; - |