2631486f1
Rob Landley
2006-05-02
Subject
Patch from Shaun Jackman:
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
coreutils/ls.c+11 -7
| @@ -338,20 +338,18 @@ static struct dnode **dnalloc(int num) | |
| } | |
| #ifdef CONFIG_FEATURE_LS_RECURSIVE | |
| - | static void dfree(struct dnode **dnp) |
| + | static void dfree(struct dnode **dnp, int nfiles) |
| { | |
| - | struct dnode *cur, *next; |
| + | int i; |
| if (dnp == NULL) | |
| return; | |
| - | cur = dnp[0]; |
| - | while (cur != NULL) { |
| + | for (i = 0; i < nfiles; i++) { |
| + | struct dnode *cur = dnp[i]; |
| if(cur->allocated) | |
| free(cur->fullname); /* free the filename */ | |
| - | next = cur->next; |
| free(cur); /* free the dnode */ | |
| - | cur = next; |
| } | |
| free(dnp); /* free the array holding the dnode pointers */ | |
| } | |
| @@ -561,7 +559,7 @@ static void showdirs(struct dnode **dn, int ndirs, int first) | |
| free(dnd); /* free the array of dnode pointers to the dirs */ | |
| } | |
| } | |
| - | dfree(subdnp); /* free the dnodes and the fullname mem */ |
| + | dfree(subdnp, nfiles); /* free the dnodes and the fullname mem */ |
| #endif | |
| } | |
| } | |
| @@ -1151,13 +1149,19 @@ int ls_main(int argc, char **argv) | |
| shellsort(dnf, dnfiles); | |
| #endif | |
| showfiles(dnf, dnfiles); | |
| + | if (ENABLE_FEATURE_CLEAN_UP) |
| + | free(dnf); |
| } | |
| if (dndirs > 0) { | |
| #ifdef CONFIG_FEATURE_LS_SORTFILES | |
| shellsort(dnd, dndirs); | |
| #endif | |
| showdirs(dnd, dndirs, dnfiles == 0); | |
| + | if (ENABLE_FEATURE_CLEAN_UP) |
| + | free(dnd); |
| } | |
| } | |
| + | if (ENABLE_FEATURE_CLEAN_UP) |
| + | dfree(dnp, nfiles); |
| return (status); | |
| } | |