*
*/
-#define VERSION_NUMBER "1.1"
+#define VERSION_NUMBER "1.2"
#define _BSD_SOURCE
return
strcmp(name, ".") == 0 ||
strcmp(name, "..") == 0 ||
- (ignore_dotfiles && name[0] == '.');
-}
-
-void print_size_sum(size_sum_t s) {
- char tmp[128];
- char *a = tmp + sizeof(tmp)/sizeof(char);
- *(--a) = '\0';
- if(s) {
- while(s) {
- *(--a) = s%10 + '0';
- s /= 10;
- }
- } else {
- *(--a) = '0';
- }
- printf("%s", a);
+ (ignore_dotfiles && name[0] == '.' && name[1] != '/');
}
size_sum_t entry_size(const char *name) {
return result;
}
+struct entry_node *push_dir_content(char *name, struct entry_node *head) {
+ char subname[PATH_MAX];
+ DIR *dir;
+ struct dirent *dir_e;
+ 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);
+ head = push_entry(subname, head);
+ }
+ }
+ closedir(dir);
+ } else {
+ fprintf(stderr, "Can not open directory %s: %s\n", name, strerror(errno));
+ exit (EXIT_FAILURE);
+ }
+ return head;
+}
+
void destroy_entry_list(struct entry_node *node) {
struct entry_node *next;
while(node) {
}
}
-void raw_print(char *buffer, char *filename, size_sum_t size) {
+void raw_print(char *buffer, size_t buffer_size,
+ char *filename, size_sum_t size) {
char *a, *b, *c, u;
b = buffer;
- if(size) {
- while(size) {
- *(b++) = size%10 + '0';
- size /= 10;
+ do {
+ if(b >= buffer + buffer_size) {
+ fprintf(stderr, "Buffer overflow in raw_print (hu?!).\n");
+ exit(EXIT_FAILURE);
}
- } else {
- *(b++) = '0';
- }
+ *(b++) = size%10 + '0';
+ size /= 10;
+ } while(size);
a = buffer;
c = b;
*(b++) = ' ';
- sprintf(b, " %s\n", filename);
+ snprintf(b, buffer_size - (b - buffer), "%s\n", filename);
}
-void fancy_print(char *buffer, char *filename, size_sum_t size) {
+void fancy_print(char *buffer, size_t buffer_size,
+ char *filename, size_sum_t size) {
if(size < 1024) {
- sprintf(buffer,
- "% 7d -- %s\n",
- ((int) size),
- filename);
+ snprintf(buffer,
+ buffer_size,
+ "% 7d -- %s\n",
+ ((int) size),
+ filename);
} else if(size < 1024 * 1024) {
- sprintf(buffer,
- "% 6.1fK -- %s\n",
- ((double) (size))/(1024.0),
- filename);
+ snprintf(buffer,
+ buffer_size,
+ "% 6.1fK -- %s\n",
+ ((double) (size))/(1024.0),
+ filename);
} else if(size < 1024 * 1024 * 1024) {
- sprintf(buffer,
- "% 6.1fM -- %s\n",
- ((double) (size))/(1024.0 * 1024),
- filename);
+ snprintf(buffer,
+ buffer_size,
+ "% 6.1fM -- %s\n",
+ ((double) (size))/(1024.0 * 1024),
+ filename);
} else {
- sprintf(buffer,
- "% 6.1fG -- %s\n",
- ((double) (size))/(1024.0 * 1024.0 * 1024.0),
- filename);
+ snprintf(buffer,
+ buffer_size,
+ "% 6.1fG -- %s\n",
+ ((double) (size))/(1024.0 * 1024.0 * 1024.0),
+ filename);
}
}
height = forced_height;
}
+ if(forced_width) {
+ width = forced_width;
+ }
+
if(height >= 0 && nb_nodes > height && !show_top && !forced_height) {
printf("...\n");
}
first = nb_nodes - n;
}
+ /* I do not like valgrind to complain about uninitialized data */
+ if(width < BUFFER_SIZE) {
+ line[width] = '\0';
+ }
+
for(n = first; n < last; n++) {
if(fancy_size_display) {
- fancy_print(line, nodes[n]->name, nodes[n]->size);
+ fancy_print(line, BUFFER_SIZE, nodes[n]->name, nodes[n]->size);
} else {
- raw_print(line, nodes[n]->name, nodes[n]->size);
+ raw_print(line, BUFFER_SIZE, nodes[n]->name, nodes[n]->size);
}
- if(width >= 0 && width < BUFFER_SIZE) {
- line[width] = '\0';
+ if(width >= 1 && width + 1 < BUFFER_SIZE && line[width]) {
+ line[width] = '\n';
+ line[width + 1] = '\0';
}
printf(line);
}
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, "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");
- 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");
+ /* 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 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, " 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\n");
- fprintf(out, " show this help.\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.\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");
}
/**********************************************************************/
};
int main(int argc, char **argv) {
- int c;
+ int c, l;
struct entry_node *root;
struct winsize win;
if (optind < argc) {
while (optind < argc) {
- root = push_entry(argv[optind++], root);
- }
- } else {
- DIR *dir;
- struct dirent *dir_e;
- dir = opendir(".");
- if(dir) {
- while((dir_e = readdir(dir))) {
- if(!ignore_entry(dir_e->d_name)) {
- root = push_entry(dir_e->d_name, root);
- }
+ 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);
}
- closedir(dir);
- } else {
- fprintf(stderr, "Can not open ./: %s\n", strerror(errno));
- exit (EXIT_FAILURE);
}
+ } else {
+ root = push_dir_content(".", root);
}
if(isatty(STDOUT_FILENO) &&
projects / dus.git / blobdiff