*
*/
-#define VERSION_NUMBER "1.1alpha"
+#define VERSION_NUMBER "1.1"
#define _BSD_SOURCE
#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/param.h>
#include <dirent.h>
#include <stdlib.h>
#include <stdio.h>
} else {
*(--a) = '0';
}
- printf(a);
+ printf("%s", a);
}
size_sum_t file_or_dir_size(const char *name) {
struct dirent *dir_e;
struct stat dummy;
size_sum_t result;
- char subname[BUFFER_SIZE];
+ char subname[PATH_MAX];
result = 0;
if(dir) {
while((dir_e = readdir(dir))) {
if(!ignore_entry(dir_e->d_name)) {
- snprintf(subname, BUFFER_SIZE, "%s/%s", name, dir_e->d_name);
+ snprintf(subname, PATH_MAX, "%s/%s", name, dir_e->d_name);
result += file_or_dir_size(subname);
}
}
char line[BUFFER_SIZE];
struct file_with_size *node;
struct file_with_size **nodes;
- int nb, n, first, last;
+ int nb_nodes, n, first, last;
- nb = 0;
+ nb_nodes = 0;
for(node = root; node; node = node->next) {
- nb++;
+ nb_nodes++;
}
- nodes = safe_malloc(nb * sizeof(struct file_with_size *));
+ nodes = safe_malloc(nb_nodes * sizeof(struct file_with_size *));
n = 0;
for(node = root; node; node = node->next) {
nodes[n++] = node;
}
- qsort(nodes, nb, sizeof(struct file_with_size *), compare_files);
+ qsort(nodes, nb_nodes, sizeof(struct file_with_size *), compare_files);
first = 0;
- last = nb;
+ last = nb_nodes;
if(forced_height) {
height = forced_height;
}
- if(height > 0 && height < nb) {
- first = nb - height;
+ if(height >= 0 && nb_nodes > height && !show_top && !forced_height) {
+ printf("...\n");
+ }
+
+ if(height > 0 && height < nb_nodes) {
+ first = nb_nodes - height;
}
if(show_top) {
n = last;
- last = nb - first;
- first = nb - n;
+ last = nb_nodes - first;
+ first = nb_nodes - n;
}
for(n = first; n < last; n++) {
}
}
+ if(height >= 0 && nb_nodes > height && show_top && !forced_height) {
+ printf("...\n");
+ }
+
free(nodes);
}
+
/**********************************************************************/
+
void print_help(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, " -d, --ignore-dots\n");
+ fprintf(out, " ignore files and directories starting with a '.'\n");
+ fprintf(out, " -f, --fancy\n");
+ fprintf(out, " display size with float values and K, M and G units.\n");
+ fprintf(out, " -r, --reverse-order\n");
+ fprintf(out, " reverse the sorting order.\n");
+ fprintf(out, " -t, --show-top\n");
+ fprintf(out, " 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 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");
+ fprintf(out, " -l <lines>, --nb-lines <lines>\n");
+ fprintf(out, " same as -c for number of lines.\n");
+ fprintf(out, " -h, --help\n");
+ fprintf(out, " 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");
}
int main(int argc, char **argv) {
int c;
struct file_with_size *root;
+ struct winsize win;
root = 0;
setlocale (LC_ALL, "");
while (1) {
- c = getopt(argc, argv, "dfrtl:c:m:hdu");
+ int option_index = 0;
+ 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 }
+ };
+
+ c = getopt_long(argc, argv, "dfrtl:c:m:hd",
+ long_options, &option_index);
if (c == -1)
break;
}
}
- if(isatty(STDOUT_FILENO)) {
- struct winsize win;
- if(ioctl (STDOUT_FILENO, TIOCGWINSZ, (char *) &win)) {
- fprintf(stderr, "Can not get the tty size: %s\n", strerror(errno));
- exit (EXIT_FAILURE);
- }
+ if(isatty(STDOUT_FILENO) &&
+ !ioctl (STDOUT_FILENO, TIOCGWINSZ, (char *) &win)) {
print_sorted(root, win.ws_col, win.ws_row - 2);
} else {
print_sorted(root, -1, -1);
projects / dus.git / blobdiff