===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/pr/pr.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -c -r1.40 -r1.41
*** src/usr.bin/pr/pr.c	2017/11/02 09:52:04	1.40
--- src/usr.bin/pr/pr.c	2017/12/23 20:53:07	1.41
***************
*** 1,4 ****
! /*	$OpenBSD: pr.c,v 1.40 2017/11/02 09:52:04 jca Exp $	*/
  
  /*-
   * Copyright (c) 1991 Keith Muller.
--- 1,4 ----
! /*	$OpenBSD: pr.c,v 1.41 2017/12/23 20:53:07 cheloha Exp $	*/
  
  /*-
   * Copyright (c) 1991 Keith Muller.
***************
*** 34,40 ****
   */
  
  #include <sys/types.h>
- #include <sys/time.h>
  #include <sys/stat.h>
  
  #include <ctype.h>
--- 34,39 ----
***************
*** 45,50 ****
--- 44,50 ----
  #include <stdarg.h>
  #include <stdlib.h>
  #include <string.h>
+ #include <time.h>
  #include <unistd.h>
  
  #include "pr.h"
***************
*** 1442,1448 ****
  nxtfile(int argc, char *argv[], char **fname, char *buf, int dt)
  {
      FILE *inf = NULL;
-     struct timeval tv;
      struct tm *timeptr = NULL;
      struct stat statbuf;
      time_t curtime;
--- 1442,1447 ----
***************
*** 1463,1476 ****
  	    *fname = FNAME;
  	if (nohead)
  	    return(inf);
! 	if (gettimeofday(&tv, NULL) < 0) {
! 	    ++errcnt;
! 	    ferrout("pr: cannot get time of day, %s\n",
! 		strerror(errno));
! 	    eoptind = argc - 1;
! 	    return(NULL);
! 	}
! 	curtime = tv.tv_sec;
  	timeptr = localtime(&curtime);
      }
      for (; eoptind < argc; ++eoptind) {
--- 1462,1468 ----
  	    *fname = FNAME;
  	if (nohead)
  	    return(inf);
! 	curtime = time(NULL);;
  	timeptr = localtime(&curtime);
      }
      for (; eoptind < argc; ++eoptind) {
***************
*** 1487,1499 ****
  	    ++eoptind;
  	    if (nohead || (dt && twice))
  		return(inf);
! 	    if (gettimeofday(&tv, NULL) < 0) {
! 		++errcnt;
! 		ferrout("pr: cannot get time of day, %s\n",
! 		    strerror(errno));
! 		return(NULL);
! 	    }
! 	    curtime = tv.tv_sec;
  	    timeptr = localtime(&curtime);
  	} else {
  	    /*
--- 1479,1485 ----
  	    ++eoptind;
  	    if (nohead || (dt && twice))
  		return(inf);
! 	    curtime = time(NULL);
  	    timeptr = localtime(&curtime);
  	} else {
  	    /*
***************
*** 1518,1530 ****
  		return(inf);
  
  	    if (dt) {
! 		if (gettimeofday(&tv, NULL) < 0) {
! 		    ++errcnt;
! 		    ferrout("pr: cannot get time of day, %s\n",
! 			 strerror(errno));
! 		    return(NULL);
! 		}
! 		curtime = tv.tv_sec;
  		timeptr = localtime(&curtime);
  	    } else {
  		if (fstat(fileno(inf), &statbuf) < 0) {
--- 1504,1510 ----
  		return(inf);
  
  	    if (dt) {
! 		curtime = time(NULL);
  		timeptr = localtime(&curtime);
  	    } else {
  		if (fstat(fileno(inf), &statbuf) < 0) {