Check that you are not present in trail twice

[oweals/gnunet.git] / src / transport / gnunet-transport-certificate-creation.c

diff --git a/src/transport/gnunet-transport-certificate-creation.c b/src/transport/gnunet-transport-certificate-creation.c
index dc7798ec083dcaa3da4d8030583b89bec16d7378..e8669625460a95e1f43c5ad7424443712d64af16 100644 (file)
--- a/src/transport/gnunet-transport-certificate-creation.c
+++ b/src/transport/gnunet-transport-certificate-creation.c
@@ -26,6 +26,29 @@
 #include "platform.h"
 #include "gnunet_util_lib.h"
 
+#ifndef WINDOWS
+/**
+ * Turn the given file descriptor in to '/dev/null'.
+ *
+ * @param fd fd to bind to /dev/null
+ * @param flags flags to use (O_RDONLY or O_WRONLY)
+ */
+static void
+make_dev_zero (int fd,
+              int flags)
+{
+  int z;
+
+  GNUNET_assert (0 == close (fd));
+  z = open ("/dev/null", flags);
+  GNUNET_assert (-1 != z);
+  if (z == fd)
+    return;
+  dup2 (z, fd);
+  GNUNET_assert (0 == close (z));
+}
+#endif
+
 
 static void
 removecerts (const char *file1,
@@ -60,13 +83,20 @@ main (int argc, char **argv)
     return 1;
   }
   removecerts (argv[1], argv[2]);
-  GNUNET_DISK_directory_create_for_file (argv[1]);
-  GNUNET_DISK_directory_create_for_file (argv[2]);
-  (void) close (2);                    /* eliminate stderr */
+  (void) GNUNET_DISK_directory_create_for_file (argv[1]);
+  (void) GNUNET_DISK_directory_create_for_file (argv[2]);
+  /* eliminate stderr */
+#if WINDOWS
+  (void) close (2);
+#else
+  make_dev_zero (2, O_WRONLY);
+#endif
   /* Create RSA Private Key */
   /* openssl genrsa -out $1 1024 2> /dev/null */
   openssl =
-      GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "openssl", "openssl", "genrsa",
+      GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+                               NULL, NULL, NULL,
+                               "openssl", "openssl", "genrsa",
                                "-out", argv[1], "1024", NULL);
   if (NULL == openssl)
   {
@@ -80,7 +110,9 @@ main (int argc, char **argv)
   /* Create a self-signed certificate in batch mode using rsa key */
   /* openssl req -batch -days 365 -out $2 -new -x509 -key $1 2> /dev/null */
   openssl =
-      GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "openssl", "openssl", "req",
+      GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+                               NULL, NULL, NULL,
+                               "openssl", "openssl", "req",
                                "-batch", "-days", "365", "-out", argv[2],
                                "-new", "-x509", "-key", argv[1], NULL);
   if (NULL == openssl)