mount.nfs: mnt_freq and mnt_pass are always zero

[nfs-utils.git] / utils / mount / mount.c

diff --git a/utils/mount/mount.c b/utils/mount/mount.c
index a7539324122c68b1281ac9b127a9ed3b5add0a90..a19af53ede893d92a5efb7b53b65268dba1c5769 100644 (file)
--- a/utils/mount/mount.c
+++ b/utils/mount/mount.c
@@ -24,12 +24,12 @@
 
 #include <unistd.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/mount.h>
-#include <sys/utsname.h>
 #include <getopt.h>
 #include <mntent.h>
 #include <pwd.h>
@@ -38,6 +38,7 @@
 #include "xcommon.h"
 #include "nls.h"
 #include "mount_constants.h"
+#include "mount_config.h"
 #include "nfs_paths.h"
 #include "nfs_mntent.h"
 
@@ -45,8 +46,8 @@
 #include "nfs4_mount.h"
 #include "mount.h"
 #include "error.h"
-#include "network.h"
 #include "stropts.h"
+#include "version.h"
 
 char *progname;
 int nfs_mount_data_version;
@@ -146,24 +147,8 @@ static const struct opt_map opt_map[] = {
   { NULL,      0, 0, 0         }
 };
 
-#define MAKE_VERSION(p,q,r)    (65536 * (p) + 256 * (q) + (r))
-
 static void parse_opts(const char *options, int *flags, char **extra_opts);
 
