Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-10-11 10:23:41 +00:00
Code Issues Projects Releases Wiki Activity

Patch from Shaun Jackman:

Browse Source 
ls has an ugly bug. ls uses an array of pointers, the elements of
which are all in a linked list. To free the elements, instead of
freeing all the elements in the array, array[0..nelements], it frees
by iterating the linked list starting at array[0], which it assumes is
the head of the list. Unfortunately, ls also sorts the array! So,
array[0] is no longer the head, but somewhere in the middle of the
linked list. This patch fixes this bug, and also adds an
ENABLE_FEATURE_CLEAN_UP stanza.
This commit is contained in:
Rob Landley 2006-05-02 19:46:52 +00:00
parent 6389ff1115
commit 2631486f1b
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
coreutils/ls.c
View File

@ -338,20 +338,18 @@ static struct dnode **dnalloc(int num)
} }
#ifdef CONFIG_FEATURE_LS_RECURSIVE #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) if (dnp == NULL)
return; return;
cur = dnp[0]; for (i = 0; i < nfiles; i++) {
while (cur != NULL) { struct dnode *cur = dnp[i];
if(cur->allocated) if(cur->allocated)
free(cur->fullname); /* free the filename */ free(cur->fullname); /* free the filename */
next = cur->next;
free(cur); /* free the dnode */ free(cur); /* free the dnode */
cur = next;
} }
free(dnp); /* free the array holding the dnode pointers */ 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 */ 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 #endif
} }
} }
@ -1151,13 +1149,19 @@ int ls_main(int argc, char **argv)
shellsort(dnf, dnfiles); shellsort(dnf, dnfiles);
#endif #endif
showfiles(dnf, dnfiles); showfiles(dnf, dnfiles);
if (ENABLE_FEATURE_CLEAN_UP)
free(dnf);
} }
if (dndirs > 0) { if (dndirs > 0) {
#ifdef CONFIG_FEATURE_LS_SORTFILES #ifdef CONFIG_FEATURE_LS_SORTFILES
shellsort(dnd, dndirs); shellsort(dnd, dndirs);
#endif #endif
showdirs(dnd, dndirs, dnfiles == 0); showdirs(dnd, dndirs, dnfiles == 0);
if (ENABLE_FEATURE_CLEAN_UP)
free(dnd);
} }
} }
if (ENABLE_FEATURE_CLEAN_UP)
dfree(dnp, nfiles);
return (status); return (status);
} }