diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-10-09 20:43:14 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-10-09 20:43:14 +0000 |
commit | 2cc6f2cc2a4515737af4289b9d679e4ac6e0f6f5 (patch) | |
tree | 0fdf208c2fbf189f7eb65bbca63e11df5566aad4 /src/transport | |
parent | d36a5863ee8d8f440934f93969da167cb383f4c7 (diff) | |
download | gnunet-2cc6f2cc2a4515737af4289b9d679e4ac6e0f6f5.tar.gz gnunet-2cc6f2cc2a4515737af4289b9d679e4ac6e0f6f5.zip |
-replace stderr with /dev/null, instead of just closing
Diffstat (limited to 'src/transport')
-rw-r--r-- | src/transport/gnunet-transport-certificate-creation.c | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/src/transport/gnunet-transport-certificate-creation.c b/src/transport/gnunet-transport-certificate-creation.c index 497c86eb0..fbf809426 100644 --- a/src/transport/gnunet-transport-certificate-creation.c +++ b/src/transport/gnunet-transport-certificate-creation.c | |||
@@ -26,6 +26,29 @@ | |||
26 | #include "platform.h" | 26 | #include "platform.h" |
27 | #include "gnunet_util_lib.h" | 27 | #include "gnunet_util_lib.h" |
28 | 28 | ||
29 | #ifndef WINDOWS | ||
30 | /** | ||
31 | * Turn the given file descriptor in to '/dev/null'. | ||
32 | * | ||
33 | * @param fd fd to bind to /dev/null | ||
34 | * @param flags flags to use (O_RDONLY or O_WRONLY) | ||
35 | */ | ||
36 | static void | ||
37 | make_dev_zero (int fd, | ||
38 | int flags) | ||
39 | { | ||
40 | int z; | ||
41 | |||
42 | GNUNET_assert (0 == close (fd)); | ||
43 | z = open ("/dev/null", flags); | ||
44 | GNUNET_assert (-1 != z); | ||
45 | if (z == fd) | ||
46 | return; | ||
47 | dup2 (z, fd); | ||
48 | GNUNET_assert (0 == close (z)); | ||
49 | } | ||
50 | #endif | ||
51 | |||
29 | 52 | ||
30 | static void | 53 | static void |
31 | removecerts (const char *file1, | 54 | removecerts (const char *file1, |
@@ -62,7 +85,12 @@ main (int argc, char **argv) | |||
62 | removecerts (argv[1], argv[2]); | 85 | removecerts (argv[1], argv[2]); |
63 | (void) GNUNET_DISK_directory_create_for_file (argv[1]); | 86 | (void) GNUNET_DISK_directory_create_for_file (argv[1]); |
64 | (void) GNUNET_DISK_directory_create_for_file (argv[2]); | 87 | (void) GNUNET_DISK_directory_create_for_file (argv[2]); |
65 | (void) close (2); /* eliminate stderr */ | 88 | /* eliminate stderr */ |
89 | #if WINDOWS | ||
90 | (void) close (2); | ||
91 | #else | ||
92 | make_dev_zero (2, O_WRONLY); | ||
93 | #endif | ||
66 | /* Create RSA Private Key */ | 94 | /* Create RSA Private Key */ |
67 | /* openssl genrsa -out $1 1024 2> /dev/null */ | 95 | /* openssl genrsa -out $1 1024 2> /dev/null */ |
68 | openssl = | 96 | openssl = |