emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix up ls.c to ensure human readable works properly in all cases

Browse Source
This commit is contained in:
Eric Andersen 2001-03-07 03:48:02 +00:00
parent 6c563bc1a1
commit 651f8c04ef
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
coreutils/ls.c
View File

@ -186,7 +186,7 @@ static unsigned short column_width = COLUMN_WIDTH;
static int status = EXIT_SUCCESS; static int status = EXIT_SUCCESS;
#ifdef BB_FEATURE_HUMAN_READABLE #ifdef BB_FEATURE_HUMAN_READABLE
unsigned long ls_disp_hr = KILOBYTE; unsigned long ls_disp_hr = 0;
#endif #endif
static int my_stat(struct dnode *cur) static int my_stat(struct dnode *cur)
@ -610,7 +610,7 @@ int list_single(struct dnode *dn)
break; break;
case LIST_BLOCKS: case LIST_BLOCKS:
#ifdef BB_FEATURE_HUMAN_READABLE #ifdef BB_FEATURE_HUMAN_READABLE
fprintf(stdout, "%5s ", format(dn->dstat.st_blocks>>1, 1)); fprintf(stdout, "%5s ", format(dn->dstat.st_blocks>>1, (ls_disp_hr==TRUE)? 0: 1));
#else #else
#if _FILE_OFFSET_BITS == 64 #if _FILE_OFFSET_BITS == 64
printf("%4lld ", dn->dstat.st_blocks>>1); printf("%4lld ", dn->dstat.st_blocks>>1);
@ -647,7 +647,7 @@ int list_single(struct dnode *dn)
printf("%4d, %3d ", (int)MAJOR(dn->dstat.st_rdev), (int)MINOR(dn->dstat.st_rdev)); printf("%4d, %3d ", (int)MAJOR(dn->dstat.st_rdev), (int)MINOR(dn->dstat.st_rdev));
} else { } else {
#ifdef BB_FEATURE_HUMAN_READABLE #ifdef BB_FEATURE_HUMAN_READABLE
fprintf(stdout, "%9s ", format(dn->dstat.st_size, ls_disp_hr)); fprintf(stdout, "%9s ", format(dn->dstat.st_size, (ls_disp_hr==TRUE)? 0: 1));
#else #else
#if _FILE_OFFSET_BITS == 64 #if _FILE_OFFSET_BITS == 64
printf("%9lld ", dn->dstat.st_size>>1); printf("%9lld ", dn->dstat.st_size>>1);
@ -779,7 +779,7 @@ extern int ls_main(int argc, char **argv)
style_fmt = STYLE_LONG; style_fmt = STYLE_LONG;
list_fmt |= LIST_LONG; list_fmt |= LIST_LONG;
#ifdef BB_FEATURE_HUMAN_READABLE #ifdef BB_FEATURE_HUMAN_READABLE
ls_disp_hr = 1; ls_disp_hr = FALSE;
#endif #endif
break; break;
case 'n': list_fmt |= LIST_ID_NUMERIC; break; case 'n': list_fmt |= LIST_ID_NUMERIC; break;
@ -826,7 +826,7 @@ extern int ls_main(int argc, char **argv)
case 'w': terminal_width= atoi(optarg); break; case 'w': terminal_width= atoi(optarg); break;
#endif #endif
#ifdef BB_FEATURE_HUMAN_READABLE #ifdef BB_FEATURE_HUMAN_READABLE
case 'h': ls_disp_hr = 0; break; case 'h': ls_disp_hr = TRUE; break;
#endif #endif
case 'k': break; case 'k': break;
default: default:

10
ls.c
View File

@ -186,7 +186,7 @@ static unsigned short column_width = COLUMN_WIDTH;
static int status = EXIT_SUCCESS; static int status = EXIT_SUCCESS;
#ifdef BB_FEATURE_HUMAN_READABLE #ifdef BB_FEATURE_HUMAN_READABLE
unsigned long ls_disp_hr = KILOBYTE; unsigned long ls_disp_hr = 0;
#endif #endif
static int my_stat(struct dnode *cur) static int my_stat(struct dnode *cur)
@ -610,7 +610,7 @@ int list_single(struct dnode *dn)
break; break;
case LIST_BLOCKS: case LIST_BLOCKS:
#ifdef BB_FEATURE_HUMAN_READABLE #ifdef BB_FEATURE_HUMAN_READABLE
fprintf(stdout, "%5s ", format(dn->dstat.st_blocks>>1, 1)); fprintf(stdout, "%5s ", format(dn->dstat.st_blocks>>1, (ls_disp_hr==TRUE)? 0: 1));
#else #else
#if _FILE_OFFSET_BITS == 64 #if _FILE_OFFSET_BITS == 64
printf("%4lld ", dn->dstat.st_blocks>>1); printf("%4lld ", dn->dstat.st_blocks>>1);
@ -647,7 +647,7 @@ int list_single(struct dnode *dn)
printf("%4d, %3d ", (int)MAJOR(dn->dstat.st_rdev), (int)MINOR(dn->dstat.st_rdev)); printf("%4d, %3d ", (int)MAJOR(dn->dstat.st_rdev), (int)MINOR(dn->dstat.st_rdev));
} else { } else {
#ifdef BB_FEATURE_HUMAN_READABLE #ifdef BB_FEATURE_HUMAN_READABLE
fprintf(stdout, "%9s ", format(dn->dstat.st_size, ls_disp_hr)); fprintf(stdout, "%9s ", format(dn->dstat.st_size, (ls_disp_hr==TRUE)? 0: 1));
#else #else
#if _FILE_OFFSET_BITS == 64 #if _FILE_OFFSET_BITS == 64
printf("%9lld ", dn->dstat.st_size>>1); printf("%9lld ", dn->dstat.st_size>>1);
@ -779,7 +779,7 @@ extern int ls_main(int argc, char **argv)
style_fmt = STYLE_LONG; style_fmt = STYLE_LONG;
list_fmt |= LIST_LONG; list_fmt |= LIST_LONG;
#ifdef BB_FEATURE_HUMAN_READABLE #ifdef BB_FEATURE_HUMAN_READABLE
ls_disp_hr = 1; ls_disp_hr = FALSE;
#endif #endif
break; break;
case 'n': list_fmt |= LIST_ID_NUMERIC; break; case 'n': list_fmt |= LIST_ID_NUMERIC; break;
@ -826,7 +826,7 @@ extern int ls_main(int argc, char **argv)
case 'w': terminal_width= atoi(optarg); break; case 'w': terminal_width= atoi(optarg); break;
#endif #endif
#ifdef BB_FEATURE_HUMAN_READABLE #ifdef BB_FEATURE_HUMAN_READABLE
case 'h': ls_disp_hr = 0; break; case 'h': ls_disp_hr = TRUE; break;
#endif #endif
case 'k': break; case 'k': break;
default: default: