===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/touch/touch.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/usr.bin/touch/touch.c	2003/06/03 02:56:20	1.9
--- src/usr.bin/touch/touch.c	2003/06/10 22:20:53	1.10
***************
*** 1,4 ****
! /*	$OpenBSD: touch.c,v 1.9 2003/06/03 02:56:20 millert Exp $	*/
  /*	$NetBSD: touch.c,v 1.11 1995/08/31 22:10:06 jtc Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: touch.c,v 1.10 2003/06/10 22:20:53 deraadt Exp $	*/
  /*	$NetBSD: touch.c,v 1.11 1995/08/31 22:10:06 jtc Exp $	*/
  
  /*
***************
*** 40,46 ****
  #if 0
  static char sccsid[] = "@(#)touch.c	8.2 (Berkeley) 4/28/95";
  #endif
! static char rcsid[] = "$OpenBSD: touch.c,v 1.9 2003/06/03 02:56:20 millert Exp $";
  #endif /* not lint */
  
  #include <sys/types.h>
--- 40,46 ----
  #if 0
  static char sccsid[] = "@(#)touch.c	8.2 (Berkeley) 4/28/95";
  #endif
! static char rcsid[] = "$OpenBSD: touch.c,v 1.10 2003/06/10 22:20:53 deraadt Exp $";
  #endif /* not lint */
  
  #include <sys/types.h>
***************
*** 65,73 ****
  void	usage(void);
  
  int
! main(argc, argv)
! 	int argc;
! 	char *argv[];
  {
  	struct stat sb;
  	struct timeval tv[2];
--- 65,71 ----
  void	usage(void);
  
  int
! main(int argc, char *argv[])
  {
  	struct stat sb;
  	struct timeval tv[2];
***************
*** 187,195 ****
  #define	ATOI2(s)	((s) += 2, ((s)[-2] - '0') * 10 + ((s)[-1] - '0'))
  
  void
! stime_arg1(arg, tvp)
! 	char *arg;
! 	struct timeval *tvp;
  {
  	struct tm *t;
  	time_t tmptime;
--- 185,191 ----
  #define	ATOI2(s)	((s) += 2, ((s)[-2] - '0') * 10 + ((s)[-1] - '0'))
  
  void
! stime_arg1(char *arg, struct timeval *tvp)
  {
  	struct tm *t;
  	time_t tmptime;
***************
*** 248,257 ****
  }
  
  void
! stime_arg2(arg, year, tvp)
! 	char *arg;
! 	int year;
! 	struct timeval *tvp;
  {
  	struct tm *t;
  	time_t tmptime;
--- 244,250 ----
  }
  
  void
! stime_arg2(char *arg, int year, struct timeval *tvp)
  {
  	struct tm *t;
  	time_t tmptime;
***************
*** 284,292 ****
  }
  
  void
! stime_file(fname, tvp)
! 	char *fname;
! 	struct timeval *tvp;
  {
  	struct stat sb;
  
--- 277,283 ----
  }
  
  void
! stime_file(char *fname, struct timeval *tvp)
  {
  	struct stat sb;
  
***************
*** 297,306 ****
  }
  
  int
! rw(fname, sbp, force)
! 	char *fname;
! 	struct stat *sbp;
! 	int force;
  {
  	int fd, needed_chmod, rval;
  	u_char byte;
--- 288,294 ----
  }
  
  int
! rw(char *fname, struct stat *sbp, int force)
  {
  	int fd, needed_chmod, rval;
  	u_char byte;
***************
*** 349,355 ****
  }
  
  __dead void
! usage()
  {
  	(void)fprintf(stderr,
  	    "usage: touch [-acfm] [-r file] [-t time] file ...\n");
--- 337,343 ----
  }
  
  __dead void
! usage(void)
  {
  	(void)fprintf(stderr,
  	    "usage: touch [-acfm] [-r file] [-t time] file ...\n");