From: james <james>
Date: Fri, 15 Feb 2008 19:09:00 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ac5d03e2d024f8f902e2a6615efb6609f7cfe697;p=sympathy.git

*** empty log message ***
---

diff --git a/src/lockfile.c b/src/lockfile.c
index 7a2849b..9c7acc0 100644
--- a/src/lockfile.c
+++ b/src/lockfile.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.6  2008/02/15 19:09:00  james
+ * *** empty log message ***
+ *
  * Revision 1.5  2008/02/15 18:26:49  james
  * *** empty log message ***
  *
@@ -199,8 +202,7 @@ lockfile_add_places (Filelist * fl, char *leaf)
   char *lock_dirs[] =
     { "/var/lock/uucp", "/var/spool/lock", "/var/spool/uucp", "/etc/locks",
     "/usr/spool/uucp", "/var/spool/locks", "/usr/spool/lock",
-    "/usr/spool/locks",
-    "/usr/spool/uucp/LCK"
+    "/usr/spool/locks", "/usr/spool/uucp/LCK"
   };
   int i;
 
diff --git a/src/serial.c b/src/serial.c
index 429c2e3..dbd8206 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.5  2008/02/15 19:09:00  james
+ * *** empty log message ***
+ *
  * Revision 1.4  2008/02/15 16:48:56  james
  * *** empty log message ***
  *
@@ -56,13 +59,16 @@ static char rcsid[] = "$Id$";
 #include <dirent.h>
 #include <sys/stat.h>
 
-#define NLOCKFILES	10
+
 
 typedef struct
 {
-  char *lockfiles[NLOCKFILES];
-  char *potential_lockfiles[NLOCKFILES];
-  struct timeval last_content_check;
+  int mode;
+  int i;
+
+  struct timeval last_stale_purge;
+  Filelist locks_to_check;
+  Filelist locks_held;
 } Serial_lock;
 
 typedef struct
diff --git a/src/serial.h b/src/serial.h
new file mode 100644
index 0000000..dd33ad7
--- /dev/null
+++ b/src/serial.h
@@ -0,0 +1,26 @@
+/*
+ * serial.h:
+ *
+ * Copyright (c) 2008 James McKenzie <james@fishsoup.dhs.org>,
+ * All rights reserved.
+ *
+ */
+
+/*
+ * $Id$
+ */
+
+/*
+ * $Log$
+ * Revision 1.1  2008/02/15 19:09:00  james
+ * *** empty log message ***
+ *
+ */
+
+#ifndef __SERIAL_H__
+#define __SERIAL_H__
+
+#define SERIAL_LOCK_PASSIVE 0
+#define SERIAL_LOCK_ACTIVE  1
+
+#endif /* __SERIAL_H__ */