X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fnfs4mount.c;h=311e5a07b0b04c6ac4c42ed84fb47e0ab7f29161;hp=26a6896855db4c5bc4e959ab80fcb28e7f46eebf;hb=ab26cd622e1a5ef22be2df1f3176158b1505df30;hpb=d70bea17c3e6ef2ad5bd61b5e2c231f805d69e6e

diff --git a/utils/mount/nfs4mount.c b/utils/mount/nfs4mount.c
index 26a6896..311e5a0 100644
--- a/utils/mount/nfs4mount.c
+++ b/utils/mount/nfs4mount.c
@@ -18,6 +18,10 @@
  * - Moved to nfs-utils/utils/mount from util-linux/mount.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>
@@ -39,13 +43,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
@@ -166,7 +170,7 @@ static int get_my_ipv4addr(char *ip_addr, int len)
 }
 
 int nfs4mount(const char *spec, const char *node, int flags,
-	      char **extra_opts, int fake)
+	      char **extra_opts, int fake, int running_bg)
 {
 	static struct nfs4_mount_data data;
 	static char hostdir[1024];
@@ -321,8 +325,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;
 			}
 		}
@@ -367,14 +371,14 @@ int nfs4mount(const char *spec, const char *node, int flags,
 	data.host_addrlen = sizeof(server_addr);
 
 #ifdef NFS_MOUNT_DEBUG
-	printf("rsize = %d, wsize = %d, timeo = %d, retrans = %d\n",
+	printf(_("rsize = %d, wsize = %d, timeo = %d, retrans = %d\n"),
 	       data.rsize, data.wsize, data.timeo, data.retrans);
-	printf("acreg (min, max) = (%d, %d), acdir (min, max) = (%d, %d)\n",
+	printf(_("acreg (min, max) = (%d, %d), acdir (min, max) = (%d, %d)\n"),
 	       data.acregmin, data.acregmax, data.acdirmin, data.acdirmax);
-	printf("port = %d, bg = %d, retry = %d, flags = %.8x\n",
+	printf(_("port = %d, bg = %d, retry = %d, flags = %.8x\n"),
 	       ntohs(server_addr.sin_port), bg, retry, data.flags);
-	printf("soft = %d, intr = %d, nocto = %d, noac = %d, "
-	       "nosharecache = %d\n",
+	printf(_("soft = %d, intr = %d, nocto = %d, noac = %d, "
+	       "nosharecache = %d\n"),
 	       (data.flags & NFS4_MOUNT_SOFT) != 0,
 	       (data.flags & NFS4_MOUNT_INTR) != 0,
 	       (data.flags & NFS4_MOUNT_NOCTO) != 0,
@@ -384,7 +388,7 @@ int nfs4mount(const char *spec, const char *node, int flags,
 	if (num_flavour > 0) {
 		int pf_cnt, i;
 
-		printf("sec = ");
+		printf(_("sec = "));
 		for (pf_cnt = 0; pf_cnt < num_flavour; pf_cnt++) {
 			for (i = 0; i < flav_map_size; i++) {
 				if (flav_map[i].fnum == pseudoflavour[pf_cnt]) {
@@ -395,7 +399,7 @@ int nfs4mount(const char *spec, const char *node, int flags,
 			printf("%s", (pf_cnt < num_flavour-1) ? ":" : "\n");
 		}
 	}
-	printf("proto = %s\n", (data.proto == IPPROTO_TCP) ? "tcp" : "udp");
+	printf(_("proto = %s\n"), (data.proto == IPPROTO_TCP) ? _("tcp") : _("udp"));
 #endif
 
 	timeout = time(NULL) + 60 * retry;
@@ -428,15 +432,15 @@ int nfs4mount(const char *spec, const char *node, int flags,
 			if (errno == ETIMEDOUT)
 				break;
 		default:
-			mount_errors(hostname, 0, bg);
+			rpc_mount_errors(hostname, 0, bg);
 			goto fail;
 		}
 		t = time(NULL);
 		if (t >= timeout) {
-			mount_errors(hostname, 0, bg);
+			rpc_mount_errors(hostname, 0, bg);
 			goto fail;
 		}
-		mount_errors(hostname, 1, bg);
+		rpc_mount_errors(hostname, 1, bg);
 		continue;
 	}
 
@@ -448,7 +452,7 @@ int nfs4mount(const char *spec, const char *node, int flags,
 		}
 	}
 
-	return 0;
+	return EX_SUCCESS;
 
 fail:
 	return retval;