Changeset 1321 for toilet/trunk/src/main.cTweet

Timestamp:

Nov 10, 2006, 8:56:55 AM (16 years ago)

Author:

Sam Hocevar

Message:

• Moved export stuff in export.c.
• Bail out with an error if the requested export format is unsupported.

File:

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

toilet/trunk/src/main.c

@@ -35 +35 @@
 #include "render.h"
 #include "filter.h"
+#include "export.h"
 
 static void version(void);
@@ -40 +41 @@
 static void usage(void);
 #endif
-static int export_list(void);
 
 int main(int argc, char *argv[])
@@ -139 +139 @@
             if(!strcmp(optarg, "list"))
                 return export_list();
-            cx->export = optarg;
+            if(export_set(cx, optarg) < 0)
+                return -1;
             break;
         case 140: /* --irc */
-            cx->export = "irc";
+            export_set(cx, "irc");
             break;
         case 141: /* --html */
-            cx->export = "html";
+            export_set(cx, "html");
             break;
         case '?':
@@ -261 +262 @@
 #endif
 
-static int export_list(void)
-{
-    char const * const * exports, * const * p;
-
-    exports = cucul_get_export_list();
-
-    printf("Available export formats:\n");
-    for(p = exports; *p; p += 2)
-        printf("\"%s\": %s\n", *p, *(p + 1));
-
-    return 0;
-}
-