[dovecot-cvs] dovecot/src/lib-index/mbox mbox-lock.c,1.15,1.16 mbox-sync.c,1.23,1.24

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib-index/mbox
In directory danu:/tmp/cvs-serv18780/src/lib-index/mbox

Modified Files:
	mbox-lock.c mbox-sync.c 
Log Message:
We compile now if dev_t is a structure (eg. glibc+tcc).



Index: mbox-lock.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/mbox/mbox-lock.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- mbox-lock.c	25 Nov 2002 19:02:49 -0000	1.15
+++ mbox-lock.c	26 Nov 2002 18:47:43 -0000	1.16
@@ -261,7 +261,7 @@
         old_dev = index->mbox_dotlock_dev;
         old_ino = index->mbox_dotlock_ino;
 
-        index->mbox_dotlock_dev = 0;
+        memset(&index->mbox_dotlock_dev, 0, sizeof(index->mbox_dotlock_dev));
         index->mbox_dotlock_ino = 0;
 
 	if (stat(path, &st) < 0) {
@@ -273,7 +273,9 @@
 	}
 
 	/* make sure it's still our dotlock */
-	if (old_dev != st.st_dev || old_ino != st.st_ino) {
+	if (old_ino != st.st_ino ||
+	    major(old_dev) != major(st.st_dev) ||
+	    minor(old_dev) != minor(st.st_dev)) {
 		index_set_error(index,
 			"Warning: Our dotlock file %s was overridden", path);
 		return FALSE;

Index: mbox-sync.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/mbox/mbox-sync.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- mbox-sync.c	20 Nov 2002 18:28:15 -0000	1.23
+++ mbox-sync.c	26 Nov 2002 18:47:43 -0000	1.24
@@ -108,7 +108,9 @@
 	}
 	filesize = st.st_size;
 
-	if (index->mbox_dev != st.st_dev || index->mbox_ino != st.st_ino) {
+	if (index->mbox_ino != st.st_ino ||
+	    major(index->mbox_dev) != major(st.st_dev) ||
+	    minor(index->mbox_dev) != minor(st.st_dev)) {
 		/* mbox file was overwritten, close it if it was open */
 		index->mbox_dev = st.st_dev;
 		index->mbox_ino = st.st_ino;