[Cvs-cvs] ccvs/src ChangeLog admin.c commit.c cvs.h edit....

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     07/09/12 13:07:34

Modified files:
        src            : ChangeLog admin.c commit.c cvs.h edit.c 
                         history.c import.c lock.c main.c recurse.c 
                         server.c tag.c watch.c 
Added files:
        src            : lock.h 

Log message:
        * cvs.h (Reader_Lock, Simple_Lock_Cleanup, Lock_Cleanup,
        lock_tree_promotably, lock_dir_for_write, history_lock,
        clear_history_lock, val_tags_lock, clear_val_tags_lock): Move these...
        * lock.h (Reader_Lock, Simple_Lock_Cleanup, Lock_Cleanup,
        lock_tree_promotably, lock_dir_for_write, history_lock,
        clear_history_lock, val_tags_lock, clear_val_tags_lock): ...prototype
        to this new file.
        * admin.c, commit.c, edit.c, history.c, import.c, lock.c, main.c,
        recurse.c, server.c, tag.c, watch.c: Include new "lock.h".

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3535&r2=1.3536
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/admin.c?cvsroot=cvs&r1=1.118&r2=1.119
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/commit.c?cvsroot=cvs&r1=1.274&r2=1.275
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/cvs.h?cvsroot=cvs&r1=1.354&r2=1.355
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/edit.c?cvsroot=cvs&r1=1.98&r2=1.99
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/history.c?cvsroot=cvs&r1=1.100&r2=1.101
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/import.c?cvsroot=cvs&r1=1.186&r2=1.187
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/lock.c?cvsroot=cvs&r1=1.122&r2=1.123
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/main.c?cvsroot=cvs&r1=1.272&r2=1.273
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/recurse.c?cvsroot=cvs&r1=1.121&r2=1.122
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/server.c?cvsroot=cvs&r1=1.478&r2=1.479
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/tag.c?cvsroot=cvs&r1=1.150&r2=1.151
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/watch.c?cvsroot=cvs&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/lock.h?cvsroot=cvs&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3535
retrieving revision 1.3536
diff -u -b -r1.3535 -r1.3536
--- ChangeLog   12 Sep 2007 02:45:21 -0000      1.3535
+++ ChangeLog   12 Sep 2007 13:07:32 -0000      1.3536
@@ -1,3 +1,15 @@
+2007-09-12  Derek Price  <address@hidden>
+
+       * cvs.h (Reader_Lock, Simple_Lock_Cleanup, Lock_Cleanup,
+       lock_tree_promotably, lock_dir_for_write, history_lock,
+       clear_history_lock, val_tags_lock, clear_val_tags_lock): Move these...
+       * lock.h (Reader_Lock, Simple_Lock_Cleanup, Lock_Cleanup,
+       lock_tree_promotably, lock_dir_for_write, history_lock,
+       clear_history_lock, val_tags_lock, clear_val_tags_lock): ...prototype
+       to this new file.
+       * admin.c, commit.c, edit.c, history.c, import.c, lock.c, main.c,
+       recurse.c, server.c, tag.c, watch.c: Include new "lock.h".
+
 2007-09-11  Derek Price  <address@hidden>
 
        * add.c, import.c, update.c: Call Entries_Open() & Entries_Close() with

Index: admin.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/admin.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- admin.c     30 May 2007 23:20:42 -0000      1.118
+++ admin.c     12 Sep 2007 13:07:33 -0000      1.119
@@ -1,7 +1,8 @@
 /*
- * Copyright (C) 1986-2006 The Free Software Foundation, Inc.
+ * Copyright (C) 1986-2007 The Free Software Foundation, Inc.
  *
- * Portions Copyright (C) 1998-2005 Derek Price, Ximbiot <http://ximbiot.com>,
+ * Portions Copyright (C) 1998-2007 Derek Price,
+ *                                  Ximbiot LLC <http://ximbiot.com>,
  *                                  and others.
  *
  * Portions Copyright (c) 1992, Brian Berliner and Jeff Polk
@@ -20,6 +21,7 @@
 
 /* CVS headers.  */
 #include "ignore.h"
+#include "lock.h"
 #include "recurse.h"
 #include "repos.h"
 #include "wrapper.h"

