X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=dus.git;a=blobdiff_plain;f=dus.c;h=2947b5a34be3e8f52d1194253070cee89cd13e8e;hp=5f481d7535d4a3a667385c738e40a1c2f759242d;hb=1963a3e9d47673eb126ca00c2679018448c3e196;hpb=dff998515d9469572147d445213cad08f12e4cb6

diff --git a/dus.c b/dus.c
index 5f481d7..2947b5a 100644
--- a/dus.c
+++ b/dus.c
@@ -73,7 +73,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) {
-    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;
@@ -98,7 +100,9 @@ size_sum_t entry_size(const char *name) {
   result = 0;
 
   if(lstat(name, &dummy) != 0) {
-    fprintf(stderr, "dus: 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 +121,9 @@ size_sum_t entry_size(const char *name) {
       }
       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);
     }
   } else if(S_ISREG(dummy.st_mode)) {
@@ -149,7 +155,9 @@ size_sum_t atoss(const char *string) {
       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);
     }
   }
@@ -190,7 +198,9 @@ struct entry_node *push_dir_content(char *name, struct entry_node *head) {
     }
     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;
@@ -240,7 +250,8 @@ void raw_print(char *buffer, size_t 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';
@@ -371,6 +382,8 @@ void usage(FILE *out) {
   fprintf(out, "Lists files and directories according to their size. The sizes are computed by summing recursively exact file sizes through directories. If a given directory has its name appended with '/', it is not listed, but the elements it contains are. If no files or directories are provided as arguments, the current directory is used as default.\n");
   fprintf(out, "\n");
   /*            01234567890123456789012345678901234567890123456789012345678901234567890123456789*/
+  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, "   -f, --fancy                display size with float values and K, M and G\n");
   fprintf(out, "                              units.\n");
@@ -383,7 +396,6 @@ void usage(FILE *out) {
   fprintf(out, "                              if the stdout is not a tty.\n");
   fprintf(out, "   -l <lines>, --nb-lines <lines>\n");
   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. The size\n");
   fprintf(out, "                              can be specified using the G, M, K, and B units.\n");
@@ -394,6 +406,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' },
@@ -414,10 +427,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;