[GNUnet-SVN] r16323 - gnunet/src/transport

[gnunet]

Author: grothoff
Date: 2011-08-02 10:52:16 +0200 (Tue, 02 Aug 2011)
New Revision: 16323

Modified:
   gnunet/src/transport/gnunet-transport-certificate-creation.c
Log:
fix double-waitpid here too

Modified: gnunet/src/transport/gnunet-transport-certificate-creation.c
===================================================================
--- gnunet/src/transport/gnunet-transport-certificate-creation.c        
2011-08-02 08:47:33 UTC (rev 16322)
+++ gnunet/src/transport/gnunet-transport-certificate-creation.c        
2011-08-02 08:52:16 UTC (rev 16323)
@@ -35,12 +35,12 @@
 {
   if (GNUNET_DISK_file_test (file1) == GNUNET_YES)
     {
-      CHMOD (file1, 0777);
+      CHMOD (file1, S_IWUSR | S_IRUSR);
       REMOVE (file1);
     }
   if (GNUNET_DISK_file_test (file2) == GNUNET_YES)
     {
-      CHMOD (file2, 0777);
+      CHMOD (file2, S_IWUSR | S_IRUSR);
       REMOVE (file2);
     }
 }
@@ -50,13 +50,11 @@
 main (int argc, char **argv)
 {
   struct GNUNET_OS_Process *openssl;
-  enum GNUNET_OS_ProcessStatusType status_type;
-  unsigned long code;
 
   if (argc != 3)
     return 1;
-  close (2); /* no output to stderr */
   removecerts (argv[1], argv[2]);
+  close (2); /* eliminate stderr */
   /* Create RSA Private Key */
   /* openssl genrsa -out $1 1024 2> /dev/null */
   openssl = GNUNET_OS_start_process (NULL, NULL,
@@ -66,24 +64,7 @@
                                     NULL);
   if (openssl == NULL)
     return 2;
-  if (GNUNET_OS_process_wait (openssl) != GNUNET_OK)
-    {
-      GNUNET_OS_process_kill (openssl, SIGTERM);
-      removecerts (argv[1], argv[2]);
-      return 3;
-    }
-  if (GNUNET_OS_process_status (openssl, &status_type, &code) != GNUNET_OK)
-    {
-      GNUNET_OS_process_kill (openssl, SIGTERM);
-      removecerts (argv[1], argv[2]);
-      return 4;
-    }
-  if (status_type != GNUNET_OS_PROCESS_EXITED || code != 0)
-    {
-      GNUNET_OS_process_kill (openssl, SIGTERM);
-      removecerts (argv[1], argv[2]);
-      return 5;
-    }
+  GNUNET_assert (GNUNET_OS_process_wait (openssl) == GNUNET_OK);
   GNUNET_OS_process_close (openssl);
   
   /* Create a self-signed certificate in batch mode using rsa key*/
@@ -95,28 +76,11 @@
                                     "-out", argv[2], "-new", "-x509", "-key", 
argv[1], 
                                     NULL);
   if (openssl == NULL)
-    return 6;
-  if (GNUNET_OS_process_wait (openssl) != GNUNET_OK)
-    {
-      GNUNET_OS_process_kill (openssl, SIGTERM);
-      removecerts (argv[1], argv[2]);
-      return 7;
-    }
-  if (GNUNET_OS_process_status (openssl, &status_type, &code) != GNUNET_OK)
-    {
-      GNUNET_OS_process_kill (openssl, SIGTERM);
-      removecerts (argv[1], argv[2]);
-      return 8;
-    }
-  if (status_type != GNUNET_OS_PROCESS_EXITED || code != 0)
-    {
-      GNUNET_OS_process_kill (openssl, SIGTERM);
-      removecerts (argv[1], argv[2]);
-      return 9;
-    }
+    return 3;
+  GNUNET_assert (GNUNET_OS_process_wait (openssl) == GNUNET_OK);
   GNUNET_OS_process_close (openssl);
-  CHMOD (argv[1], 0400);
-  CHMOD (argv[2], 0400);
+  CHMOD (argv[1], S_IRUSR);
+  CHMOD (argv[2], S_IRUSR);
   return 0;
 }