#include "nls.h"
#include "mount_constants.h"
#include "nfs_paths.h"
+#include "nfs_mntent.h"
#include "nfs_mount.h"
#include "nfs4_mount.h"
#include "mount.h"
#include "error.h"
#include "network.h"
+#include "stropts.h"
char *progname;
int nfs_mount_data_version;
int nomtab;
int verbose;
int sloppy;
+int string;
#define FOREGROUND (0)
#define BACKGROUND (1)
}
if (nfs_mount_data_version > NFS_MOUNT_VERSION)
nfs_mount_data_version = NFS_MOUNT_VERSION;
+ else
+ if (kernel_version > MAKE_VERSION(2, 6, 22))
+ string++;
}
static void print_one(char *spec, char *node, char *type, char *opts)
int flags, char *opts, int freq, int pass)
{
struct mntent ment;
- FILE *mtab;
+ mntFILE *mtab;
int result = EX_FILEIO;
ment.mnt_fsname = spec;
if (flags & MS_REMOUNT) {
update_mtab(ment.mnt_dir, &ment);
- return 0;
+ free(ment.mnt_opts);
+ return EX_SUCCESS;
}
lock_mtab();
- if ((mtab = setmntent(MOUNTED, "a+")) == NULL) {
- unlock_mtab();
+ mtab = nfs_setmntent(MOUNTED, "a+");
+ if (mtab == NULL || mtab->mntent_fp == NULL) {
nfs_error(_("Can't open mtab: %s"),
strerror(errno));
goto fail_unlock;
}
- if (addmntent(mtab, &ment) == 1) {
+ if (nfs_addmntent(mtab, &ment) == 1) {
nfs_error(_("Can't write mount entry to mtab: %s"),
strerror(errno));
goto fail_close;
}
- if (fchmod(fileno(mtab), 0644) == -1) {
+ if (fchmod(fileno(mtab->mntent_fp), 0644) == -1) {
nfs_error(_("Can't set permissions on mtab: %s"),
strerror(errno));
goto fail_close;
}
- result = 0;
+ result = EX_SUCCESS;
fail_close:
- endmntent(mtab);
+ nfs_endmntent(mtab);
fail_unlock:
unlock_mtab();
+ free(ment.mnt_opts);
return result;
}
void mount_usage(void)
{
- printf(_("usage: %s remotetarget dir [-rvVwfnsh] [-o nfsoptions]\n"),
+ printf(_("usage: %s remotetarget dir [-rvVwfnsih] [-o nfsoptions]\n"),
progname);
printf(_("options:\n"));
printf(_("\t-r\t\tMount file system readonly\n"));
{
int ret;
- if (strcmp(fs_type, "nfs4") == 0)
- ret = nfs4mount(spec, mount_point, flags,
- extra_opts, fake, bg);
- else
- ret = nfsmount(spec, mount_point, flags,
- extra_opts, fake, bg);
+ if (string)
+ ret = nfsmount_string(spec, mount_point, fs_type, flags,
+ extra_opts, fake, bg);
+ else {
+ if (strcmp(fs_type, "nfs4") == 0)
+ ret = nfs4mount(spec, mount_point, flags,
+ extra_opts, fake, bg);
+ else
+ ret = nfsmount(spec, mount_point, flags,
+ extra_opts, fake, bg);
+ }
if (ret)
return ret;
printf("%s ("PACKAGE_STRING")\n", progname);
else
mount_usage();
- exit(0);
+ exit(EX_SUCCESS);
}
if ((argc < 3)) {
break;
case 'V':
printf("%s: ("PACKAGE_STRING")\n", progname);
- return 0;
+ exit(EX_SUCCESS);
case 'w':
flags &= ~MS_RDONLY;
break;
case 'h':
default:
mount_usage();
- exit(EX_USAGE);
+ goto out_usage;
}
}
*/
if (optind != argc - 2) {
mount_usage();
- exit(EX_USAGE);
+ goto out_usage;
}
if (strcmp(progname, "mount.nfs4") == 0)
strcmp(mc->m.mnt_type, fs_type) != 0) {
nfs_error(_("%s: permission denied: no match for %s "
"found in /etc/fstab"), progname, mount_point);
- exit(EX_USAGE);
+ goto out_usage;
}
/*
mount_point = canonicalize(mount_point);
if (!mount_point) {
nfs_error(_("%s: no mount point provided"), progname);
- exit(EX_USAGE);
+ goto out_usage;
}
if (mount_point[0] != '/') {
nfs_error(_("%s: unrecognized mount point %s"),
mnt_err = try_mount(spec, mount_point, flags, fs_type, &extra_opts,
mount_opts, fake, nomtab, FOREGROUND);
if (mnt_err == EX_BG) {
- printf(_("mount: backgrounding \"%s\"\n"), spec);
+ printf(_("%s: backgrounding \"%s\"\n"),
+ progname, spec);
fflush(stdout);
/*
- * Parent exits immediately with success. Make
- * sure not to free "mount_point"
+ * Parent exits immediately with success.
*/
- if (fork() > 0)
- exit(0);
+ if (daemon(0, 0)) {
+ nfs_error(_("%s: failed to start "
+ "background process: %s\n"),
+ progname, strerror(errno));
+ exit(EX_FAIL);
+ }
mnt_err = try_mount(spec, mount_point, flags, fs_type,
&extra_opts, mount_opts, fake,
if (verbose && mnt_err)
printf(_("%s: giving up \"%s\"\n"),
progname, spec);
- exit(0);
}
out:
+ free(mount_opts);
+ free(extra_opts);
free(mount_point);
exit(mnt_err);
+
+out_usage:
+ free(mount_opts);
+ exit(EX_USAGE);
}