Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-27 16:31:24 +00:00
Code Issues Projects Releases Wiki Activity

Static-ify a variable. make du work with all the human-readable variants

Browse Source 
since my last pass only fixed 'du -h' but left the others broken.
This commit is contained in:
Eric Andersen 2001-03-07 06:04:08 +00:00
parent a7db19bb81
commit ec9fad9a49
4 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
coreutils/df.c
View File

@ -31,7 +31,7 @@
extern const char mtab_file[]; /* Defined in utility.c */ extern const char mtab_file[]; /* Defined in utility.c */
#ifdef BB_FEATURE_HUMAN_READABLE #ifdef BB_FEATURE_HUMAN_READABLE
unsigned long disp_hr = KILOBYTE; static unsigned long disp_hr = KILOBYTE;
#endif #endif
static int df(char *device, const char *mountPoint) static int df(char *device, const char *mountPoint)

21
coreutils/du.c
View File

@ -36,7 +36,7 @@
#ifdef BB_FEATURE_HUMAN_READABLE #ifdef BB_FEATURE_HUMAN_READABLE
unsigned long du_disp_hr = KILOBYTE; static unsigned long disp_hr = KILOBYTE;
#endif #endif
typedef void (Display) (long, char *); typedef void (Display) (long, char *);
@ -48,8 +48,19 @@ static Display *print;
static void print_normal(long size, char *filename) static void print_normal(long size, char *filename)
{ {
unsigned long base;
#ifdef BB_FEATURE_HUMAN_READABLE #ifdef BB_FEATURE_HUMAN_READABLE
printf("%s\t%s\n", format(size, du_disp_hr), filename); switch (disp_hr) {
case MEGABYTE:
base = KILOBYTE;
break;
case KILOBYTE:
base = 1;
break;
default:
base = 0;
}
printf("%s\t%s\n", format(size, base), filename);
#else #else
printf("%ld\t%s\n", size, filename); printf("%ld\t%s\n", size, filename);
#endif #endif
@ -156,8 +167,8 @@ int du_main(int argc, char **argv)
count_hardlinks = 1; count_hardlinks = 1;
break; break;
#ifdef BB_FEATURE_HUMAN_READABLE #ifdef BB_FEATURE_HUMAN_READABLE
case 'h': du_disp_hr = 0; break; case 'h': disp_hr = 0; break;
case 'm': du_disp_hr = MEGABYTE; break; case 'm': disp_hr = MEGABYTE; break;
#endif #endif
case 'k': break; case 'k': break;
default: default:
@ -185,7 +196,7 @@ int du_main(int argc, char **argv)
return status; return status;
} }
/* $Id: du.c,v 1.40 2001/03/07 03:53:40 andersen Exp $ */ /* $Id: du.c,v 1.41 2001/03/07 06:04:08 andersen Exp $ */
/* /*
Local Variables: Local Variables:
c-file-style: "linux" c-file-style: "linux"

2
df.c
View File

@ -31,7 +31,7 @@
extern const char mtab_file[]; /* Defined in utility.c */ extern const char mtab_file[]; /* Defined in utility.c */
#ifdef BB_FEATURE_HUMAN_READABLE #ifdef BB_FEATURE_HUMAN_READABLE
unsigned long disp_hr = KILOBYTE; static unsigned long disp_hr = KILOBYTE;
#endif #endif
static int df(char *device, const char *mountPoint) static int df(char *device, const char *mountPoint)

21
du.c
View File

@ -36,7 +36,7 @@
#ifdef BB_FEATURE_HUMAN_READABLE #ifdef BB_FEATURE_HUMAN_READABLE
unsigned long du_disp_hr = KILOBYTE; static unsigned long disp_hr = KILOBYTE;
#endif #endif
typedef void (Display) (long, char *); typedef void (Display) (long, char *);
@ -48,8 +48,19 @@ static Display *print;
static void print_normal(long size, char *filename) static void print_normal(long size, char *filename)
{ {
unsigned long base;
#ifdef BB_FEATURE_HUMAN_READABLE #ifdef BB_FEATURE_HUMAN_READABLE
printf("%s\t%s\n", format(size, du_disp_hr), filename); switch (disp_hr) {
case MEGABYTE:
base = KILOBYTE;
break;
case KILOBYTE:
base = 1;
break;
default:
base = 0;
}
printf("%s\t%s\n", format(size, base), filename);
#else #else
printf("%ld\t%s\n", size, filename); printf("%ld\t%s\n", size, filename);
#endif #endif
@ -156,8 +167,8 @@ int du_main(int argc, char **argv)
count_hardlinks = 1; count_hardlinks = 1;
break; break;
#ifdef BB_FEATURE_HUMAN_READABLE #ifdef BB_FEATURE_HUMAN_READABLE
case 'h': du_disp_hr = 0; break; case 'h': disp_hr = 0; break;
case 'm': du_disp_hr = MEGABYTE; break; case 'm': disp_hr = MEGABYTE; break;
#endif #endif
case 'k': break; case 'k': break;
default: default:
@ -185,7 +196,7 @@ int du_main(int argc, char **argv)
return status; return status;
} }
/* $Id: du.c,v 1.40 2001/03/07 03:53:40 andersen Exp $ */ /* $Id: du.c,v 1.41 2001/03/07 06:04:08 andersen Exp $ */
/* /*
Local Variables: Local Variables:
c-file-style: "linux" c-file-style: "linux"