Added the -v option to print the version number.

[dus.git] / dus.c

diff --git a/dus.c b/dus.c
index 91cb0f0..4acc517 100644 (file)
--- a/dus.c
+++ b/dus.c
@@ -73,7 +73,7 @@ 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) {
-    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;
@@ -98,7 +98,7 @@ size_sum_t entry_size(const char *name) {
   result = 0;
 
   if(lstat(name, &dummy) != 0) {
-    fprintf(stderr, "Can not stat %s: %s\n", name, strerror(errno));
+    fprintf(stderr, "dus: Can not stat %s: %s\n", name, strerror(errno));
     exit(EXIT_FAILURE);
   }
 
@@ -117,7 +117,7 @@ size_sum_t entry_size(const char *name) {
       }
       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);
     }
   } else if(S_ISREG(dummy.st_mode)) {
@@ -136,6 +136,9 @@ size_sum_t atoss(const char *string) {
   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;
@@ -146,9 +149,13 @@ size_sum_t atoss(const char *string) {
       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;
 }
 
@@ -183,7 +190,7 @@ struct entry_node *push_dir_content(char *name, struct entry_node *head) {
     }
     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;
@@ -233,7 +240,7 @@ void raw_print(char *buffer, size_t buffer_size,
   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';
@@ -378,7 +385,8 @@ void usage(FILE *out) {
   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");
 }
@@ -386,6 +394,7 @@ void usage(FILE *out) {
 /**********************************************************************/
 
 static struct option long_options[] = {
+  { "version", no_argument, 0, 'v' },
   { "ignore-dots", no_argument, 0, 'd' },
   { "reverse-order", no_argument, 0, 'r' },
   { "show-top", no_argument, 0, 't' },
@@ -406,10 +415,15 @@ int main(int argc, char **argv) {
 
   setlocale (LC_ALL, "");
 
-  while ((c = getopt_long(argc, argv, "dfrtl:c:m:hd",
+  while ((c = getopt_long(argc, argv, "vdfrtl: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;