aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Brinkmann <[email protected]>2001-12-13 21:38:11 +0000
committerMarcus Brinkmann <[email protected]>2001-12-13 21:38:11 +0000
commite1643c49f521913c42ba6f6191c3ec4a57812f70 (patch)
tree687d1b4ef21b8c4a0b98f055106427294b4e8019
parent2001-12-13 Marcus Brinkmann <[email protected]> (diff)
downloadgpgme-e1643c49f521913c42ba6f6191c3ec4a57812f70.tar.gz
gpgme-e1643c49f521913c42ba6f6191c3ec4a57812f70.zip
2001-12-13 Marcus Brinkmann <[email protected]>
* assuan-connect.c (assuan_pipe_connect): Remove code that closes all the little file descriptors we set up.
-rw-r--r--trunk/assuan/ChangeLog5
-rw-r--r--trunk/assuan/assuan-connect.c22
2 files changed, 8 insertions, 19 deletions
diff --git a/trunk/assuan/ChangeLog b/trunk/assuan/ChangeLog
index 8d05c0e9..d74fa030 100644
--- a/trunk/assuan/ChangeLog
+++ b/trunk/assuan/ChangeLog
@@ -1,5 +1,10 @@
2001-12-13 Marcus Brinkmann <[email protected]>
+ * assuan-connect.c (assuan_pipe_connect): Remove code that closes
+ all the little file descriptors we set up.
+
+2001-12-13 Marcus Brinkmann <[email protected]>
+
* assuan-buffer.c (assuan_read_line): Fix order of execution to
get correct return values.
diff --git a/trunk/assuan/assuan-connect.c b/trunk/assuan/assuan-connect.c
index 683c7f06..b8ce1a9c 100644
--- a/trunk/assuan/assuan-connect.c
+++ b/trunk/assuan/assuan-connect.c
@@ -137,26 +137,10 @@ assuan_pipe_connect (ASSUAN_CONTEXT *ctx, const char *name, char *const argv[])
if ((*ctx)->pid == 0)
{
- int i, n;
char errbuf[512];
-#ifdef HAVE_JNLIB_LOGGING
- int log_fd = log_get_fd ();
-#endif
- /* close all files which will not be duped but keep stderr
- and log_stream for now */
- n = sysconf (_SC_OPEN_MAX);
- if (n < 0)
- n = MAX_OPEN_FDS;
- for (i=0; i < n; i++)
- {
- if (i != fileno (stderr)
-#ifdef HAVE_JNLIB_LOGGING
- && i != log_fd
-#endif
- && i != rp[1] && i != wp[0])
- close(i);
- }
- errno = 0;
+
+ close (rp[0]);
+ close (wp[1]);
/* Dup handles and to stdin/stdout and exec */
if (rp[1] != STDOUT_FILENO)