void *safe_malloc(size_t n) {
void *p = malloc(n);
if (!p && n != 0) {
- fprintf(stderr, "Can not allocate memory: %s\n", strerror(errno));
+ fprintf(stderr, "dus: Can not allocate memory: %s\n", strerror(errno));
exit(EXIT_FAILURE);
}
return p;
return
strcmp(name, ".") == 0 ||
strcmp(name, "..") == 0 ||
- (ignore_dotfiles && name[0] == '.' && name[1] != '/');
+ (ignore_dotfiles && name[0] == '.' && name[1] != '/');
}
size_sum_t entry_size(const char *name) {
result = 0;
if(lstat(name, &dummy) != 0) {
- fprintf(stderr, "Can not stat %s: %s\n", name, strerror(errno));
+ fprintf(stderr, "dus: Can not stat %s: %s\n", name, strerror(errno));
exit(EXIT_FAILURE);
}
return 0;
}
- dir = opendir(name);
-
- if(dir) {
- while((dir_e = readdir(dir))) {
- if(!ignore_entry(dir_e->d_name)) {
- snprintf(subname, PATH_MAX, "%s/%s", name, dir_e->d_name);
- result += entry_size(subname);
+ if(S_ISDIR(dummy.st_mode)) {
+ dir = opendir(name);
+ if(dir) {
+ while((dir_e = readdir(dir))) {
+ if(!ignore_entry(dir_e->d_name)) {
+ snprintf(subname, PATH_MAX, "%s/%s", name, dir_e->d_name);
+ result += entry_size(subname);
+ }
}
+ closedir(dir);
+ } else {
+ fprintf(stderr, "dus: Can not open directory %s: %s\n", name, strerror(errno));
+ exit(EXIT_FAILURE);
}
- closedir(dir);
- } else {
- if(S_ISREG(dummy.st_mode)) {
- result += dummy.st_size;
- }
+ } else if(S_ISREG(dummy.st_mode)) {
+ result += dummy.st_size;
}
return result;
for(c = string; *c; c++) {
if(*c >= '0' && *c <= '9') {
partial_total = 10 * partial_total + ((int) (*c - '0'));
+ } else if(*c == 'B' || *c == 'b') {
+ total += partial_total;
+ partial_total = 0;
} else if(*c == 'K' || *c == 'k') {
total += partial_total * 1024;
partial_total = 0;
total += partial_total * 1024 * 1024 * 1024;
partial_total = 0;
} else {
- fprintf(stderr, "Syntax error in %s\n", string);
+ fprintf(stderr, "dus: Syntax error in size specification `%s'\n", string);
+ exit(EXIT_FAILURE);
}
}
+
+ total += partial_total;
+
return total;
}
}
closedir(dir);
} else {
- fprintf(stderr, "Can not open directory %s: %s\n", name, strerror(errno));
+ fprintf(stderr, "dus: Can not open directory %s: %s\n", name, strerror(errno));
exit (EXIT_FAILURE);
}
return head;
b = buffer;
do {
if(b >= buffer + buffer_size) {
- fprintf(stderr, "Buffer overflow in raw_print (hu?!).\n");
+ fprintf(stderr, "dus: Buffer overflow in raw_print (hu?!).\n");
exit(EXIT_FAILURE);
}
*(b++) = size%10 + '0';
snprintf(b, buffer_size - (b - buffer), "%s\n", filename);
}
-void fancy_print(char *buffer, size_t buffer_size, char *filename, size_sum_t size) {
+void fancy_print(char *buffer, size_t buffer_size,
+ char *filename, size_sum_t size) {
if(size < 1024) {
snprintf(buffer,
buffer_size,
- "% 7d -- %s\n",
+ "% 8d -- %s\n",
((int) size),
filename);
} else if(size < 1024 * 1024) {
snprintf(buffer,
buffer_size,
- "% 6.1fK -- %s\n",
+ "% 7.1fK -- %s\n",
((double) (size))/(1024.0),
filename);
} else if(size < 1024 * 1024 * 1024) {
snprintf(buffer,
buffer_size,
- "% 6.1fM -- %s\n",
+ "% 7.1fM -- %s\n",
((double) (size))/(1024.0 * 1024),
filename);
} else {
snprintf(buffer,
buffer_size,
- "% 6.1fG -- %s\n",
+ "% 7.1fG -- %s\n",
((double) (size))/(1024.0 * 1024.0 * 1024.0),
filename);
}
void usage(FILE *out) {
fprintf(out, "Usage: dus [OPTION]... [FILE]...\n");
fprintf(out, "Version %s (%s)\n", VERSION_NUMBER, UNAME);
- fprintf(out, "List files and directories sorted according to their sizes. If no files or directories are provided as arguments, use the content of the current directory.\n");
+ fprintf(out, "Lists files and directories according to their size. The sizes are computed by summing recursively exact file sizes through directories. If a given directory has its name appended with '/', it is not listed, but the elements it contains are. If no files or directories are provided as arguments, the current directory is used as default.\n");
fprintf(out, "\n");
/* 01234567890123456789012345678901234567890123456789012345678901234567890123456789*/
fprintf(out, " -d, --ignore-dots ignore files and directories starting with a '.'\n");
fprintf(out, " same as -c for number of lines.\n");
fprintf(out, " -h, --help show this help.\n");
fprintf(out, " -m <size>, --size-min <size>\n");
- fprintf(out, " set the listed entries minimum size.\n");
+ fprintf(out, " set the listed entries minimum size. The size\n");
+ fprintf(out, " can be specified using the G, M, K, and B units.\n");
fprintf(out, "\n");
fprintf(out, "Report bugs and comments to <francois@fleuret.org>.\n");
}
/**********************************************************************/
static struct option long_options[] = {
+ { "version", no_argument, 0, 'v' },
{ "ignore-dots", no_argument, 0, 'd' },
{ "reverse-order", no_argument, 0, 'r' },
{ "show-top", no_argument, 0, 't' },
};
int main(int argc, char **argv) {
- int c;
+ int c, l;
struct entry_node *root;
struct winsize win;
setlocale (LC_ALL, "");
- while ((c = getopt_long(argc, argv, "dfrtl:c:m:hd",
+ while ((c = getopt_long(argc, argv, "vdfrtl:c:m:hd",
long_options, NULL)) != -1) {
switch (c) {
+ case 'v':
+ printf("dus version %s (%s)\n", VERSION_NUMBER, UNAME);
+ exit(EXIT_SUCCESS);
+ break;
+
case 'd':
ignore_dotfiles = 1;
break;
if (optind < argc) {
while (optind < argc) {
- if(argv[optind][strlen(argv[optind]) - 1] == '/') {
- argv[optind][strlen(argv[optind]) - 1] = '\0';
+ l = strlen(argv[optind]);
+ if(l > 0 && argv[optind][l - 1] == '/') {
+ argv[optind][l - 1] = '\0';
root = push_dir_content(argv[optind++], root);
} else {
root = push_entry(argv[optind++], root);