Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-06-13 18:29:34 +00:00
Code Issues Projects Releases Wiki Activity

ls: fix for !FEATURE_LS_RECURSIVE (forgotten free); cleanups

Browse Source 
no code changes if FEATURE_LS_RECURSIVE

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2009-10-03 11:42:33 +02:00
parent 0683d4d633
commit ffd4774ad2
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
coreutils/ls.c
View File

@ -324,7 +324,6 @@ static struct dnode *my_stat(const char *fullname, const char *name, int force_f
return cur; return cur;
} }
/* FYI type values: 1:fifo 2:char 4:dir 6:blk 8:file 10:link 12:socket /* FYI type values: 1:fifo 2:char 4:dir 6:blk 8:file 10:link 12:socket
* (various wacky OSes: 13:Sun door 14:BSD whiteout 5:XENIX named file * (various wacky OSes: 13:Sun door 14:BSD whiteout 5:XENIX named file
* 3/7:multiplexed char/block device) * 3/7:multiplexed char/block device)
@ -386,7 +385,6 @@ static char append_char(mode_t mode)
} }
#endif #endif
#define countdirs(A, B) count_dirs((A), (B), 1) #define countdirs(A, B) count_dirs((A), (B), 1)
#define countsubdirs(A, B) count_dirs((A), (B), 0) #define countsubdirs(A, B) count_dirs((A), (B), 0)
static unsigned count_dirs(struct dnode **dn, unsigned nfiles, int notsubdirs) static unsigned count_dirs(struct dnode **dn, unsigned nfiles, int notsubdirs)
@ -430,10 +428,10 @@ static void dfree(struct dnode **dnp, unsigned nfiles)
for (i = 0; i < nfiles; i++) { for (i = 0; i < nfiles; i++) {
struct dnode *cur = dnp[i]; struct dnode *cur = dnp[i];
if (cur->fname_allocated) if (cur->fname_allocated)
free((char*)cur->fullname); /* free the filename */ free((char*)cur->fullname);
free(cur); /* free the dnode */ free(cur);
} }
free(dnp); /* free the array holding the dnode pointers */ free(dnp);
} }
#else #else
#define dfree(...) ((void)0) #define dfree(...) ((void)0)
@ -564,9 +562,10 @@ static void showfiles(struct dnode **dn, unsigned nfiles)
for (row = 0; row < nrows; row++) { for (row = 0; row < nrows; row++) {
for (nc = 0; nc < ncols; nc++) { for (nc = 0; nc < ncols; nc++) {
/* reach into the array based on the column and row */ /* reach into the array based on the column and row */
i = (nc * nrows) + row; /* assume display by column */
if (all_fmt & DISP_ROWS) if (all_fmt & DISP_ROWS)
i = (row * ncols) + nc; /* display across row */ i = (row * ncols) + nc; /* display across row */
else
i = (nc * nrows) + row; /* display by column */
if (i < nfiles) { if (i < nfiles) {
if (column > 0) { if (column > 0) {
nexttab -= column; nexttab -= column;
@ -640,21 +639,21 @@ static void showdirs(struct dnode **dn, unsigned ndirs, int first)
/* list all files at this level */ /* list all files at this level */
dnsort(subdnp, nfiles); dnsort(subdnp, nfiles);
showfiles(subdnp, nfiles); showfiles(subdnp, nfiles);
if (ENABLE_FEATURE_LS_RECURSIVE) { if (ENABLE_FEATURE_LS_RECURSIVE
if (all_fmt & DISP_RECURSIVE) { && (all_fmt & DISP_RECURSIVE)
/* recursive- list the sub-dirs */ ) {
dnd = splitdnarray(subdnp, nfiles, SPLIT_SUBDIR); /* recursive - list the sub-dirs */
dndirs = countsubdirs(subdnp, nfiles); dnd = splitdnarray(subdnp, nfiles, SPLIT_SUBDIR);
if (dndirs > 0) { dndirs = countsubdirs(subdnp, nfiles);
dnsort(dnd, dndirs); if (dndirs > 0) {
showdirs(dnd, dndirs, 0); dnsort(dnd, dndirs);
/* free the array of dnode pointers to the dirs */ showdirs(dnd, dndirs, 0);
free(dnd); /* free the array of dnode pointers to the dirs */
} free(dnd);
} }
/* free the dnodes and the fullname mem */
dfree(subdnp, nfiles);
} }
/* free the dnodes and the fullname mem */
dfree(subdnp, nfiles);
} }
} }
} }