X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fnfsmount.c;h=a56bfe1ff2e66e4b280b258e830eaf2ca443c757;hp=b2b1992757fc261e713df02c29ba10e9f9fd0ae7;hb=53a9b4a2ea971d5718ccfcc2f2825ff9af81cd23;hpb=5835b1eec5a1f1e463c0762c510c6643fa2bff62

diff --git a/utils/mount/nfsmount.c b/utils/mount/nfsmount.c
index b2b1992..a56bfe1 100644
--- a/utils/mount/nfsmount.c
+++ b/utils/mount/nfsmount.c
@@ -56,10 +56,8 @@
 #include <paths.h>
 #include <syslog.h>
 
-#include "conn.h"
 #include "xcommon.h"
 #include "mount.h"
-#include "nfsumount.h"
 #include "nfs_mount.h"
 #include "mount_constants.h"
 #include "nls.h"
@@ -192,7 +190,6 @@ parse_options(char *old_opts, struct nfs_mount_data *data,
 		if ((opteq = strchr(opt, '=')) && isdigit(opteq[1])) {
 			int val = atoi(opteq + 1);	
 			*opteq = '\0';
-/* printf("opt=%s\n", opt); */
 			if (!strcmp(opt, "rsize"))
 				data->rsize = val;
 			else if (!strcmp(opt, "wsize"))
@@ -273,7 +270,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 +312,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
@@ -427,15 +426,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);
+			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 +449,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;
 }