/************************************************************************/
-#include "busybox.h"
#include <sys/types.h>
#include <sys/stat.h>
#include <stdio.h>
#include <dirent.h>
#include <errno.h>
#include <stdio.h>
-#ifdef BB_FEATURE_LS_TIMESTAMPS
-#include <time.h>
-#endif
#include <string.h>
#include <stdlib.h>
-
#include <fcntl.h>
#include <signal.h>
#include <sys/ioctl.h>
+#include "busybox.h"
+
+#ifdef BB_FEATURE_LS_TIMESTAMPS
+#include <time.h>
+#endif
-#ifndef NAJOR
+#ifndef MAJOR
#define MAJOR(dev) (((dev)>>8)&0xff)
#define MINOR(dev) ((dev)&0xff)
#endif
break;
case LIST_BLOCKS:
#ifdef BB_FEATURE_HUMAN_READABLE
- fprintf(stdout, "%5s ", format(dn->dstat.st_size, ls_disp_hr));
+ fprintf(stdout, "%5s ", format(dn->dstat.st_blocks>>1, 1));
#else
#if _FILE_OFFSET_BITS == 64
printf("%4lld ", dn->dstat.st_blocks>>1);
fprintf(stdout, "%9s ", format(dn->dstat.st_size, ls_disp_hr));
#else
#if _FILE_OFFSET_BITS == 64
- printf("%9lld ", dn->dstat.st_size);
+ printf("%9lld ", dn->dstat.st_size>>1);
#else
- printf("%9ld ", dn->dstat.st_size);
+ printf("%9ld ", dn->dstat.st_size>>1);
#endif
#endif
}
time_fmt= TIME_MOD;
#endif
#ifdef BB_FEATURE_AUTOWIDTH
- ioctl(fileno(stdout), TIOCGWINSZ, &win);
- if (win.ws_row > 4)
- column_width = win.ws_row - 2;
- if (win.ws_col > 0)
- terminal_width = win.ws_col - 1;
+ ioctl(fileno(stdout), TIOCGWINSZ, &win);
+ if (win.ws_row > 4)
+ column_width = win.ws_row - 2;
+ if (win.ws_col > 0)
+ terminal_width = win.ws_col - 1;
#endif
- tabstops = 8;
nfiles=0;
/* process options */
return(status);
print_usage_message:
- usage(ls_usage);
+ show_usage();
}