mount.nfs: Support double-wide characters in printed strings

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

diff --git a/utils/mount/nfsmount.c b/utils/mount/nfsmount.c
index 6371d77e4d43ec718d3fa749fd25d4cd02ed636a..a56bfe1ff2e66e4b280b258e830eaf2ca443c757 100644 (file)
--- 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"))
@@ -434,7 +431,7 @@ parse_options(char *old_opts, struct nfs_mount_data *data,
                                                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) {