Changeset cffb044 for zcrypt.c

Timestamp:

Apr 19, 2013, 3:23:18 AM (10 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Parents:

487cc2b (diff), 0625919 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 0625919d1e483ec9ba11021e1281e05f9d2b877a into 487cc2b1b658bcc696e3951201320be455fc86e4

File:

• zcrypt.c (modified) (6 diffs)

zcrypt.c

@@ -16 +16 @@
 #include <sys/wait.h>
 #include <ctype.h>
+#include <limits.h>
+#include <getopt.h>
 
 #include <config.h>
@@ -26 +28 @@
 
 #include "filterproc.h"
+
+#ifndef OWL_VERSION_STRING
+#ifdef  GIT_VERSION
+#define stringify(x)       __stringify(x)
+#define __stringify(x)     #x
+#define OWL_VERSION_STRING stringify(GIT_VERSION)
+#else
+#define OWL_VERSION_STRING PACKAGE_VERSION
+#endif
+#endif /* !OWL_VERSION_STRING */
 
 /* Annotate functions in which the caller owns the return value and is
@@ -106 +118 @@
 }
 
+void usage(FILE *file, const char *progname)
+{
+  fprintf(file, "Usage: %s [-Z|-D|-E|-R|-S] [-F Keyfile] [-c class] [-i instance]\n", progname);
+  fprintf(file, "       [-advqtluon] [-s signature] [-f arg] [-m message]\n");
+  fprintf(file, "  One or more of class, instance, and keyfile must be specified.\n");
+}
+
 int main(int argc, char *argv[])
 {
@@ -116 +135 @@
   int mode = M_NONE;
 
-  char c;
+  int c;
 
   int messageflag = FALSE;
@@ -122 +141 @@
   zoptions.flags = 0;
 
-  while ((c = getopt(argc, argv, "ZDERSF:c:i:advqtluons:f:m")) != (char)EOF)
+  enum {
+    OPT_VERSION = CHAR_MAX + 1,
+    OPT_HELP,
+  };
+  static const struct option options[] = {
+    {"version", no_argument, NULL, OPT_VERSION},
+    {"help", no_argument, NULL, OPT_HELP},
+    {NULL, 0, NULL, 0}
+  };
+
+  while ((c = getopt_long(argc, argv, "ZDERSF:c:i:advqtluons:f:m", options, NULL)) != -1)
   {
     switch(c)
     {
+      case OPT_VERSION:
+        /* Version */
+        printf("This is zcrypt version %s\n", OWL_VERSION_STRING);
+        exit(0);
+      case OPT_HELP:
+        /* Help */
+        usage(stdout, argv[0]);
+        exit(0);
       case 'Z':
         /* Zephyr encrypt */
@@ -257 +294 @@
   if (error || !cryptspec)
   {
-    fprintf(stderr, "Usage: %s [-Z|-D|-E|-R|-S] [-F Keyfile] [-c class] [-i instance]\n", argv[0]);
-    fprintf(stderr, "       [-advqtluon] [-s signature] [-f arg] [-m message]\n");
-    fprintf(stderr, "  One or more of class, instance, and keyfile must be specified.\n");
+    usage(stderr, argv[0]);
     exit(1);
   }