From a6541762d3eb5b9a5a5e55bca43a29d7f99f19e5 Mon Sep 17 00:00:00 2001 From: CaS Date: Wed, 7 Aug 2002 15:47:27 +0000 Subject: [PATCH] Minor tidyup git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@14244 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 1 + Tools/gdomap.c | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index fb507e6b4..6bed5eae5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ * Source/NSObject.m: Remove dealloc notifications hack ... the dealloc method can now safely be used to refrain from deallocating objects, so I don't think the hack is needed any more. + * Tools/gdomap.c: Tidyup patch by Matthias Klose 2002-07-29 Adam Fedor diff --git a/Tools/gdomap.c b/Tools/gdomap.c index 8e2a7313c..b02d825c4 100644 --- a/Tools/gdomap.c +++ b/Tools/gdomap.c @@ -4478,19 +4478,30 @@ printf( */ for (c = 0; c < FD_SETSIZE; c++) { - if (c != 2) + if (is_daemon || (c != 2)) { (void)close(c); } } if (open("/dev/null", O_RDONLY) != 0) { - perror("failed to open stdin from /dev/null\n"); + sprintf(ebuf, "failed to open stdin from /dev/null (%s)\n", + strerror(errno)); + gdomap_log(LOG_CRIT); exit(1); } if (open("/dev/null", O_WRONLY) != 1) { - perror("failed to open stdout from /dev/null\n"); + sprintf(ebuf, "failed to open stdout from /dev/null (%s)\n", + strerror(errno)); + gdomap_log(LOG_CRIT); + exit(1); + } + if (is_daemon && open("/dev/null", O_WRONLY) != 2) + { + sprintf(ebuf, "failed to open stderr from /dev/null (%s)\n", + strerror(errno)); + gdomap_log(LOG_CRIT); exit(1); } if (debug)