libexport.a: Refactor client_init()

[nfs-utils.git] / support / export / client.c

diff --git a/support/export/client.c b/support/export/client.c
index 859dcf1771dfdea480106d7b256cb5131d989e97..9259180dd1d618f4a36196becade0751769df821 100644 (file)
--- a/support/export/client.c
+++ b/support/export/client.c
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <netdb.h>
-#include "xmalloc.h"
+
 #include "misc.h"
 #include "nfslib.h"
 #include "exportfs.h"
@@ -30,8 +30,6 @@ extern int    innetgr(char *netgr, char *host, char *, char *);
 #endif
 
 static char    *add_name(char *old, const char *add);
-static void    client_init(nfs_client *clp, const char *hname,
-                                       struct hostent *hp);
 
 nfs_client     *clientlist[MCL_MAXTYPES] = { NULL, };
 
@@ -55,8 +53,64 @@ init_addrlist(nfs_client *clp, const struct hostent *hp)
 static void
 client_free(nfs_client *clp)
 {
-       xfree(clp->m_hostname);
-       xfree(clp);
+       free(clp->m_hostname);
+       free(clp);
+}
+
+static int
+init_netmask(nfs_client *clp, const char *slash)
+{
+       if (strchr(slash + 1, '.') != NULL)
+               clp->m_addrlist[1].s_addr = inet_addr(slash + 1);
+       else {
+               int prefixlen = atoi(slash + 1);
+               if (0 < prefixlen && prefixlen <= 32)
+                       clp->m_addrlist[1].s_addr =
+                                       htonl((uint32_t)~0 << (32 - prefixlen));
+               else
+                       goto out_badprefix;
+       }
+
+       return 1;
+
+out_badprefix:
+       xlog(L_ERROR, "Invalid prefix `%s' for %s", slash + 1, clp->m_hostname);
+       return 0;
+}
+
+static int
+init_subnetwork(nfs_client *clp)
+{
+       static char slash32[] = "/32";
+       char *cp;
+
+       cp = strchr(clp->m_hostname, '/');
+       if (cp == NULL)
+               cp = slash32;
+
+       *cp = '\0';
+       clp->m_addrlist[0].s_addr = inet_addr(clp->m_hostname);
+       *cp = '/';
+
+       return init_netmask(clp, cp);
+}
+
+static int
+client_init(nfs_client *clp, const char *hname, const struct hostent *hp)
+{
+       clp->m_hostname = strdup(hname);
+       if (clp->m_hostname == NULL)
+               return 0;
+
+       clp->m_exported = 0;
+       clp->m_count = 0;
+       clp->m_naddr = 0;
+
+       if (clp->m_type == MCL_SUBNETWORK)
+               return init_subnetwork(clp);
+
+       init_addrlist(clp, hp);
+       return 1;
 }
 
 /* if canonical is set, then we *know* this is already a canonical name
@@ -111,17 +165,23 @@ client_lookup(char *hname, int canonical)
                }
        }
 
-       if (!clp) {
-               clp = (nfs_client *) xmalloc(sizeof(*clp));
-               memset(clp, 0, sizeof(*clp));
+       if (clp == NULL) {
+               clp = calloc(1, sizeof(*clp));
+               if (clp == NULL)
+                       goto out;
                clp->m_type = htype;
-               client_init(clp, hname, NULL);
+               if (!client_init(clp, hname, NULL)) {
+                       client_free(clp);
+                       clp = NULL;
+                       goto out;
+               }
                client_add(clp);
        }
 
        if (htype == MCL_FQDN && clp->m_naddr == 0)
                init_addrlist(clp, hp);
 
+out:
        if (hp)
                free (hp);
 
@@ -133,57 +193,21 @@ client_dup(nfs_client *clp, struct hostent *hp)
 {
        nfs_client              *new;
 
-       new = (nfs_client *) xmalloc(sizeof(*new));
+       new = (nfs_client *)malloc(sizeof(*new));
+       if (new == NULL)
+               return NULL;
        memcpy(new, clp, sizeof(*new));
        new->m_type = MCL_FQDN;
        new->m_hostname = NULL;
 
-       client_init(new, (char *) hp->h_name, hp);
+       if (!client_init(new, hp->h_name, hp)) {
+               client_free(new);
+               return NULL;
+       }
        client_add(new);
        return new;
 }
 
-static void
-client_init(nfs_client *clp, const char *hname, struct hostent *hp)
-{
-       xfree(clp->m_hostname);
-       if (hp)
-               clp->m_hostname = xstrdup(hp->h_name);
-       else
-               clp->m_hostname = xstrdup(hname);
-
-       clp->m_exported = 0;
-       clp->m_count = 0;
-       clp->m_naddr = 0;
-
-       if (clp->m_type == MCL_SUBNETWORK) {
-               char    *cp = strchr(clp->m_hostname, '/');
-               static char slash32[] = "/32";
-
-               if(!cp) cp = slash32;
-               *cp = '\0';
-               clp->m_addrlist[0].s_addr = inet_addr(clp->m_hostname);
-               if (strchr(cp + 1, '.')) {
-                       clp->m_addrlist[1].s_addr = inet_addr(cp+1);
-               }
-               else {
-                       int netmask = atoi(cp + 1);
-                       if (0 < netmask && netmask <= 32) {
-                               clp->m_addrlist[1].s_addr =
-                                       htonl ((uint32_t) ~0 << (32 - netmask));
-                       }
-                       else {
-                               xlog(L_FATAL, "invalid netmask `%s' for %s",
-                                    cp + 1, clp->m_hostname);
-                       }
-               }
-               *cp = '/';
-               return;
-       }
-       
-       init_addrlist(clp, hp);
-}
-
 void
 client_add(nfs_client *clp)
 {