mount.nfs: fix more nits with error messages

Catch-all.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>

diff --git a/utils/mount/error.c b/utils/mount/error.c
index 62f6850660b11dab725d53a03094bf359b9cf70b..57608a586a8f12c41a6cf3e3645f49f33e916b7b 100644 (file)
--- a/utils/mount/error.c
+++ b/utils/mount/error.c
@@ -86,7 +86,7 @@ void mount_errors(char *server, int will_retry, int bg)
                        "mount to NFS server '%s' failed: ", server);
        else
                pos = snprintf(tmp, (erreob - tmp),
                        "mount to NFS server '%s' failed: ", server);
        else
                pos = snprintf(tmp, (erreob - tmp),

-                       "mount: mount to NFS server '%s' failed: ", server);
+                       "%s: mount to NFS server '%s' failed: ", server);

 
        tmp = &errbuf[pos];
        if (rpc_createerr.cf_stat == RPC_TIMEDOUT) {
 
        tmp = &errbuf[pos];
        if (rpc_createerr.cf_stat == RPC_TIMEDOUT) {

diff --git a/utils/mount/network.c b/utils/mount/network.c
index 8da57d9cb0bec897e812be76ff8ec96f90d28774..ab8cfb751a021989721074486f8c87791415e280 100644 (file)
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -106,12 +106,13 @@ int nfs_gethostbyname(const char *hostname, struct sockaddr_in *saddr)
        saddr->sin_family = AF_INET;
        if (!inet_aton(hostname, &saddr->sin_addr)) {
                if ((hp = gethostbyname(hostname)) == NULL) {
        saddr->sin_family = AF_INET;
        if (!inet_aton(hostname, &saddr->sin_addr)) {
                if ((hp = gethostbyname(hostname)) == NULL) {

-                       nfs_error(_("mount: can't get address for %s\n"),
-                               hostname);
+                       nfs_error(_("%s: can't get address for %s\n"),
+                                       progname, hostname);

                        return 0;
                } else {
                        if (hp->h_length > sizeof(*saddr)) {
                        return 0;
                } else {
                        if (hp->h_length > sizeof(*saddr)) {

-                               nfs_error(_("mount: got bad hp->h_length\n"));
+                               nfs_error(_("%s: got bad hp->h_length\n"),
+                                               progname);

                                hp->h_length = sizeof(*saddr);
                        }
                        memcpy(&saddr->sin_addr, hp->h_addr, hp->h_length);
                                hp->h_length = sizeof(*saddr);
                        }
                        memcpy(&saddr->sin_addr, hp->h_addr, hp->h_length);

diff --git a/utils/mount/nfsmount.c b/utils/mount/nfsmount.c
index b2b1992757fc261e713df02c29ba10e9f9fd0ae7..6371d77e4d43ec718d3fa749fd25d4cd02ed636a 100644 (file)
--- a/utils/mount/nfsmount.c
+++ b/utils/mount/nfsmount.c
@@ -273,7 +273,8 @@ parse_options(char *old_opts, struct nfs_mount_data *data,
                                char *secflavor = opteq+1;
                                /* see RFC 2623 */
                                if (nfs_mount_data_version < 5) {
                                char *secflavor = opteq+1;
                                /* see RFC 2623 */
                                if (nfs_mount_data_version < 5) {

-                                       printf(_("Warning: ignoring sec=%s option\n"), secflavor);
+                                       printf(_("Warning: ignoring sec=%s option\n"),
+                                                       secflavor);

                                        continue;
                                } else if (!strcmp(secflavor, "none"))
                                        data->pseudoflavor = AUTH_NONE;
                                        continue;
                                } else if (!strcmp(secflavor, "none"))
                                        data->pseudoflavor = AUTH_NONE;


@@ -314,8 +315,9 @@ parse_options(char *old_opts, struct nfs_mount_data *data,
                                int ctxlen = strlen(context);
 
                                if (ctxlen > NFS_MAX_CONTEXT_LEN) {
                                int ctxlen = strlen(context);
 
                                if (ctxlen > NFS_MAX_CONTEXT_LEN) {

-                                       printf(_("context parameter exceeds limit of %d\n"),
-                                                NFS_MAX_CONTEXT_LEN);
+                                       nfs_error(_("context parameter exceeds"
+                                                       " limit of %d"),
+                                                       NFS_MAX_CONTEXT_LEN);

                                        goto bad_parameter;
                                }
                                /* The context string is in the format of
                                        goto bad_parameter;
                                }
                                /* The context string is in the format of


@@ -427,15 +429,17 @@ parse_options(char *old_opts, struct nfs_mount_data *data,
                        bad_option:
                                if (sloppy)
                                        continue;
                        bad_option:
                                if (sloppy)
                                        continue;

-                               printf(_("Unsupported nfs mount option: "
-                                        "%s%s\n"), val ? "" : "no", opt);
+                               nfs_error(_("%s: Unsupported nfs mount option:"
+                                               " %s%s"), progname,
+                                               val ? "" : "no", opt);

                                goto out_bad;
                        }
                        sprintf(cbuf, val ? "%s,":"no%s,", opt);
                }
                len += strlen(cbuf);
                if (len >= opt_size) {
                                goto out_bad;
                        }
                        sprintf(cbuf, val ? "%s,":"no%s,", opt);
                }
                len += strlen(cbuf);
                if (len >= opt_size) {

-                       printf(_("mount: excessively long option argument\n"));
+                       nfs_error(_("%s: excessively long option argument"),
+                                       progname);

                        goto out_bad;
                }
                strcat(new_opts, cbuf);
                        goto out_bad;
                }
                strcat(new_opts, cbuf);


@@ -448,7 +452,7 @@ parse_options(char *old_opts, struct nfs_mount_data *data,
        }
        return 1;
  bad_parameter:
        }
        return 1;
  bad_parameter:

-       printf(_("Bad nfs mount parameter: %s\n"), opt);
+       nfs_error(_("%s: Bad nfs mount parameter: %s\n"), progname, opt);

  out_bad:
        return 0;
 }
  out_bad:
        return 0;
 }