#include "nfs_mount.h"
#include "nfs4_mount.h"
-#include "nfsumount.h"
#include "mount.h"
#include "error.h"
#include "network.h"
static void print_one(char *spec, char *node, char *type, char *opts)
{
- if (verbose) {
- printf("%s on %s type %s", spec, node, type);
+ if (!verbose)
+ return;
- if (opts != NULL)
- printf(" (%s)", opts);
-
- printf("\n");
- }
+ if (opts)
+ printf(_("%s on %s type %s (%s)\n"), spec, node, type, opts);
+ else
+ printf(_("%s on %s type %s\n"), spec, node, type);
}
/*
return result;
}
-void mount_usage()
+void mount_usage(void)
{
- printf("usage: %s remotetarget dir [-rvVwfnh] [-o nfsoptions]\n",
+ printf(_("usage: %s remotetarget dir [-rvVwfnh] [-o nfsoptions]\n"),
progname);
- printf("options:\n");
- printf("\t-r\t\tMount file system readonly\n");
- printf("\t-v\t\tVerbose\n");
- printf("\t-V\t\tPrint version\n");
- printf("\t-w\t\tMount file system read-write\n");
- printf("\t-f\t\tFake mount, do not actually mount\n");
- printf("\t-n\t\tDo not update /etc/mtab\n");
- printf("\t-s\t\tTolerate sloppy mount options rather than failing.\n");
- printf("\t-h\t\tPrint this help\n");
- printf("\tnfsoptions\tRefer to mount.nfs(8) or nfs(5)\n\n");
+ printf(_("options:\n"));
+ printf(_("\t-r\t\tMount file system readonly\n"));
+ printf(_("\t-v\t\tVerbose\n"));
+ printf(_("\t-V\t\tPrint version\n"));
+ printf(_("\t-w\t\tMount file system read-write\n"));
+ printf(_("\t-f\t\tFake mount, do not actually mount\n"));
+ printf(_("\t-n\t\tDo not update /etc/mtab\n"));
+ printf(_("\t-s\t\tTolerate sloppy mount options rather than failing.\n"));
+ printf(_("\t-h\t\tPrint this help\n"));
+ 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)
discover_nfs_mount_data_version();
- if(!strncmp(progname, "umount", strlen("umount"))) {
- if(argc < 2) {
- umount_usage();
- exit(EX_USAGE);
- }
+ if(!strncmp(progname, "umount", strlen("umount")))
exit(nfsumount(argc, argv));
- }
if (argv[1] && argv[1][0] == '-') {
if(argv[1][1] == 'V')
}
if (strcmp(fs_type, "nfs4") == 0)
- mnt_err = nfs4mount(spec, mount_point, flags, &extra_opts, fake);
+ mnt_err = nfs4mount(spec, mount_point, flags,
+ &extra_opts, fake, 0);
else
- mnt_err = nfsmount(spec, mount_point, flags, &extra_opts, fake);
+ mnt_err = nfsmount(spec, mount_point, flags,
+ &extra_opts, fake, 0);
if (mnt_err)
exit(EX_FAIL);