a2ef7833f1
* The CVS client again correctly reports files with conflicts when using servers running CVS 1.11.20/1.12.12, or earlier (and maybe 3rd party servers). * The GSSAPI server should now build under HP-UX. * `cvs rtag' now correctly tags files that have been removed from the trunk. * Code efficiency has been improved slightly. * A rare race condition that could leave a lock on the val-tags file has been avoided. * A potential buffer overflow in the history command has been fixed. * Thanks to a report and patch from Garrett Rooney <grooney@collab.net>, paused trigger processes no longer cause the CVS server to consume 100% CPU. * Thanks to a suggestion from Joseph P. Skudlarek <Jskud@Jskud.com>, an :extssh: has been added as a synonym of the :ext: access method, as a kindness to users of old version of Eclipse. * Misc documentation updates and minor bug fixes.
60 lines
1.5 KiB
Text
60 lines
1.5 KiB
Text
$NetBSD: patch-ae,v 1.2 2008/01/04 06:48:06 martti Exp $
|
|
|
|
--- src/rcs.c.orig 2006-06-08 16:55:04.000000000 +0300
|
|
+++ src/rcs.c 2008-01-02 14:43:41.000000000 +0200
|
|
@@ -3533,7 +3533,7 @@
|
|
size_t len;
|
|
};
|
|
#define KEYWORD_INIT(s) (s), sizeof (s) - 1
|
|
-static const struct rcs_keyword keywords[] =
|
|
+static struct rcs_keyword keywords[] =
|
|
{
|
|
{ KEYWORD_INIT ("Author") },
|
|
{ KEYWORD_INIT ("Date") },
|
|
@@ -3546,6 +3546,7 @@
|
|
{ KEYWORD_INIT ("Revision") },
|
|
{ KEYWORD_INIT ("Source") },
|
|
{ KEYWORD_INIT ("State") },
|
|
+ { NULL, 0 },
|
|
{ NULL, 0 }
|
|
};
|
|
enum keyword
|
|
@@ -3560,7 +3561,8 @@
|
|
KEYWORD_RCSFILE,
|
|
KEYWORD_REVISION,
|
|
KEYWORD_SOURCE,
|
|
- KEYWORD_STATE
|
|
+ KEYWORD_STATE,
|
|
+ KEYWORD_LOCALID
|
|
};
|
|
|
|
/* Convert an RCS date string into a readable string. This is like
|
|
@@ -3697,6 +3699,11 @@
|
|
return;
|
|
}
|
|
|
|
+ if (RCS_citag != NULL) {
|
|
+ keywords[KEYWORD_LOCALID].string = RCS_citag;
|
|
+ keywords[KEYWORD_LOCALID].len = strlen(RCS_citag);
|
|
+ }
|
|
+
|
|
/* If we are using -kkvl, dig out the locker information if any. */
|
|
locker = NULL;
|
|
if (expand == KFLAG_KVL)
|
|
@@ -3788,6 +3795,7 @@
|
|
|
|
case KEYWORD_HEADER:
|
|
case KEYWORD_ID:
|
|
+ case KEYWORD_LOCALID:
|
|
{
|
|
const char *path;
|
|
int free_path;
|
|
@@ -4466,7 +4474,7 @@
|
|
if (info != NULL)
|
|
{
|
|
/* If the size of `devtype' changes, fix the sscanf call also */
|
|
- char devtype[16];
|
|
+ char devtype[16+1];
|
|
|
|
if (sscanf (info->data, "%15s %lu",
|
|
devtype, &devnum_long) < 2)
|