}
void print_size_sum(size_sum_t s) {
- char tmp[100];
+ char tmp[128];
char *a = tmp + sizeof(tmp)/sizeof(char);
*(--a) = '\0';
if(s) {
printf("%s", a);
}
-size_sum_t file_or_dir_size(const char *name) {
+size_sum_t entry_size(const char *name) {
DIR *dir;
struct dirent *dir_e;
struct stat dummy;
while((dir_e = readdir(dir))) {
if(!ignore_entry(dir_e->d_name)) {
snprintf(subname, PATH_MAX, "%s/%s", name, dir_e->d_name);
- result += file_or_dir_size(subname);
+ result += entry_size(subname);
}
}
closedir(dir);
/**********************************************************************/
-struct file_with_size {
- char *filename;
+struct entry_node {
+ struct entry_node *next;
+ char *name;
size_sum_t size;
- struct file_with_size *next;
};
-struct file_with_size *create(char *name, struct file_with_size *current) {
- struct file_with_size *result;
- result = safe_malloc(sizeof(struct file_with_size));
- result->filename = strdup(name);
- result->size = file_or_dir_size(name);
- result->next = current;
+struct entry_node *push_entry(char *name, struct entry_node *head) {
+ struct entry_node *result;
+ result = safe_malloc(sizeof(struct entry_node));
+ result->name = strdup(name);
+ result->size = entry_size(name);
+ result->next = head;
return result;
}
-void destroy(struct file_with_size *node) {
- struct file_with_size *next;
+void destroy_entry_list(struct entry_node *node) {
+ struct entry_node *next;
while(node) {
next = node->next;
- free(node->filename);
+ free(node->name);
free(node);
node = next;
}
/**********************************************************************/
int compare_files(const void *x1, const void *x2) {
- const struct file_with_size **f1, **f2;
+ const struct entry_node **f1, **f2;
- f1 = (const struct file_with_size **) x1;
- f2 = (const struct file_with_size **) x2;
+ f1 = (const struct entry_node **) x1;
+ f2 = (const struct entry_node **) x2;
if(reverse_sorting) {
if((*f1)->size < (*f2)->size) {
*(b++) = ' ';
- sprintf(b, " %s\n", filename);
+ sprintf(b, "%s\n", filename);
}
void fancy_print(char *buffer, char *filename, size_sum_t size) {
}
}
-void print_sorted(struct file_with_size *root, int width, int height) {
+void print_sorted(struct entry_node *root, int width, int height) {
char line[BUFFER_SIZE];
- struct file_with_size *node;
- struct file_with_size **nodes;
+ struct entry_node *node;
+ struct entry_node **nodes;
int nb_nodes, n, first, last;
nb_nodes = 0;
for(node = root; node; node = node->next) {
- nb_nodes++;
+ if(size_min < 0 || node->size >= size_min) {
+ nb_nodes++;
+ }
}
- nodes = safe_malloc(nb_nodes * sizeof(struct file_with_size *));
+ nodes = safe_malloc(nb_nodes * sizeof(struct entry_node *));
n = 0;
for(node = root; node; node = node->next) {
- nodes[n++] = node;
+ if(size_min < 0 || node->size >= size_min) {
+ nodes[n++] = node;
+ }
}
- qsort(nodes, nb_nodes, sizeof(struct file_with_size *), compare_files);
+ qsort(nodes, nb_nodes, sizeof(struct entry_node *), compare_files);
first = 0;
last = nb_nodes;
height = forced_height;
}
+ if(forced_width) {
+ width = forced_width;
+ }
+
if(height >= 0 && nb_nodes > height && !show_top && !forced_height) {
printf("...\n");
}
}
for(n = first; n < last; n++) {
- if(size_min < 0 || nodes[n]->size >= size_min) {
- if(fancy_size_display) {
- fancy_print(line, nodes[n]->filename, nodes[n]->size);
- } else {
- raw_print(line, nodes[n]->filename, nodes[n]->size);
- }
- if(width >= 0 && width < BUFFER_SIZE) {
- line[width] = '\0';
- }
- printf(line);
+ if(fancy_size_display) {
+ fancy_print(line, nodes[n]->name, nodes[n]->size);
+ } else {
+ raw_print(line, nodes[n]->name, nodes[n]->size);
+ }
+ if(width >= 1 && width + 1 < BUFFER_SIZE && line[width]) {
+ line[width] = '\n';
+ line[width + 1] = '\0';
}
+ printf(line);
}
if(height >= 0 && nb_nodes > height && show_top && !forced_height) {
/**********************************************************************/
-void print_help(FILE *out) {
+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 size or content size. Take the content of the current directory as argument if none is provided.\n");
fprintf(out, "\n");
- fprintf(out, " -d ignore files and directories starting with a '.'\n");
- fprintf(out, " -f display size with float values and K, M and G units.\n");
- fprintf(out, " -r reverse the sorting order.\n");
- fprintf(out, " -t show the top of the list.\n");
- fprintf(out, " -c <cols> specificy the number of columns to display. The value -1\n");
- fprintf(out, " corresponds to no constraint. By default the command\n");
- fprintf(out, " uses the tty width, or no constraint if the stdout is\n");
- fprintf(out, " not a tty.\n");
- fprintf(out, " -l <lines> same as -c for number of lines.\n");
- fprintf(out, " -h show this help.\n");
- fprintf(out, " -m <size> size min.\n");
+ /* 01234567890123456789012345678901234567890123456789012345678901234567890123456789*/
+ fprintf(out, " -d, --ignore-dots ignore files and directories starting with a '.'\n");
+ fprintf(out, " -f, --fancy display size with float values and K, M and G\n");
+ fprintf(out, " units.\n");
+ fprintf(out, " -r, --reverse-order reverse the sorting order.\n");
+ fprintf(out, " -t, --show-top show the top of the list.\n");
+ fprintf(out, " -c <cols>, --nb-columns <cols>\n");
+ fprintf(out, " specificy the number of columns to display. The\n");
+ fprintf(out, " value -1 corresponds to no constraint. By default\n");
+ fprintf(out, " the command uses the tty width, or no constraint\n");
+ fprintf(out, " if the stdout is not a tty.\n");
+ fprintf(out, " -l <lines>, --nb-lines <lines>\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, "\n");
- fprintf(out, "Report bugs and comments to <francois@fleuret.org>\n");
+ fprintf(out, "Report bugs and comments to <francois@fleuret.org>.\n");
}
/**********************************************************************/
+static struct option long_options[] = {
+ { "ignore-dots", no_argument, 0, 'd' },
+ { "reverse-order", no_argument, 0, 'r' },
+ { "show-top", no_argument, 0, 't' },
+ { "help", no_argument, 0, 'h' },
+ { "fancy", no_argument, 0, 'f' },
+ { "nb-columns", 1, 0, 'c' },
+ { "nb-lines", 1, 0, 'l' },
+ { "size-min", 1, 0, 'm' },
+ { 0, 0, 0, 0 }
+};
+
int main(int argc, char **argv) {
int c;
- struct file_with_size *root;
+ struct entry_node *root;
struct winsize win;
root = 0;
setlocale (LC_ALL, "");
- while (1) {
- c = getopt(argc, argv, "dfrtl:c:m:hdu");
- if (c == -1)
- break;
-
+ while ((c = getopt_long(argc, argv, "dfrtl:c:m:hd",
+ long_options, NULL)) != -1) {
switch (c) {
case 'd':
break;
case 'h':
- print_help(stdout);
+ usage(stdout);
exit(EXIT_SUCCESS);
break;
default:
- print_help(stderr);
+ usage(stderr);
exit(EXIT_FAILURE);
}
}
if (optind < argc) {
while (optind < argc) {
- root = create(argv[optind++], root);
+ root = push_entry(argv[optind++], root);
}
} else {
DIR *dir;
if(dir) {
while((dir_e = readdir(dir))) {
if(!ignore_entry(dir_e->d_name)) {
- root = create(dir_e->d_name, root);
+ root = push_entry(dir_e->d_name, root);
}
}
closedir(dir);
print_sorted(root, -1, -1);
}
- destroy(root);
+ destroy_entry_list(root);
exit(EXIT_SUCCESS);
}
projects / dus.git / blobdiff