projects
/
dus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added the "%s" format when simply writing a string.
[dus.git]
/
dus.c
diff --git
a/dus.c
b/dus.c
index
336f201
..
c698d2e
100644
(file)
--- a/
dus.c
+++ b/
dus.c
@@
-66,6
+66,10
@@
size_sum_t size_min = -1; /* -1 means no minimum size, otherwise lower
bound on the size to display a
file/dir */
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. */
/********************************************************************/
/* malloc with error checking. */
@@
-73,7
+77,9
@@
size_sum_t size_min = -1; /* -1 means no minimum size, otherwise lower
void *safe_malloc(size_t n) {
void *p = malloc(n);
if (!p && n != 0) {
void *safe_malloc(size_t n) {
void *p = malloc(n);
if (!p && n != 0) {
- fprintf(stderr, "dus: Can not allocate memory: %s\n", strerror(errno));
+ fprintf(stderr,
+ "dus: Can not allocate memory: %s\n",
+ strerror(errno));
exit(EXIT_FAILURE);
}
return p;
exit(EXIT_FAILURE);
}
return p;
@@
-98,8
+104,14
@@
size_sum_t entry_size(const char *name) {
result = 0;
if(lstat(name, &dummy) != 0) {
result = 0;
if(lstat(name, &dummy) != 0) {
- fprintf(stderr, "dus: 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)) {
}
if(S_ISLNK(dummy.st_mode)) {
@@
-117,8
+129,12
@@
size_sum_t entry_size(const char *name) {
}
closedir(dir);
} else {
}
closedir(dir);
} else {
- fprintf(stderr, "dus: Can not open directory %s: %s\n", name, strerror(errno));
- exit(EXIT_FAILURE);
+ if(!(errno == EACCES && ignore_protected_files)) {
+ fprintf(stderr,
+ "dus: Can not open directory %s: %s\n",
+ name, strerror(errno));
+ exit(EXIT_FAILURE);
+ }
}
} else if(S_ISREG(dummy.st_mode)) {
result += dummy.st_size;
}
} else if(S_ISREG(dummy.st_mode)) {
result += dummy.st_size;
@@
-149,7
+165,9
@@
size_sum_t atoss(const char *string) {
total += partial_total * 1024 * 1024 * 1024;
partial_total = 0;
} else {
total += partial_total * 1024 * 1024 * 1024;
partial_total = 0;
} else {
- fprintf(stderr, "dus: Syntax error in size specification `%s'\n", string);
+ fprintf(stderr,
+ "dus: Syntax error in size specification `%s'\n",
+ string);
exit(EXIT_FAILURE);
}
}
exit(EXIT_FAILURE);
}
}
@@
-190,7
+208,9
@@
struct entry_node *push_dir_content(char *name, struct entry_node *head) {
}
closedir(dir);
} else {
}
closedir(dir);
} else {
- fprintf(stderr, "dus: 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;
exit (EXIT_FAILURE);
}
return head;
@@
-240,7
+260,8
@@
void raw_print(char *buffer, size_t buffer_size,
b = buffer;
do {
if(b >= buffer + buffer_size) {
b = buffer;
do {
if(b >= buffer + buffer_size) {
- fprintf(stderr, "dus: Buffer overflow in raw_print (hu?!).\n");
+ fprintf(stderr,
+ "dus: Buffer overflow in raw_print (hu?!).\n");
exit(EXIT_FAILURE);
}
*(b++) = size%10 + '0';
exit(EXIT_FAILURE);
}
*(b++) = size%10 + '0';
@@
-353,7
+374,7
@@
void print_sorted(struct entry_node *root, int width, int height) {
line[width] = '\n';
line[width + 1] = '\0';
}
line[width] = '\n';
line[width + 1] = '\0';
}
- printf(line);
+ printf(
"%s",
line);
}
if(height >= 0 && nb_nodes > height && show_top && !forced_height) {
}
if(height >= 0 && nb_nodes > height && show_top && !forced_height) {
@@
-374,6
+395,8
@@
void usage(FILE *out) {
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, " -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, " -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");
@@
-397,6
+420,7
@@
void usage(FILE *out) {
static struct option long_options[] = {
{ "version", no_argument, 0, 'v' },
{ "ignore-dots", no_argument, 0, 'd' },
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' },
{ "reverse-order", no_argument, 0, 'r' },
{ "show-top", no_argument, 0, 't' },
{ "help", no_argument, 0, 'h' },
@@
-416,7
+440,7
@@
int main(int argc, char **argv) {
setlocale (LC_ALL, "");
setlocale (LC_ALL, "");
- while ((c = getopt_long(argc, argv, "vdfrtl:c:m:hd",
+ while ((c = getopt_long(argc, argv, "
i
vdfrtl:c:m:hd",
long_options, NULL)) != -1) {
switch (c) {
long_options, NULL)) != -1) {
switch (c) {
@@
-429,6
+453,10
@@
int main(int argc, char **argv) {
ignore_dotfiles = 1;
break;
ignore_dotfiles = 1;
break;
+ case 'i':
+ ignore_protected_files = 1;
+ break;
+
case 'f':
fancy_size_display = 1;
break;
case 'f':
fancy_size_display = 1;
break;