From: Francois Fleuret <francois@fleuret.org>
Date: Tue, 16 Mar 2010 18:19:07 +0000 (+0100)
Subject: Added the long options.
X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=commitdiff_plain;h=8f34c2a3b6f0f23f9125f75d35955df3b01d8140;p=dus.git

Added the long options.
---

diff --git a/dus.1 b/dus.1
index f938ac4..01cee50 100644
--- a/dus.1
+++ b/dus.1
@@ -20,30 +20,29 @@ recursively exact file sizes through directories.
 
 .SH "OPTIONS"
 .TP
-\fB-h\fR
+\fB-h, --help\fR
 display help and exit
 .TP
-\fB-d\fR
+\fB-d, --ignore-dots\fR
 ignore files and directories whose name starts with a dot
 .TP
-\fB-f\fR
+\fB-f, --fancy\fR
 display floating point size with K, M and G units
 .TP
-\fB-r\fR
+\fB-r, --reverse-order\fR
 reverse the sorting order (big to small instead of small to big)
 .TP
-\fB-t\fR
+\fB-t, --show-top\fR
 show the top of the list instead of the bottom
 .TP
-\fB-c \fI<cols>\fR
-impose the number of columns, -1 means no limit (it
-is by default no limits if the stdout is not a tty and the tty width
-otherwise)
+\fB-c \fI<cols>\fR, \fB--nb-columns \fI<cols>\fR
+force the number of columns, -1 means no limit (it is by default no
+limits if the stdout is not a tty and the tty width otherwise)
 .TP
-\fB-l \fI<lines>\fR
+\fB-l \fI<lines>\fR, \fB--nb-lines \fI<lines>\fR
 same as \fB-c\fR but for the number of lines
 .TP
-\fB-m \fI<size min>\fR
+\fB-m \fI<size min>\fR, \fB--min-size \fI<size min>\fR
 restrict the printing of files and directories to these of size bigger
 than a lower bound
 
diff --git a/dus.c b/dus.c
index 40d5a16..f1be9f2 100644
--- a/dus.c
+++ b/dus.c
@@ -338,17 +338,25 @@ void print_help(FILE *out) {
   fprintf(out, "Version %s (%s)\n", VERSION_NUMBER, UNAME);
   fprintf(out, "List files and directories sorted according to their size or content size. Take the content of the current directory as argument if none is provided.\n");
   fprintf(out, "\n");
-  fprintf(out, "   -d          ignore files and directories starting with a '.'\n");
-  fprintf(out, "   -f          display size with float values and K, M and G units.\n");
-  fprintf(out, "   -r          reverse the sorting order.\n");
-  fprintf(out, "   -t          show the top of the list.\n");
-  fprintf(out, "   -c <cols>   specificy the number of columns to display. The value -1\n");
+  fprintf(out, "   -d, --ignore-dots\n");
+  fprintf(out, "               ignore files and directories starting with a '.'\n");
+  fprintf(out, "   -f, --fancy\n");
+  fprintf(out, "               display size with float values and K, M and G units.\n");
+  fprintf(out, "   -r, --reverse-order\n");
+  fprintf(out, "               reverse the sorting order.\n");
+  fprintf(out, "   -t, --show-top\n");
+  fprintf(out, "               show the top of the list.\n");
+  fprintf(out, "   -c <cols>, --nb-columns <cols>\n");
+  fprintf(out, "               specificy the number of columns to display. The value -1\n");
   fprintf(out, "               corresponds to no constraint. By default the command\n");
   fprintf(out, "               uses the tty width, or no constraint if the stdout is\n");
   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, "   -l <lines>, --nb-lines <lines>\n");
+  fprintf(out, "               same as -c for number of lines.\n");
+  fprintf(out, "   -h, --help\n");
+  fprintf(out, "               show this help.\n");
+  fprintf(out, "   -m <size>, --size-min <size>\n");
+  fprintf(out, "               set the listed entries minimum size.\n");
   fprintf(out, "\n");
   fprintf(out, "Report bugs and comments to <francois@fleuret.org>\n");
 }
@@ -365,7 +373,21 @@ int main(int argc, char **argv) {
   setlocale (LC_ALL, "");
 
   while (1) {
-    c = getopt(argc, argv, "dfrtl:c:m:hdu");
+    int option_index = 0;
+    static struct option long_options[] = {
+      { "ignore-dots", no_argument, 0, 'd' },
+      { "reverse-order", no_argument, 0, 'r' },
+      { "show-top", no_argument, 0, 't' },
+      { "help", no_argument, 0, 'h' },
+      { "fancy", no_argument, 0, 'f' },
+      { "nb-columns", 1, 0, 'c' },
+      { "nb-lines", 1, 0, 'l' },
+      { "size-min", 1, 0, 'm' },
+      { 0, 0, 0, 0 }
+    };
+
+    c = getopt_long(argc, argv, "dfrtl:c:m:hd",
+                    long_options, &option_index);
     if (c == -1)
       break;