umount.nfs: make umount_usage() static

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

diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c
index 1b3c8d105daba1e05bca2c592b4825f9930a72d1..3d387c11e8c3a01b32fbab9004dcbe20f94c9b7a 100644 (file)
--- a/utils/mount/nfsumount.c
+++ b/utils/mount/nfsumount.c
@@ -123,9 +123,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");
@@ -134,9 +133,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);
                 }
         }
 
@@ -202,7 +200,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)))
@@ -224,7 +221,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;
 }
 
@@ -238,7 +235,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");
@@ -255,6 +252,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;
@@ -283,17 +285,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 == '/')
@@ -305,8 +307,8 @@ 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);
+               nfs_error(_("%s: %s on %s it not an nfs filesystem"),
+                               progname, mc->m.mnt_fsname, mc->m.mnt_dir);
                return EX_USAGE;
        }
 
@@ -319,9 +321,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");
@@ -357,4 +359,3 @@ int nfsumount(int argc, char *argv[])
 
        return ret;
 }
-