From 5f08476e3bc5c134ce57d924b01d1c1fcacd53db Mon Sep 17 00:00:00 2001
From: markus schnalke <meillo@marmaro.de>
Date: Sat, 24 Mar 2012 12:28:35 +0100
Subject: [PATCH] closefds() doesn't seem relevant or large enough to be a
 function. I should beware in-sourcing too much ...

---
 h/prototypes.h  |    1 -
 sbr/Makefile.in |    2 +-
 sbr/closefds.c  |   19 -------------------
 uip/repl.c      |    6 ++++--
 uip/send.c      |    5 ++++-
 uip/slocal.c    |    6 ++++--
 6 files changed, 13 insertions(+), 26 deletions(-)
 delete mode 100644 sbr/closefds.c

diff --git a/h/prototypes.h b/h/prototypes.h
index 528da47..b05535d 100644
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -29,7 +29,6 @@ void advise(char *, char *, ...);
 void ambigsw(char *, struct swit *);
 char **brkstring(char *, char *, char *);
 int check_charset(char *, int);
-void closefds(int);
 char *concat(char *, ...);
 int context_del(char *);
 char *context_find(char *);
diff --git a/sbr/Makefile.in b/sbr/Makefile.in
index 5b40ab3..d96807c 100644
--- a/sbr/Makefile.in
+++ b/sbr/Makefile.in
@@ -46,7 +46,7 @@ SIGNAL_H = @SIGNAL_H@
 
 # source for library functions
 SRCS = addrsbr.c ambigsw.c brkstring.c  \
-	check_charset.c closefds.c concat.c context_del.c  \
+	check_charset.c concat.c context_del.c  \
 	context_find.c context_foil.c context_read.c  \
 	context_replace.c context_save.c \
 	copyip.c cpydata.c cpydgst.c crawl_folders.c  \
diff --git a/sbr/closefds.c b/sbr/closefds.c
deleted file mode 100644
index 8a4da49..0000000
--- a/sbr/closefds.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-** closefds.c -- close-up fd's
-**
-** This code is Copyright (c) 2002, by the authors of nmh.  See the
-** COPYRIGHT file in the root directory of the nmh distribution for
-** complete copyright information.
-*/
-
-#include <h/mh.h>
-
-
-void
-closefds(int i)
-{
-	int nbits = OPEN_MAX;
-
-	for (; i < nbits; i++)
-		close(i);
-}
diff --git a/uip/repl.c b/uip/repl.c
index be4eb40..3c9e483 100644
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -766,7 +766,7 @@ insert(struct mailname *np)
 static void
 replfilter(FILE *in, FILE *out, char *filter)
 {
-	int pid;
+	int pid, n;
 	char *errstr;
 
 	if (filter == NULL)
@@ -785,7 +785,9 @@ replfilter(FILE *in, FILE *out, char *filter)
 	case OK:
 		dup2(fileno(in), fileno(stdin));
 		dup2(fileno(out), fileno(stdout));
-		closefds(3);
+		for (n=3; n<OPEN_MAX; n++) {
+			close(n);
+		}
 
 		execlp("mhl", "mhl", "-form", filter, NULL);
 		errstr = strerror(errno);
diff --git a/uip/send.c b/uip/send.c
index 5054273..a735c67 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -97,6 +97,7 @@ main(int argc, char **argv)
 	int msgp = 0, nfiles = 0, distsw = 0, vecp = 1;
 	int msgnum, status;
 	int in, out;
+	int n;
 	char *cp, *maildir = NULL;
 	char buf[BUFSIZ], **ap, **argp, **arguments;
 	char *msgs[MAXARGS], *vec[MAXARGS];
@@ -304,7 +305,9 @@ main(int argc, char **argv)
 	}
 	status = 0;
 	vec[0] = "spost";
-	closefds(3);
+	for (n=3; n<OPEN_MAX; n++) {
+		close(n);
+	}
 
 	for (msgnum = 0; msgnum < nfiles; msgnum++) {
 		switch (sendsbr(vec, vecp, files[msgnum], &st, 1)) {
diff --git a/uip/slocal.c b/uip/slocal.c
index f03d487..608ddf2 100644
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -1106,7 +1106,7 @@ static int
 usr_pipe(int fd, char *cmd, char *pgm, char **vec, int suppress)
 {
 	pid_t child_id;
-	int bytes, seconds, status;
+	int bytes, seconds, status, n;
 	struct stat st;
 	char *path;
 
@@ -1133,7 +1133,9 @@ usr_pipe(int fd, char *cmd, char *pgm, char **vec, int suppress)
 		if (fd != 3) {
 			dup2(fd, 3);
 		}
-		closefds(4);
+		for (n=4; n<OPEN_MAX; n++) {
+			close(n);
+		}
 
 #ifdef TIOCNOTTY
 		if ((fd = open("/dev/tty", O_RDWR)) != -1) {
-- 
1.7.10.4