mount: move code from nfsmount.c into mount.c
authorDenis Vlasenko <vda.linux@googlemail.com>
Thu, 14 Sep 2006 15:46:33 +0000 (15:46 -0000)
committerDenis Vlasenko <vda.linux@googlemail.com>
Thu, 14 Sep 2006 15:46:33 +0000 (15:46 -0000)
include/libbb.h
util-linux/Makefile.in
util-linux/mount.c
util-linux/nfsmount.c [deleted file]

index dfb7a70bd3a8f837da8e7d065d818b36cedeeef8..10309cff27cb2c88706a1d8fa82c5d24b07c26fe 100644 (file)
@@ -303,9 +303,6 @@ extern int set_loop(char **device, const char *file, int offset);
 extern int vdprintf(int d, const char *format, va_list ap);
 #endif
 
-int mount_it_now(struct mntent *mp, int vfsflags, char *filteropts);
-int nfsmount(struct mntent *mp, int vfsflags, char *filteropts);
-
 /* Include our own copy of struct sysinfo to avoid binary compatibility
  * problems with Linux 2.4, which changed things.  Grumble, grumble. */
 struct sysinfo {
index d12f9f24f28edc0a8c1b7d764ccc640b3de4186c..3d6c96a353146d0de84d1ea80c09a5a6317e0a2b 100644 (file)
@@ -29,7 +29,6 @@ UTILLINUX-$(CONFIG_MKFS_MINIX)    +=mkfs_minix.o
 UTILLINUX-$(CONFIG_MKSWAP)        +=mkswap.o
 UTILLINUX-$(CONFIG_MORE)          +=more.o
 UTILLINUX-$(CONFIG_MOUNT)         +=mount.o
-UTILLINUX-$(CONFIG_FEATURE_MOUNT_NFS)  +=nfsmount.o
 UTILLINUX-$(CONFIG_PIVOT_ROOT)    +=pivot_root.o
 UTILLINUX-$(CONFIG_RDATE)         +=rdate.o
 UTILLINUX-$(CONFIG_READPROFILE)   +=readprofile.o
index 4ed000e8816c3650ae8b51a5043ee1b37275db5b..5592a7a5f64927d7d8edf46661072b8b4a984fe1 100644 (file)
@@ -84,10 +84,10 @@ struct {
        {"ro", MS_RDONLY},        // vfs flag
        {"rw", ~MS_RDONLY},       // vfs flag
        {"remount", MS_REMOUNT},  // action flag
-
-
 };
 
+static int nfsmount(struct mntent *mp, int vfsflags, char *filteropts);
+
 /* Append mount options to string */
 static void append_mount_options(char **oldopts, char *newopts)
 {
@@ -196,7 +196,7 @@ static int fakeIt;
 #endif
 
 // Perform actual mount of specific filesystem at specific location.
-int mount_it_now(struct mntent *mp, int vfsflags, char *filteropts)
+static int mount_it_now(struct mntent *mp, int vfsflags, char *filteropts)
 {
        int rc;
 
@@ -234,7 +234,7 @@ int mount_it_now(struct mntent *mp, int vfsflags, char *filteropts)
                // Add vfs string flags
 
                for(i=0; mount_options[i].flags != MS_REMOUNT; i++)
-                       if (mount_options[i].flags > 0 && (mount_options[i].flags&vfsflags))
+                       if (mount_options[i].flags > 0 && (mount_options[i].flags & vfsflags))
                                append_mount_options(&(mp->mnt_opts), mount_options[i].name);
 
                // Remove trailing / (if any) from directory we mounted on
@@ -260,8 +260,8 @@ int mount_it_now(struct mntent *mp, int vfsflags, char *filteropts)
                                mp->mnt_fsname = srcbuf;
                        }
                        mp->mnt_type = "none";
-                       mp->mnt_freq = mp->mnt_passno = 0;
                }
+               mp->mnt_freq = mp->mnt_passno = 0;
 
                // Write and close.
 
@@ -613,3 +613,1016 @@ clean_up:
 
        return rc;
 }
