*
*/
-#define VERSION_NUMBER "1.1"
+#define VERSION_NUMBER "1.2"
#define _BSD_SOURCE
bound on the size to display a
file/dir */
+int ignore_protected_files = 0; /* Should we simply ignore files or
+ directories which are protected
+ ? */
+
/********************************************************************/
/* malloc with error checking. */
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] == '.');
-}
-
-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) {
result = 0;
if(lstat(name, &dummy) != 0) {
- fprintf(stderr, "Can not stat %s: %s\n", name, strerror(errno));
- exit(EXIT_FAILURE);
+ if(!(errno == EACCES && ignore_protected_files)) {
+ fprintf(stderr,
+ "dus: Can not stat %s: %s\n",
+ name, strerror(errno));
+ exit(EXIT_FAILURE);
+ } else {
+ return 0;
+ }
}
if(S_ISLNK(dummy.st_mode)) {
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 {
+ if(!(errno == EACCES && ignore_protected_files)) {
+ 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;
}
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,
+ "dus: 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,
+ "dus: 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,
+ "% 8d -- %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,
+ "% 7.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,
+ "% 7.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,
+ "% 7.1fG -- %s\n",
+ ((double) (size))/(1024.0 * 1024.0 * 1024.0),
+ filename);
}
}
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 >= 1 && width + 1 < BUFFER_SIZE && line[width]) {
line[width] = '\n';
line[width + 1] = '\0';
}
- printf(line);
+ printf("%s", line);
}
if(height >= 0 && nb_nodes > height && show_top && !forced_height) {
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");
/* 01234567890123456789012345678901234567890123456789012345678901234567890123456789*/
+ fprintf(out, " -h, --help show this help.\n");
+ fprintf(out, " -v, --version prints the version number and exit\n");
fprintf(out, " -d, --ignore-dots ignore files and directories starting with a '.'\n");
+ fprintf(out, " -i, --ignore-protected ignore files and directories for which we do not\n");
+ fprintf(out, " have permission\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, " 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, " 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' },
+ { "ignore-protected", no_argument, 0, 'i' },
{ "reverse-order", no_argument, 0, 'r' },
{ "show-top", no_argument, 0, 't' },
{ "help", no_argument, 0, 'h' },
};
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, "ivdfrtl: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;
+ case 'i':
+ ignore_protected_files = 1;
+ break;
+
case 'f':
fancy_size_display = 1;
break;
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) &&