* dus is a simple utility to display the files and directories
* according to their total disk occupancy.
*
- * Copyright (c) 2010 Francois Fleuret
+ * Copyright (c) 2010, 2011 Francois Fleuret
* Written by Francois Fleuret <francois@fleuret.org>
*
* This file is part of dus.
*
*/
-#define VERSION_NUMBER "1.2"
+#define VERSION_NUMBER "1.3"
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
#include <sys/types.h>
#include <sys/stat.h>
bound on the size to display a
file/dir */
+int dont_exit_on_protected_files = 0; /* Should we go on when we meet
+ 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;
(ignore_dotfiles && name[0] == '.' && name[1] != '/');
}
-size_sum_t entry_size(const char *name) {
+size_sum_t entry_size(const char *name, int *isdir) {
DIR *dir;
struct dirent *dir_e;
struct stat dummy;
char subname[PATH_MAX];
result = 0;
+ if(isdir) { *isdir = 0; }
if(lstat(name, &dummy) != 0) {
- fprintf(stderr, "Can not stat %s: %s\n", name, strerror(errno));
- exit(EXIT_FAILURE);
+ fprintf(stderr,
+ "dus: Can not stat %s: %s\n",
+ name, strerror(errno));
+ if(!(errno == EACCES && dont_exit_on_protected_files)) {
+ 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)) {
+ if(isdir) { *isdir = 1; }
+ 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, 0);
+ }
+ }
+ closedir(dir);
+ } else {
+ fprintf(stderr,
+ "dus: Can not open directory %s: %s\n",
+ name, strerror(errno));
+ if(!(errno == EACCES && dont_exit_on_protected_files)) {
+ 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;
}
};
struct entry_node *push_entry(char *name, struct entry_node *head) {
+ char tmp_name[PATH_MAX];
struct entry_node *result;
+ int isdir;
result = safe_malloc(sizeof(struct entry_node));
- result->name = strdup(name);
- result->size = entry_size(name);
+ result->size = entry_size(name, &isdir);
+ if(isdir) {
+ snprintf(tmp_name, PATH_MAX, "%s/", name);
+ result->name = strdup(tmp_name);
+ } else {
+ result->name = strdup(name);
+ }
result->next = head;
return result;
}
}
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);
}
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 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, " -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 do not exit when visiting files and directories\n");
+ fprintf(out, " for which we do not 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' },
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':
+ dont_exit_on_protected_files = 1;
+ break;
+
case 'f':
fancy_size_display = 1;
break;
projects / dus.git / blobdiff