+
+
+#if ENABLE_FEATURE_MOUNT_NFS
+
+/*
+ * Linux NFS mount
+ * Copyright (C) 1993 Rick Sladkey <jrs@world.std.com>
+ *
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ *
+ * Wed Feb  8 12:51:48 1995, biro@yggdrasil.com (Ross Biro): allow all port
+ * numbers to be specified on the command line.
+ *
+ * Fri, 8 Mar 1996 18:01:39, Swen Thuemmler <swen@uni-paderborn.de>:
+ * Omit the call to connect() for Linux version 1.3.11 or later.
+ *
+ * Wed Oct  1 23:55:28 1997: Dick Streefland <dick_streefland@tasking.com>
+ * Implemented the "bg", "fg" and "retry" mount options for NFS.
+ *
+ * 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@misiek.eu.org>
+ * - added Native Language Support
+ *
+ * Modified by Olaf Kirch and Trond Myklebust for new NFS code,
+ * plus NFSv3 stuff.
+ */
+
+#include <syslog.h>
+#include <sys/utsname.h>
+#undef TRUE
+#undef FALSE
+#include <rpc/rpc.h>
+#include <rpc/pmap_prot.h>
+#include <rpc/pmap_clnt.h>
+
+/* This is just a warning of a common mistake.  Possibly this should be a
+ * uclibc faq entry rather than in busybox... */
+#if ENABLE_FEATURE_MOUNT_NFS && defined(__UCLIBC__) && ! defined(__UCLIBC_HAS_RPC__)
+#error "You need to build uClibc with UCLIBC_HAS_RPC for NFS support."
+#endif
+
+#define MOUNTPORT 635
+#define MNTPATHLEN 1024
+#define MNTNAMLEN 255
+#define FHSIZE 32
+#define FHSIZE3 64
+
+typedef char fhandle[FHSIZE];
+
+typedef struct {
+       unsigned int fhandle3_len;
+       char *fhandle3_val;
+} fhandle3;
+
+enum mountstat3 {
+       MNT_OK = 0,
+       MNT3ERR_PERM = 1,
+       MNT3ERR_NOENT = 2,
+       MNT3ERR_IO = 5,
+       MNT3ERR_ACCES = 13,
+       MNT3ERR_NOTDIR = 20,
+       MNT3ERR_INVAL = 22,
+       MNT3ERR_NAMETOOLONG = 63,
+       MNT3ERR_NOTSUPP = 10004,
+       MNT3ERR_SERVERFAULT = 10006,
+};
+typedef enum mountstat3 mountstat3;
+
+struct fhstatus {
+       unsigned int fhs_status;
+       union {
+               fhandle fhs_fhandle;
+       } fhstatus_u;
+};
+typedef struct fhstatus fhstatus;
+
+struct mountres3_ok {
+       fhandle3 fhandle;
+       struct {
+               unsigned int auth_flavours_len;
+               char *auth_flavours_val;
+       } auth_flavours;
+};
+typedef struct mountres3_ok mountres3_ok;
+
+struct mountres3 {
+       mountstat3 fhs_status;
+       union {
+               mountres3_ok mountinfo;
+       } mountres3_u;
+};
+typedef struct mountres3 mountres3;
+
+typedef char *dirpath;
+
+typedef char *name;
+
+typedef struct mountbody *mountlist;
+
+struct mountbody {
+       name ml_hostname;
+       dirpath ml_directory;
+       mountlist ml_next;
+};
+typedef struct mountbody mountbody;
+
+typedef struct groupnode *groups;
+
+struct groupnode {
+       name gr_name;
+       groups gr_next;
+};
+typedef struct groupnode groupnode;
+
+typedef struct exportnode *exports;
+
+struct exportnode {
+       dirpath ex_dir;
+       groups ex_groups;
+       exports ex_next;
+};
+typedef struct exportnode exportnode;
+
+struct ppathcnf {
+       int pc_link_max;
+       short pc_max_canon;
+       short pc_max_input;
+       short pc_name_max;
+       short pc_path_max;
+       short pc_pipe_buf;
+       u_char pc_vdisable;
+       char pc_xxx;
+       short pc_mask[2];
+};
+typedef struct ppathcnf ppathcnf;
+
+#define MOUNTPROG 100005
+#define MOUNTVERS 1
+
+#define MOUNTPROC_NULL 0
+#define MOUNTPROC_MNT 1
+#define MOUNTPROC_DUMP 2
+#define MOUNTPROC_UMNT 3
+#define MOUNTPROC_UMNTALL 4
+#define MOUNTPROC_EXPORT 5
+#define MOUNTPROC_EXPORTALL 6
+
+#define MOUNTVERS_POSIX 2
+
+#define MOUNTPROC_PATHCONF 7
+
+#define MOUNT_V3 3
+
+#define MOUNTPROC3_NULL 0
+#define MOUNTPROC3_MNT 1
+#define MOUNTPROC3_DUMP 2
+#define MOUNTPROC3_UMNT 3
+#define MOUNTPROC3_UMNTALL 4
+#define MOUNTPROC3_EXPORT 5
+
+enum {
+#ifndef NFS_FHSIZE
+       NFS_FHSIZE = 32,
+#endif
+#ifndef NFS_PORT
+       NFS_PORT = 2049
+#endif
+};
+
+
+/*
+ * We want to be able to compile mount on old kernels in such a way
+ * that the binary will work well on more recent kernels.
+ * Thus, if necessary we teach nfsmount.c the structure of new fields
+ * that will come later.
+ *
+ * Moreover, the new kernel includes conflict with glibc includes
+ * so it is easiest to ignore the kernel altogether (at compile time).
+ */
+
+struct nfs2_fh {
+       char                    data[32];
+};
+struct nfs3_fh {
+       unsigned short          size;
+       unsigned char           data[64];
+};
+
+struct nfs_mount_data {
+       int             version;                /* 1 */
+       int             fd;                     /* 1 */
+       struct nfs2_fh  old_root;               /* 1 */
+       int             flags;                  /* 1 */
+       int             rsize;                  /* 1 */
+       int             wsize;                  /* 1 */
+       int             timeo;                  /* 1 */
+       int             retrans;                /* 1 */
+       int             acregmin;               /* 1 */
+       int             acregmax;               /* 1 */
+       int             acdirmin;               /* 1 */
+       int             acdirmax;               /* 1 */
+       struct sockaddr_in addr;                /* 1 */
+       char            hostname[256];          /* 1 */
+       int             namlen;                 /* 2 */
+       unsigned int    bsize;                  /* 3 */
+       struct nfs3_fh  root;                   /* 4 */
+};
+
+/* bits in the flags field */
+enum {
+       NFS_MOUNT_SOFT = 0x0001,        /* 1 */
+       NFS_MOUNT_INTR = 0x0002,        /* 1 */
+       NFS_MOUNT_SECURE = 0x0004,      /* 1 */
+       NFS_MOUNT_POSIX = 0x0008,       /* 1 */
+       NFS_MOUNT_NOCTO = 0x0010,       /* 1 */
+       NFS_MOUNT_NOAC = 0x0020,        /* 1 */
+       NFS_MOUNT_TCP = 0x0040,         /* 2 */
+       NFS_MOUNT_VER3 = 0x0080,        /* 3 */
+       NFS_MOUNT_KERBEROS = 0x0100,    /* 3 */
+       NFS_MOUNT_NONLM = 0x0200        /* 3 */
+};
+
+
+/*
+ * We need to translate between nfs status return values and
+ * the local errno values which may not be the same.
+ *
+ * Andreas Schwab <schwab@LS5.informatik.uni-dortmund.de>: change errno:
+ * "after #include <errno.h> the symbol errno is reserved for any use,
+ *  it cannot even be used as a struct tag or field name".
+ */
+
+#ifndef EDQUOT
+#define EDQUOT ENOSPC
+#endif
+
+// Convert each NFSERR_BLAH into EBLAH
+
+static const struct {
+       int stat;
+       int errnum;
+} nfs_errtbl[] = {
+       {0,0}, {1,EPERM}, {2,ENOENT}, {5,EIO}, {6,ENXIO}, {13,EACCES}, {17,EEXIST},
+       {19,ENODEV}, {20,ENOTDIR}, {21,EISDIR}, {22,EINVAL}, {27,EFBIG},
+       {28,ENOSPC}, {30,EROFS}, {63,ENAMETOOLONG}, {66,ENOTEMPTY}, {69,EDQUOT},
+       {70,ESTALE}, {71,EREMOTE}, {-1,EIO}
+};
+
+static char *nfs_strerror(int status)
+{
+       int i;
+       static char buf[256];
+
+       for (i = 0; nfs_errtbl[i].stat != -1; i++) {
+               if (nfs_errtbl[i].stat == status)
+                       return strerror(nfs_errtbl[i].errnum);
+       }
+       sprintf(buf, "unknown nfs status return value: %d", status);
+       return buf;
+}
+
+static bool_t xdr_fhandle(XDR *xdrs, fhandle objp)
+{
+       if (!xdr_opaque(xdrs, objp, FHSIZE))
+                return FALSE;
+       return TRUE;
+}
+
+static bool_t xdr_fhstatus(XDR *xdrs, fhstatus *objp)
+{
+       if (!xdr_u_int(xdrs, &objp->fhs_status))
+                return FALSE;
+       switch (objp->fhs_status) {
+       case 0:
+               if (!xdr_fhandle(xdrs, objp->fhstatus_u.fhs_fhandle))
+                        return FALSE;
+               break;
+       default:
+               break;
+       }
+       return TRUE;
+}
+
+static bool_t xdr_dirpath(XDR *xdrs, dirpath *objp)
+{
+       if (!xdr_string(xdrs, objp, MNTPATHLEN))
+                return FALSE;
+       return TRUE;
+}
+
+static bool_t xdr_fhandle3(XDR *xdrs, fhandle3 *objp)
+{
+       if (!xdr_bytes(xdrs, (char **)&objp->fhandle3_val, (unsigned int *) &objp->fhandle3_len, FHSIZE3))
+                return FALSE;
+       return TRUE;
+}
+
+static bool_t xdr_mountres3_ok(XDR *xdrs, mountres3_ok *objp)
+{
+       if (!xdr_fhandle3(xdrs, &objp->fhandle))
+               return FALSE;
+       if (!xdr_array(xdrs, &(objp->auth_flavours.auth_flavours_val), &(objp->auth_flavours.auth_flavours_len), ~0,
+                               sizeof (int), (xdrproc_t) xdr_int))
+               return FALSE;
+       return TRUE;
+}
+
+static bool_t xdr_mountstat3(XDR *xdrs, mountstat3 *objp)
+{
+       if (!xdr_enum(xdrs, (enum_t *) objp))
+                return FALSE;
+       return TRUE;
+}
+
+static bool_t xdr_mountres3(XDR *xdrs, mountres3 *objp)
+{
+       if (!xdr_mountstat3(xdrs, &objp->fhs_status))
+               return FALSE;
+       switch (objp->fhs_status) {
+       case MNT_OK:
+               if (!xdr_mountres3_ok(xdrs, &objp->mountres3_u.mountinfo))
+                        return FALSE;
+               break;
+       default:
+               break;
+       }
+       return TRUE;
+}
+
+#define MAX_NFSPROT ((nfs_mount_version >= 4) ? 3 : 2)
+
+/*
+ * nfs_mount_version according to the sources seen at compile time.
+ */
+static int nfs_mount_version;
+static int kernel_version;
+
+/*
+ * Unfortunately, the kernel prints annoying console messages
+ * in case of an unexpected nfs mount version (instead of
+ * just returning some error).  Therefore we'll have to try
+ * and figure out what version the kernel expects.
+ *
+ * Variables:
+ *     KERNEL_NFS_MOUNT_VERSION: kernel sources at compile time
+ *     NFS_MOUNT_VERSION: these nfsmount sources at compile time
+ *     nfs_mount_version: version this source and running kernel can handle
+ */
+static void
+find_kernel_nfs_mount_version(void)
+{
+       if (kernel_version)
+               return;
+
+       nfs_mount_version = 4; /* default */
+
+       kernel_version = get_linux_version_code();
+       if (kernel_version) {
+               if (kernel_version < KERNEL_VERSION(2,1,32))
+                       nfs_mount_version = 1;
+               else if (kernel_version < KERNEL_VERSION(2,2,18) ||
+                               (kernel_version >= KERNEL_VERSION(2,3,0) &&
+                                kernel_version < KERNEL_VERSION(2,3,99)))
+                       nfs_mount_version = 3;
+               /* else v4 since 2.3.99pre4 */
+       }
+}
+
+static struct pmap *
+get_mountport(struct sockaddr_in *server_addr,
+       long unsigned prog,
+       long unsigned version,
+       long unsigned proto,
+       long unsigned port)
+{
+       struct pmaplist *pmap;
+       static struct pmap p = {0, 0, 0, 0};
+
+       server_addr->sin_port = PMAPPORT;
+       pmap = pmap_getmaps(server_addr);
+
+       if (version > MAX_NFSPROT)
+               version = MAX_NFSPROT;
+       if (!prog)
+               prog = MOUNTPROG;
+       p.pm_prog = prog;
+       p.pm_vers = version;
+       p.pm_prot = proto;
+       p.pm_port = port;
+       
+       while (pmap) {
+               if (pmap->pml_map.pm_prog != prog)
+                       goto next;
+               if (!version && p.pm_vers > pmap->pml_map.pm_vers)
+                       goto next;
+               if (version > 2 && pmap->pml_map.pm_vers != version)
+                       goto next;
+               if (version && version <= 2 && pmap->pml_map.pm_vers > 2)
+                       goto next;
+               if (pmap->pml_map.pm_vers > MAX_NFSPROT ||
+                   (proto && p.pm_prot && pmap->pml_map.pm_prot != proto) ||
+                   (port && pmap->pml_map.pm_port != port))
+                       goto next;
+               memcpy(&p, &pmap->pml_map, sizeof(p));
+next:
+               pmap = pmap->pml_next;
+       }
+       if (!p.pm_vers)
+               p.pm_vers = MOUNTVERS;
+       if (!p.pm_port)
+               p.pm_port = MOUNTPORT;
+       if (!p.pm_prot)
+               p.pm_prot = IPPROTO_TCP;
+       return &p;
+}
+
+static int daemonize(void)
+{
+       int fd;
+       int pid = fork();
+       if (pid < 0) /* error */
+               return -errno;
+       if (pid > 0) /* parent */
+               return 0;
+       /* child */
+       fd = xopen(bb_dev_null, O_RDWR);
+       dup2(fd, 0);
+       dup2(fd, 1);
+       dup2(fd, 2);
+       if (fd > 2) close(fd);
+       setsid();
+       openlog(bb_applet_name, LOG_PID, LOG_DAEMON);
+       logmode = LOGMODE_SYSLOG;
+       return 1;
+}
+
+// TODO
+static inline int we_saw_this_host_before(const char *hostname)
+{
+       return 0;
+}
+
+/* RPC strerror analogs are terminally idiotic:
+ * *mandatory* prefix and \n at end.
+ * This hopefully helps. Usage:
+ * error_msg_rpc(clnt_*error*(" ")) */
+static void error_msg_rpc(const char *msg)
+{
+       size_t len;
+       while (msg[0] == ' ' || msg[0] == ':') msg++;
+       len = strlen(msg);
+       while (len && msg[len-1] == '\n') len--;
+       bb_error_msg("%.*s", len, msg);
+}
+
+static int nfsmount(struct mntent *mp, int vfsflags, char *filteropts)
+{
+       CLIENT *mclient;
+       char *hostname;
+       char *pathname;
+       char *mounthost;
+       struct nfs_mount_data data;
+       char *opt;
+       struct hostent *hp;
+       struct sockaddr_in server_addr;
+       struct sockaddr_in mount_server_addr;
+       int msock, fsock;
+       union {
+               struct fhstatus nfsv2;
+               struct mountres3 nfsv3;
+       } status;
+       int daemonized;
+       char *s;
+       int port;
+       int mountport;
+       int proto;
+       int bg;
+       int soft;
+       int intr;
+       int posix;
+       int nocto;
+       int noac;
+       int nolock;
+       int retry;
+       int tcp;
+       int mountprog;
+       int mountvers;
+       int nfsprog;
+       int nfsvers;
+       int retval;
+
+       find_kernel_nfs_mount_version();
+
+       daemonized = 0;
+       mounthost = NULL;
+       retval = ETIMEDOUT;
+       msock = fsock = -1;
+       mclient = NULL;
+
+       /* NB: hostname, mounthost, filteropts must be free()d prior to return */
+
+       filteropts = xstrdup(filteropts); /* going to trash it later... */
+
+       hostname = xstrdup(mp->mnt_fsname);
+       /* mount_main() guarantees that ':' is there */
+       s = strchr(hostname, ':');
+       pathname = s + 1;
+       *s = '\0';
+       /* Ignore all but first hostname in replicated mounts
+          until they can be fully supported. (mack@sgi.com) */
+       s = strchr(hostname, ',');
+       if (s) {
+               *s = '\0';
+               bb_error_msg("warning: multiple hostnames not supported");
+       }
+
+       server_addr.sin_family = AF_INET;
+       if (!inet_aton(hostname, &server_addr.sin_addr)) {
+               hp = gethostbyname(hostname);
+               if (hp == NULL) {
+                       bb_herror_msg("%s", hostname);
+                       goto fail;
+               }
+               if (hp->h_length > sizeof(struct in_addr)) {
+                       bb_error_msg("got bad hp->h_length");
+                       hp->h_length = sizeof(struct in_addr);
+               }
+               memcpy(&server_addr.sin_addr,
+                               hp->h_addr, hp->h_length);
+       }
+
+       memcpy(&mount_server_addr, &server_addr, sizeof(mount_server_addr));
+
+       /* add IP address to mtab options for use when unmounting */
+
+       if (!mp->mnt_opts) { /* TODO: actually mp->mnt_opts is never NULL */
+               mp->mnt_opts = xasprintf("addr=%s", inet_ntoa(server_addr.sin_addr));
+       } else {
+               char *tmp = xasprintf("%s%saddr=%s", mp->mnt_opts,
+                                       mp->mnt_opts[0] ? "," : "",
+                                       inet_ntoa(server_addr.sin_addr));
+               free(mp->mnt_opts);
+               mp->mnt_opts = tmp;
+       }
+
+       /* Set default options.
+        * rsize/wsize (and bsize, for ver >= 3) are left 0 in order to
+        * let the kernel decide.
+        * timeo is filled in after we know whether it'll be TCP or UDP. */
+       memset(&data, 0, sizeof(data));
+       data.retrans    = 3;
+       data.acregmin   = 3;
+       data.acregmax   = 60;
+       data.acdirmin   = 30;
+       data.acdirmax   = 60;
+       data.namlen     = NAME_MAX;
+
+       bg = 0;
+       soft = 0;
+       intr = 0;
+       posix = 0;
+       nocto = 0;
+       nolock = 0;
+       noac = 0;
+       retry = 10000;          /* 10000 minutes ~ 1 week */
+       tcp = 0;
+
+       mountprog = MOUNTPROG;
+       mountvers = 0;
+       port = 0;
+       mountport = 0;
+       nfsprog = 100003;
+       nfsvers = 0;
+
+       /* parse options */
+
+       for (opt = strtok(filteropts, ","); opt; opt = strtok(NULL, ",")) {
+               char *opteq = strchr(opt, '=');
+               if (opteq) {
+                       int val = atoi(opteq + 1);
+                       *opteq = '\0';
+                       if (!strcmp(opt, "rsize"))
+                               data.rsize = val;
+                       else if (!strcmp(opt, "wsize"))
+                               data.wsize = val;
+                       else if (!strcmp(opt, "timeo"))
+                               data.timeo = val;
+                       else if (!strcmp(opt, "retrans"))
+                               data.retrans = val;
+                       else if (!strcmp(opt, "acregmin"))
+                               data.acregmin = val;
+                       else if (!strcmp(opt, "acregmax"))
+                               data.acregmax = val;
+                       else if (!strcmp(opt, "acdirmin"))
+                               data.acdirmin = val;
+                       else if (!strcmp(opt, "acdirmax"))
+                               data.acdirmax = val;
+                       else if (!strcmp(opt, "actimeo")) {
+                               data.acregmin = val;
+                               data.acregmax = val;
+                               data.acdirmin = val;
+                               data.acdirmax = val;
+                       }
+                       else if (!strcmp(opt, "retry"))
+                               retry = val;
+                       else if (!strcmp(opt, "port"))
+                               port = val;
+                       else if (!strcmp(opt, "mountport"))
+                               mountport = val;
+                       else if (!strcmp(opt, "mounthost"))
+                               mounthost = xstrndup(opteq+1,
+                                                 strcspn(opteq+1," \t\n\r,"));
+                       else if (!strcmp(opt, "mountprog"))
+                               mountprog = val;
+                       else if (!strcmp(opt, "mountvers"))
+                               mountvers = val;
+                       else if (!strcmp(opt, "nfsprog"))
+                               nfsprog = val;
+                       else if (!strcmp(opt, "nfsvers") ||
+                                !strcmp(opt, "vers"))
+                               nfsvers = val;
+                       else if (!strcmp(opt, "proto")) {
+                               if (!strncmp(opteq+1, "tcp", 3))
+                                       tcp = 1;
+                               else if (!strncmp(opteq+1, "udp", 3))
+                                       tcp = 0;
+                               else
+                                       bb_error_msg("warning: unrecognized proto= option");
+                       } else if (!strcmp(opt, "namlen")) {
+                               if (nfs_mount_version >= 2)
+                                       data.namlen = val;
+                               else
+                                       bb_error_msg("warning: option namlen is not supported\n");
+                       } else if (!strcmp(opt, "addr"))
+                               /* ignore */;
+                       else {
+                               bb_error_msg("unknown nfs mount parameter: %s=%d", opt, val);
+                               goto fail;
+                       }
+               }
+               else {
+                       int val = 1;
+                       if (!strncmp(opt, "no", 2)) {
+                               val = 0;
+                               opt += 2;
+                       }
+                       if (!strcmp(opt, "bg"))
+                               bg = val;
+                       else if (!strcmp(opt, "fg"))
+                               bg = !val;
+                       else if (!strcmp(opt, "soft"))
+                               soft = val;
+                       else if (!strcmp(opt, "hard"))
+                               soft = !val;
+                       else if (!strcmp(opt, "intr"))
+                               intr = val;
+                       else if (!strcmp(opt, "posix"))
+                               posix = val;
+                       else if (!strcmp(opt, "cto"))
+                               nocto = !val;
+                       else if (!strcmp(opt, "ac"))
+                               noac = !val;
+                       else if (!strcmp(opt, "tcp"))
+                               tcp = val;
+                       else if (!strcmp(opt, "udp"))
+                               tcp = !val;
+                       else if (!strcmp(opt, "lock")) {
+                               if (nfs_mount_version >= 3)
+                                       nolock = !val;
+                               else
+                                       bb_error_msg("warning: option nolock is not supported");
+                       } else {
+                               bb_error_msg("unknown nfs mount option: %s%s", val ? "" : "no", opt);
+                               goto fail;
+                       }
+               }
+       }
+       proto = (tcp) ? IPPROTO_TCP : IPPROTO_UDP;
+
+       data.flags = (soft ? NFS_MOUNT_SOFT : 0)
+               | (intr ? NFS_MOUNT_INTR : 0)
+               | (posix ? NFS_MOUNT_POSIX : 0)
+               | (nocto ? NFS_MOUNT_NOCTO : 0)
+               | (noac ? NFS_MOUNT_NOAC : 0);
+       if (nfs_mount_version >= 2)
+               data.flags |= (tcp ? NFS_MOUNT_TCP : 0);
+       if (nfs_mount_version >= 3)
+               data.flags |= (nolock ? NFS_MOUNT_NONLM : 0);
+       if (nfsvers > MAX_NFSPROT || mountvers > MAX_NFSPROT) {
+               bb_error_msg("NFSv%d not supported", nfsvers);
+               goto fail;
+       }
+       if (nfsvers && !mountvers)
+               mountvers = (nfsvers < 3) ? 1 : nfsvers;
+       if (nfsvers && nfsvers < mountvers) {
+               mountvers = nfsvers;
+       }
+
+       /* Adjust options if none specified */
+       if (!data.timeo)
+               data.timeo = tcp ? 70 : 7;
+
+#ifdef NFS_MOUNT_DEBUG
+       printf("rsize = %d, wsize = %d, timeo = %d, retrans = %d\n",
+               data.rsize, data.wsize, data.timeo, data.retrans);
+       printf("acreg (min, max) = (%d, %d), acdir (min, max) = (%d, %d)\n",
+               data.acregmin, data.acregmax, data.acdirmin, data.acdirmax);
+       printf("port = %d, bg = %d, retry = %d, flags = %.8x\n",
+               port, bg, retry, data.flags);
+       printf("mountprog = %d, mountvers = %d, nfsprog = %d, nfsvers = %d\n",
+               mountprog, mountvers, nfsprog, nfsvers);
+       printf("soft = %d, intr = %d, posix = %d, nocto = %d, noac = %d\n",
+               (data.flags & NFS_MOUNT_SOFT) != 0,
+               (data.flags & NFS_MOUNT_INTR) != 0,
+               (data.flags & NFS_MOUNT_POSIX) != 0,
+               (data.flags & NFS_MOUNT_NOCTO) != 0,
+               (data.flags & NFS_MOUNT_NOAC) != 0);
+       printf("tcp = %d\n",
+               (data.flags & NFS_MOUNT_TCP) != 0);
+#endif
+
+       data.version = nfs_mount_version;
+
+       if (vfsflags & MS_REMOUNT)
+               goto do_mount;
+
+       /*
+        * If the previous mount operation on the same host was
+        * backgrounded, and the "bg" for this mount is also set,
+        * give up immediately, to avoid the initial timeout.
+        */
+       if (bg && we_saw_this_host_before(hostname)) {
+               daemonized = daemonize(); /* parent or error */
+               if (daemonized <= 0) { /* parent or error */
+                       retval = -daemonized;
+                       goto ret;
+               }
+       }
+
+       /* create mount daemon client */
+       /* See if the nfs host = mount host. */
+       if (mounthost) {
+               if (mounthost[0] >= '0' && mounthost[0] <= '9') {
+                       mount_server_addr.sin_family = AF_INET;
+                       mount_server_addr.sin_addr.s_addr = inet_addr(hostname);
+               } else {
+                       hp = gethostbyname(mounthost);
+                       if (hp == NULL) {
+                               bb_herror_msg("%s", mounthost);
+                               goto fail;
+                       } else {
+                               if (hp->h_length > sizeof(struct in_addr)) {
+                                       bb_error_msg("got bad hp->h_length?");
+                                       hp->h_length = sizeof(struct in_addr);
+                               }
+                               mount_server_addr.sin_family = AF_INET;
+                               memcpy(&mount_server_addr.sin_addr,
+                                               hp->h_addr, hp->h_length);
+                       }
+               }
+       }
+
+       /*
+        * The following loop implements the mount retries. When the mount
+        * times out, and the "bg" option is set, we background ourself
+        * and continue trying.
+        *
+        * The case where the mount point is not present and the "bg"
+        * option is set, is treated as a timeout. This is done to
+        * support nested mounts.
+        *
+        * The "retry" count specified by the user is the number of
+        * minutes to retry before giving up.
+        */
+       {
+               struct timeval total_timeout;
+               struct timeval retry_timeout;
+               struct pmap* pm_mnt;
+               time_t t;
+               time_t prevt;
+               time_t timeout;
+
+               retry_timeout.tv_sec = 3;
+               retry_timeout.tv_usec = 0;
+               total_timeout.tv_sec = 20;
+               total_timeout.tv_usec = 0;
+               timeout = time(NULL) + 60 * retry;
+               prevt = 0;
+               t = 30;
+retry:
+               /* be careful not to use too many CPU cycles */
+               if (t - prevt < 30)
+                       sleep(30);
+
+               pm_mnt = get_mountport(&mount_server_addr,
+                               mountprog,
+                               mountvers,
+                               proto,
+                               mountport);
+               nfsvers = (pm_mnt->pm_vers < 2) ? 2 : pm_mnt->pm_vers;
+
+               /* contact the mount daemon via TCP */
+               mount_server_addr.sin_port = htons(pm_mnt->pm_port);
+               msock = RPC_ANYSOCK;
+
+               switch (pm_mnt->pm_prot) {
+               case IPPROTO_UDP:
+                       mclient = clntudp_create(&mount_server_addr,
+                                                pm_mnt->pm_prog,
+                                                pm_mnt->pm_vers,
+                                                retry_timeout,
+                                                &msock);
+                       if (mclient)
+                               break;
+                       mount_server_addr.sin_port = htons(pm_mnt->pm_port);
+                       msock = RPC_ANYSOCK;
+               case IPPROTO_TCP:
+                       mclient = clnttcp_create(&mount_server_addr,
+                                                pm_mnt->pm_prog,
+                                                pm_mnt->pm_vers,
+                                                &msock, 0, 0);
+                       break;
+               default:
+                       mclient = 0;
+               }
+               if (!mclient) {
+                       if (!daemonized && prevt == 0)
+                               error_msg_rpc(clnt_spcreateerror(" "));
+               } else {
+                       enum clnt_stat clnt_stat;
+                       /* try to mount hostname:pathname */
+                       mclient->cl_auth = authunix_create_default();
+
+                       /* make pointers in xdr_mountres3 NULL so
+                        * that xdr_array allocates memory for us
+                        */
+                       memset(&status, 0, sizeof(status));
+
+                       if (pm_mnt->pm_vers == 3)
+                               clnt_stat = clnt_call(mclient, MOUNTPROC3_MNT,
+                                             (xdrproc_t) xdr_dirpath,
+                                             (caddr_t) &pathname,
+                                             (xdrproc_t) xdr_mountres3,
+                                             (caddr_t) &status,
+                                             total_timeout);
+                       else
+                               clnt_stat = clnt_call(mclient, MOUNTPROC_MNT,
+                                             (xdrproc_t) xdr_dirpath,
+                                             (caddr_t) &pathname,
+                                             (xdrproc_t) xdr_fhstatus,
+                                             (caddr_t) &status,
+                                             total_timeout);
+
+                       if (clnt_stat == RPC_SUCCESS)
+                               goto prepare_kernel_data; /* we're done */
+                       if (errno != ECONNREFUSED) {
+                               error_msg_rpc(clnt_sperror(mclient, " "));
+                               goto fail;      /* don't retry */
+                       }
+                       /* Connection refused */
+                       if (!daemonized && prevt == 0) /* print just once */
+                               error_msg_rpc(clnt_sperror(mclient, " "));
+                       auth_destroy(mclient->cl_auth);
+                       clnt_destroy(mclient);
+                       mclient = 0;
+                       close(msock);
+               }
+
+               /* Timeout. We are going to retry... maybe */
+
+               if (!bg)
+                       goto fail;
+               if (!daemonized) {
+                       daemonized = daemonize();
+                       if (daemonized <= 0) { /* parent or error */
+                               retval = -daemonized;
+                               goto ret;
+                       }
+               }
+               prevt = t;
+               t = time(NULL);
+               if (t >= timeout)
+                       /* TODO error message */
+                       goto fail;
+
+               goto retry;
+       }
+
+prepare_kernel_data:
+
+       if (nfsvers == 2) {
+               if (status.nfsv2.fhs_status != 0) {
+                       bb_error_msg("%s:%s failed, reason given by server: %s",
+                               hostname, pathname,
+                               nfs_strerror(status.nfsv2.fhs_status));
+                       goto fail;
+               }
+               memcpy(data.root.data,
+                               (char *) status.nfsv2.fhstatus_u.fhs_fhandle,
+                               NFS_FHSIZE);
+               data.root.size = NFS_FHSIZE;
+               memcpy(data.old_root.data,
+                               (char *) status.nfsv2.fhstatus_u.fhs_fhandle,
+                               NFS_FHSIZE);
+       } else {
+               fhandle3 *my_fhandle;
+               if (status.nfsv3.fhs_status != 0) {
+                       bb_error_msg("%s:%s failed, reason given by server: %s",
+                               hostname, pathname,
+                               nfs_strerror(status.nfsv3.fhs_status));
+                       goto fail;
+               }
+               my_fhandle = &status.nfsv3.mountres3_u.mountinfo.fhandle;
+               memset(data.old_root.data, 0, NFS_FHSIZE);
+               memset(&data.root, 0, sizeof(data.root));
+               data.root.size = my_fhandle->fhandle3_len;
+               memcpy(data.root.data,
+                               (char *) my_fhandle->fhandle3_val,
+                               my_fhandle->fhandle3_len);
+
+               data.flags |= NFS_MOUNT_VER3;
+       }
+
+       /* create nfs socket for kernel */
+
+       if (tcp) {
+               if (nfs_mount_version < 3) {
+                       bb_error_msg("NFS over TCP is not supported");
+                       goto fail;
+               }
+               fsock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+       } else
+               fsock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+       if (fsock < 0) {
+               bb_perror_msg("nfs socket");
+               goto fail;
+       }
+       if (bindresvport(fsock, 0) < 0) {
+               bb_perror_msg("nfs bindresvport");
+               goto fail;
+       }
+       if (port == 0) {
+               server_addr.sin_port = PMAPPORT;
+               port = pmap_getport(&server_addr, nfsprog, nfsvers,
+                                       tcp ? IPPROTO_TCP : IPPROTO_UDP);
+               if (port == 0)
+                       port = NFS_PORT;
+#ifdef NFS_MOUNT_DEBUG
+               else
+                       printf("used portmapper to find NFS port\n");
+#endif
+       }
+#ifdef NFS_MOUNT_DEBUG
+       printf("using port %d for nfs daemon\n", port);
+#endif
+       server_addr.sin_port = htons(port);
+
+       /* prepare data structure for kernel */
+
+       data.fd = fsock;
+       memcpy((char *) &data.addr, (char *) &server_addr, sizeof(data.addr));
+       strncpy(data.hostname, hostname, sizeof(data.hostname));
+
+       /* clean up */
+
+       auth_destroy(mclient->cl_auth);
+       clnt_destroy(mclient);
+       close(msock);
+
+       if (bg) {
+               /* We must wait until mount directory is available */
+               struct stat statbuf;
+               int delay = 1;
+               while (stat(mp->mnt_dir, &statbuf) == -1) {
+                       if (!daemonized) {
+                               daemonized = daemonize();
+                               if (daemonized <= 0) { /* parent or error */
+                                       retval = -daemonized;
+                                       goto ret;
+                               }
+                       }
+                       sleep(delay);   /* 1, 2, 4, 8, 16, 30, ... */
+                       delay *= 2;
+                       if (delay > 30)
+                               delay = 30;
+               }
+       }
+
+do_mount: /* perform actual mount */
+
+       mp->mnt_type = "nfs";
+       retval = mount_it_now(mp, vfsflags, (char*)&data);
+       goto ret;
+
+fail:  /* abort */
+
+       if (msock != -1) {
+               if (mclient) {
+                       auth_destroy(mclient->cl_auth);
+                       clnt_destroy(mclient);
+               }
+               close(msock);
+       }
+       if (fsock != -1)
+               close(fsock);
+
+ret:
+       free(hostname);
+       free(mounthost);
+       free(filteropts);
+       return retval;
+}
+
+#endif /* ENABLE_FEATURE_MOUNT_NFS */
diff --git a/util-linux/nfsmount.c b/util-linux/nfsmount.c
deleted file mode 100644 (file)
index 4e523b5..0000000
+++ /dev/null
@@ -1,1022 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * nfsmount.c -- Linux NFS mount
- * Copyright (C) 1993 Rick Sladkey <jrs@world.std.com>
- *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
- *
- * Wed Feb  8 12:51:48 1995, biro@yggdrasil.com (Ross Biro): allow all port
- * numbers to be specified on the command line.
- *
- * Fri, 8 Mar 1996 18:01:39, Swen Thuemmler <swen@uni-paderborn.de>:
- * Omit the call to connect() for Linux version 1.3.11 or later.
- *
- * Wed Oct  1 23:55:28 1997: Dick Streefland <dick_streefland@tasking.com>
- * Implemented the "bg", "fg" and "retry" mount options for NFS.
- *
- * 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@misiek.eu.org>
- * - added Native Language Support
- *
- * Modified by Olaf Kirch and Trond Myklebust for new NFS code,
- * plus NFSv3 stuff.
- */
-
-#include "busybox.h"
-#include <syslog.h>
-#include <mntent.h>
-#include <sys/utsname.h>
-#undef TRUE
-#undef FALSE
-#include <rpc/rpc.h>
-#include <rpc/pmap_prot.h>
-#include <rpc/pmap_clnt.h>
-
-/* This is just a warning of a common mistake.  Possibly this should be a
- * uclibc faq entry rather than in busybox... */
-#if ENABLE_FEATURE_MOUNT_NFS && defined(__UCLIBC__) && ! defined(__UCLIBC_HAS_RPC__)
-#error "You need to build uClibc with UCLIBC_HAS_RPC for NFS support."
-#endif
-
-/* former nfsmount.h */
-
-#define MOUNTPORT 635
-#define MNTPATHLEN 1024
-#define MNTNAMLEN 255
-#define FHSIZE 32
-#define FHSIZE3 64
-
-typedef char fhandle[FHSIZE];
-
-typedef struct {
-       unsigned int fhandle3_len;
-       char *fhandle3_val;
-} fhandle3;
-
-enum mountstat3 {
-       MNT_OK = 0,
-       MNT3ERR_PERM = 1,
-       MNT3ERR_NOENT = 2,
-       MNT3ERR_IO = 5,
-       MNT3ERR_ACCES = 13,
-       MNT3ERR_NOTDIR = 20,
-       MNT3ERR_INVAL = 22,
-       MNT3ERR_NAMETOOLONG = 63,
-       MNT3ERR_NOTSUPP = 10004,
-       MNT3ERR_SERVERFAULT = 10006,
-};
-typedef enum mountstat3 mountstat3;
-
-struct fhstatus {
-       unsigned int fhs_status;
-       union {
-               fhandle fhs_fhandle;
-       } fhstatus_u;
-};
-typedef struct fhstatus fhstatus;
-
-struct mountres3_ok {
-       fhandle3 fhandle;
-       struct {
-               unsigned int auth_flavours_len;
-               char *auth_flavours_val;
-       } auth_flavours;
-};
-typedef struct mountres3_ok mountres3_ok;
-
-struct mountres3 {
-       mountstat3 fhs_status;
-       union {
-               mountres3_ok mountinfo;
-       } mountres3_u;
-};
-typedef struct mountres3 mountres3;
-
-typedef char *dirpath;
-
-typedef char *name;
-
-typedef struct mountbody *mountlist;
-
-struct mountbody {
-       name ml_hostname;
-       dirpath ml_directory;
-       mountlist ml_next;
-};
-typedef struct mountbody mountbody;
-
-typedef struct groupnode *groups;
-
-struct groupnode {
-       name gr_name;
-       groups gr_next;
-};
-typedef struct groupnode groupnode;
-
-typedef struct exportnode *exports;
-
-struct exportnode {
-       dirpath ex_dir;
-       groups ex_groups;
-       exports ex_next;
-};
-typedef struct exportnode exportnode;
-
-struct ppathcnf {
-       int pc_link_max;
-       short pc_max_canon;
-       short pc_max_input;
-       short pc_name_max;
-       short pc_path_max;
-       short pc_pipe_buf;
-       u_char pc_vdisable;
-       char pc_xxx;
-       short pc_mask[2];
-};
-typedef struct ppathcnf ppathcnf;
-
-#define MOUNTPROG 100005
-#define MOUNTVERS 1
-
-#define MOUNTPROC_NULL 0
-#define MOUNTPROC_MNT 1
-#define MOUNTPROC_DUMP 2
-#define MOUNTPROC_UMNT 3
-#define MOUNTPROC_UMNTALL 4
-#define MOUNTPROC_EXPORT 5
-#define MOUNTPROC_EXPORTALL 6
-
-#define MOUNTVERS_POSIX 2
-
-#define MOUNTPROC_PATHCONF 7
-
-#define MOUNT_V3 3
-
-#define MOUNTPROC3_NULL 0
-#define MOUNTPROC3_MNT 1
-#define MOUNTPROC3_DUMP 2
-#define MOUNTPROC3_UMNT 3
-#define MOUNTPROC3_UMNTALL 4
-#define MOUNTPROC3_EXPORT 5
-
-/* former nfsmount.h ends */
-
-enum {
-#ifndef NFS_FHSIZE
-       NFS_FHSIZE = 32,
-#endif
-#ifndef NFS_PORT
-       NFS_PORT = 2049
-#endif
-};
-
-//enum {
-//     S_QUOTA = 128,     /* Quota initialized for file/directory/symlink */
-//};
-
-
-/*
- * We want to be able to compile mount on old kernels in such a way
- * that the binary will work well on more recent kernels.
- * Thus, if necessary we teach nfsmount.c the structure of new fields
- * that will come later.
- *
- * Moreover, the new kernel includes conflict with glibc includes
- * so it is easiest to ignore the kernel altogether (at compile time).
- */
-
-struct nfs2_fh {
-       char                    data[32];
-};
-struct nfs3_fh {
-       unsigned short          size;
-       unsigned char           data[64];
-};
-
-struct nfs_mount_data {
-       int             version;                /* 1 */
-       int             fd;                     /* 1 */
-       struct nfs2_fh  old_root;               /* 1 */
-       int             flags;                  /* 1 */
-       int             rsize;                  /* 1 */
-       int             wsize;                  /* 1 */
-       int             timeo;                  /* 1 */
-       int             retrans;                /* 1 */
-       int             acregmin;               /* 1 */
-       int             acregmax;               /* 1 */
-       int             acdirmin;               /* 1 */
-       int             acdirmax;               /* 1 */
-       struct sockaddr_in addr;                /* 1 */
-       char            hostname[256];          /* 1 */
-       int             namlen;                 /* 2 */
-       unsigned int    bsize;                  /* 3 */
-       struct nfs3_fh  root;                   /* 4 */
-};
-
-/* bits in the flags field */
-enum {
-       NFS_MOUNT_SOFT = 0x0001,        /* 1 */
-       NFS_MOUNT_INTR = 0x0002,        /* 1 */
-       NFS_MOUNT_SECURE = 0x0004,      /* 1 */
-       NFS_MOUNT_POSIX = 0x0008,       /* 1 */
-       NFS_MOUNT_NOCTO = 0x0010,       /* 1 */
-       NFS_MOUNT_NOAC = 0x0020,        /* 1 */
-       NFS_MOUNT_TCP = 0x0040,         /* 2 */
-       NFS_MOUNT_VER3 = 0x0080,        /* 3 */
-       NFS_MOUNT_KERBEROS = 0x0100,    /* 3 */
-       NFS_MOUNT_NONLM = 0x0200        /* 3 */
-};
-
-#define HAVE_inet_aton
-
-/*
- * We need to translate between nfs status return values and
- * the local errno values which may not be the same.
- *
- * Andreas Schwab <schwab@LS5.informatik.uni-dortmund.de>: change errno:
- * "after #include <errno.h> the symbol errno is reserved for any use,
- *  it cannot even be used as a struct tag or field name".
- */
-
-#ifndef EDQUOT
-#define EDQUOT ENOSPC
-#endif
-
-// Convert each NFSERR_BLAH into EBLAH
-
-static const struct {
-       int stat;
-       int errnum;
-} nfs_errtbl[] = {
-       {0,0}, {1,EPERM}, {2,ENOENT}, {5,EIO}, {6,ENXIO}, {13,EACCES}, {17,EEXIST},
-       {19,ENODEV}, {20,ENOTDIR}, {21,EISDIR}, {22,EINVAL}, {27,EFBIG},
-       {28,ENOSPC}, {30,EROFS}, {63,ENAMETOOLONG}, {66,ENOTEMPTY}, {69,EDQUOT},
-       {70,ESTALE}, {71,EREMOTE}, {-1,EIO}
-};
-
-static char *nfs_strerror(int status)
-{
-       int i;
-       static char buf[256];
-
-       for (i = 0; nfs_errtbl[i].stat != -1; i++) {
-               if (nfs_errtbl[i].stat == status)
-                       return strerror(nfs_errtbl[i].errnum);
-       }
-       sprintf(buf, "unknown nfs status return value: %d", status);
-       return buf;
-}
-
-static bool_t xdr_fhandle(XDR *xdrs, fhandle objp)
-{
-       if (!xdr_opaque(xdrs, objp, FHSIZE))
-                return FALSE;
-       return TRUE;
-}
-
-static bool_t xdr_fhstatus(XDR *xdrs, fhstatus *objp)
-{
-       if (!xdr_u_int(xdrs, &objp->fhs_status))
-                return FALSE;
-       switch (objp->fhs_status) {
-       case 0:
-               if (!xdr_fhandle(xdrs, objp->fhstatus_u.fhs_fhandle))
-                        return FALSE;
-               break;
-       default:
-               break;
-       }
-       return TRUE;
-}
-
-static bool_t xdr_dirpath(XDR *xdrs, dirpath *objp)
-{
-       if (!xdr_string(xdrs, objp, MNTPATHLEN))
-                return FALSE;
-       return TRUE;
-}
-
-static bool_t xdr_fhandle3(XDR *xdrs, fhandle3 *objp)
-{
-       if (!xdr_bytes(xdrs, (char **)&objp->fhandle3_val, (unsigned int *) &objp->fhandle3_len, FHSIZE3))
-                return FALSE;
-       return TRUE;
-}
-
-static bool_t xdr_mountres3_ok(XDR *xdrs, mountres3_ok *objp)
-{
-       if (!xdr_fhandle3(xdrs, &objp->fhandle))
-               return FALSE;
-       if (!xdr_array(xdrs, &(objp->auth_flavours.auth_flavours_val), &(objp->auth_flavours.auth_flavours_len), ~0,
-                               sizeof (int), (xdrproc_t) xdr_int))
-               return FALSE;
-       return TRUE;
-}
-
-static bool_t xdr_mountstat3(XDR *xdrs, mountstat3 *objp)
-{
-       if (!xdr_enum(xdrs, (enum_t *) objp))
-                return FALSE;
-       return TRUE;
-}
-
-static bool_t xdr_mountres3(XDR *xdrs, mountres3 *objp)
-{
-       if (!xdr_mountstat3(xdrs, &objp->fhs_status))
-               return FALSE;
-       switch (objp->fhs_status) {
-       case MNT_OK:
-               if (!xdr_mountres3_ok(xdrs, &objp->mountres3_u.mountinfo))
-                        return FALSE;
-               break;
-       default:
-               break;
-       }
-       return TRUE;
-}
-
-#define MAX_NFSPROT ((nfs_mount_version >= 4) ? 3 : 2)
-
-/*
- * nfs_mount_version according to the sources seen at compile time.
- */
-static int nfs_mount_version;
-static int kernel_version;
-
-/*
- * Unfortunately, the kernel prints annoying console messages
- * in case of an unexpected nfs mount version (instead of
- * just returning some error).  Therefore we'll have to try
- * and figure out what version the kernel expects.
- *
- * Variables:
- *     KERNEL_NFS_MOUNT_VERSION: kernel sources at compile time
- *     NFS_MOUNT_VERSION: these nfsmount sources at compile time
- *     nfs_mount_version: version this source and running kernel can handle
- */
-static void
-find_kernel_nfs_mount_version(void)
-{
-       if (kernel_version)
-               return;
-
-       nfs_mount_version = 4; /* default */
-
-       kernel_version = get_linux_version_code();
-       if (kernel_version) {
-               if (kernel_version < KERNEL_VERSION(2,1,32))
-                       nfs_mount_version = 1;
-               else if (kernel_version < KERNEL_VERSION(2,2,18) ||
-                               (kernel_version >= KERNEL_VERSION(2,3,0) &&
-                                kernel_version < KERNEL_VERSION(2,3,99)))
-                       nfs_mount_version = 3;
-               /* else v4 since 2.3.99pre4 */
-       }
-}
-
-static struct pmap *
-get_mountport(struct sockaddr_in *server_addr,
-       long unsigned prog,
-       long unsigned version,
-       long unsigned proto,
-       long unsigned port)
-{
-       struct pmaplist *pmap;
-       static struct pmap p = {0, 0, 0, 0};
-
-       server_addr->sin_port = PMAPPORT;
-       pmap = pmap_getmaps(server_addr);
-
-       if (version > MAX_NFSPROT)
-               version = MAX_NFSPROT;
-       if (!prog)
-               prog = MOUNTPROG;
-       p.pm_prog = prog;
-       p.pm_vers = version;
-       p.pm_prot = proto;
-       p.pm_port = port;
-       
-       while (pmap) {
-               if (pmap->pml_map.pm_prog != prog)
-                       goto next;
-               if (!version && p.pm_vers > pmap->pml_map.pm_vers)
-                       goto next;
-               if (version > 2 && pmap->pml_map.pm_vers != version)
-                       goto next;
-               if (version && version <= 2 && pmap->pml_map.pm_vers > 2)
-                       goto next;
-               if (pmap->pml_map.pm_vers > MAX_NFSPROT ||
-                   (proto && p.pm_prot && pmap->pml_map.pm_prot != proto) ||
-                   (port && pmap->pml_map.pm_port != port))
-                       goto next;
-               memcpy(&p, &pmap->pml_map, sizeof(p));
-next:
-               pmap = pmap->pml_next;
-       }
-       if (!p.pm_vers)
-               p.pm_vers = MOUNTVERS;
-       if (!p.pm_port)
-               p.pm_port = MOUNTPORT;
-       if (!p.pm_prot)
-               p.pm_prot = IPPROTO_TCP;
-       return &p;
-}
-
-static int daemonize(void)
-{
-       int fd;
-       int pid = fork();
-       if (pid < 0) /* error */
-               return -errno;
-       if (pid > 0) /* parent */
-               return 0;
-       /* child */
-       fd = xopen(bb_dev_null, O_RDWR);
-       dup2(fd, 0);
-       dup2(fd, 1);
-       dup2(fd, 2);
-       if (fd > 2) close(fd);
-       setsid();
-       openlog(bb_applet_name, LOG_PID, LOG_DAEMON);
-       logmode = LOGMODE_SYSLOG;
-       return 1;
-}
-
-// TODO
-static inline int we_saw_this_host_before(const char *hostname)
-{
-       return 0;
-}
-
-/* RPC strerror analogs are terminally idiotic:
- * *mandatory* prefix and \n at end.
- * This hopefully helps. Usage:
- * error_msg_rpc(clnt_*error*(" ")) */
-static void error_msg_rpc(const char *msg)
-{
-       size_t len;
-       while (msg[0] == ' ' || msg[0] == ':') msg++;
-       len = strlen(msg);
-       while (len && msg[len-1] == '\n') len--;
-       bb_error_msg("%.*s", len, msg);
-}
-
-int nfsmount(struct mntent *mp, int vfsflags, char *filteropts)
-{
-       CLIENT *mclient;
-       char *hostname;
-       char *pathname;
-       char *mounthost;
-       struct nfs_mount_data data;
-       char *opt;
-       struct hostent *hp;
-       struct sockaddr_in server_addr;
-       struct sockaddr_in mount_server_addr;
-       int msock, fsock;
-       union {
-               struct fhstatus nfsv2;
-               struct mountres3 nfsv3;
-       } status;
-       int daemonized;
-       char *s;
-       int port;
-       int mountport;
-       int proto;
-       int bg;
-       int soft;
-       int intr;
-       int posix;
-       int nocto;
-       int noac;
-       int nolock;
-       int retry;
-       int tcp;
-       int mountprog;
-       int mountvers;
-       int nfsprog;
-       int nfsvers;
-       int retval;
-
-       find_kernel_nfs_mount_version();
-
-       daemonized = 0;
-       mounthost = NULL;
-       retval = ETIMEDOUT;
-       msock = fsock = -1;
-       mclient = NULL;
-
-       /* NB: hostname, mounthost, filteropts must be free()d prior to return */
-
-       filteropts = xstrdup(filteropts); /* going to trash it later... */
-
-       hostname = xstrdup(mp->mnt_fsname);
-       /* mount_main() guarantees that ':' is there */
-       s = strchr(hostname, ':');
-       pathname = s + 1;
-       *s = '\0';
-       /* Ignore all but first hostname in replicated mounts
-          until they can be fully supported. (mack@sgi.com) */
-       s = strchr(hostname, ',');
-       if (s) {
-               *s = '\0';
-               bb_error_msg("warning: multiple hostnames not supported");
-       }
-
-       server_addr.sin_family = AF_INET;
-#ifdef HAVE_inet_aton
-       if (!inet_aton(hostname, &server_addr.sin_addr))
-#endif
-       {
-               hp = gethostbyname(hostname);
-               if (hp == NULL) {
-                       bb_herror_msg("%s", hostname);
-                       goto fail;
-               }
-               if (hp->h_length > sizeof(struct in_addr)) {
-                       bb_error_msg("got bad hp->h_length");
-                       hp->h_length = sizeof(struct in_addr);
-               }
-               memcpy(&server_addr.sin_addr,
-                               hp->h_addr, hp->h_length);
-       }
-
-       memcpy(&mount_server_addr, &server_addr, sizeof(mount_server_addr));
-
-       /* add IP address to mtab options for use when unmounting */
-
-       if (!mp->mnt_opts) { /* TODO: actually mp->mnt_opts is never NULL */
-               mp->mnt_opts = xasprintf("addr=%s", inet_ntoa(server_addr.sin_addr));
-       } else {
-               char *tmp = xasprintf("%s%saddr=%s", mp->mnt_opts,
-                                       mp->mnt_opts[0] ? "," : "",
-                                       inet_ntoa(server_addr.sin_addr));
-               free(mp->mnt_opts);
-               mp->mnt_opts = tmp;
-       }
-
-       /* Set default options.
-        * rsize/wsize (and bsize, for ver >= 3) are left 0 in order to
-        * let the kernel decide.
-        * timeo is filled in after we know whether it'll be TCP or UDP. */
-       memset(&data, 0, sizeof(data));
-       data.retrans    = 3;
-       data.acregmin   = 3;
-       data.acregmax   = 60;
-       data.acdirmin   = 30;
-       data.acdirmax   = 60;
-       data.namlen     = NAME_MAX;
-
-       bg = 0;
-       soft = 0;
-       intr = 0;
-       posix = 0;
-       nocto = 0;
-       nolock = 0;
-       noac = 0;
-       retry = 10000;          /* 10000 minutes ~ 1 week */
-       tcp = 0;
-
-       mountprog = MOUNTPROG;
-       mountvers = 0;
-       port = 0;
-       mountport = 0;
-       nfsprog = 100003;
-       nfsvers = 0;
-
-       /* parse options */
-
-       for (opt = strtok(filteropts, ","); opt; opt = strtok(NULL, ",")) {
-               char *opteq = strchr(opt, '=');
-               if (opteq) {
-                       int val = atoi(opteq + 1);
-                       *opteq = '\0';
-                       if (!strcmp(opt, "rsize"))
-                               data.rsize = val;
-                       else if (!strcmp(opt, "wsize"))
-                               data.wsize = val;
-                       else if (!strcmp(opt, "timeo"))
-                               data.timeo = val;
-                       else if (!strcmp(opt, "retrans"))
-                               data.retrans = val;
-                       else if (!strcmp(opt, "acregmin"))
-                               data.acregmin = val;
-                       else if (!strcmp(opt, "acregmax"))
-                               data.acregmax = val;
-                       else if (!strcmp(opt, "acdirmin"))
-                               data.acdirmin = val;
-                       else if (!strcmp(opt, "acdirmax"))
-                               data.acdirmax = val;
-                       else if (!strcmp(opt, "actimeo")) {
-                               data.acregmin = val;
-                               data.acregmax = val;
-                               data.acdirmin = val;
-                               data.acdirmax = val;
-                       }
-                       else if (!strcmp(opt, "retry"))
-                               retry = val;
-                       else if (!strcmp(opt, "port"))
-                               port = val;
-                       else if (!strcmp(opt, "mountport"))
-                               mountport = val;
-                       else if (!strcmp(opt, "mounthost"))
-                               mounthost = xstrndup(opteq+1,
-                                                 strcspn(opteq+1," \t\n\r,"));
-                       else if (!strcmp(opt, "mountprog"))
-                               mountprog = val;
-                       else if (!strcmp(opt, "mountvers"))
-                               mountvers = val;
-                       else if (!strcmp(opt, "nfsprog"))
-                               nfsprog = val;
-                       else if (!strcmp(opt, "nfsvers") ||
-                                !strcmp(opt, "vers"))
-                               nfsvers = val;
-                       else if (!strcmp(opt, "proto")) {
-                               if (!strncmp(opteq+1, "tcp", 3))
-                                       tcp = 1;
-                               else if (!strncmp(opteq+1, "udp", 3))
-                                       tcp = 0;
-                               else
-                                       bb_error_msg("warning: unrecognized proto= option");
-                       } else if (!strcmp(opt, "namlen")) {
-                               if (nfs_mount_version >= 2)
-                                       data.namlen = val;
-                               else
-                                       bb_error_msg("warning: option namlen is not supported\n");
-                       } else if (!strcmp(opt, "addr"))
-                               /* ignore */;
-                       else {
-                               bb_error_msg("unknown nfs mount parameter: %s=%d", opt, val);
-                               goto fail;
-                       }
-               }
-               else {
-                       int val = 1;
-                       if (!strncmp(opt, "no", 2)) {
-                               val = 0;
-                               opt += 2;
-                       }
-                       if (!strcmp(opt, "bg"))
-                               bg = val;
-                       else if (!strcmp(opt, "fg"))
-                               bg = !val;
-                       else if (!strcmp(opt, "soft"))
-                               soft = val;
-                       else if (!strcmp(opt, "hard"))
-                               soft = !val;
-                       else if (!strcmp(opt, "intr"))
-                               intr = val;
-                       else if (!strcmp(opt, "posix"))
-                               posix = val;
-                       else if (!strcmp(opt, "cto"))
-                               nocto = !val;
-                       else if (!strcmp(opt, "ac"))
-                               noac = !val;
-                       else if (!strcmp(opt, "tcp"))
-                               tcp = val;
-                       else if (!strcmp(opt, "udp"))
-                               tcp = !val;
-                       else if (!strcmp(opt, "lock")) {
-                               if (nfs_mount_version >= 3)
-                                       nolock = !val;
-                               else
-                                       bb_error_msg("warning: option nolock is not supported");
-                       } else {
-                               bb_error_msg("unknown nfs mount option: %s%s", val ? "" : "no", opt);
-                               goto fail;
-                       }
-               }
-       }
-       proto = (tcp) ? IPPROTO_TCP : IPPROTO_UDP;
-
-       data.flags = (soft ? NFS_MOUNT_SOFT : 0)
-               | (intr ? NFS_MOUNT_INTR : 0)
-               | (posix ? NFS_MOUNT_POSIX : 0)
-               | (nocto ? NFS_MOUNT_NOCTO : 0)
-               | (noac ? NFS_MOUNT_NOAC : 0);
-       if (nfs_mount_version >= 2)
-               data.flags |= (tcp ? NFS_MOUNT_TCP : 0);
-       if (nfs_mount_version >= 3)
-               data.flags |= (nolock ? NFS_MOUNT_NONLM : 0);
-       if (nfsvers > MAX_NFSPROT || mountvers > MAX_NFSPROT) {
-               bb_error_msg("NFSv%d not supported", nfsvers);
-               goto fail;
-       }
-       if (nfsvers && !mountvers)
-               mountvers = (nfsvers < 3) ? 1 : nfsvers;
-       if (nfsvers && nfsvers < mountvers) {
-               mountvers = nfsvers;
-       }
-
-       /* Adjust options if none specified */
-       if (!data.timeo)
-               data.timeo = tcp ? 70 : 7;
-
-#ifdef NFS_MOUNT_DEBUG
-       printf("rsize = %d, wsize = %d, timeo = %d, retrans = %d\n",
-               data.rsize, data.wsize, data.timeo, data.retrans);
-       printf("acreg (min, max) = (%d, %d), acdir (min, max) = (%d, %d)\n",
-               data.acregmin, data.acregmax, data.acdirmin, data.acdirmax);
-       printf("port = %d, bg = %d, retry = %d, flags = %.8x\n",
-               port, bg, retry, data.flags);
-       printf("mountprog = %d, mountvers = %d, nfsprog = %d, nfsvers = %d\n",
-               mountprog, mountvers, nfsprog, nfsvers);
-       printf("soft = %d, intr = %d, posix = %d, nocto = %d, noac = %d\n",
-               (data.flags & NFS_MOUNT_SOFT) != 0,
-               (data.flags & NFS_MOUNT_INTR) != 0,
-               (data.flags & NFS_MOUNT_POSIX) != 0,
-               (data.flags & NFS_MOUNT_NOCTO) != 0,
-               (data.flags & NFS_MOUNT_NOAC) != 0);
-       printf("tcp = %d\n",
-               (data.flags & NFS_MOUNT_TCP) != 0);
-#endif
-
-       data.version = nfs_mount_version;
-
-       if (vfsflags & MS_REMOUNT)
-               goto do_mount;
-
-       /*
-        * If the previous mount operation on the same host was
-        * backgrounded, and the "bg" for this mount is also set,
-        * give up immediately, to avoid the initial timeout.
-        */
-       if (bg && we_saw_this_host_before(hostname)) {
-               daemonized = daemonize(); /* parent or error */
-               if (daemonized <= 0) { /* parent or error */
-                       retval = -daemonized;
-                       goto ret;
-               }
-       }
-
-       /* create mount daemon client */
-       /* See if the nfs host = mount host. */
-       if (mounthost) {
-               if (mounthost[0] >= '0' && mounthost[0] <= '9') {
-                       mount_server_addr.sin_family = AF_INET;
-                       mount_server_addr.sin_addr.s_addr = inet_addr(hostname);
-               } else {
-                       hp = gethostbyname(mounthost);
-                       if (hp == NULL) {
-                               bb_herror_msg("%s", mounthost);
-                               goto fail;
-                       } else {
-                               if (hp->h_length > sizeof(struct in_addr)) {
-                                       bb_error_msg("got bad hp->h_length?");
-                                       hp->h_length = sizeof(struct in_addr);
-                               }
-                               mount_server_addr.sin_family = AF_INET;
-                               memcpy(&mount_server_addr.sin_addr,
-                                               hp->h_addr, hp->h_length);
-                       }
-               }
-       }
-
-       /*
-        * The following loop implements the mount retries. When the mount
-        * times out, and the "bg" option is set, we background ourself
-        * and continue trying.
-        *
-        * The case where the mount point is not present and the "bg"
-        * option is set, is treated as a timeout. This is done to
-        * support nested mounts.
-        *
-        * The "retry" count specified by the user is the number of
-        * minutes to retry before giving up.
-        */
-       {
-               struct timeval total_timeout;
-               struct timeval retry_timeout;
-               struct pmap* pm_mnt;
-               time_t t;
-               time_t prevt;
-               time_t timeout;
-
-               retry_timeout.tv_sec = 3;
-               retry_timeout.tv_usec = 0;
-               total_timeout.tv_sec = 20;
-               total_timeout.tv_usec = 0;
-               timeout = time(NULL) + 60 * retry;
-               prevt = 0;
-               t = 30;
-retry:
-               /* be careful not to use too many CPU cycles */
-               if (t - prevt < 30)
-                       sleep(30);
-
-               pm_mnt = get_mountport(&mount_server_addr,
-                               mountprog,
-                               mountvers,
-                               proto,
-                               mountport);
-               nfsvers = (pm_mnt->pm_vers < 2) ? 2 : pm_mnt->pm_vers;
-
-               /* contact the mount daemon via TCP */
-               mount_server_addr.sin_port = htons(pm_mnt->pm_port);
-               msock = RPC_ANYSOCK;
-
-               switch (pm_mnt->pm_prot) {
-               case IPPROTO_UDP:
-                       mclient = clntudp_create(&mount_server_addr,
-                                                pm_mnt->pm_prog,
-                                                pm_mnt->pm_vers,
-                                                retry_timeout,
-                                                &msock);
-                       if (mclient)
-                               break;
-                       mount_server_addr.sin_port = htons(pm_mnt->pm_port);
-                       msock = RPC_ANYSOCK;
-               case IPPROTO_TCP:
-                       mclient = clnttcp_create(&mount_server_addr,
-                                                pm_mnt->pm_prog,
-                                                pm_mnt->pm_vers,
-                                                &msock, 0, 0);
-                       break;
-               default:
-                       mclient = 0;
-               }
-               if (!mclient) {
-                       if (!daemonized && prevt == 0)
-                               error_msg_rpc(clnt_spcreateerror(" "));
-               } else {
-                       enum clnt_stat clnt_stat;
-                       /* try to mount hostname:pathname */
-                       mclient->cl_auth = authunix_create_default();
-
-                       /* make pointers in xdr_mountres3 NULL so
-                        * that xdr_array allocates memory for us
-                        */
-                       memset(&status, 0, sizeof(status));
-
-                       if (pm_mnt->pm_vers == 3)
-                               clnt_stat = clnt_call(mclient, MOUNTPROC3_MNT,
-                                             (xdrproc_t) xdr_dirpath,
-                                             (caddr_t) &pathname,
-                                             (xdrproc_t) xdr_mountres3,
-                                             (caddr_t) &status,
-                                             total_timeout);
-                       else
-                               clnt_stat = clnt_call(mclient, MOUNTPROC_MNT,
-                                             (xdrproc_t) xdr_dirpath,
-                                             (caddr_t) &pathname,
-                                             (xdrproc_t) xdr_fhstatus,
-                                             (caddr_t) &status,
-                                             total_timeout);
-
-                       if (clnt_stat == RPC_SUCCESS)
-                               goto prepare_kernel_data; /* we're done */
-                       if (errno != ECONNREFUSED) {
-                               error_msg_rpc(clnt_sperror(mclient, " "));
-                               goto fail;      /* don't retry */
-                       }
-                       /* Connection refused */
-                       if (!daemonized && prevt == 0) /* print just once */
-                               error_msg_rpc(clnt_sperror(mclient, " "));
-                       auth_destroy(mclient->cl_auth);
-                       clnt_destroy(mclient);
-                       mclient = 0;
-                       close(msock);
-               }
-
-               /* Timeout. We are going to retry... maybe */
-
-               if (!bg)
-                       goto fail;
-               if (!daemonized) {
-                       daemonized = daemonize();
-                       if (daemonized <= 0) { /* parent or error */
-                               retval = -daemonized;
-                               goto ret;
-                       }
-               }
-               prevt = t;
-               t = time(NULL);
-               if (t >= timeout)
-                       /* TODO error message */
-                       goto fail;
-
-               goto retry;
-       }
-
-prepare_kernel_data:
-
-       if (nfsvers == 2) {
-               if (status.nfsv2.fhs_status != 0) {
-                       bb_error_msg("%s:%s failed, reason given by server: %s",
-                               hostname, pathname,
-                               nfs_strerror(status.nfsv2.fhs_status));
-                       goto fail;
-               }
-               memcpy(data.root.data,
-                               (char *) status.nfsv2.fhstatus_u.fhs_fhandle,
-                               NFS_FHSIZE);
-               data.root.size = NFS_FHSIZE;
-               memcpy(data.old_root.data,
-                               (char *) status.nfsv2.fhstatus_u.fhs_fhandle,
-                               NFS_FHSIZE);
-       } else {
-               fhandle3 *my_fhandle;
-               if (status.nfsv3.fhs_status != 0) {
-                       bb_error_msg("%s:%s failed, reason given by server: %s",
-                               hostname, pathname,
-                               nfs_strerror(status.nfsv3.fhs_status));
-                       goto fail;
-               }
-               my_fhandle = &status.nfsv3.mountres3_u.mountinfo.fhandle;
-               memset(data.old_root.data, 0, NFS_FHSIZE);
-               memset(&data.root, 0, sizeof(data.root));
-               data.root.size = my_fhandle->fhandle3_len;
-               memcpy(data.root.data,
-                               (char *) my_fhandle->fhandle3_val,
-                               my_fhandle->fhandle3_len);
-
-               data.flags |= NFS_MOUNT_VER3;
-       }
-
-       /* create nfs socket for kernel */
-
-       if (tcp) {
-               if (nfs_mount_version < 3) {
-                       bb_error_msg("NFS over TCP is not supported");
-                       goto fail;
-               }
-               fsock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-       } else
-               fsock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-       if (fsock < 0) {
-               bb_perror_msg("nfs socket");
-               goto fail;
-       }
-       if (bindresvport(fsock, 0) < 0) {
-               bb_perror_msg("nfs bindresvport");
-               goto fail;
-       }
-       if (port == 0) {
-               server_addr.sin_port = PMAPPORT;
-               port = pmap_getport(&server_addr, nfsprog, nfsvers,
-                                       tcp ? IPPROTO_TCP : IPPROTO_UDP);
-               if (port == 0)
-                       port = NFS_PORT;
-#ifdef NFS_MOUNT_DEBUG
-               else
-                       printf("used portmapper to find NFS port\n");
-#endif
-       }
-#ifdef NFS_MOUNT_DEBUG
-       printf("using port %d for nfs daemon\n", port);
-#endif
-       server_addr.sin_port = htons(port);
-
-       /* prepare data structure for kernel */
-
-       data.fd = fsock;
-       memcpy((char *) &data.addr, (char *) &server_addr, sizeof(data.addr));
-       strncpy(data.hostname, hostname, sizeof(data.hostname));
-
-       /* clean up */
-
-       auth_destroy(mclient->cl_auth);
-       clnt_destroy(mclient);
-       close(msock);
-
-       if (bg) {
-               /* We must wait until mount directory is available */
-               struct stat statbuf;
-               int delay = 1;
-               while (stat(mp->mnt_dir, &statbuf) == -1) {
-                       if (!daemonized) {
-                               daemonized = daemonize();
-                               if (daemonized <= 0) { /* parent or error */
-                                       retval = -daemonized;
-                                       goto ret;
-                               }
-                       }
-                       sleep(delay);   /* 1, 2, 4, 8, 16, 30, ... */
-                       delay *= 2;
-                       if (delay > 30)
-                               delay = 30;
-               }
-       }
-
-do_mount: /* perform actual mount */
-
-       mp->mnt_type = "nfs";
-       retval = mount_it_now(mp, vfsflags, (char*)&data);
-       goto ret;
-
-fail:  /* abort */
-
-       if (msock != -1) {
-               if (mclient) {
-                       auth_destroy(mclient->cl_auth);
-                       clnt_destroy(mclient);
-               }
-               close(msock);
-       }
-       if (fsock != -1)
-               close(fsock);
-
-ret:
-       free(hostname);
-       free(mounthost);
-       free(filteropts);
-       return retval;
-}