Attachment #54352 for bug #86476

Lines 114-120 password_entry_parseline (const char *cv Link Here

(-)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 379-384 patch_fileproc (void *callerdat, struct Link Here

(-)src/patch.c (-3 / +4 lines)
379	struct utimbuf t;	379	struct utimbuf t;
380	char vers_tag, vers_head;	380	char vers_tag, vers_head;
381	char *rcs = NULL;	381	char *rcs = NULL;
		382	char *rcs_orig = NULL;
382	RCSNode *rcsfile;	383	RCSNode *rcsfile;
383	FILE fp1, fp2, *fp3;	384	FILE fp1, fp2, *fp3;
384	int ret = 0;	385	int ret = 0;
Lines 409-415 patch_fileproc (void *callerdat, struct Link Here
409	if ((rcsfile->flags & VALID) && (rcsfile->flags & INATTIC))	410	if ((rcsfile->flags & VALID) && (rcsfile->flags & INATTIC))
410	isattic = 1;	411	isattic = 1;
411		412
412	rcs = xmalloc (strlen (finfo->file) + sizeof (RCSEXT) + 5);	413	rcs_orig = rcs = xmalloc (strlen (finfo->file) + sizeof (RCSEXT) + 5);
413	(void)sprintf (rcs, "%s%s", finfo->file, RCSEXT);	414	(void)sprintf (rcs, "%s%s", finfo->file, RCSEXT);
414		415
415	/* if vers_head is NULL, may have been removed from the release */	416	/* if vers_head is NULL, may have been removed from the release */
Lines 748-755 failed to read diff file header %s for % Link Here
748	free (vers_tag);	749	free (vers_tag);
749	if (vers_head != NULL)	750	if (vers_head != NULL)
750	free (vers_head);	751	free (vers_head);
751	if (rcs != NULL)	752	if (rcs_orig)
752	free (rcs);	753	free (rcs_orig);
753	return ret;	754	return ret;
754	}	755	}
755		756

Lines 2946-2953 RCS_getdate (RCSNode rcs, const char d Link Here

(-)src/rcs.c (-4 / +5 lines)
2946	if (retval != NULL)	2946	if (retval != NULL)
2947	return retval;	2947	return retval;
2948		2948
2949	if (!force_tag_match \|\|	2949	if (vers && (!force_tag_match \|\| RCS_datecmp (vers->date, date) <= 0))
2950	(vers != NULL && RCS_datecmp (vers->date, date) <= 0))
2951	return xstrdup (vers->version);	2950	return xstrdup (vers->version);
2952	else	2951	else
2953	return NULL;	2952	return NULL;
Lines 4093-4099 RCS_checkout (RCSNode rcs, const char Link Here
4093	size_t len;	4092	size_t len;
4094	int free_value = 0;	4093	int free_value = 0;
4095	char *log = NULL;	4094	char *log = NULL;
4096	size_t loglen;	4095	size_t loglen = 0;
4097	Node *vp = NULL;	4096	Node *vp = NULL;
4098	#ifdef PRESERVE_PERMISSIONS_SUPPORT	4097	#ifdef PRESERVE_PERMISSIONS_SUPPORT
4099	uid_t rcs_owner = (uid_t) -1;	4098	uid_t rcs_owner = (uid_t) -1;
Lines 7357-7363 RCS_deltas (RCSNode rcs, FILE fp, stru Link Here
7357		7356
7358	for (ln = 0; ln < headlines.nlines; ++ln)	7357	for (ln = 0; ln < headlines.nlines; ++ln)
7359	{	7358	{
7360	char buf[80];	7359	char *buf;
7361	/* Period which separates year from month in date. */	7360	/* Period which separates year from month in date. */
7362	char *ym;	7361	char *ym;
7363	/* Period which separates month from day in date. */	7362	/* Period which separates month from day in date. */
Lines 7368-7377 RCS_deltas (RCSNode rcs, FILE fp, stru Link Here
7368	if (prvers == NULL)	7367	if (prvers == NULL)
7369	prvers = vers;	7368	prvers = vers;
7370		7369
		7370	buf = xmalloc (strlen (prvers->version) + 24);
7371	sprintf (buf, "%-12s (%-8.8s ",	7371	sprintf (buf, "%-12s (%-8.8s ",
7372	prvers->version,	7372	prvers->version,
7373	prvers->author);	7373	prvers->author);
7374	cvs_output (buf, 0);	7374	cvs_output (buf, 0);
		7375	free (buf);
7375		7376
7376	/* Now output the date. */	7377	/* Now output the date. */
7377	ym = strchr (prvers->date, '.');	7378	ym = strchr (prvers->date, '.');