Changeset 1115 for toilet/trunk/srcTweet

Timestamp:

Sep 27, 2006, 1:13:01 AM (16 years ago)

Author:

Sam Hocevar

Message:

• Added -d and completed -I options.

File:

• toilet/trunk/src/main.c (modified) (7 diffs)

toilet/trunk/src/main.c

@@ -50 +50 @@
     char const *export = "utf8";
     char const *font = "mono9";
+    char const *dir = "/usr/share/figlet/";
     unsigned int flag_gay = 0;
     unsigned int flag_metal = 0;
@@ -65 +66 @@
             /* Long option, needs arg, flag, short option */
             { "font", 1, NULL, 'f' },
+            { "directory", 1, NULL, 'd' },
             { "width", 1, NULL, 'w' },
             { "gay", 0, NULL, 'g' },
@@ -75 +77 @@
         };
 
-        int c = getopt_long(argc, argv, "f:w:gmihI:v",
+        int c = getopt_long(argc, argv, "d:f:I:w:ghimv",
                             long_options, &option_index);
 #   else
 #       define MOREINFO "Try `%s -h' for more information.\n"
-        int c = getopt(argc, argv, "f:w:gmihI:v");
+        int c = getopt(argc, argv, "d:f:I:w:ghimv");
 #   endif
         if(c == -1)
@@ -97 +99 @@
         case 'f': /* --font */
             font = optarg;
+            break;
+        case 'd': /* --directory */
+            dir = optarg;
             break;
         case 'g': /* --gay */
@@ -135 +140 @@
             return 0;
         case 2:
-            printf("/usr/share/figlet\n");
+            printf("%s\n", dir);
             return 0;
         case 3:
-            printf("mono9\n");
+            printf("%s\n", font);
             return 0;
         case 4:
@@ -217 +222 @@
 static void usage(void)
 {
-    printf("Usage: toilet [ -gmihv ] [ message ]\n");
+    printf("Usage: toilet [ -ghimv ] [ -d fontdirectory ]\n");
     printf("              [ -f fontfile ] [ -w outputwidth ]\n");
-    printf("              [ -I infocode ]\n");
+    printf("              [ -I infocode ] [ message ]\n");
 #   ifdef HAVE_GETOPT_LONG
     printf("  -f, --font <fontfile>    select the font\n");
+    printf("  -d, --directory <dir>    specify font directory\n");
     printf("  -w, --width <width>      set output width\n");
     printf("  -g, --gay                add a rainbow effect to the text\n");
@@ -231 +237 @@
 #   else
     printf("  -f <fontfile>    select the font\n");
+    printf("  -d <dir>         specify font directory\n");
     printf("  -w <width>       set output width\n");
     printf("  -g               add a rainbow effect to the text\n");