[comp.sources.unix] v22i033: Patch to Brian Berliner's CVS system, Patch1

rsalz@uunet.uu.net (Rich Salz) (05/08/90)

Submitted-by: Brian Berliner <berliner@sun.com>
Posting-number: Volume 22, Issue 33
Archive-name: cvs-berliner/patch1
Patch-To: volume22/cvs-berliner

This patch addresses a major portability bug and is very small.  It will
probably be the only patch I send out for this version of CVS.  The 2.0
release of CVS is almost complete, and I'll likely be sending that one to
you in a couple of months.

	-Brian
	berliner@sun.com

---------CUT-FOR-PATCH---------CUT-FOR-PATCH---------CUT-FOR-PATCH----------
This patch fixes a major portability bug in the 1.0 release of CVS.  Apply
the following patch with the "patch" command or by hand.  Also, my new email
address is:

	berliner@sun.com

Please direct all future inquiries about CVS to this address.

	-Brian

diff -c cvs/src/patch.c:1.5 cvs/src/patch.c:1.6
*** cvs/src/patch.c:1.5	Wed Feb 14 10:02:10 1990
--- cvs/src/patch.c	Wed Feb 14 10:02:10 1990
***************
*** 1,5 ****
  #ifndef lint
! static char rcsid[] = "$Id: patch.c,v 1.5 89/11/19 23:40:41 berliner Exp $";
  #endif !lint
  
  /*
--- 1,5 ----
  #ifndef lint
! static char rcsid[] = "$Id: patch.c,v 1.6 90/02/14 10:01:33 berliner Exp $";
  #endif !lint
  
  /*
***************
*** 22,28 ****
  #include <ctype.h>
  #include "cvs.h"
  
! extern time_t timelocal();
  
  extern char update_dir[];
  extern DBM *open_module();
--- 22,28 ----
  #include <ctype.h>
  #include "cvs.h"
  
! extern long maketime();
  
  extern char update_dir[];
  extern DBM *open_module();
***************
*** 380,391 ****
  		ret = 0;
  		*semi = '\0';
  		ftm = &tm;
! 		bzero((char *)ftm, sizeof(*ftm));
  		(void) sscanf(cp, DATEFORM, &ftm->tm_year, &ftm->tm_mon,
  			      &ftm->tm_mday, &ftm->tm_hour, &ftm->tm_min,
  			      &ftm->tm_sec);
  		ftm->tm_mon--;
! 		revdate = timelocal(ftm) - 1;
  		ftm = localtime(&revdate);
  		(void) sprintf(date, DATEFORM, ftm->tm_year, ftm->tm_mon+1,
  			       ftm->tm_mday, ftm->tm_hour, ftm->tm_min,
--- 380,391 ----
  		ret = 0;
  		*semi = '\0';
  		ftm = &tm;
! 		zaptime((int *)ftm);
  		(void) sscanf(cp, DATEFORM, &ftm->tm_year, &ftm->tm_mon,
  			      &ftm->tm_mday, &ftm->tm_hour, &ftm->tm_min,
  			      &ftm->tm_sec);
  		ftm->tm_mon--;
! 		revdate = (time_t)maketime(ftm) - 1;
  		ftm = localtime(&revdate);
  		(void) sprintf(date, DATEFORM, ftm->tm_year, ftm->tm_mon+1,
  			       ftm->tm_mday, ftm->tm_hour, ftm->tm_min,

exit 0 # Just in case...
-- 
Please send comp.sources.unix-related mail to rsalz@uunet.uu.net.
Use a domain-based address or give alternate paths, or you may lose out.