|
|
@@ -2039,7 +2039,7 @@ RCS file: /v/ossp/pkg/tool/cvs/cvs/cvs/src/main.c,v
|
|
|
retrieving revision 1.1.1.15
|
|
|
diff -u -d -r1.1.1.15 main.c
|
|
|
--- src/main.c 29 May 2004 04:49:51 -0000 1.1.1.15
|
|
|
-+++ src/main.c 13 Feb 2005 13:39:57 -0000
|
|
|
++++ src/main.c 13 Feb 2005 14:28:33 -0000
|
|
|
@@ -25,6 +25,10 @@
|
|
|
const char *program_path;
|
|
|
const char *cvs_cmd_name;
|
|
|
@@ -2428,10 +2428,18 @@ diff -u -d -r1.1.1.15 main.c
|
|
|
case '?':
|
|
|
default:
|
|
|
usage (usg);
|
|
|
-@@ -681,6 +915,28 @@
|
|
|
+@@ -675,12 +909,36 @@
|
|
|
+ if (argc < 1)
|
|
|
+ usage (usg);
|
|
|
+
|
|
|
++#ifndef RSE_PATCH_COSMETICS
|
|
|
+ if (readonlyfs && !really_quiet) {
|
|
|
+ error (0, 0,
|
|
|
+ "WARNING: Read-only repository access mode selected via `cvs -R'.\n\
|
|
|
Using this option to access a repository which some users write to may\n\
|
|
|
cause intermittent sandbox corruption.");
|
|
|
}
|
|
|
++#endif
|
|
|
+#ifdef RSE_PATCH_CUSTOMCMD
|
|
|
+ /* Look up the custom command. */
|
|
|
+ cm = NULL;
|
|
|
@@ -2457,7 +2465,7 @@ diff -u -d -r1.1.1.15 main.c
|
|
|
|
|
|
/* Look up the command name. */
|
|
|
|
|
|
-@@ -703,6 +959,10 @@
|
|
|
+@@ -703,6 +961,10 @@
|
|
|
else
|
|
|
cvs_cmd_name = cm->fullname; /* Global pointer for later use */
|
|
|
|
|
|
@@ -2468,7 +2476,7 @@ diff -u -d -r1.1.1.15 main.c
|
|
|
if (help)
|
|
|
{
|
|
|
argc = -1; /* some functions only check for this */
|
|
|
-@@ -730,6 +990,116 @@
|
|
|
+@@ -730,6 +992,116 @@
|
|
|
CVSUMASK_ENV, cp);
|
|
|
}
|
|
|
|
|
|
@@ -2585,7 +2593,7 @@ diff -u -d -r1.1.1.15 main.c
|
|
|
#ifdef SERVER_SUPPORT
|
|
|
|
|
|
# ifdef HAVE_KERBEROS
|
|
|
-@@ -746,6 +1116,21 @@
|
|
|
+@@ -746,6 +1118,21 @@
|
|
|
}
|
|
|
# endif /* HAVE_KERBEROS */
|
|
|
|
|
|
@@ -2607,7 +2615,7 @@ diff -u -d -r1.1.1.15 main.c
|
|
|
|
|
|
# if defined (AUTH_SERVER_SUPPORT) || defined (HAVE_GSSAPI)
|
|
|
if (strcmp (cvs_cmd_name, "pserver") == 0)
|
|
|
-@@ -770,6 +1155,10 @@
|
|
|
+@@ -770,6 +1157,10 @@
|
|
|
|
|
|
#endif /* SERVER_SUPPORT */
|
|
|
|
|
|
@@ -2618,7 +2626,7 @@ diff -u -d -r1.1.1.15 main.c
|
|
|
|
|
|
#ifdef SERVER_SUPPORT
|
|
|
if (server_active)
|
|
|
-@@ -832,8 +1221,12 @@
|
|
|
+@@ -832,8 +1223,12 @@
|
|
|
in server mode, since the client will send the repository
|
|
|
directory after the connection is made. */
|
|
|
|
|
|
@@ -2631,7 +2639,7 @@ diff -u -d -r1.1.1.15 main.c
|
|
|
{
|
|
|
char *CVSADM_Root;
|
|
|
|
|
|
-@@ -889,6 +1282,54 @@
|
|
|
+@@ -889,6 +1284,54 @@
|
|
|
error (1, 0,
|
|
|
"CVS/Root file (if any).");
|
|
|
}
|
|
|
@@ -2686,7 +2694,7 @@ diff -u -d -r1.1.1.15 main.c
|
|
|
}
|
|
|
|
|
|
/* Here begins the big loop over unique cvsroot values. We
|
|
|
-@@ -921,6 +1362,9 @@
|
|
|
+@@ -921,6 +1364,9 @@
|
|
|
end of things. */
|
|
|
|
|
|
while (
|
|
|
@@ -2696,7 +2704,7 @@ diff -u -d -r1.1.1.15 main.c
|
|
|
#ifdef SERVER_SUPPORT
|
|
|
server_active ||
|
|
|
#endif
|
|
|
-@@ -932,8 +1376,12 @@
|
|
|
+@@ -932,8 +1378,12 @@
|
|
|
in server mode, since the client will send the repository
|
|
|
directory after the connection is made. */
|
|
|
|
|
|
@@ -2709,7 +2717,7 @@ diff -u -d -r1.1.1.15 main.c
|
|
|
{
|
|
|
/* Now we're 100% sure that we have a valid CVSROOT
|
|
|
variable. Parse it to see if we're supposed to do
|
|
|
-@@ -966,7 +1414,12 @@
|
|
|
+@@ -966,7 +1416,12 @@
|
|
|
{
|
|
|
save_errno = errno;
|
|
|
/* If this is "cvs init", the root need not exist yet. */
|
|
|
@@ -2722,7 +2730,7 @@ diff -u -d -r1.1.1.15 main.c
|
|
|
{
|
|
|
error (1, save_errno, "%s", path);
|
|
|
}
|
|
|
-@@ -1002,6 +1455,9 @@
|
|
|
+@@ -1002,6 +1457,9 @@
|
|
|
read_cvsrc and other such places or vice versa. That sort
|
|
|
of thing probably needs more thought. */
|
|
|
if (1
|
|
|
@@ -2732,7 +2740,7 @@ diff -u -d -r1.1.1.15 main.c
|
|
|
#ifdef SERVER_SUPPORT
|
|
|
&& !server_active
|
|
|
#endif
|
|
|
-@@ -1032,7 +1488,31 @@
|
|
|
+@@ -1032,7 +1490,31 @@
|
|
|
}
|
|
|
#endif
|
|
|
|
|
|
@@ -2764,7 +2772,7 @@ diff -u -d -r1.1.1.15 main.c
|
|
|
#ifdef SERVER_SUPPORT
|
|
|
/* Don't worry about lock_cleanup_setup when the server is
|
|
|
* active since we can only go through this loop once in that
|
|
|
-@@ -1044,6 +1524,9 @@
|
|
|
+@@ -1044,6 +1526,9 @@
|
|
|
!current_parsed_root->isremote &&
|
|
|
#endif
|
|
|
!lock_cleanup_setup)
|
|
|
@@ -2774,7 +2782,7 @@ diff -u -d -r1.1.1.15 main.c
|
|
|
{
|
|
|
/* Set up to clean up any locks we might create on exit. */
|
|
|
cleanup_register (Lock_Cleanup);
|
|
|
-@@ -1052,6 +1535,27 @@
|
|
|
+@@ -1052,6 +1537,27 @@
|
|
|
|
|
|
/* Call our worker function. */
|
|
|
err = (*(cm->func)) (argc, argv);
|
|
|
@@ -2802,7 +2810,7 @@ diff -u -d -r1.1.1.15 main.c
|
|
|
|
|
|
/* Mark this root directory as done. When the server is
|
|
|
active, current_root will be NULL -- don't try and
|
|
|
-@@ -1070,12 +1574,21 @@
|
|
|
+@@ -1070,12 +1576,21 @@
|
|
|
dellist (&root_directories);
|
|
|
#endif
|
|
|
|