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

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

diff --git a/utils/mount/nfs4mount.c b/utils/mount/nfs4mount.c
index 90d5c1e64bb873401bcf7c5ba4c150b3c6afc618..94f1b4bdb27a3abcfd95a80ff00a2a25aee199c2 100644 (file)
--- a/utils/mount/nfs4mount.c
+++ b/utils/mount/nfs4mount.c
@@ -39,13 +39,13 @@
 
 #include "pseudoflavors.h"
 #include "nls.h"
-#include "conn.h"
 #include "xcommon.h"
 
 #include "mount_constants.h"
 #include "nfs4_mount.h"
 #include "nfs_mount.h"
 #include "error.h"
+#include "network.h"
 
 #if defined(VAR_LOCK_DIR)
 #define DEFAULT_DIR VAR_LOCK_DIR
@@ -70,7 +70,7 @@ char *GSSDLCK = DEFAULT_DIR "/rpcgssd";
                if (access(GSSDLCK, F_OK)) { \
                        printf(_("Warning: rpc.gssd appears not to be running.\n")); \
                } \
-} while(0); 
+} while(0);
 
 #ifndef NFS_PORT
 #define NFS_PORT 2049
@@ -304,9 +304,9 @@ int nfs4mount(const char *spec, const char *node, int flags,
                                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"))
                                soft = val;
@@ -321,8 +321,8 @@ int nfs4mount(const char *spec, const char *node, int flags,
                        else if (!strcmp(opt, "sharecache"))
                                unshared = !val;
                        else if (!sloppy) {
-                               printf(_("unknown nfs mount option: "
-                                        "%s%s\n"), val ? "" : "no", opt);
+                               printf(_("unknown nfs mount option: %s%s\n"),
+                                               val ? "" : "no", opt);
                                goto fail;
                        }
                }