r471 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2006-07-14 13:44:28 +0200 (Fri, 14 Jul 2006)
New Revision: 471

Modified:
   trunk/varnish-cache/bin/varnishd/shmlog.c
Log:
Better and more paranoid SHMEM creation logic


Modified: trunk/varnish-cache/bin/varnishd/shmlog.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/shmlog.c	2006-07-14 11:42:29 UTC (rev 470)
+++ trunk/varnish-cache/bin/varnishd/shmlog.c	2006-07-14 11:44:28 UTC (rev 471)
@@ -141,19 +141,29 @@
 VSL_MgtInit(const char *fn, unsigned size)
 {
 	struct shmloghead slh;
-	int i;
+	int i = 0;
 
-	heritage.vsl_fd = open(fn, O_RDWR | O_CREAT, 0644);
-	if (heritage.vsl_fd < 0) {
-		fprintf(stderr, "Could not open %s: %s\n",
-		    fn, strerror(errno));
-		exit (1);
-	}
-	i = read(heritage.vsl_fd, &slh, sizeof slh);
-	if (i != sizeof slh || slh.magic != SHMLOGHEAD_MAGIC) {
+	heritage.vsl_fd = open(fn, O_RDWR, 0644);
+	if (heritage.vsl_fd >= 0)
+		i = read(heritage.vsl_fd, &slh, sizeof slh);
+	if (heritage.vsl_fd < 0 || i != sizeof slh ||
+	    slh.magic != SHMLOGHEAD_MAGIC ||
+	    slh.hdrsize != sizeof slh) {
 		/* XXX more checks */
 
+		if (heritage.vsl_fd >= 0);
+			close(heritage.vsl_fd);
+		unlink(fn);
+		heritage.vsl_fd = open(fn, O_RDWR | O_CREAT, 0644);
+		if (heritage.vsl_fd < 0) {
+			fprintf(stderr, "Could not open %s: %s\n",
+			    fn, strerror(errno));
+			exit (1);
+		}
+		memset(&slh, 0, sizeof slh);
+
 		slh.magic = SHMLOGHEAD_MAGIC;
+		slh.hdrsize = sizeof slh;
 		slh.size = size;
 		slh.ptr = 0;
 		slh.start = sizeof slh;