Changeset a08bfc3

Timestamp:

Mar 17, 2010, 10:36:59 PM (15 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:

4133e34

Parents:

356465e

git-author:

Nelson Elhage <nelhage@mit.edu> (04/13/09 20:35:44)

git-committer:

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

Message:

zcrypt: Send errors to stderr, not stdout.

File:

• zcrypt.c (modified) (12 diffs)

zcrypt.c

@@ -190 +190 @@
     if (!zoptions.message)
     {
-      printf("Memory allocation error.\n");
+      fprintf(stderr, "Memory allocation error.\n");
       error = TRUE;
     }
@@ -210 +210 @@
   if (error || fname == NULL)
   {
-    printf("Usage: %s [-Z|-D|-E|-R|-S] [-F Keyfile] [-c class] [-i instance]\n", argv[0]);
-    printf("       [-advqtluon] [-s signature] [-f arg] [-m message]\n");
-    printf("  One or more of class, instance, and keyfile must be specified.\n");
+    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");
   }
   else
@@ -230 +230 @@
         }
  */
-      printf("Feature not yet implemented.\n");
+      fprintf(stderr, "Feature not yet implemented.\n");
     }
     else if (mode == M_SETKEY)
@@ -250 +250 @@
       fkey = fopen(fname, "w");
       if (!fkey)
-        printf("Could not open key file for writing: %s\n", fname);
+        fprintf(stderr, "Could not open key file for writing: %s\n", fname);
       else
       {
         if (fputs(newkey, fkey) != strlen(newkey) || putc('\n', fkey) != '\n')
         {
-          printf("Error writing to key file.\n");
+          fprintf(stderr, "Error writing to key file.\n");
           fclose(fkey);
         }
@@ -261 +261 @@
         {
           fclose(fkey);
-          printf("Key update complete.\n");
+          fprintf(stderr, "Key update complete.\n");
         }
       }
@@ -270 +270 @@
       FILE *fkey = fopen(fname, "r");
       if (!fkey)
-        printf("Could not open key file: %s\n", fname);
+        fprintf(stderr, "Could not open key file: %s\n", fname);
       else
       {
@@ -394 +394 @@
     if (keyfile == NULL)
     {
-      printf("Could not find key table entry.\n");
+      fprintf(stderr, "Could not find key table entry.\n");
     }
     else
@@ -404 +404 @@
         strcpy(keyfile, temp);
       else
-        printf("Memory allocation error.\n");
+        fprintf(stderr, "Memory allocation error.\n");
     }
     
@@ -410 +410 @@
   }
   else
-    printf("Could not open key table file: %s\n", filename);
+    fprintf(stderr, "Could not open key table file: %s\n", filename);
 
   for(i = 0; i < MAX_SEARCH; i++) {
@@ -485 +485 @@
     close(fildes[0]);
     execvp(argv[0], argv);
-    printf("Exec error: could not run zwrite\n");
+    fprintf(stderr, "Exec error: could not run zwrite\n");
     exit(0);
   }
@@ -564 +564 @@
       if ((inptr = inbuff = (char *)malloc(MAX_RESULT)) == NULL)
       {
-        printf("Memory allocation error\n");
+        fprintf(stderr, "Memory allocation error\n");
         return FALSE;
       }
@@ -594 +594 @@
     if (!outfile)
     {
-      printf("Could not run zwrite\n");
+      fprintf(stderr, "Could not run zwrite\n");
       if (freein && inbuff)
         free(inbuff);