Merge commit '67f22bd1b6c2acfa5d23fa1821a0c9e895d085eb'

2 files changed, 137 insertions, 11 deletions

diff --git a/errno.c b/errno.c
index 3644c8f..872d11a 100644
--- a/errno.c
+++ b/errno.c
@@ -17,13 +17,17 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+#define _GNU_SOURCE
 
 #include <ctype.h>
 #include <errno.h>
+#include <locale.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
+#include <getopt.h>
 
 
 static struct {
@@ -70,25 +74,112 @@ report_from_code(int code)
 }
 
 
+static bool
+matches(int code, int num_words, char **words)
+{
+    const char *text = strerror(code);
+    int i;
+    
+    for (i = 0; i < num_words; ++i) {
+        if (strcasestr(text, words[i]) == NULL)
+            return false;
+    }
+    return true;
+}
+
+
+static void
+search(int num_words, char **words)
+{
+    int i;
+    
+    for (i = 0; i < num_errnos; ++i) {
+        if (matches(errnos[i].code, num_words, words))
+            report(errnos[i].name, errnos[i].code);
+    }
+}
+
+
+static struct option
+options[] = {
+    { "help", 0, NULL, 'h' },
+    { "list", 0, NULL, 'l' },
+    { "search", 0, NULL, 's' },
+};
+
+
+static void
+usage(void)
+{
+    printf("Usage: errno [-ls] [--list] [--search] [keyword]\n");
+}
+
+
 int 
 main(int argc, char **argv)
 {
     int i;
     int exit_code;
+    int index = 0;
+    enum { lookup_mode, list_mode, search_mode } mode = lookup_mode;
+    
+    setlocale(LC_ALL, "");
     
+    for (;;) {
+        int c = getopt_long(argc, argv, "hls", options, &index);
+        if (c == -1)
+            break;
+            
+        switch (c) {
+        case 'h':
+            usage();
+            return EXIT_SUCCESS;
+
+        case 'l':
+            mode = list_mode;
+            break;
+            
+        case 's':
+            mode = search_mode;
+            break;
+
+        case '?':
+            break;
+
+        default:
+            fprintf(stderr, "getopt returned 0x%02x\n", c);
+            return EXIT_FAILURE;
+        }
+    }
+ 
     exit_code = EXIT_SUCCESS;
-    for (i = 1; i < argc; ++i) {
-        const char *arg = argv[i];
-        if (toupper(arg[0]) == 'E') {
-            if (!report_from_name(arg))
-                exit_code = EXIT_FAILURE;
-        } else if (isdigit(arg[0])) {
-            if (!report_from_code(atoi(arg)))
+
+    switch (mode) {
+    case lookup_mode:
+        for (i = optind; i < argc; ++i) {
+            const char *arg = argv[i];
+            if (toupper(arg[0]) == 'E') {
+                if (!report_from_name(arg))
+                    exit_code = EXIT_FAILURE;
+            } else if (isdigit(arg[0])) {
+                if (!report_from_code(atoi(arg)))
+                    exit_code = EXIT_FAILURE;
+            } else {
+                fprintf(stderr, "ERROR: Not understood: %s\n", arg);
                 exit_code = EXIT_FAILURE;
-        } else {
-            fprintf(stderr, "ERROR: Not understood: %s\n", arg);
-            exit_code = EXIT_FAILURE;
+            }
         }
+        break;
+        
+    case list_mode:
+        for (i = 0; i < num_errnos; ++i)
+            report(errnos[i].name, errnos[i].code);
+        break;
+        
+    case search_mode:
+        search(argc - optind, argv + optind);
+        break;
     }
+
     return exit_code;
 }
diff --git a/errno.docbook b/errno.docbook
index 0ddaba1..ccd2437 100644
--- a/errno.docbook
+++ b/errno.docbook
@@ -33,7 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 			<firstname>Lars</firstname>
 			<surname>Wirzenius</surname>
 		</author>
-		<date>2012-06-04</date>
+		<date>2012-06-05</date>
 	</refentryinfo>
 
 	<refmeta>
@@ -51,6 +51,17 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 			<command>errno</command>
             <arg choice="req"><replaceable>name-or-code</replaceable></arg>
 		</cmdsynopsis>
+		<cmdsynopsis>
+			<command>errno</command>
+            <arg>-ls</arg>
+            <arg>--list</arg>
+		</cmdsynopsis>
+		<cmdsynopsis>
+			<command>errno</command>
+            <arg>-s</arg>
+            <arg>--search</arg>
+            <arg choice="req"><replaceable>word</replaceable></arg>
+		</cmdsynopsis>
 	</refsynopsisdiv>
 	
 	<refsect1>
@@ -66,6 +77,30 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	</refsect1>
 	
 	<refsect1>
+        <title>OPTIONS</title>
+        
+        <variablelist>
+            <varlistentry>
+                <term><option>-l</option></term>
+                <term><option>--list</option></term>
+                <listitem>
+                    <para>List all errno values.</para>
+                </listitem>
+            </varlistentry>
+
+            <varlistentry>
+                <term><option>-s</option></term>
+                <term><option>--search</option></term>
+                <listitem>
+                    <para>Search for errors whose description contains
+                    all the given words (case-insensitive).</para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+
+	</refsect1>
+	
+	<refsect1>
 		<title>AUTHOR</title>
 			Lars Wirzenius
 		<para>