OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 03-Oct-2005 17:12:36
Branch: HEAD Handle: 2005100316123600
Modified files:
openpkg-src/cvs cvs.patch.rse
Log:
fix two bugs in RSE patches and further reduce size
Summary:
Revision Changes Path
1.20 +27 -90 openpkg-src/cvs/cvs.patch.rse
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cvs/cvs.patch.rse
============================================================================
$ cvs diff -u -r1.19 -r1.20 cvs.patch.rse
--- openpkg-src/cvs/cvs.patch.rse 3 Oct 2005 14:20:35 -0000 1.19
+++ openpkg-src/cvs/cvs.patch.rse 3 Oct 2005 15:12:36 -0000 1.20
@@ -684,7 +684,7 @@
retrieving revision 1.1.1.19
diff -u -d -r1.1.1.19 cvs.h
--- src/cvs.h 14 Apr 2005 14:14:55 -0000 1.1.1.19
-+++ src/cvs.h 3 Oct 2005 14:12:33 -0000
++++ src/cvs.h 3 Oct 2005 14:34:42 -0000
@@ -12,6 +12,38 @@
*/
@@ -1511,7 +1511,7 @@
retrieving revision 1.1.1.18
diff -u -d -r1.1.1.18 main.c
--- src/main.c 17 Mar 2005 19:42:23 -0000 1.1.1.18
-+++ src/main.c 3 Oct 2005 14:17:54 -0000
++++ src/main.c 3 Oct 2005 15:06:03 -0000
@@ -26,6 +26,10 @@
const char *program_path;
const char *cvs_cmd_name;
@@ -1792,7 +1792,7 @@
#endif /* SERVER_SUPPORT */
case 'Q':
really_quiet = 1;
-@@ -614,7 +789,31 @@
+@@ -614,7 +789,30 @@
case 'd':
if (CVSroot_cmdline != NULL)
free (CVSroot_cmdline);
@@ -1810,7 +1810,6 @@
+ if (!quiet)
+ fprintf(stderr, "%s: using repository `%s'\n",
program_name, e->masterpath);
+ CVSroot_cmdline = xstrdup(e->masterpath);
-+ CVSroot_parsed->original = xstrdup(e->masterpath);
+ cvsroot_free(e);
+ }
+ else {
@@ -1824,7 +1823,7 @@
break;
case 'H':
help = 1;
-@@ -659,6 +858,28 @@
+@@ -659,6 +857,28 @@
We will issue an error later if stream
authentication is not supported. */
break;
@@ -1853,7 +1852,7 @@
case '?':
default:
usage (usg);
-@@ -676,6 +897,28 @@
+@@ -676,6 +896,28 @@
Using this option to access a repository which some users write to may\n\
cause intermittent sandbox corruption.");
}
@@ -1882,7 +1881,7 @@
/* Calculate the cvs global session ID */
-@@ -705,6 +948,10 @@
+@@ -705,6 +947,10 @@
else
cvs_cmd_name = cm->fullname; /* Global pointer for later use */
@@ -1893,7 +1892,7 @@
if (help)
{
argc = -1; /* some functions only check for this */
-@@ -732,6 +979,116 @@
+@@ -732,6 +978,116 @@
CVSUMASK_ENV, cp);
}
@@ -2010,7 +2009,7 @@
#ifdef SERVER_SUPPORT
# ifdef HAVE_KERBEROS
-@@ -748,6 +1105,21 @@
+@@ -748,6 +1104,21 @@
}
# endif /* HAVE_KERBEROS */
@@ -2032,7 +2031,7 @@
# if defined (AUTH_SERVER_SUPPORT) || defined (HAVE_GSSAPI)
if (strcmp (cvs_cmd_name, "pserver") == 0)
-@@ -772,6 +1144,10 @@
+@@ -772,6 +1143,10 @@
#endif /* SERVER_SUPPORT */
@@ -2043,7 +2042,7 @@
#ifdef SERVER_SUPPORT
if (server_active)
-@@ -850,8 +1226,12 @@
+@@ -850,8 +1225,12 @@
* in server mode, since the client will send the repository
* directory after the connection is made.
*/
@@ -2056,7 +2055,7 @@
{
/* First check if a root was set via the command line. */
if (CVSroot_cmdline)
-@@ -907,6 +1287,48 @@
+@@ -907,6 +1286,52 @@
error (1, 0,
"or set the %s environment variable.", CVSROOT_ENV);
}
@@ -2073,6 +2072,8 @@
+ fprintf(stderr, "%s: switching to MASTER
location of repository `%s'\n", program_name, e->nickname);
+ fprintf(stderr, "%s: %s <-- %s\n",
program_name, e->masterpath, e->slavepath);
+ }
++ if (CVSroot_parsed->original != NULL)
++ free(CVSroot_parsed->original);
+ CVSroot_parsed->original = xstrdup(e->masterpath);
+ if (CVSroot_cmdline != NULL)
+ free(CVSroot_cmdline);
@@ -2091,6 +2092,8 @@
+ fprintf(stderr, "%s: switching to SLAVE
location of repository `%s'\n", program_name, e->nickname);
+ fprintf(stderr, "%s: %s --> %s\n",
program_name, e->masterpath, e->slavepath);
+ }
++ if (CVSroot_parsed->original != NULL)
++ free(CVSroot_parsed->original);
+ CVSroot_parsed->original =
xstrdup(e->slavepath);
+ if (CVSroot_cmdline != NULL)
+ free(CVSroot_cmdline);
@@ -2105,7 +2108,7 @@
}
/* Here begins the big loop over unique cvsroot values. We
-@@ -939,6 +1361,9 @@
+@@ -939,6 +1364,9 @@
end of things. */
while (
@@ -2115,25 +2118,25 @@
#ifdef SERVER_SUPPORT
server_active ||
#endif
-@@ -950,8 +1375,12 @@
+@@ -950,8 +1378,12 @@
in server mode, since the client will send the repository
directory after the connection is made. */
+#if defined(RSE_PATCH_CVSROOT) || defined(RSE_PATCH_CUSTOMCMD)
+ if (!server_active && !standalone_command)
-+#else
++#else
if (!server_active)
#endif
+#endif
{
/* Now we're 100% sure that we have a valid CVSROOT
variable. Parse it to see if we're supposed to do
-@@ -979,7 +1408,12 @@
+@@ -979,7 +1411,12 @@
save_errno = errno;
/* If this is "cvs init", the root need not exist yet.
*/
+#ifdef RSE_PATCH_CVSROOT
-+ if (strcmp (cvs_cmd_name, "init") ||
++ if (strcmp (cvs_cmd_name, "init") &&
+ strcmp (cvs_cmd_name, "root") )
+#else
if (strcmp (cvs_cmd_name, "init"))
@@ -2141,7 +2144,7 @@
error (1, save_errno, "%s", path);
}
free (path);
-@@ -1012,6 +1446,9 @@
+@@ -1012,6 +1449,9 @@
read_cvsrc and other such places or vice versa. That sort
of thing probably needs more thought. */
if (1
@@ -2151,7 +2154,7 @@
#ifdef SERVER_SUPPORT
&& !server_active
#endif
-@@ -1043,7 +1480,31 @@
+@@ -1043,7 +1483,31 @@
}
#endif
@@ -2183,7 +2186,7 @@
#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
-@@ -1056,6 +1517,9 @@
+@@ -1056,6 +1520,9 @@
!current_parsed_root->isremote &&
#endif
!lock_cleanup_setup))
@@ -2193,7 +2196,7 @@
{
/* Set up to clean up any locks we might create on exit. */
cleanup_register (Lock_Cleanup);
-@@ -1064,7 +1528,32 @@
+@@ -1064,7 +1531,32 @@
/* Call our worker function. */
err = (*(cm->func)) (argc, argv);
@@ -2226,7 +2229,7 @@
/* Mark this root directory as done. When the server is
active, our list will be empty -- don't try and
remove it from the list. */
-@@ -1087,6 +1576,10 @@
+@@ -1087,6 +1579,10 @@
#endif
} /* end of loop for cvsroot values */
@@ -2237,7 +2240,7 @@
dellist (&root_directories);
} /* end of stuff that gets done if the user DOESN'T ask for help */
-@@ -1346,6 +1839,12 @@
+@@ -1346,6 +1842,12 @@
TRACE (TRACE_FUNCTION, "format_date (%s)", datestr);
@@ -2256,7 +2259,7 @@
retrieving revision 1.1.1.11
diff -u -d -r1.1.1.11 mkmodules.c
--- src/mkmodules.c 17 Mar 2005 19:42:23 -0000 1.1.1.11
-+++ src/mkmodules.c 3 Oct 2005 12:50:08 -0000
++++ src/mkmodules.c 3 Oct 2005 15:06:16 -0000
@@ -234,6 +234,48 @@
NULL
};
@@ -2988,72 +2991,6 @@
+
+#endif /* RSE_PATCH_CVSROOT */
+
-Index: src/sanity.sh
-===================================================================
-RCS file: /v/ossp/pkg/tool/cvs/cvs/cvs/src/sanity.sh,v
-retrieving revision 1.1.1.19
-diff -u -d -r1.1.1.19 sanity.sh
---- src/sanity.sh 14 Apr 2005 14:14:58 -0000 1.1.1.19
-+++ src/sanity.sh 3 Oct 2005 12:50:10 -0000
-@@ -430,6 +430,7 @@
- # "debugger"
- #set -x
-
-+echo '[THIS PROCEDURE TAKES APPROX. 25min ON A PII/400MHz, SO BE PATIENT!]'
- echo 'This test should produce no other output than this message, and a
final "OK".'
- echo '(Note that the test can take an hour or more to run and periodically
stops'
- echo 'for as long as one minute. Do not assume there is a problem just
because'
-@@ -12313,10 +12314,12 @@
- ############################################################
- # Check out the whole repository
- mkdir 1; cd 1
-- dotest modules-1 "${testcvs} -q co ." 'U CVSROOT/checkoutlist
-+ dotest modules-1 "${testcvs} -q co ." 'U CVSROOT/admininfo
-+U CVSROOT/checkoutlist
- U CVSROOT/commitinfo
- U CVSROOT/config
- U CVSROOT/cvswrappers
-+U CVSROOT/importinfo
- U CVSROOT/loginfo
- U CVSROOT/modules
- U CVSROOT/notify
-@@ -12339,10 +12342,12 @@
- ############################################################
- # Check out CVSROOT
- mkdir 1; cd 1
-- dotest modules-2 "${testcvs} -q co CVSROOT" 'U CVSROOT/checkoutlist
-+ dotest modules-2 "${testcvs} -q co CVSROOT" 'U CVSROOT/admininfo
-+U CVSROOT/checkoutlist
- U CVSROOT/commitinfo
- U CVSROOT/config
- U CVSROOT/cvswrappers
-+U CVSROOT/importinfo
- U CVSROOT/loginfo
- U CVSROOT/modules
- U CVSROOT/notify
-@@ -12368,10 +12373,12 @@
- mkdir 1; cd 1
- dotest modules-3 "${testcvs} -q co somedir" ''
- cd somedir
-- dotest modules-3d "${testcvs} -q co CVSROOT" 'U CVSROOT/checkoutlist
-+ dotest modules-3d "${testcvs} -q co CVSROOT" 'U CVSROOT/admininfo
-+U CVSROOT/checkoutlist
- U CVSROOT/commitinfo
- U CVSROOT/config
- U CVSROOT/cvswrappers
-+U CVSROOT/importinfo
- U CVSROOT/loginfo
- U CVSROOT/modules
- U CVSROOT/notify
-@@ -24666,7 +24673,7 @@
- add a line on trunk after trunktag"
- # But diff thinks that HEAD is "br1". Case (b) from cvs.texinfo.
- # Probably people are relying on it.
-- dotest head-br1-diff "${testcvs} -q diff -c -r HEAD -r br1" ""
-+ #RSE# dotest head-br1-diff "${testcvs} -q diff -c -r HEAD -r br1" ""
-
- # With a nonbranch sticky tag on a branch,
- # HEAD is the head of the trunk
Index: src/server.c
===================================================================
RCS file: /v/ossp/pkg/tool/cvs/cvs/cvs/src/server.c,v
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
