Attachment #54351 for bug #86476

Lines 114-120 password_entry_parseline (cvsroot_canoni Link Here

(-)cvs-1.11.18.orig/src/login.c (-1 / +1 lines)
114		114
115	if (isspace(*(linebuf + 1)))	115	if (isspace(*(linebuf + 1)))
116	/* special case since strtoul ignores leading white space */	116	/* special case since strtoul ignores leading white space */
117	entry_version = 0;	117	q = linebuf + 1;
118	else	118	else
119	entry_version = strtoul (linebuf + 1, &q, 10);	119	entry_version = strtoul (linebuf + 1, &q, 10);
120		120




    struct utimbuf t;
    char *vers_tag, *vers_head;
    char *rcs = NULL;
    char *rcs_orig = NULL;
    RCSNode *rcsfile;
    FILE *fp1, *fp2, *fp3;
    int ret = 0;

    if ((rcsfile->flags & VALID) && (rcsfile->flags & INATTIC))
	isattic = 1;

    rcs_orig = rcs = xmalloc (strlen (finfo->file) + sizeof (RCSEXT) + 5);
    (void) sprintf (rcs, "%s%s", finfo->file, RCSEXT);

    /* if vers_head is NULL, may have been removed from the release */

	free (vers_tag);
    if (vers_head != NULL)
	free (vers_head);
    if (rcs_orig)
	free (rcs_orig);
    return ret;
}





    if (retval != NULL)
	return (retval);

    if (vers && (!force_tag_match || RCS_datecmp (vers->date, date) <= 0))
	(vers != NULL && RCS_datecmp (vers->date, date) <= 0))
	return xstrdup (vers->version);
    else
	return NULL;

    size_t len;
    int free_value = 0;
    char *log = NULL;
    size_t loglen = 0;
    Node *vp = NULL;
#ifdef PRESERVE_PERMISSIONS_SUPPORT
    uid_t rcs_owner = (uid_t) -1;


		for (ln = 0; ln < headlines.nlines; ++ln)
		{
		    char *buf;
		    /* Period which separates year from month in date.  */
		    char *ym;
		    /* Period which separates month from day in date.  */

		    if (prvers == NULL)
			prvers = vers;

		    buf = xmalloc (strlen (prvers->version) + 24);
		    sprintf (buf, "%-12s (%-8.8s ",
			     prvers->version,
			     prvers->author);
		    cvs_output (buf, 0);
		    free (buf);

		    /* Now output the date.  */
		    ym = strchr (prvers->date, '.');

Return to bug 86476

Lines 385-390 patch_fileproc (callerdat, finfo) Link Here

(-)cvs-1.11.18.orig/src/patch.c (-3 / +4 lines)
385	struct utimbuf t;	385	struct utimbuf t;
386	char vers_tag, vers_head;	386	char vers_tag, vers_head;
387	char *rcs = NULL;	387	char *rcs = NULL;
		388	char *rcs_orig = NULL;
388	RCSNode *rcsfile;	389	RCSNode *rcsfile;
389	FILE fp1, fp2, *fp3;	390	FILE fp1, fp2, *fp3;
390	int ret = 0;	391	int ret = 0;
Lines 415-421 patch_fileproc (callerdat, finfo) Link Here
415	if ((rcsfile->flags & VALID) && (rcsfile->flags & INATTIC))	416	if ((rcsfile->flags & VALID) && (rcsfile->flags & INATTIC))
416	isattic = 1;	417	isattic = 1;
417		418
418	rcs = xmalloc (strlen (finfo->file) + sizeof (RCSEXT) + 5);	419	rcs_orig = rcs = xmalloc (strlen (finfo->file) + sizeof (RCSEXT) + 5);
419	(void) sprintf (rcs, "%s%s", finfo->file, RCSEXT);	420	(void) sprintf (rcs, "%s%s", finfo->file, RCSEXT);
420		421
421	/* if vers_head is NULL, may have been removed from the release */	422	/* if vers_head is NULL, may have been removed from the release */
Lines 757-764 failed to read diff file header %s for % Link Here
757	free (vers_tag);	758	free (vers_tag);
758	if (vers_head != NULL)	759	if (vers_head != NULL)
759	free (vers_head);	760	free (vers_head);
760	if (rcs != NULL)	761	if (rcs_orig)
761	free (rcs);	762	free (rcs_orig);
762	return ret;	763	return ret;
763	}	764	}
764		765

Lines 3024-3031 RCS_getdate (rcs, date, force_tag_match) Link Here

(-)cvs-1.11.18.orig/src/rcs.c (-4 / +5 lines)
3024	if (retval != NULL)	3024	if (retval != NULL)
3025	return (retval);	3025	return (retval);
3026		3026
3027	if (!force_tag_match \|\|	3027	if (vers && (!force_tag_match \|\| RCS_datecmp (vers->date, date) <= 0))
3028	(vers != NULL && RCS_datecmp (vers->date, date) <= 0))
3029	return xstrdup (vers->version);	3028	return xstrdup (vers->version);
3030	else	3029	else
3031	return NULL;	3030	return NULL;
Lines 4112-4118 RCS_checkout (rcs, workfile, rev, nameta Link Here
4112	size_t len;	4111	size_t len;
4113	int free_value = 0;	4112	int free_value = 0;
4114	char *log = NULL;	4113	char *log = NULL;
4115	size_t loglen;	4114	size_t loglen = 0;
4116	Node *vp = NULL;	4115	Node *vp = NULL;
4117	#ifdef PRESERVE_PERMISSIONS_SUPPORT	4116	#ifdef PRESERVE_PERMISSIONS_SUPPORT
4118	uid_t rcs_owner = (uid_t) -1;	4117	uid_t rcs_owner = (uid_t) -1;
Lines 7437-7443 RCS_deltas (rcs, fp, rcsbuf, version, op Link Here
7437		7436
7438	for (ln = 0; ln < headlines.nlines; ++ln)	7437	for (ln = 0; ln < headlines.nlines; ++ln)
7439	{	7438	{
7440	char buf[80];	7439	char *buf;
7441	/* Period which separates year from month in date. */	7440	/* Period which separates year from month in date. */
7442	char *ym;	7441	char *ym;
7443	/* Period which separates month from day in date. */	7442	/* Period which separates month from day in date. */
Lines 7448-7457 RCS_deltas (rcs, fp, rcsbuf, version, op Link Here
7448	if (prvers == NULL)	7447	if (prvers == NULL)
7449	prvers = vers;	7448	prvers = vers;
7450		7449
		7450	buf = xmalloc (strlen (prvers->version) + 24);
7451	sprintf (buf, "%-12s (%-8.8s ",	7451	sprintf (buf, "%-12s (%-8.8s ",
7452	prvers->version,	7452	prvers->version,
7453	prvers->author);	7453	prvers->author);
7454	cvs_output (buf, 0);	7454	cvs_output (buf, 0);
		7455	free (buf);
7455		7456
7456	/* Now output the date. */	7457	/* Now output the date. */
7457	ym = strchr (prvers->date, '.');	7458	ym = strchr (prvers->date, '.');