Changeset 4133e34

Timestamp:

Mar 17, 2010, 10:36:59 PM (14 years ago)

Author:

Nelson Elhage <nelhage@ksplice.com>

Branches:

master, release-1.10, release-1.6, release-1.7, release-1.8, release-1.9

Children:

f7f35c0

Parents:

a08bfc3

git-author:

Nelson Elhage <nelhage@mit.edu> (04/13/09 19:22:27)

git-committer:

Nelson Elhage <nelhage@ksplice.com> (03/17/10 22:36:59)

Message:

zcrypt: Improve error handling behavior slightly.

* Don't print usage if we have valid usage, but couldn't find a key.
* Exit with an appropriate exit code

File:

• zcrypt.c (modified) (3 diffs)

zcrypt.c

@@ -208 +208 @@
     fname = GetZephyrVarKeyFile(argv[0], class, instance);
   
-  if (error || fname == NULL)
+  if (error)
   {
     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);
+  }
+  else if(!fname)
+  {
+    exit(1);
   }
   else
@@ -257 +262 @@
           fprintf(stderr, "Error writing to key file.\n");
           fclose(fkey);
+          exit(1);
         }
         else
@@ -269 +275 @@
       /* Encrypt/decrypt */
       FILE *fkey = fopen(fname, "r");
-      if (!fkey)
+      if (!fkey) {
         fprintf(stderr, "Could not open key file: %s\n", fname);
+        exit(1);
+      }
       else
       {