summaryrefslogtreecommitdiff
path: root/devel/cvs/patches/patch-ap
blob: 72b44112cc50fb8b344493ec53a95fc6971eb078 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
$NetBSD: patch-ap,v 1.8 2006/01/29 02:40:40 wiz Exp $

--- src/main.c.orig	2005-09-05 20:04:38.000000000 +0200
+++ src/main.c
@@ -46,6 +46,7 @@ int really_quiet = 0;
 int quiet = 0;
 int trace = 0;
 int noexec = 0;
+int nolock = 0;
 int logoff = 0;
 
 /* Set if we should be writing CVSADM directories at top level.  At
@@ -54,6 +55,7 @@ int logoff = 0;
 int top_level_admin = 0;
 
 mode_t cvsumask = UMASK_DFLT;
+char *RCS_citag = NULL;
 
 char *CurDir;
 
@@ -243,6 +245,7 @@ static const char *const opt_usage[] =
     "    -r           Make checked-out files read-only.\n",
     "    -w           Make checked-out files read-write (default).\n",
     "    -n           Do not execute anything that will change the disk.\n",
+    "    -u           Don't create locks (implies -l).\n",
     "    -t           Show trace of program execution -- try with -n.\n",
     "    -v           CVS version and copyright.\n",
     "    -T tmpdir    Use 'tmpdir' for temporary files.\n",
@@ -401,7 +404,7 @@ main (argc, argv)
     int help = 0;		/* Has the user asked for help?  This
 				   lets us support the `cvs -H cmd'
 				   convention to give help for cmd. */
-    static const char short_options[] = "+Qqrwtnvb:T:e:d:Hfz:s:xa";
+    static const char short_options[] = "+Qqrwtunvb:T:e:d:Hfz:s:xa";
     static struct option long_options[] =
     {
         {"help", 0, NULL, 'H'},
@@ -525,6 +528,11 @@ main (argc, argv)
 		break;
 	    case 'n':
 		noexec = 1;
+		nolock = 1;
+		logoff = 1;
+		break;
+	    case 'u':
+		nolock = 1;
 		logoff = 1;
 		break;
 	    case 'v':