-int linux_version_code(void)
-{
-       struct utsname my_utsname;
-       int p, q, r;
-
-       if (uname(&my_utsname) == 0) {
-               p = atoi(strtok(my_utsname.release, "."));
-               q = atoi(strtok(NULL, "."));
-               r = atoi(strtok(NULL, "."));
-               return MAKE_VERSION(p,q,r);
-       }
-       return 0;
-}
-
 /*
  * Choose the version of the nfs_mount_data structure that is appropriate
  * for the kernel that is doing the mount.
@@ -173,7 +158,7 @@ int linux_version_code(void)
  */
 static void discover_nfs_mount_data_version(void)
 {
-       int kernel_version = linux_version_code();
+       unsigned int kernel_version = linux_version_code();
 
        if (kernel_version) {
                if (kernel_version < MAKE_VERSION(2, 1, 32))
@@ -224,7 +209,7 @@ static char *fix_opts_string(int flags, const char *extra_opts)
        }
        if (flags & MS_USERS)
                new_opts = xstrconcat3(new_opts, ",users", "");
-       
+
        for (om = opt_map; om->opt != NULL; om++) {
                if (om->skip)
                        continue;
@@ -239,6 +224,20 @@ static char *fix_opts_string(int flags, const char *extra_opts)
        return new_opts;
 }
 
+static void
+init_mntent(struct mntent *mnt, char *fsname, char *dir, char *type,
+               int flags, char *opts)
+{
+       mnt->mnt_fsname = fsname;
+       mnt->mnt_dir    = dir;
+       mnt->mnt_type   = type;
+       mnt->mnt_opts   = fix_opts_string(flags & ~MS_NOMTAB, opts);
+
+       /* these are always zero for NFS */
+       mnt->mnt_freq   = 0;
+       mnt->mnt_passno = 0;
+}
+
 /* Create mtab with a root entry.  */
 static void
 create_mtab (void) {
@@ -260,11 +259,8 @@ create_mtab (void) {
        if ((fstab = getfsfile ("/")) || (fstab = getfsfile ("root"))) {
                char *extra_opts;
                parse_opts (fstab->m.mnt_opts, &flags, &extra_opts);
-               mnt.mnt_dir = "/";
-               mnt.mnt_fsname = xstrdup(fstab->m.mnt_fsname);
-               mnt.mnt_type = fstab->m.mnt_type;
-               mnt.mnt_opts = fix_opts_string (flags, extra_opts);
-               mnt.mnt_freq = mnt.mnt_passno = 0;
+               init_mntent(&mnt, xstrdup(fstab->m.mnt_fsname), "/",
+                               fstab->m.mnt_type, flags, extra_opts);
                free(extra_opts);
 
                if (nfs_addmntent (mfp, &mnt) == 1) {
@@ -288,17 +284,12 @@ create_mtab (void) {
 }
 
 static int add_mtab(char *spec, char *mount_point, char *fstype,
-                       int flags, char *opts, int freq, int pass)
+                       int flags, char *opts)
 {
        struct mntent ment;
        int result = EX_SUCCESS;
 
-       ment.mnt_fsname = spec;
-       ment.mnt_dir = mount_point;
-       ment.mnt_type = fstype;
-       ment.mnt_opts = fix_opts_string(flags, opts);
-       ment.mnt_freq = freq;
-       ment.mnt_passno = pass;
+       init_mntent(&ment, spec, mount_point, fstype, flags, opts);
 
        if (!nomtab && mtab_does_not_exist()) {
                if (verbose > 1)
@@ -336,7 +327,7 @@ static int add_mtab(char *spec, char *mount_point, char *fstype,
        return result;
 }
 
-void mount_usage(void)
+static void mount_usage(void)
 {
        printf(_("usage: %s remotetarget dir [-rvVwfnsih] [-o nfsoptions]\n"),
                progname);
@@ -352,7 +343,7 @@ void mount_usage(void)
        printf(_("\tnfsoptions\tRefer to mount.nfs(8) or nfs(5)\n\n"));
 }
 
-static void parse_opt(const char *opt, int *mask, char *extra_opts, int len)
+static void parse_opt(const char *opt, int *mask, char *extra_opts, size_t len)
 {
        const struct opt_map *om;
 
@@ -386,7 +377,7 @@ static void parse_opts(const char *options, int *flags, char **extra_opts)
        if (options != NULL) {
                char *opts = xstrdup(options);
                char *opt, *p;
-               int len = strlen(opts) + 1;     /* include room for a null */
+               size_t len = strlen(opts) + 1;  /* include room for a null */
                int open_quote = 0;
 
                *extra_opts = xmalloc(len);
@@ -434,7 +425,7 @@ static int chk_mountpoint(char *mount_point)
 
 static int try_mount(char *spec, char *mount_point, int flags,
                        char *fs_type, char **extra_opts, char *mount_opts,
-                       int fake, int nomtab, int bg)
+                       int fake, int bg)
 {
        int ret;
 
@@ -456,9 +447,7 @@ static int try_mount(char *spec, char *mount_point, int flags,
        if (!fake)
                print_one(spec, mount_point, fs_type, mount_opts);
 
-       ret = add_mtab(spec, mount_point, fs_type, flags, *extra_opts,
-                       0, 0 /* these are always zero for NFS */ );
-       return ret;
+       return add_mtab(spec, mount_point, fs_type, flags, *extra_opts);
 }
 
 int main(int argc, char *argv[])
@@ -491,6 +480,8 @@ int main(int argc, char *argv[])
        spec = argv[1];
        mount_point = argv[2];
 
+       mount_config_init(progname);
+
        argv[2] = argv[0]; /* so that getopt error messages are correct */
        while ((c = getopt_long(argc - 2, argv + 2, "rvVwfno:hs",
                                longopts, NULL)) != -1) {
@@ -576,6 +567,10 @@ int main(int argc, char *argv[])
                mnt_err = EX_USAGE;
                goto out;
        }
+       /*
+        * Concatenate mount options from the configuration file
+        */
+       mount_opts = mount_config_opts(spec, mount_point, mount_opts);
 
        parse_opts(mount_opts, &flags, &extra_opts);
 
@@ -599,10 +594,13 @@ int main(int argc, char *argv[])
        }
 
        mnt_err = try_mount(spec, mount_point, flags, fs_type, &extra_opts,
-                               mount_opts, fake, nomtab, FOREGROUND);
+                               mount_opts, fake, FOREGROUND);
        if (mnt_err == EX_BG) {
                printf(_("%s: backgrounding \"%s\"\n"),
                        progname, spec);
+               printf(_("%s: mount options: \"%s\"\n"),
+                       progname, extra_opts);
+
                fflush(stdout);
 
                /*
@@ -617,7 +615,7 @@ int main(int argc, char *argv[])
 
                mnt_err = try_mount(spec, mount_point, flags, fs_type,
                                        &extra_opts, mount_opts, fake,
-                                       nomtab, BACKGROUND);
+                                       BACKGROUND);
                if (verbose && mnt_err)
                        printf(_("%s: giving up \"%s\"\n"),
                                progname, spec);