Changeset 391Tweet

Timestamp:

Jan 4, 2005, 12:13:01 AM (18 years ago)

Author:

Sam Hocevar

Message:

• check for getopt_long; work with simple getopt.

Location:

pwntcha/trunk

Files:

• configure.ac (modified) (1 diff)
• src/main.c (modified) (8 diffs)

pwntcha/trunk/configure.ac

@@ -18 +18 @@
 AC_C_INLINE
 AC_TYPE_SIZE_T
+
+AC_CHECK_FUNCS(getopt_long)
 
 # Use OpenCV?

pwntcha/trunk/src/main.c

@@ -18 +18 @@
 #include "common.h"
 
+#ifdef HAVE_GETOPT_LONG
+#   define MOREINFO "Try `%s --help' for more information.\n"
+#else
+#   define MOREINFO "Try `%s -h' for more information.\n"
+#endif
+
 int main(int argc, char *argv[])
 {
@@ -28 +34 @@
     {
         int this_option_optind = optind ? optind : 1;
+#ifdef HAVE_GETOPT_LONG
         int option_index = 0;
         static struct option long_options[] =
@@ -38 +45 @@
 
         c = getopt_long(argc, argv, "hm:v", long_options, &option_index);
+#else
+        c = getopt(argc, argv, "hm:v");
+#endif
         if(c == -1)
             break;
@@ -45 +55 @@
         case 'h': /* --help */
             printf("Usage: %s [OPTION]... FILE...\n", argv[0]);
+#ifdef HAVE_GETOPT_LONG
             printf("  -m, --mode      force operating mode\n");
             printf("  -h, --help      display this help and exit\n");
             printf("  -v, --version   output version information and exit\n");
+#else
+            printf("  -m     force operating mode\n");
+            printf("  -h     display this help and exit\n");
+            printf("  -v     output version information and exit\n");
+#endif
             return 0;
         case 'm': /* --mode */
@@ -53 +69 @@
             break;
         case 'v': /* --version */
-            printf("pwntcha (CAPTCHA decoder) %s\n", VERSION);
+            printf("pwntcha (captcha decoder) %s\n", VERSION);
             printf("Written by Sam Hocevar.\n");
             printf("\n");
@@ -61 +77 @@
             return 0;
         case '?':
-            break;
+            printf(MOREINFO, argv[0]);
+            return 1;
         default:
             printf("%s: invalid option -- %i\n", argv[0], c);
-            printf("Try `%s --help' for more information.\n", argv[0]);
+            printf(MOREINFO, argv[0]);
             return 1;
         }
@@ -72 +89 @@
     {
         printf("%s: too few arguments\n", argv[0]);
-        printf("Try `%s --help' for more information.\n", argv[0]);
+        printf(MOREINFO, argv[0]);
         return 1;
     }
@@ -103 +120 @@
             else
             {
-                fprintf(stderr, "%s: could not guess CAPTCHA type\n", argv[0]);
+                fprintf(stderr, "%s: could not guess captcha type\n", argv[0]);
                 printf("\n");
                 image_free(img);