X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fnfsmount.c;h=6371d77e4d43ec718d3fa749fd25d4cd02ed636a;hp=a59d2c29271acda8b1a8975c55087f43aff7a21f;hb=a574c7558e33f172b6dfee53ee8df9e59c84c7b5;hpb=6734ef89f4618f84e26f847b075f65f62ef086cf

diff --git a/utils/mount/nfsmount.c b/utils/mount/nfsmount.c
index a59d2c2..6371d77 100644
--- a/utils/mount/nfsmount.c
+++ b/utils/mount/nfsmount.c
@@ -23,7 +23,7 @@
  *
  * 1999-02-22 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL>
  * - added Native Language Support
- * 
+ *
  * Modified by Olaf Kirch and Trond Myklebust for new NFS code,
  * plus NFSv3 stuff.
  *
@@ -93,7 +93,7 @@ extern char *progname;
 extern int verbose;
 extern int sloppy;
 
-extern int linux_version_code();
+extern int linux_version_code(void);
 
 static inline enum clnt_stat
 nfs3_mount(CLIENT *clnt, mnt3arg_t *mnt3arg, mnt3res_t *mnt3res)
@@ -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) {
-					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;
@@ -314,8 +315,9 @@ parse_options(char *old_opts, struct nfs_mount_data *data,
 				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
@@ -339,9 +341,9 @@ parse_options(char *old_opts, struct nfs_mount_data *data,
 				val = 0;
 				opt += 2;
 			}
-			if (!strcmp(opt, "bg")) 
+			if (!strcmp(opt, "bg"))
 				*bg = val;
-			else if (!strcmp(opt, "fg")) 
+			else if (!strcmp(opt, "fg"))
 				*bg = !val;
 			else if (!strcmp(opt, "soft")) {
 				data->flags &= ~NFS_MOUNT_SOFT;
@@ -427,15 +429,17 @@ parse_options(char *old_opts, struct nfs_mount_data *data,
 			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) {
-			printf(_("mount: excessively long option argument\n"));
+			nfs_error(_("%s: excessively long option argument"),
+					progname);
 			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:
-	printf(_("Bad nfs mount parameter: %s\n"), opt);
+	nfs_error(_("%s: Bad nfs mount parameter: %s\n"), progname, opt);
  out_bad:
 	return 0;
 }
@@ -500,7 +504,7 @@ nfsmount(const char *spec, const char *node, int flags,
 	clnt_addr_t mnt_server = { &mounthost, };
 	clnt_addr_t nfs_server = { &hostname, };
 	struct sockaddr_in *nfs_saddr = &nfs_server.saddr;
-	struct pmap  *mnt_pmap = &mnt_server.pmap, 
+	struct pmap  *mnt_pmap = &mnt_server.pmap,
 		     *nfs_pmap = &nfs_server.pmap;
 	struct pmap  save_mnt, save_nfs;
 
@@ -744,7 +748,7 @@ nfsmount(const char *spec, const char *node, int flags,
 #if NFS_MOUNT_VERSION >= 5
 		mountres = &mntres.nfsv3.mountres3_u.mountinfo;
 		i = mountres->auth_flavors.auth_flavors_len;
-		if (i <= 0) 
+		if (i <= 0)
 			goto noauth_flavors;
 
 		flavor = mountres->auth_flavors.auth_flavors_val;