X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fnfsumount.c;h=18cd14b1091084cebf62e60ae9ef7b597cf91e3b;hp=81fd2640cb4e7cb695062fad5ac425f4513ea694;hb=264c9705f48e145f9cb3575a953336dcd2161e49;hpb=28e4224b9bbfc355c83e17df74c47221afacd560 diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c index 81fd264..18cd14b 100644 --- a/utils/mount/nfsumount.c +++ b/utils/mount/nfsumount.c @@ -35,6 +35,7 @@ #include "mount.h" #include "nfsumount.h" #include "error.h" +#include "network.h" #if !defined(MNT_FORCE) /* dare not try to include -- lots of errors */ @@ -46,55 +47,13 @@ #endif extern char *progname; -extern int nfs_mount_version; extern int nomtab; extern int verbose; int force; int lazy; int remount; -extern int find_kernel_nfs_mount_version(void); -extern int probe_mntport(clnt_addr_t *); -extern int nfs_gethostbyname(const char *, struct sockaddr_in *); - -static inline enum clnt_stat -nfs_umount(dirpath *argp, CLIENT *clnt) -{ - return clnt_call(clnt, MOUNTPROC_UMNT, - (xdrproc_t) xdr_dirpath, (caddr_t)argp, - (xdrproc_t) xdr_void, NULL, - TIMEOUT); -} - -int nfs_call_umount(clnt_addr_t *mnt_server, dirpath *argp) -{ - CLIENT *clnt; - enum clnt_stat res = 0; - int msock; - - switch (mnt_server->pmap.pm_vers) { - case 3: - case 2: - case 1: - if (!probe_mntport(mnt_server)) - goto out_bad; - clnt = mnt_openclnt(mnt_server, &msock); - if (!clnt) - goto out_bad; - res = nfs_umount(argp, clnt); - mnt_closeclnt(clnt, msock); - if (res == RPC_SUCCESS) - return 1; - break; - default: - res = 1; - break; - } - out_bad: - return res; -} - -int del_mtab(const char *spec, const char *node) +static int del_mtab(const char *spec, const char *node) { int umnt_err, res; @@ -127,9 +86,8 @@ int del_mtab(const char *spec, const char *node) MS_MGC_VAL | MS_REMOUNT | MS_RDONLY, NULL); if (res == 0) { struct mntent remnt; - fprintf(stderr, - _("umount: %s busy - remounted read-only\n"), - spec); + nfs_error(_("%s: %s busy - remounted read-only"), + progname, spec); remnt.mnt_type = remnt.mnt_fsname = NULL; remnt.mnt_dir = xstrdup(node); remnt.mnt_opts = xstrdup("ro"); @@ -138,9 +96,8 @@ int del_mtab(const char *spec, const char *node) return 0; } else if (errno != EBUSY) { /* hmm ... */ perror("remount"); - fprintf(stderr, - _("umount: could not remount %s read-only\n"), - spec); + nfs_error(_("%s: could not remount %s read-only"), + progname, spec); } } @@ -161,13 +118,13 @@ int del_mtab(const char *spec, const char *node) if (umnt_err) umount_error(umnt_err, node); - return 1; + return EX_FILEIO; } /* * Returns 1 if everything went well, else 0. */ -int _nfsumount(const char *spec, char *opts) +static int do_nfs_umount(const char *spec, char *opts) { char *hostname; char *dirname; @@ -176,7 +133,6 @@ int _nfsumount(const char *spec, char *opts) struct pmap *pmap = &mnt_server.pmap; char *p; - nfs_mount_version = find_kernel_nfs_mount_version(); if (spec == NULL || (p = strchr(spec,':')) == NULL) goto out_bad; hostname = xstrndup(spec, p-spec); @@ -207,7 +163,6 @@ int _nfsumount(const char *spec, char *opts) pmap->pm_prog = MOUNTPROG; pmap->pm_vers = MOUNTVERS_NFSV3; - pmap->pm_prot = IPPROTO_TCP; if (opts && (p = strstr(opts, "mountprog=")) && isdigit(*(p+10))) pmap->pm_prog = atoi(p+10); if (opts && (p = strstr(opts, "mountport=")) && isdigit(*(p+10))) @@ -229,7 +184,7 @@ int _nfsumount(const char *spec, char *opts) goto out_bad; return nfs_call_umount(&mnt_server, &dirname); out_bad: - fprintf(stderr, "%s: %s: not found or not mounted\n", progname, spec); + nfs_error(_("%s: %s: not found or not mounted"), progname, spec); return 0; } @@ -243,7 +198,7 @@ static struct option umount_longopts[] = { NULL, 0, 0, 0 } }; -void umount_usage() +static void umount_usage(void) { printf("usage: %s dir [-fvnrlh]\n", progname); printf("options:\n\t-f\t\tforce unmount\n"); @@ -260,6 +215,11 @@ int nfsumount(int argc, char *argv[]) char *spec; struct mntentchn *mc; + if (argc < 2) { + umount_usage(); + return EX_USAGE; + } + spec = argv[1]; argv += 1; @@ -288,17 +248,17 @@ int nfsumount(int argc, char *argv[]) case 'h': default: umount_usage(); - return 0; + return EX_USAGE; } } if (optind != argc) { umount_usage(); - return 0; + return EX_USAGE; } if (spec == NULL || (*spec != '/' && strchr(spec,':') == NULL)) { - printf(_("umount: %s: not found\n"), spec); - return 0; + nfs_error(_("%s: %s: not found\n"), progname, spec); + return EX_USAGE; } if (*spec == '/') @@ -310,9 +270,9 @@ int nfsumount(int argc, char *argv[]) if (mc && strcmp(mc->m.mnt_type, "nfs") != 0 && strcmp(mc->m.mnt_type, "nfs4") != 0) { - fprintf(stderr, "umount.nfs: %s on %s it not an nfs filesystem\n", - mc->m.mnt_fsname, mc->m.mnt_dir); - exit(1); + nfs_error(_("%s: %s on %s it not an nfs filesystem"), + progname, mc->m.mnt_fsname, mc->m.mnt_dir); + return EX_USAGE; } if (getuid() != 0) { @@ -324,9 +284,9 @@ int nfsumount(int argc, char *argv[]) return 0; only_root: - fprintf(stderr,"%s: You are not permitted to unmount %s\n", - progname, spec); - return 0; + nfs_error(_("%s: You are not permitted to unmount %s"), + progname, spec); + return EX_USAGE; } if (hasmntopt(&mc->m, "users") == NULL) { char *opt = hasmntopt(&mc->m, "user"); @@ -352,14 +312,13 @@ int nfsumount(int argc, char *argv[]) ret = 0; if (mc) { if (!lazy) - _nfsumount(mc->m.mnt_fsname, mc->m.mnt_opts); + do_nfs_umount(mc->m.mnt_fsname, mc->m.mnt_opts); ret = del_mtab(mc->m.mnt_fsname, mc->m.mnt_dir); } else if (*spec != '/') { if (!lazy) - _nfsumount(spec, "tcp,v3"); + do_nfs_umount(spec, "tcp,v3"); } else ret = del_mtab(NULL, spec); - return(ret); + return ret; } -