*
*/
-#define VERSION_NUMBER "1.0alpha"
+#define VERSION_NUMBER "1.1alpha"
#define _BSD_SOURCE
#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/param.h>
#include <dirent.h>
#include <stdlib.h>
#include <stdio.h>
int show_top = 0; /* 1 means to show the top of the sorted list
instead of the bottom */
+size_sum_t size_min = -1; /* -1 means no minimum size, otherwise lower
+ bound on the size to display a
+ file/dir */
+
/********************************************************************/
/* malloc with error checking. */
} else {
*(--a) = '0';
}
- printf(a);
+ printf("%s", a);
}
size_sum_t file_or_dir_size(const char *name) {
struct dirent *dir_e;
struct stat dummy;
size_sum_t result;
- char subname[BUFFER_SIZE];
+ char subname[PATH_MAX];
result = 0;
if(dir) {
while((dir_e = readdir(dir))) {
if(!ignore_entry(dir_e->d_name)) {
- snprintf(subname, BUFFER_SIZE, "%s/%s", name, dir_e->d_name);
+ snprintf(subname, PATH_MAX, "%s/%s", name, dir_e->d_name);
result += file_or_dir_size(subname);
}
}
return result;
}
+size_sum_t atoss(const char *string) {
+ size_sum_t total, partial_total;
+ const char *c;
+ total = 0;
+ partial_total = 0;
+
+ for(c = string; *c; c++) {
+ if(*c >= '0' && *c <= '9') {
+ partial_total = 10 * partial_total + ((int) (*c - '0'));
+ } else if(*c == 'K' || *c == 'k') {
+ total += partial_total * 1024;
+ partial_total = 0;
+ } else if(*c == 'M' || *c == 'm') {
+ total += partial_total * 1024 * 1024;
+ partial_total = 0;
+ } else if(*c == 'G' || *c == 'g') {
+ total += partial_total * 1024 * 1024 * 1024;
+ partial_total = 0;
+ } else {
+ fprintf(stderr, "Syntax error in %s\n", string);
+ }
+ }
+ return total;
+}
+
/**********************************************************************/
struct file_with_size {
void fancy_print(char *buffer, char *filename, size_sum_t size) {
if(size < 1024) {
sprintf(buffer,
- "% 7d %s\n",
+ "% 7d -- %s\n",
((int) size),
filename);
} else if(size < 1024 * 1024) {
sprintf(buffer,
- "% 6.1fK %s\n",
+ "% 6.1fK -- %s\n",
((double) (size))/(1024.0),
filename);
} else if(size < 1024 * 1024 * 1024) {
sprintf(buffer,
- "% 6.1fM %s\n",
+ "% 6.1fM -- %s\n",
((double) (size))/(1024.0 * 1024),
filename);
} else {
sprintf(buffer,
- "% 6.1fG %s\n",
+ "% 6.1fG -- %s\n",
((double) (size))/(1024.0 * 1024.0 * 1024.0),
filename);
}
}
for(n = first; n < last; n++) {
- if(fancy_size_display) {
- fancy_print(line, nodes[n]->filename, nodes[n]->size);
- } else {
- raw_print(line, nodes[n]->filename, nodes[n]->size);
- }
- if(width >= 0 && width < BUFFER_SIZE) {
- line[width] = '\0';
+ if(size_min < 0 || nodes[n]->size >= size_min) {
+ if(fancy_size_display) {
+ fancy_print(line, nodes[n]->filename, nodes[n]->size);
+ } else {
+ raw_print(line, nodes[n]->filename, nodes[n]->size);
+ }
+ if(width >= 0 && width < BUFFER_SIZE) {
+ line[width] = '\0';
+ }
+ printf(line);
}
- printf(line);
}
free(nodes);
fprintf(out, " not a tty.\n");
fprintf(out, " -l <lines> same as -c for number of lines.\n");
fprintf(out, " -h show this help.\n");
+ fprintf(out, " -m <size> size min.\n");
fprintf(out, "\n");
fprintf(out, "Report bugs and comments to <francois@fleuret.org>\n");
}
int main(int argc, char **argv) {
int c;
struct file_with_size *root;
+ struct winsize win;
root = 0;
setlocale (LC_ALL, "");
while (1) {
- c = getopt(argc, argv, "dfrtl:c:hdu");
+ c = getopt(argc, argv, "dfrtl:c:m:hdu");
if (c == -1)
break;
forced_width = atoi(optarg);
break;
+ case 'm':
+ size_min = atoss(optarg);
+ break;
+
case 'h':
print_help(stdout);
exit(EXIT_SUCCESS);
}
}
- if(isatty(STDOUT_FILENO)) {
- struct winsize win;
- if(ioctl (STDOUT_FILENO, TIOCGWINSZ, (char *) &win)) {
- fprintf(stderr, "Can not get the tty size: %s\n", strerror(errno));
- exit (EXIT_FAILURE);
- }
+ if(isatty(STDOUT_FILENO) &&
+ !ioctl (STDOUT_FILENO, TIOCGWINSZ, (char *) &win)) {
print_sorted(root, win.ws_col, win.ws_row - 2);
} else {
print_sorted(root, -1, -1);