Fixed file descriptor leak in mhfixmsg when run on multiple input files.

[nmh] / sbr / client.c

diff --git a/sbr/client.c b/sbr/client.c
index 7ae356addd6aa2b5a72eb5cd5f32656b1222023b..8d390a816510b54a7ee6c1c89209ec07378ebbbf 100644 (file)
--- a/sbr/client.c
+++ b/sbr/client.c
@@ -1,206 +1,122 @@
-
-/*
- * client.c -- connect to a server
+/* client.c -- connect to a server

  *
  * 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.
  */
 
  *
  * 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>
-#include <h/mts.h>
-#include <h/utils.h>
-#include <errno.h>
+#include "h/mh.h"
+#include "client.h"
+#include "h/mts.h"
+#include "h/utils.h"
+#include <fcntl.h>

 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
 #include <arpa/inet.h>

-
-#define        MAXARGS   1000
-
-/*
- * static prototypes
- */
-
-/* client's own static version of several nmh subroutines */
-static char **client_brkstring (char *, char *, char *);
-static int client_brkany (char, char *);
-static char **client_copyip (char **, char **, int);
-static char *client_getcpy (char *);
-static void client_freelist(char **);
+#include <errno.h>

 
 
 int
 
 
 int

-client (char *args, char *service, char *response, int len_response, int debug)
+client (char *server, char *service, char *response, int len_response,
+       int debug)

 {
     int sd, rc;
 {
     int sd, rc;

-    char **ap, *arguments[MAXARGS];

     struct addrinfo hints, *res, *ai;
 
     struct addrinfo hints, *res, *ai;
 

-    ap = arguments;
-    if (args != NULL && *args != 0) {
-       ap = client_copyip (client_brkstring (client_getcpy (args), " ", "\n"),
-               ap, MAXARGS);
-    } else {
-       if (servers != NULL && *servers != 0)
-           ap = client_copyip (client_brkstring (client_getcpy (servers), " ", "\n"),
-               ap, MAXARGS);
-    }
-    if (ap == arguments) {
-       *ap++ = client_getcpy ("localhost");
-       *ap = NULL;
+    if (!server || *server == '\0') {
+       snprintf(response, len_response, "Internal error: NULL server name "
+                "passed to client()");
+       return NOTOK;

     }
 
     }
 

-    memset(&hints, 0, sizeof(hints));
+    ZERO(&hints);

 #ifdef AI_ADDRCONFIG
     hints.ai_flags = AI_ADDRCONFIG;
 #endif
     hints.ai_family = PF_UNSPEC;
     hints.ai_socktype = SOCK_STREAM;
 
 #ifdef AI_ADDRCONFIG
     hints.ai_flags = AI_ADDRCONFIG;
 #endif
     hints.ai_family = PF_UNSPEC;
     hints.ai_socktype = SOCK_STREAM;
 

-    for (ap = arguments; *ap; ap++) {
+    if (debug) {
+       fprintf(stderr, "Trying to connect to \"%s\" ...\n", server);
+    }
+
+    rc = getaddrinfo(server, service, &hints, &res);

 
 

+    if (rc) {
+       snprintf(response, len_response, "Lookup of \"%s\" failed: %s",
+                server, gai_strerror(rc));
+       return NOTOK;
+    }
+
+    for (ai = res; ai != NULL; ai = ai->ai_next) {

        if (debug) {
        if (debug) {

-           fprintf(stderr, "Trying to connect to \"%s\" ...\n", *ap);
+           char address[NI_MAXHOST];
+           char port[NI_MAXSERV];
+
+           rc = getnameinfo(ai->ai_addr, ai->ai_addrlen, address,
+                            sizeof(address), port, sizeof port,
+                            NI_NUMERICHOST | NI_NUMERICSERV);
+
+           fprintf(stderr, "Connecting to %s:%s...\n",
+                   rc ? "unknown" : address, rc ? "--" : port);

        }
 
        }
 

-       rc = getaddrinfo(*ap, service, &hints, &res);
+       sd = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);

 
 

-       if (rc) {
-           if (debug) {
-               fprintf(stderr, "Lookup of \"%s\" failed: %s\n", *ap,
-                       gai_strerror(rc));
-           }
+       if (sd < 0) {
+           if (debug)
+               fprintf(stderr, "socket() failed: %s\n", strerror(errno));
+           rc = errno;

            continue;
        }
 
            continue;
        }
 

-       for (ai = res; ai != NULL; ai = ai->ai_next) {
-           if (debug) {
-               char address[NI_MAXHOST];
-
-               rc = getnameinfo(ai->ai_addr, ai->ai_addrlen, address,
-                                sizeof(address), NULL, 0, NI_NUMERICHOST);
+       if (connect(sd, ai->ai_addr, ai->ai_addrlen) == 0) {
+           int flags;

 
 

-               fprintf(stderr, "Connecting to %s...\n",
-                       rc ? "unknown" : address);
-           }
+           freeaddrinfo(res);

 
 

-           sd = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+           flags = fcntl(sd, F_GETFD, 0);

 
 

-           if (sd < 0) {
-               if (debug)
-                   fprintf(stderr, "socket() failed: %s\n", strerror(errno));
-               continue;
-           }
+           if (flags != -1)
+               fcntl(sd, F_SETFD, flags | FD_CLOEXEC);

 
 

-           if (connect(sd, ai->ai_addr, ai->ai_addrlen) == 0) {
-               freeaddrinfo(res);
-               client_freelist(ap);
-               return sd;
-           }
+           return sd;
+       }

 
 

-           if (debug) {
-               fprintf(stderr, "Connection failed: %s\n", strerror(errno));
-           }
+       rc = errno;

 
 

-           close(sd);
+       if (debug) {
+           fprintf(stderr, "Connection failed: %s\n", strerror(errno));

        }
 
        }
 

-       freeaddrinfo(res);
+       close(sd);

     }
 
     }
 

-    client_freelist(ap);
-    strncpy (response, "no servers available", len_response);
-    return NOTOK;
-}
-
-
-/*
- * Free a list of strings
- */
-
-static void
-client_freelist(char **list)
-{
-    while (*list++ != NULL)
-       free(*list);
-}
-
-
-/*
- * static copies of three nmh subroutines
- */
-
-static char *broken[MAXARGS + 1];
-
-static char **
-client_brkstring (char *strg, char *brksep, char *brkterm)
-{
-    register int bi;
-    register char c, *sp;
-
-    sp = strg;
-
-    for (bi = 0; bi < MAXARGS; bi++) {
-       while (client_brkany (c = *sp, brksep))
-           *sp++ = 0;
-       if (!c || client_brkany (c, brkterm)) {
-           *sp = 0;
-           broken[bi] = 0;
-           return broken;
+    /*
+     * Improve error handling a bit. If we were given multiple IP addresses
+     * then return the old "no servers available" error, but point the user
+     * to -snoop (hopefully that's universal).  Otherwise report a specific
+     * error.
+     */
+
+    if (res->ai_next)
+       snprintf(response, len_response, "no servers available (use -snoop "
+                "for details)");
+    else {
+       char port[NI_MAXSERV];
+
+       if (getnameinfo(res->ai_addr, res->ai_addrlen, NULL, 0, port,
+                       sizeof port, NI_NUMERICSERV)) {
+           strncpy(port, "unknown", sizeof port);
+           port[sizeof(port) - 1] = '\0';

        }
 
        }
 

-       broken[bi] = sp;
-       while ((c = *++sp) && !client_brkany (c, brksep) && !client_brkany (c, brkterm))
-           continue;
+       snprintf(response, len_response, "Connection to \"%s:%s\" failed: %s",
+                server, port, strerror(errno));

     }
     }

-    broken[MAXARGS] = 0;
-
-    return broken;
-}
-
-
-/*
- * returns 1 if chr in strg, 0 otherwise
- */
-static int
-client_brkany (char chr, char *strg)
-{
-    register char *sp;
- 
-    if (strg)
-       for (sp = strg; *sp; sp++)
-           if (chr == *sp)
-               return 1;
-    return 0;
-}

 
 

+    freeaddrinfo(res);

 
 

-/*
- * copy a string array and return pointer to end
- */
-static char **
-client_copyip (char **p, char **q, int len_q)
-{
-    while (*p && --len_q > 0)
-       *q++ = *p++;
-
-    *q = NULL;
-
-    return q;
-}
-
-
-static char *
-client_getcpy (char *str)
-{
-    char *cp;
-    size_t len;
-
-    len = strlen(str) + 1;
-    cp = mh_xmalloc(len);
-
-    memcpy (cp, str, len);
-    return cp;
+    return NOTOK;

 }
 }

-