projects
/
dus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added the -i option to ignore protected files and directories.
[dus.git]
/
dus.c
diff --git
a/dus.c
b/dus.c
index
2947b5a
..
7cdf03e
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. */
@@
-121,10
+125,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;
@@
-385,6
+391,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");
@@
-408,6
+416,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' },
@@
-427,7
+436,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) {
@@
-440,6
+449,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;