Changeset 3564

Timestamp:

08/19/08 14:22:31 (4 months ago)

Author:

cstender

Message:

improved vconvert help messages

Files:

• format-plugins/vformat/tools/vconvert.c (modified) (5 diffs)

format-plugins/vformat/tools/vconvert.c

@@ -39 +39 @@
 static void usage (char *name, int ecode)
 {
-        fprintf (stderr, "Usage: %s <file> <switches>\n", name);
+        fprintf (stderr, "Usage: %s <file> <switches>\n\n", name);
+        fprintf (stderr, "Switches:\n");
+        fprintf (stderr, "--help\t\tShow this help message\n");
         fprintf (stderr, "--out <file>\tStore the output in this file (No output to stdout)\n");
         fprintf (stderr, "--to-vcard21\tConvert to vcard 2.1\n");
@@ -281 +283 @@
                 usage (argv[0], 1);
 
+        if (!strcmp (argv[1], "--help"))
+                usage (argv[0], 0);
+
         char *filename = argv[1];
         char *output = NULL;
@@ -289 +294 @@
         for (i = 2; i < argc; i++) {
                 char *arg = argv[i];
-                if (!strcmp (arg, "--to-vcard21")) {
+                if (!strcmp (arg, "--help")) {
+                        usage (argv[0], 0);
+                } else if (!strcmp (arg, "--to-vcard21")) {
                         type = TARGET_VCARD_21;
                 } else if (!strcmp (arg, "--to-vcard30")) {
@@ -312 +319 @@
                         if (!output)
                                 usage (argv[0], 1);
-                } else if (!strcmp (arg, "--help")) {
-                        usage (argv[0], 0);
                 } else if (!strcmp (arg, "--")) {
                         break;
@@ -336 +341 @@
         }
 
+        // read file
         char *buffer;
         unsigned int size;