X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=support%2Fexport%2Fxtab.c;h=0ddb2516a8d5e8327441555ca668788f6c1850e6;hp=54470c1cfeb60171d808b073dad71e1e09c9756b;hb=ac5b03be829b4c9369ebfb07a688308721103228;hpb=37e49789ab1cd849def25ba4c4d97ccdb11d1e61

diff --git a/support/export/xtab.c b/support/export/xtab.c
index 54470c1..0ddb251 100644
--- a/support/export/xtab.c
+++ b/support/export/xtab.c
@@ -6,7 +6,9 @@
  * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <sys/fcntl.h>
 #include <unistd.h>
@@ -18,6 +20,8 @@
 #include "xio.h"
 #include "xlog.h"
 
+static void cond_rename(char *newfile, char *oldfile);
+
 static int
 xtab_read(char *xtab, int is_export)
 {
@@ -32,7 +36,7 @@ xtab_read(char *xtab, int is_export)
 	if ((lockid = xflock(xtab, "r")) < 0)
 		return 0;
 	setexportent(xtab, "r");
-	while ((xp = getexportent()) != NULL) {
+	while ((xp = getexportent(is_export==0, 0)) != NULL) {
 		if (!(exp = export_lookup(xp->e_hostname, xp->e_path, is_export != 1)) &&
 		    !(exp = export_create(xp, is_export!=1))) {
 			continue;
@@ -63,6 +67,9 @@ xtab_mount_read(void)
 	if ((fd=open(_PATH_PROC_EXPORTS, O_RDONLY))>=0) {
 		close(fd);
 		return xtab_read(_PATH_PROC_EXPORTS, 0);
+	} else if ((fd=open(_PATH_PROC_EXPORTS_ALT, O_RDONLY) >= 0)) {
+		close(fd);
+		return xtab_read(_PATH_PROC_EXPORTS_ALT, 0);
 	} else
 		return xtab_read(_PATH_XTAB, 2);
 }
@@ -104,7 +111,7 @@ xtab_write(char *xtab, char *xtabtmp, int is_export)
 	}
 	endexportent();
 
-	rename(xtabtmp, xtab);
+	cond_rename(xtabtmp, xtab);
 
 	xfunlock(lockid);
 
@@ -142,3 +149,46 @@ xtab_append(nfs_export *exp)
 	exp->m_xtabent = 1;
 }
 
+/*
+ * rename newfile onto oldfile unless
+ * they are identical
+ */
+static void cond_rename(char *newfile, char *oldfile)
+{
+	int nfd, ofd;
+	char nbuf[4096], obuf[4096];
+	int ncnt, ocnt;
+
+	nfd = open(newfile, 0);
+	if (nfd < 0)
+		return;
+	ofd = open(oldfile, 0);
+	if (ofd < 0) {
+		close(nfd);
+		rename(newfile, oldfile);
+		return;
+	}
+
+	do {
+		ncnt = read(nfd, nbuf, sizeof(nbuf));
+		if (ncnt < 0)
+			break;
+		ocnt = read(ofd, obuf, sizeof(obuf));
+		if (ocnt < 0)
+			break;
+		if (ncnt != ocnt)
+			break;
+		if (ncnt == 0) {
+			close(nfd);
+			close(ofd);
+			unlink(newfile);
+			return;
+		}
+	} while (memcmp(obuf, nbuf, ncnt) == 0);
+
+	/* some mis-match */
+	close(nfd);
+	close(ofd);
+	rename(newfile, oldfile);
+	return;
+}