Changes in zcrypt.c [8f335a8:6249a88f]

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>
@@ -28 +26 @@
 
 #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
@@ -118 +106 @@
 }
 
-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[])
 {
@@ -135 +116 @@
   int mode = M_NONE;
 
-  int c;
+  char c;
 
   int messageflag = FALSE;
@@ -141 +122 @@
   zoptions.flags = 0;
 
-  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)
+  while ((c = getopt(argc, argv, "ZDERSF:c:i:advqtluons:f:m")) != (char)EOF)
   {
     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 */
@@ -294 +257 @@
   if (error || !cryptspec)
   {
-    usage(stderr, argv[0]);
+    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");
     exit(1);
   }