projects
/
dus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added the DESTDIR variable.
[dus.git]
/
dus.c
diff --git
a/dus.c
b/dus.c
index
2947b5a
..
6de022a
100644
(file)
--- a/
dus.c
+++ b/
dus.c
@@
-3,7
+3,7
@@
* dus is a simple utility to display the files and directories
* according to their total disk occupancy.
*
* 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.
* Written by Francois Fleuret <francois@fleuret.org>
*
* This file is part of dus.
@@
-22,7
+22,7
@@
*
*/
*
*/
-#define VERSION_NUMBER "1.
2
"
+#define VERSION_NUMBER "1.
3
"
#define _BSD_SOURCE
#define _BSD_SOURCE
@@
-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 dont_exit_on_protected_files = 0; /* Should we go on when we meet
+ files or directories which
+ are protected ? */
+
/********************************************************************/
/* malloc with error checking. */
/********************************************************************/
/* malloc with error checking. */
@@
-90,7
+94,7
@@
int ignore_entry(const char *name) {
(ignore_dotfiles && name[0] == '.' && name[1] != '/');
}
(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;
DIR *dir;
struct dirent *dir_e;
struct stat dummy;
@@
-98,12
+102,17
@@
size_sum_t entry_size(const char *name) {
char subname[PATH_MAX];
result = 0;
char subname[PATH_MAX];
result = 0;
+ if(isdir) { *isdir = 0; }
if(lstat(name, &dummy) != 0) {
fprintf(stderr,
"dus: Can not stat %s: %s\n",
name, strerror(errno));
if(lstat(name, &dummy) != 0) {
fprintf(stderr,
"dus: Can not stat %s: %s\n",
name, strerror(errno));
- exit(EXIT_FAILURE);
+ if(!(errno == EACCES && dont_exit_on_protected_files)) {
+ exit(EXIT_FAILURE);
+ } else {
+ return 0;
+ }
}
if(S_ISLNK(dummy.st_mode)) {
}
if(S_ISLNK(dummy.st_mode)) {
@@
-111,12
+120,13
@@
size_sum_t entry_size(const char *name) {
}
if(S_ISDIR(dummy.st_mode)) {
}
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);
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);
+ result += entry_size(subname
, 0
);
}
}
closedir(dir);
}
}
closedir(dir);
@@
-124,7
+134,9
@@
size_sum_t entry_size(const char *name) {
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);
+ if(!(errno == EACCES && dont_exit_on_protected_files)) {
+ 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;
@@
-176,10
+188,17
@@
struct entry_node {
};
struct entry_node *push_entry(char *name, struct entry_node *head) {
};
struct entry_node *push_entry(char *name, struct entry_node *head) {
+ char tmp_name[PATH_MAX];
struct entry_node *result;
struct entry_node *result;
+ int isdir;
result = safe_malloc(sizeof(struct entry_node));
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;
}
result->next = head;
return result;
}
@@
-276,25
+295,25
@@
void fancy_print(char *buffer, size_t buffer_size,
if(size < 1024) {
snprintf(buffer,
buffer_size,
if(size < 1024) {
snprintf(buffer,
buffer_size,
- "% 8d
--
%s\n",
+ "% 8d %s\n",
((int) size),
filename);
} else if(size < 1024 * 1024) {
snprintf(buffer,
buffer_size,
((int) size),
filename);
} else if(size < 1024 * 1024) {
snprintf(buffer,
buffer_size,
- "% 7.1fK
--
%s\n",
+ "% 7.1fK %s\n",
((double) (size))/(1024.0),
filename);
} else if(size < 1024 * 1024 * 1024) {
snprintf(buffer,
buffer_size,
((double) (size))/(1024.0),
filename);
} else if(size < 1024 * 1024 * 1024) {
snprintf(buffer,
buffer_size,
- "% 7.1fM
--
%s\n",
+ "% 7.1fM %s\n",
((double) (size))/(1024.0 * 1024),
filename);
} else {
snprintf(buffer,
buffer_size,
((double) (size))/(1024.0 * 1024),
filename);
} else {
snprintf(buffer,
buffer_size,
- "% 7.1fG
--
%s\n",
+ "% 7.1fG %s\n",
((double) (size))/(1024.0 * 1024.0 * 1024.0),
filename);
}
((double) (size))/(1024.0 * 1024.0 * 1024.0),
filename);
}
@@
-364,7
+383,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) {
@@
-385,6
+404,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 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, " -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
+429,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
+449,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
+462,10
@@
int main(int argc, char **argv) {
ignore_dotfiles = 1;
break;
ignore_dotfiles = 1;
break;
+ case 'i':
+ dont_exit_on_protected_files = 1;
+ break;
+
case 'f':
fancy_size_display = 1;
break;
case 'f':
fancy_size_display = 1;
break;