BSD 4_3_Net_2 release

[unix-history] / usr / src / sbin / mount / mount.c

diff --git a/usr/src/sbin/mount/mount.c b/usr/src/sbin/mount/mount.c
index 0e9355c..9c561b2 100644 (file)
--- a/usr/src/sbin/mount/mount.c
+++ b/usr/src/sbin/mount/mount.c
@@ -1,30 +1,52 @@
 /*
 /*

- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1980, 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
 char copyright[] =
  */
 
 #ifndef lint
 char copyright[] =

-"@(#) Copyright (c) 1980 Regents of the University of California.\n\
+"@(#) Copyright (c) 1980, 1989 The Regents of the University of California.\n\

  All rights reserved.\n";
  All rights reserved.\n";

-#endif not lint
+#endif /* not lint */

 
 #ifndef lint
 
 #ifndef lint

-static char sccsid[] = "@(#)mount.c    5.9 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)mount.c    5.44 (Berkeley) 2/26/91";
+#endif /* not lint */

 
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/time.h>
 
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/time.h>

-#include <fstab.h>
-#include <mtab.h>
-#include <errno.h>
-#include <stdio.h>
-#include <strings.h>
-#include <sys/dir.h>
-#include <sys/uio.h>
-#include <sys/namei.h>
+#include <sys/wait.h>
+#include <sys/errno.h>
+#include <sys/signal.h>

 #include <sys/mount.h>
 #ifdef NFS
 #include <sys/socket.h>
 #include <sys/mount.h>
 #ifdef NFS
 #include <sys/socket.h>


@@ -37,6 +59,13 @@ static char sccsid[] = "@(#)mount.c  5.9 (Berkeley) %G%";
 #include <nfs/nfsv2.h>
 #include <nfs/nfs.h>
 #endif
 #include <nfs/nfsv2.h>
 #include <nfs/nfs.h>
 #endif

+#include <fstab.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "pathnames.h"
+
+#define DEFAULT_ROOTUID        -2

 
 #define        BADTYPE(type) \
        (strcmp(type, FSTAB_RO) && strcmp(type, FSTAB_RW) && \
 
 #define        BADTYPE(type) \
        (strcmp(type, FSTAB_RO) && strcmp(type, FSTAB_RW) && \


@@ -44,14 +73,18 @@ static char sccsid[] = "@(#)mount.c 5.9 (Berkeley) %G%";
 #define        SETTYPE(type) \
        (!strcmp(type, FSTAB_RW) || !strcmp(type, FSTAB_RQ))
 
 #define        SETTYPE(type) \
        (!strcmp(type, FSTAB_RW) || !strcmp(type, FSTAB_RQ))
 

-#define        MTAB    "/etc/mtab"
+int fake, verbose, updateflg, mnttype;
+char *mntname, **envp;
+char **vfslist, **makevfslist();
+static void prmount();

 
 

-static struct mtab mtab[NMOUNT];
-static int fake, verbose, mnttype;

 #ifdef NFS
 int xdr_dir(), xdr_fh();
 #ifdef NFS
 int xdr_dir(), xdr_fh();

-struct nfs_args nfsargs = {
-       (struct sockaddr_in *)0,
+char *getnfsargs();
+struct nfs_args nfsdefargs = {
+       (struct sockaddr *)0,
+       SOCK_DGRAM,
+       0,

        (nfsv2fh_t *)0,
        0,
        NFS_WSIZE,
        (nfsv2fh_t *)0,
        0,
        NFS_WSIZE,


@@ -65,28 +98,33 @@ struct nfhret {
        u_long  stat;
        nfsv2fh_t nfh;
 };
        u_long  stat;
        nfsv2fh_t nfh;
 };

-int retrycnt = 10000;
+#define        DEF_RETRY       10000
+int retrycnt;

 #define        BGRND   1
 #define        ISBGRND 2
 int opflags = 0;
 #endif
 
 #define        BGRND   1
 #define        ISBGRND 2
 int opflags = 0;
 #endif
 

-main(argc, argv)
+main(argc, argv, arge)

        int argc;
        char **argv;
        int argc;
        char **argv;

+       char **arge;

 {
        extern char *optarg;
        extern int optind;
 {
        extern char *optarg;
        extern int optind;

-       register struct mtab *mp;

        register struct fstab *fs;
        register struct fstab *fs;

-       register int cnt;
-       int all, ch, fd, rval, sfake;
-       char *type;
+       int all, ch, rval, flags, ret, pid, i;
+       long mntsize;
+       struct statfs *mntbuf, *getmntpt();
+       char *type, *options = NULL;
+       FILE *pidfile;

 
 

+       envp = arge;

        all = 0;
        type = NULL;
        mnttype = MOUNT_UFS;
        all = 0;
        type = NULL;
        mnttype = MOUNT_UFS;

-       while ((ch = getopt(argc, argv, "afrwvt:o:")) != EOF)
+       mntname = "ufs";
+       while ((ch = getopt(argc, argv, "afrwuvt:o:")) != EOF)

                switch((char)ch) {
                case 'a':
                        all = 1;
                switch((char)ch) {
                case 'a':
                        all = 1;


@@ -97,57 +135,47 @@ main(argc, argv)
                case 'r':
                        type = FSTAB_RO;
                        break;
                case 'r':
                        type = FSTAB_RO;
                        break;

+               case 'u':
+                       updateflg = MNT_UPDATE;
+                       break;

                case 'v':
                        verbose = 1;
                        break;
                case 'w':
                        type = FSTAB_RW;
                        break;
                case 'v':
                        verbose = 1;
                        break;
                case 'w':
                        type = FSTAB_RW;
                        break;

-#ifdef NFS
-               case 't':
-                       if (!strcmp(optarg, "nfs"))
-                               mnttype = MOUNT_NFS;
-                       break;

                case 'o':
                case 'o':

-                       getoptions(optarg,&nfsargs,&opflags,&retrycnt);
+                       options = optarg;
+                       break;
+               case 't':
+                       vfslist = makevfslist(optarg);
+                       mnttype = getmnttype(optarg);

                        break;
                        break;

-#endif

                case '?':
                default:
                        usage();
                case '?':
                default:
                        usage();

+                       /* NOTREACHED */

                }
        argc -= optind;
        argv += optind;
 
        /* NOSTRICT */
                }
        argc -= optind;
        argv += optind;
 
        /* NOSTRICT */

-       if ((fd = open(MTAB, O_RDONLY, 0)) >= 0) {
-               if (read(fd, (char *)mtab, NMOUNT * sizeof(struct mtab)) < 0)
-                       mtaberr();
-               (void)close(fd);
-       }

 
        if (all) {
                rval = 0;
 
        if (all) {
                rval = 0;

-               for (sfake = fake; fs = getfsent(); fake = sfake) {
+               while (fs = getfsent()) {

                        if (BADTYPE(fs->fs_type))
                                continue;
                        if (BADTYPE(fs->fs_type))
                                continue;

+                       if (badvfsname(fs->fs_vfstype, vfslist))
+                               continue;

                        /* `/' is special, it's always mounted */
                        if (!strcmp(fs->fs_file, "/"))
                        /* `/' is special, it's always mounted */
                        if (!strcmp(fs->fs_file, "/"))

-                               fake = 1;
-#ifdef NFS
-                       if (index(fs->fs_spec, '@') != NULL) {
-                               if (fs->fs_vfstype != NULL &&
-                                   strcmp(fs->fs_vfstype, "nfs"))
-                                       continue;
-                               if (fs->fs_mntops != NULL)
-                                       getoptions(fs->fs_mntops, &nfsargs,
-                                               &opflags, &retrycnt);
-                               mnttype = MOUNT_NFS;
-                       } else
-                               mnttype = MOUNT_UFS;
-#endif
-                       rval |= mountfs(fs->fs_spec, fs->fs_file,
-                           type ? type : fs->fs_type);
+                               flags = MNT_UPDATE;
+                       else
+                               flags = updateflg;
+                       mnttype = getmnttype(fs->fs_vfstype);
+                       rval |= mountfs(fs->fs_spec, fs->fs_file, flags,
+                           type, options, fs->fs_mntops);

                }
                exit(rval);
        }
                }
                exit(rval);
        }


@@ -155,279 +183,440 @@ main(argc, argv)
        if (argc == 0) {
                if (verbose || fake || type)
                        usage();
        if (argc == 0) {
                if (verbose || fake || type)
                        usage();

-               for (mp = mtab, cnt = NMOUNT; cnt--; ++mp)
-                       if (*mp->m_path)
-                               prmtab(mp);
+               if ((mntsize = getmntinfo(&mntbuf, MNT_NOWAIT)) == 0) {
+                       (void) fprintf(stderr,
+                               "mount: cannot get mount information\n");
+                       exit(1);
+               }
+               for (i = 0; i < mntsize; i++) {
+                       if (badvfstype(mntbuf[i].f_type, vfslist))
+                               continue;
+                       prmount(mntbuf[i].f_mntfromname, mntbuf[i].f_mntonname,
+                               mntbuf[i].f_flags);
+               }

                exit(0);
        }
 
                exit(0);
        }
 

-       if (all)
-               usage();
-
-       if (argc == 1) {
+       if (argc == 1 && updateflg) {
+               if ((mntbuf = getmntpt(*argv)) == NULL) {
+                       (void) fprintf(stderr,
+                           "mount: unknown special file or file system %s.\n",
+                           *argv);
+                       exit(1);
+               }
+               mnttype = mntbuf->f_type;
+               if (!strcmp(mntbuf->f_mntfromname, "root_device")) {
+                       fs = getfsfile("/");
+                       strcpy(mntbuf->f_mntfromname, fs->fs_spec);
+               }
+               ret = mountfs(mntbuf->f_mntfromname, mntbuf->f_mntonname,
+                   updateflg, type, options, (char *)NULL);
+       } else if (argc == 1) {

                if (!(fs = getfsfile(*argv)) && !(fs = getfsspec(*argv))) {
                if (!(fs = getfsfile(*argv)) && !(fs = getfsspec(*argv))) {

-                       fprintf(stderr,
+                       (void) fprintf(stderr,

                            "mount: unknown special file or file system %s.\n",
                            *argv);
                        exit(1);
                }
                if (BADTYPE(fs->fs_type)) {
                            "mount: unknown special file or file system %s.\n",
                            *argv);
                        exit(1);
                }
                if (BADTYPE(fs->fs_type)) {

-                       fprintf(stderr,
+                       (void) fprintf(stderr,

                            "mount: %s has unknown file system type.\n", *argv);
                        exit(1);
                }
                            "mount: %s has unknown file system type.\n", *argv);
                        exit(1);
                }

-               exit(mountfs(fs->fs_spec, fs->fs_file,
-                   type ? type : fs->fs_type));
-       }
-
-       if (argc != 2)
+               mnttype = getmnttype(fs->fs_vfstype);
+               ret = mountfs(fs->fs_spec, fs->fs_file, updateflg,
+                   type, options, fs->fs_mntops);
+       } else if (argc != 2) {

                usage();
                usage();

-
-       exit(mountfs(argv[0], argv[1], type ? type : "rw"));
+               ret = 1;
+       } else {
+               /*
+                * If -t flag has not been specified, and spec
+                * contains either a ':' or a '@' then assume that
+                * an NFS filesystem is being specified ala Sun.
+                */
+               if (vfslist == (char **)0 &&
+                   (index(argv[0], ':') || index(argv[0], '@')))
+                       mnttype = MOUNT_NFS;
+               ret = mountfs(argv[0], argv[1], updateflg, type, options,
+                   (char *)NULL);
+       }
+       if ((pidfile = fopen(_PATH_MOUNTDPID, "r")) != NULL) {
+               pid = 0;
+               fscanf(pidfile, "%d", &pid);
+               fclose(pidfile);
+               if (pid > 0)
+                       kill(pid, SIGHUP);
+       }
+       exit (ret);

 }
 
 }
 

-static
-mountfs(spec, name, type)
-       char *spec, *name, *type;
+mountfs(spec, name, flags, type, options, mntopts)
+       char *spec, *name, *type, *options, *mntopts;
+       int flags;

 {
 {

-       extern int errno;
-       register struct mtab *mp, *space;
-       register int cnt;
-       register char *p;
-#ifdef NFS
-       register CLIENT *clp;
-       struct hostent *hp;
-       struct sockaddr_in saddr;
-       struct timeval pertry, try;
-       enum clnt_stat clnt_stat;
-       int so = RPC_ANYSOCK;
-       char *hostp, *delimp;
-       u_short tport;
-       struct nfhret nfhret;
-       char nam[MNAMELEN+1];
-#endif
-       int fd, flags;
+       union wait status;
+       pid_t pid;
+       int argc, i;

        struct ufs_args args;
        struct ufs_args args;

-       char *argp;
+       struct nfs_args nfsargs;
+       char *argp, *argv[50];
+       char execname[MAXPATHLEN + 1], flagval[12];
+
+       nfsargs = nfsdefargs;
+       if (mntopts)
+               getstdopts(mntopts, &flags);
+       if (options)
+               getstdopts(options, &flags);
+       if (type)
+               getstdopts(type, &flags);
+       switch (mnttype) {
+       case MOUNT_UFS:
+               if (mntopts)
+                       getufsopts(mntopts, &flags);
+               if (options)
+                       getufsopts(options, &flags);
+               args.fspec = spec;
+               args.exroot = DEFAULT_ROOTUID;
+               if (flags & MNT_RDONLY)
+                       args.exflags = MNT_EXRDONLY;
+               else
+                       args.exflags = 0;
+               argp = (caddr_t)&args;
+               break;

 
 

-       if (!fake) {
-               flags = 0;
-               if (!strcmp(type, FSTAB_RO))
-                       flags |= M_RDONLY;

 #ifdef NFS
 #ifdef NFS

-               switch (mnttype) {
-               case MOUNT_UFS:
-                       args.fspec = spec;
-                       argp = (caddr_t)&args;
+       case MOUNT_NFS:
+               retrycnt = DEF_RETRY;
+               if (mntopts)
+                       getnfsopts(mntopts, &nfsargs, &opflags, &retrycnt);
+               if (options)
+                       getnfsopts(options, &nfsargs, &opflags, &retrycnt);
+               if (argp = getnfsargs(spec, &nfsargs))

                        break;
                        break;

-               case MOUNT_NFS:
-                       strncpy(nam, spec, MNAMELEN);
-                       nam[MNAMELEN] = '\0';
-                       if ((delimp = index(spec, '@')) != NULL) {
-                               hostp = delimp+1;
-                       } else if ((delimp = index(spec, ':')) != NULL) {
-                               hostp = spec;
-                               spec = delimp+1;
-                       } else {
-                               fprintf(stderr, "No <host>:<dirpath> or <dirpath>@<host> spec\n");
-                               return (1);
-                       }
-                       *delimp = '\0';
-                       if ((hp = gethostbyname(hostp)) == NULL) {
-                               fprintf(stderr,"Can't get net id for host\n");
-                               return (1);
-                       }
-                       bcopy(hp->h_addr,(caddr_t)&saddr.sin_addr,hp->h_length);
-                       nfhret.stat = EACCES;   /* Mark not yet successful */
-                       while (retrycnt > 0) {
-                               saddr.sin_family = AF_INET;
-                               saddr.sin_port = htons(PMAPPORT);
-                               if ((tport = pmap_getport(&saddr, RPCPROG_NFS,
-                                       NFS_VER2, IPPROTO_UDP)) == 0) {
-                                       if ((opflags & ISBGRND) == 0)
-                                               clnt_pcreateerror("NFS Portmap");
-                               } else {
-                                       saddr.sin_port = 0;
-                                       pertry.tv_sec = 10;
-                                       pertry.tv_usec = 0;
-                                       if ((clp = clntudp_create(&saddr, RPCPROG_MNT,
-                                               RPCMNT_VER1, pertry, &so)) == NULL) {
-                                               if ((opflags & ISBGRND) == 0)
-                                                       clnt_pcreateerror("Cannot MNT PRC");
-                                       } else {
-                                               clp->cl_auth = authunix_create_default();
-                                               try.tv_sec = 10;
-                                               try.tv_usec = 0;
-                                               clnt_stat = clnt_call(clp, RPCMNT_MOUNT, xdr_dir, spec,
-                                                       xdr_fh, &nfhret, try);
-                                               if (clnt_stat != RPC_SUCCESS) {
-                                                       if ((opflags & ISBGRND) == 0)
-                                                               clnt_perror(clp, "Bad MNT RPC");
-                                               } else {
-                                                       auth_destroy(clp->cl_auth);
-                                                       clnt_destroy(clp);
-                                                       retrycnt = 0;
-                                               }
-                                       }
-                               }
-                               if (--retrycnt > 0) {
-                                       if (opflags & BGRND) {
-                                               opflags &= ~BGRND;
-                                               if (fork())
-                                                       return (0);
-                                               else
-                                                       opflags |= ISBGRND;
-                                       } 
-                                       sleep(10);
-                               }
-                       }
-                       if (nfhret.stat) {
-                               if (opflags & ISBGRND)
-                                       exit(1);
-                               fprintf(stderr, "Can't access %s, errno=%d\n",
-                                       spec, nfhret.stat);
-                               return (1);
-                       }
-                       saddr.sin_port = htons(tport);
-                       nfsargs.addr = &saddr;
-                       nfsargs.fh = &nfhret.nfh;
-                       nfsargs.hostname = nam;
-                       argp = (caddr_t)&nfsargs;
+               return (1);
+#endif /* NFS */
+
+       case MOUNT_MFS:
+       default:
+               argv[0] = mntname;
+               argc = 1;
+               if (flags) {
+                       argv[argc++] = "-F";
+                       sprintf(flagval, "%d", flags);
+                       argv[argc++] = flagval;
+               }
+               if (mntopts)
+                       argc += getexecopts(mntopts, &argv[argc]);
+               if (options)
+                       argc += getexecopts(options, &argv[argc]);
+               argv[argc++] = spec;
+               argv[argc++] = name;
+               argv[argc++] = NULL;
+               sprintf(execname, "%s/mount_%s", _PATH_EXECDIR, mntname);
+               if (verbose) {
+                       (void)printf("exec: %s", execname);
+                       for (i = 1; i < argc - 1; i++)
+                               (void)printf(" %s", argv[i]);
+                       (void)printf("\n");
+               }
+               if (fake)

                        break;
                        break;

-               };
-#endif
-               if (mount(mnttype, name, flags, argp)) {
-                       if (opflags & ISBGRND)
-                               exit(1);
-                       fprintf(stderr, "%s on %s: ", spec, name);
-                       switch (errno) {
-                       case EMFILE:
-                               fprintf(stderr, "Mount table full\n");
-                               break;
-                       case EINVAL:
-                               fprintf(stderr, "Bogus super block\n");
-                               break;
-                       default:
-                               perror((char *)NULL);
-                               break;
+               if (pid = vfork()) {
+                       if (pid == -1) {
+                               perror("mount: vfork starting file system");
+                               return (1);

                        }
                        }

-                       return(1);
+                       if (waitpid(pid, (int *)&status, 0) != -1 &&
+                           WIFEXITED(status) &&
+                           WEXITSTATUS(status) != 0)
+                               return (WEXITSTATUS(status));
+                       spec = mntname;
+                       goto out;

                }
                }

+               execve(execname, argv, envp);
+               (void) fprintf(stderr, "mount: cannot exec %s for %s: ",
+                       execname, name);
+               perror((char *)NULL);
+               exit (1);
+               /* NOTREACHED */

 
 

-               /* we don't do quotas.... */
-               if (strcmp(type, FSTAB_RQ) == 0)
-                       type = FSTAB_RW;
-       }
-
-       /* trim trailing /'s and find last component of name */
-       for (p = index(spec, '\0'); *--p == '/';);
-       *++p = '\0';
-       if (p = rindex(spec, '/')) {
-               *p = '\0';
-               spec = p + 1;
-       }
-
-       for (mp = mtab, cnt = NMOUNT, space = NULL; cnt--; ++mp) {
-               if (!strcmp(mp->m_dname, spec))
-                       break;
-               if (!space && !*mp->m_path)
-                       space = mp;

        }
        }

-       if (cnt == -1) {
-               if (!space) {
-                       if ((opflags & ISBGRND) == 0)
-                               fprintf(stderr, "mount: no more room in %s.\n", MTAB);
+       if (!fake && mount(mnttype, name, flags, argp)) {
+               if (opflags & ISBGRND)

                        exit(1);
                        exit(1);

+               (void) fprintf(stderr, "%s on %s: ", spec, name);
+               switch (errno) {
+               case EMFILE:
+                       (void) fprintf(stderr, "Mount table full\n");
+                       break;
+               case EINVAL:
+                       if (flags & MNT_UPDATE)
+                               (void) fprintf(stderr, "Specified device %s\n",
+                                       "does not match mounted device");
+                       else if (mnttype == MOUNT_UFS)
+                               (void) fprintf(stderr, "Bogus super block\n");
+                       else
+                               perror((char *)NULL);
+                       break;
+               default:
+                       perror((char *)NULL);
+                       break;

                }
                }

-               mp = space;
+               return(1);

        }
 
        }
 

-#define        DNMAX   (sizeof(mtab[0].m_dname) - 1)
-#define        PNMAX   (sizeof(mtab[0].m_path) - 1)
-
-       (void)strncpy(mp->m_dname, spec, DNMAX);
-       mp->m_dname[DNMAX] = '\0';
-       (void)strncpy(mp->m_path, name, PNMAX);
-       mp->m_path[PNMAX] = '\0';
-       (void)strcpy(mp->m_type, type);
-
+out:

        if (verbose)
        if (verbose)

-               prmtab(mp);
+               prmount(spec, name, flags);

 
 

-       for (mp = mtab + NMOUNT - 1; mp > mtab && !*mp->m_path; --mp);
-       if ((fd = open(MTAB, O_WRONLY|O_CREAT|O_TRUNC, 0644)) < 0)
-               mtaberr();
-       cnt = (mp - mtab + 1) * sizeof(struct mtab);
-       /* NOSTRICT */
-       if (write(fd, (char *)mtab, cnt) != cnt)
-               mtaberr();
-       (void)close(fd);

        if (opflags & ISBGRND)
        if (opflags & ISBGRND)

-               exit();
-       else
-               return(0);
+               exit(1);
+       return(0);

 }
 
 }
 

-static
-prmtab(mp)
-       register struct mtab *mp;
+static void
+prmount(spec, name, flags)
+       char *spec, *name;
+       register short flags;

 {
 {

+       register int first;
+

        if (opflags & ISBGRND)
                return;
        if (opflags & ISBGRND)
                return;

-       printf("%s on %s", mp->m_dname, mp->m_path);
-       if (!strcmp(mp->m_type, FSTAB_RO))
-               printf("\t(read-only)");
-       else if (!strcmp(mp->m_type, FSTAB_RQ))
-               printf("\t(with quotas)");
-       printf("\n");
+       (void)printf("%s on %s", spec, name);
+       if (!(flags & MNT_VISFLAGMASK)) {
+               (void)printf("\n");
+               return;
+       }
+       first = 0;
+#define        PR(msg) (void)printf("%s%s", !first++ ? " (" : ", ", msg)
+       if (flags & MNT_RDONLY)
+               PR("read-only");
+       if (flags & MNT_NOEXEC)
+               PR("noexec");
+       if (flags & MNT_NOSUID)
+               PR("nosuid");
+       if (flags & MNT_NODEV)
+               PR("nodev");
+       if (flags & MNT_SYNCHRONOUS)
+               PR("synchronous");
+       if (flags & MNT_QUOTA)
+               PR("with quotas");
+       if (flags & MNT_LOCAL)
+               PR("local");
+       if (flags & MNT_EXPORTED)
+               if (flags & MNT_EXRDONLY)
+                       PR("NFS exported read-only");
+               else
+                       PR("NFS exported");
+       (void)printf(")\n");

 }
 
 }
 

-static
-mtaberr()
+getmnttype(fstype)
+       char *fstype;

 {
 {

-       if (opflags & ISBGRND)
-               exit(1);
-       fprintf(stderr, "mount: %s: ", MTAB);
-       perror((char *)NULL);
-       exit(1);
+
+       mntname = fstype;
+       if (!strcmp(fstype, "ufs"))
+               return (MOUNT_UFS);
+       if (!strcmp(fstype, "nfs"))
+               return (MOUNT_NFS);
+       if (!strcmp(fstype, "mfs"))
+               return (MOUNT_MFS);
+       return (0);

 }
 
 }
 

-static

 usage()
 {
 usage()
 {

-       fprintf(stderr, "usage: mount [-afrw]\nor mount [-frw] special | node\nor mount [-frw] special node\n");
+
+       (void) fprintf(stderr,
+               "usage:\n  mount %s %s\n  mount %s\n  mount %s\n",
+               "[ -frwu ] [ -t nfs | ufs | external_type ]",
+               "[ -o options ] special node",
+               "[ -afrwu ] [ -t nfs | ufs | external_type ]",
+               "[ -frwu ] special | node");

        exit(1);
 }
 
        exit(1);
 }
 

-#ifdef NFS
-/*
- * xdr routines for mount rpc's
- */
-xdr_dir(xdrsp, dirp)
-       XDR *xdrsp;
-       char *dirp;
+getstdopts(options, flagp)
+       char *options;
+       int *flagp;

 {
 {

-       return (xdr_string(xdrsp, &dirp, RPCMNT_PATHLEN));
+       register char *opt;
+       int negative;
+       char optbuf[BUFSIZ];
+
+       (void)strcpy(optbuf, options);
+       for (opt = strtok(optbuf, ","); opt; opt = strtok((char *)NULL, ",")) {
+               if (opt[0] == 'n' && opt[1] == 'o') {
+                       negative++;
+                       opt += 2;
+               } else {
+                       negative = 0;
+               }
+               if (!negative && !strcasecmp(opt, FSTAB_RO)) {
+                       *flagp |= MNT_RDONLY;
+                       continue;
+               }
+               if (!negative && !strcasecmp(opt, FSTAB_RW)) {
+                       *flagp &= ~MNT_RDONLY;
+                       continue;
+               }
+               if (!strcasecmp(opt, "exec")) {
+                       if (negative)
+                               *flagp |= MNT_NOEXEC;
+                       else
+                               *flagp &= ~MNT_NOEXEC;
+                       continue;
+               }
+               if (!strcasecmp(opt, "suid")) {
+                       if (negative)
+                               *flagp |= MNT_NOSUID;
+                       else
+                               *flagp &= ~MNT_NOSUID;
+                       continue;
+               }
+               if (!strcasecmp(opt, "dev")) {
+                       if (negative)
+                               *flagp |= MNT_NODEV;
+                       else
+                               *flagp &= ~MNT_NODEV;
+                       continue;
+               }
+               if (!strcasecmp(opt, "synchronous")) {
+                       if (!negative)
+                               *flagp |= MNT_SYNCHRONOUS;
+                       else
+                               *flagp &= ~MNT_SYNCHRONOUS;
+                       continue;
+               }
+       }

 }
 
 }
 

-xdr_fh(xdrsp, np)
-       XDR *xdrsp;
-       struct nfhret *np;
+/* ARGSUSED */
+getufsopts(options, flagp)
+       char *options;
+       int *flagp;

 {
 {

-       if (!xdr_u_long(xdrsp, &(np->stat)))
-               return (0);
-       if (np->stat)
-               return (1);
-       return (xdr_opaque(xdrsp, (caddr_t)&(np->nfh), NFSX_FH));
+       return;
+}
+
+getexecopts(options, argv)
+       char *options;
+       char **argv;
+{
+       register int argc = 0;
+       register char *opt;
+
+       for (opt = strtok(options, ","); opt; opt = strtok((char *)NULL, ",")) {
+               if (opt[0] != '-')
+                       continue;
+               argv[argc++] = opt;
+               if (opt[2] == '\0' || opt[2] != '=')
+                       continue;
+               opt[2] = '\0';
+               argv[argc++] = &opt[3];
+       }
+       return (argc);
+}
+
+struct statfs *
+getmntpt(name)
+       char *name;
+{
+       long mntsize;
+       register long i;
+       struct statfs *mntbuf;
+
+       mntsize = getmntinfo(&mntbuf, MNT_NOWAIT);
+       for (i = 0; i < mntsize; i++) {
+               if (!strcmp(mntbuf[i].f_mntfromname, name) ||
+                   !strcmp(mntbuf[i].f_mntonname, name))
+                       return (&mntbuf[i]);
+       }
+       return ((struct statfs *)0);
+}
+
+static int skipvfs;
+
+badvfstype(vfstype, vfslist)
+       short vfstype;
+       char **vfslist;
+{
+
+       if (vfslist == 0)
+               return(0);
+       while (*vfslist) {
+               if (vfstype == getmnttype(*vfslist))
+                       return(skipvfs);
+               vfslist++;
+       }
+       return (!skipvfs);
+}
+
+badvfsname(vfsname, vfslist)
+       char *vfsname;
+       char **vfslist;
+{
+
+       if (vfslist == 0)
+               return(0);
+       while (*vfslist) {
+               if (strcmp(vfsname, *vfslist) == 0)
+                       return(skipvfs);
+               vfslist++;
+       }
+       return (!skipvfs);
+}
+
+char **
+makevfslist(fslist)
+       char *fslist;
+{
+       register char **av, *nextcp;
+       register int i;
+
+       if (fslist == NULL)
+               return (NULL);
+       if (fslist[0] == 'n' && fslist[1] == 'o') {
+               fslist += 2;
+               skipvfs = 1;
+       }
+       for (i = 0, nextcp = fslist; *nextcp; nextcp++)
+               if (*nextcp == ',')
+                       i++;
+       av = (char **)malloc((size_t)(i+2) * sizeof(char *));
+       if (av == NULL)
+               return (NULL);
+       nextcp = fslist;
+       i = 0;
+       av[i++] = nextcp;
+       while (nextcp = index(nextcp, ',')) {
+               *nextcp++ = '\0';
+               av[i++] = nextcp;
+       }
+       av[i++] = 0;
+       return (av);
+}
+
+#ifdef NFS
+exclusive(a, b)
+       char *a, *b;
+{
+
+       (void) fprintf(stderr, "mount: Options %s, %s mutually exclusive\n",
+           a, b);
+       exit(1);

 }
 
 /*
  * Handle the getoption arg.
  * Essentially update "opflags", "retrycnt" and "nfsargs"
  */
 }
 
 /*
  * Handle the getoption arg.
  * Essentially update "opflags", "retrycnt" and "nfsargs"
  */

-getoptions(optarg, nfsargsp, opflagsp, retrycntp)
+getnfsopts(optarg, nfsargsp, opflagsp, retrycntp)

        char *optarg;
        char *optarg;

-       struct nfs_args *nfsargsp;
+       register struct nfs_args *nfsargsp;

        int *opflagsp;
        int *retrycntp;
 {
        int *opflagsp;
        int *retrycntp;
 {


@@ -435,8 +624,7 @@ getoptions(optarg, nfsargsp, opflagsp, retrycntp)
        int num;
        char *nump;
 
        int num;
        char *nump;
 

-       cp = optarg;
-       while (cp != NULL && *cp != '\0') {
+       for (cp = optarg; cp != NULL && *cp != '\0'; cp = nextcp) {

                if ((nextcp = index(cp, ',')) != NULL)
                        *nextcp++ = '\0';
                if ((nump = index(cp, '=')) != NULL) {
                if ((nextcp = index(cp, ',')) != NULL)
                        *nextcp++ = '\0';
                if ((nump = index(cp, '=')) != NULL) {


@@ -450,9 +638,21 @@ getoptions(optarg, nfsargsp, opflagsp, retrycntp)
                if (!strcmp(cp, "bg")) {
                        *opflagsp |= BGRND;
                } else if (!strcmp(cp, "soft")) {
                if (!strcmp(cp, "bg")) {
                        *opflagsp |= BGRND;
                } else if (!strcmp(cp, "soft")) {

+                       if (nfsargsp->flags & NFSMNT_SPONGY)
+                               exclusive("soft, spongy");

                        nfsargsp->flags |= NFSMNT_SOFT;
                        nfsargsp->flags |= NFSMNT_SOFT;

+               } else if (!strcmp(cp, "spongy")) {
+                       if (nfsargsp->flags & NFSMNT_SOFT)
+                               exclusive("soft, spongy");
+                       nfsargsp->flags |= NFSMNT_SPONGY;
+               } else if (!strcmp(cp, "compress")) {
+                       nfsargsp->flags |= NFSMNT_COMPRESS;

                } else if (!strcmp(cp, "intr")) {
                        nfsargsp->flags |= NFSMNT_INT;
                } else if (!strcmp(cp, "intr")) {
                        nfsargsp->flags |= NFSMNT_INT;

+               } else if (!strcmp(cp, "tcp")) {
+                       nfsargsp->sotype = SOCK_STREAM;
+               } else if (!strcmp(cp, "noconn")) {
+                       nfsargsp->flags |= NFSMNT_NOCONN;

                } else if (!strcmp(cp, "retry") && num > 0) {
                        *retrycntp = num;
                } else if (!strcmp(cp, "rsize") && num > 0) {
                } else if (!strcmp(cp, "retry") && num > 0) {
                        *retrycntp = num;
                } else if (!strcmp(cp, "rsize") && num > 0) {


@@ -468,7 +668,129 @@ getoptions(optarg, nfsargsp, opflagsp, retrycntp)
                        nfsargsp->retrans = num;
                        nfsargsp->flags |= NFSMNT_RETRANS;
                }
                        nfsargsp->retrans = num;
                        nfsargsp->flags |= NFSMNT_RETRANS;
                }

-               cp = nextcp;

        }
        }

+       if (nfsargsp->sotype == SOCK_DGRAM) {
+               if (nfsargsp->rsize > NFS_MAXDGRAMDATA)
+                       nfsargsp->rsize = NFS_MAXDGRAMDATA;
+               if (nfsargsp->wsize > NFS_MAXDGRAMDATA)
+                       nfsargsp->wsize = NFS_MAXDGRAMDATA;
+       }
+}
+
+char *
+getnfsargs(spec, nfsargsp)
+       char *spec;
+       struct nfs_args *nfsargsp;
+{
+       register CLIENT *clp;
+       struct hostent *hp;
+       static struct sockaddr_in saddr;
+       struct timeval pertry, try;
+       enum clnt_stat clnt_stat;
+       int so = RPC_ANYSOCK;
+       char *fsp, *hostp, *delimp;
+       u_short tport;
+       static struct nfhret nfhret;
+       static char nam[MNAMELEN + 1];
+       char buf[MAXPATHLEN + 1];
+
+       strncpy(buf, spec, MAXPATHLEN);
+       buf[MAXPATHLEN] = '\0';
+       strncpy(nam, spec, MNAMELEN);
+       nam[MNAMELEN] = '\0';
+       if ((delimp = index(buf, '@')) != NULL) {
+               hostp = delimp + 1;
+               fsp = buf;
+       } else if ((delimp = index(buf, ':')) != NULL) {
+               hostp = buf;
+               fsp = delimp + 1;
+       } else {
+               (void) fprintf(stderr,
+                   "mount: No <host>:<dirpath> or <dirpath>@<host> spec\n");
+               return (0);
+       }
+       *delimp = '\0';
+       if ((hp = gethostbyname(hostp)) == NULL) {
+               (void) fprintf(stderr, "mount: Can't get net id for host\n");
+               return (0);
+       }
+       bcopy(hp->h_addr, (caddr_t)&saddr.sin_addr, hp->h_length);
+       nfhret.stat = ETIMEDOUT;        /* Mark not yet successful */
+       while (retrycnt > 0) {
+               saddr.sin_family = AF_INET;
+               saddr.sin_port = htons(PMAPPORT);
+               if ((tport = pmap_getport(&saddr, RPCPROG_NFS,
+                   NFS_VER2, IPPROTO_UDP)) == 0) {
+                       if ((opflags & ISBGRND) == 0)
+                               clnt_pcreateerror("NFS Portmap");
+               } else {
+                       saddr.sin_port = 0;
+                       pertry.tv_sec = 10;
+                       pertry.tv_usec = 0;
+                       if ((clp = clntudp_create(&saddr, RPCPROG_MNT,
+                           RPCMNT_VER1, pertry, &so)) == NULL) {
+                               if ((opflags & ISBGRND) == 0)
+                                       clnt_pcreateerror("Cannot MNT PRC");
+                       } else {
+                               clp->cl_auth = authunix_create_default();
+                               try.tv_sec = 10;
+                               try.tv_usec = 0;
+                               clnt_stat = clnt_call(clp, RPCMNT_MOUNT,
+                                   xdr_dir, fsp, xdr_fh, &nfhret, try);
+                               if (clnt_stat != RPC_SUCCESS) {
+                                       if ((opflags & ISBGRND) == 0)
+                                               clnt_perror(clp, "Bad MNT RPC");
+                               } else {
+                                       auth_destroy(clp->cl_auth);
+                                       clnt_destroy(clp);
+                                       retrycnt = 0;
+                               }
+                       }
+               }
+               if (--retrycnt > 0) {
+                       if (opflags & BGRND) {
+                               opflags &= ~BGRND;
+                               if (fork())
+                                       return (0);
+                               else
+                                       opflags |= ISBGRND;
+                       } 
+                       sleep(10);
+               }
+       }
+       if (nfhret.stat) {
+               if (opflags & ISBGRND)
+                       exit(1);
+               (void) fprintf(stderr, "Mount RPC error on %s: ", spec);
+               errno = nfhret.stat;
+               perror((char *)NULL);
+               return (0);
+       }
+       saddr.sin_port = htons(tport);
+       nfsargsp->addr = (struct sockaddr *) &saddr;
+       nfsargsp->fh = &nfhret.nfh;
+       nfsargsp->hostname = nam;
+       return ((caddr_t)nfsargsp);

 }
 }

-#endif
+
+/*
+ * xdr routines for mount rpc's
+ */
+xdr_dir(xdrsp, dirp)
+       XDR *xdrsp;
+       char *dirp;
+{
+       return (xdr_string(xdrsp, &dirp, RPCMNT_PATHLEN));
+}
+
+xdr_fh(xdrsp, np)
+       XDR *xdrsp;
+       struct nfhret *np;
+{
+       if (!xdr_u_long(xdrsp, &(np->stat)))
+               return (0);
+       if (np->stat)
+               return (1);
+       return (xdr_opaque(xdrsp, (caddr_t)&(np->nfh), NFSX_FH));
+}
+#endif /* NFS */