closefds() doesn't seem relevant or large enough to be a function.

I should beware in-sourcing too much ...

diff --git a/h/prototypes.h b/h/prototypes.h
index 528da4734f8a2978eb694c2ed8361444cc2dc5a2..b05535d76a0d05d2c53c2c6aa62a60dde33c6ada 100644 (file)
--- 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 5b40ab324fab467e779364ac80899798c092ee09..d96807c86b9a538ee85bdb77371b0f464abad3c4 100644 (file)
--- 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 (file)
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 be4eb402262cf2626dc7253ba300d8a509afeef4..3c9e483da71aff64e52f580fafbcb2086c4396c0 100644 (file)
--- 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 5054273b61b762649a13ff5068bdae7dd536b0ce..a735c6777e8d11ddfb136452a4c792b00b8921e5 100644 (file)
--- 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 f03d48717a1fa22b33afc2bf0cb1a91b5ba7c103..608ddf29f514468615a2fdf35350b891a98b08da 100644 (file)
--- 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) {