Index: commit.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/commit.c,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -b -r1.274 -r1.275
--- commit.c    28 Aug 2007 00:15:09 -0000      1.274
+++ commit.c    12 Sep 2007 13:07:33 -0000      1.275
@@ -28,6 +28,7 @@
 #include "edit.h"
 #include "fileattr.h"
 #include "ignore.h"
+#include "lock.h"
 #include "logmsg.h"
 #include "recurse.h"
 #include "repos.h"

Index: cvs.h
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/cvs.h,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -b -r1.354 -r1.355
--- cvs.h       12 Sep 2007 02:45:22 -0000      1.354
+++ cvs.h       12 Sep 2007 13:07:33 -0000      1.355
@@ -1,7 +1,8 @@
 /*
- * Copyright (C) 1986-2006 The Free Software Foundation, Inc.
+ * Copyright (C) 1986-2007 The Free Software Foundation, Inc.
  *
- * Portions Copyright (C) 1998-2005 Derek Price, Ximbiot <http://ximbiot.com>,
+ * Portions Copyright (C) 1998-2007 Derek Price,
+ *                                  Ximbiot LLC <http://ximbiot.com>,
  *                                  and others.
  *
  * Portions Copyright (C) 1992, Brian Berliner and Jeff Polk
@@ -407,28 +408,6 @@
                   int nonbranch, int warn, int dotemplate);
 int expand_at_signs (const char *, size_t, FILE *);
 
-/* Locking subsystem (implemented in lock.c).  */
-
-int Reader_Lock (char *xrepository);
-void Simple_Lock_Cleanup (void);
-void Lock_Cleanup (void);
-
-/* Writelock an entire subtree, well the part specified by ARGC, ARGV, LOCAL,
-   and AFLAG, anyway.  */
-void lock_tree_promotably (int argc, char **argv, int local, int which,
-                          int aflag);
-
-/* See lock.c for description.  */
-void lock_dir_for_write (const char *);
-
-/* Get a write lock for the history file.  */
-int history_lock (const char *);
-void clear_history_lock (void);
-
-/* Get a write lock for the val-tags file.  */
-int val_tags_lock (const char *);
-void clear_val_tags_lock (void);
-
 void Scratch_Entry (List * list, const char *fname);
 void ParseTag (char **tagp, char **datep, int *nonbranchp);
 void WriteTag (const char *dir, const char *tag, const char *date,

Index: edit.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/edit.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- edit.c      29 Aug 2007 23:36:23 -0000      1.98
+++ edit.c      12 Sep 2007 13:07:33 -0000      1.99
@@ -27,6 +27,7 @@
 /* CVS headers.  */
 #include "base.h"
 #include "ignore.h"
+#include "lock.h"
 #include "recurse.h"
 #include "repos.h"
 

Index: history.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/history.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- history.c   11 Jun 2007 15:45:59 -0000      1.100
+++ history.c   12 Sep 2007 13:07:33 -0000      1.101
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1994-2006 The Free Software Foundation, Inc.
+ * Copyright (C) 1994-2007 The Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
 
 /* CVS headers.  */
 #include "ignore.h"
+#include "lock.h"
 #include "repos.h"
 
 #include "cvs.h"

Index: import.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/import.c,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -b -r1.186 -r1.187
--- import.c    12 Sep 2007 02:45:22 -0000      1.186
+++ import.c    12 Sep 2007 13:07:33 -0000      1.187
@@ -33,6 +33,7 @@
 
 /* CVS headers.  */
 #include "ignore.h"
+#include "lock.h"
 #include "logmsg.h"
 #include "wrapper.h"
 

Index: lock.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/lock.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- lock.c      25 Aug 2007 03:17:58 -0000      1.122
+++ lock.c      12 Sep 2007 13:07:33 -0000      1.123
@@ -74,6 +74,9 @@
 # include <config.h>
 #endif
 
+/* Verify API */
+#include "lock.h"
+
 /* CVS headers.  */
 #include "recurse.h"
 #include "repos.h"
@@ -487,7 +490,7 @@
  * Create a lock file for readers
  */
 int
-Reader_Lock (char *xrepository)
+Reader_Lock (const char *xrepository)
 {
     int err = 0;
     FILE *fp;

Index: main.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/main.c,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -b -r1.272 -r1.273
--- main.c      11 Sep 2007 20:56:46 -0000      1.272
+++ main.c      12 Sep 2007 13:07:34 -0000      1.273
@@ -31,6 +31,7 @@
 /* CVS Headers.  */
 #include "command_line_opt.h"
 #include "gpg.h"
+#include "lock.h"
 #include "sign.h"
 #include "verify.h"
 

Index: recurse.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/recurse.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- recurse.c   12 Sep 2007 02:45:22 -0000      1.121
+++ recurse.c   12 Sep 2007 13:07:34 -0000      1.122
@@ -1,7 +1,8 @@
 /*
- * Copyright (C) 1986-2006 The Free Software Foundation, Inc.
+ * Copyright (C) 1986-2007 The Free Software Foundation, Inc.
  *
- * Portions Copyright (C) 1998-2005 Derek Price, Ximbiot <http://ximbiot.com>,
+ * Portions Copyright (C) 1998-2007 Derek Price,
+ *                                  Ximbiot LLC <http://ximbiot.com>,
  *                                  and others.
  *
  * Portions Copyright (C) 1992, Brian Berliner and Jeff Polk
@@ -28,6 +29,7 @@
 #include "edit.h"
 #include "find-names.h"
 #include "fileattr.h"
+#include "lock.h"
 #include "repos.h"
 #include "wrapper.h"
 

Index: server.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/server.c,v
retrieving revision 1.478
retrieving revision 1.479
diff -u -b -r1.478 -r1.479
--- server.c    27 Aug 2007 02:11:06 -0000      1.478
+++ server.c    12 Sep 2007 13:07:34 -0000      1.479
@@ -33,6 +33,7 @@
 #include "fileattr.h"
 #include "gpg.h"
 #include "ignore.h"
+#include "lock.h"
 #include "repos.h"
 #include "watch.h"
 #include "wrapper.h"

Index: tag.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/tag.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -b -r1.150 -r1.151
--- tag.c       30 May 2007 23:20:44 -0000      1.150
+++ tag.c       12 Sep 2007 13:07:34 -0000      1.151
@@ -1,7 +1,8 @@
 /*
- * Copyright (C) 1986-2006 The Free Software Foundation, Inc.
+ * Copyright (C) 1986-2007 The Free Software Foundation, Inc.
  *
- * Portions Copyright (C) 1998-2005 Derek Price, Ximbiot <http://ximbiot.com>,
+ * Portions Copyright (C) 1998-2007 Derek Price,
+ *                                  Ximbiot LLC <http://ximbiot.com>,
  *                                  and others.
  *
  * Portions Copyright (C) 1992, Brian Berliner and Jeff Polk
@@ -27,6 +28,7 @@
 /* CVS headers.  */
 #include "classify.h"
 #include "ignore.h"
+#include "lock.h"
 #include "recurse.h"
 #include "repos.h"
 

Index: watch.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/watch.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- watch.c     16 May 2006 01:30:35 -0000      1.47
+++ watch.c     12 Sep 2007 13:07:34 -0000      1.48
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006 The Free Software Foundation, Inc.
+ * Copyright (C) 2007 The Free Software Foundation, Inc.
  *
  * Implementation for "cvs watch add", "cvs watchers", and related commands
  *
@@ -25,6 +25,7 @@
 #include "edit.h"
 #include "fileattr.h"
 #include "ignore.h"
+#include "lock.h"
 #include "recurse.h"
 
 #include "cvs.h"

Index: lock.h
===================================================================
RCS file: lock.h
diff -N lock.h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ lock.h      12 Sep 2007 13:07:33 -0000      1.1
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2005-2007 The Free Software Foundation, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef LOCK_H
+#define LOCK_H
+
+int Reader_Lock (const char *xrepository);
+void Simple_Lock_Cleanup (void);
+void Lock_Cleanup (void);
+
+/* Writelock an entire subtree, well the part specified by ARGC, ARGV, LOCAL,
+   and AFLAG, anyway.  */
+void lock_tree_promotably (int argc, char **argv, int local, int which,
+                          int aflag);
+
+/* See lock.c for description.  */
+void lock_dir_for_write (const char *);
+
+/* Get a write lock for the history file.  */
+int history_lock (const char *);
+void clear_history_lock (void);
+
+/* Get a write lock for the val-tags file.  */
+int val_tags_lock (const char *);
+void clear_val_tags_lock (void);
+
+#endif /* !defined LOCK_H */