===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/calendar/day.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -c -r1.12 -r1.13
*** src/usr.bin/calendar/day.c	2001/09/26 20:38:55	1.12
--- src/usr.bin/calendar/day.c	2001/09/27 18:19:20	1.13
***************
*** 1,4 ****
! /*	$OpenBSD: day.c,v 1.12 2001/09/26 20:38:55 mickey Exp $	*/
  
  /*
   * Copyright (c) 1989, 1993, 1994
--- 1,4 ----
! /*	$OpenBSD: day.c,v 1.13 2001/09/27 18:19:20 mickey Exp $	*/
  
  /*
   * Copyright (c) 1989, 1993, 1994
***************
*** 43,49 ****
  #if 0
  static const char sccsid[] = "@(#)calendar.c  8.3 (Berkeley) 3/25/94";
  #else
! static char rcsid[] = "$OpenBSD: day.c,v 1.12 2001/09/26 20:38:55 mickey Exp $";
  #endif
  #endif /* not lint */
  
--- 43,49 ----
  #if 0
  static const char sccsid[] = "@(#)calendar.c  8.3 (Berkeley) 3/25/94";
  #else
! static char rcsid[] = "$OpenBSD: day.c,v 1.13 2001/09/27 18:19:20 mickey Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 433,449 ****
  			}
  			if ((tmp = malloc(sizeof(struct match))) == NULL)
  				err(1, NULL);
! 			tmp->when = f_time + v2 * SECSPERDAY;
  			(void)mktime(&tmtmp);
  			if (strftime(tmp->print_date,
  			    sizeof(tmp->print_date),
  			/*    "%a %b %d", &tm);  Skip weekdays */
  			    "%b %d", &tmtmp) == 0)
  				tmp->print_date[sizeof(tmp->print_date) - 1] = '\0';
- 			if (bodun && (day - tp->tm_yday) == -1)
- 				strcpy(tmp->prefix, "Бодун на утро от: ");
- 			else
- 				tmp->prefix[0] = '\0';
  
  			tmp->var   = varp;
  			tmp->next  = NULL;
--- 433,454 ----
  			}
  			if ((tmp = malloc(sizeof(struct match))) == NULL)
  				err(1, NULL);
! 
! 			if (bodun && (day - tp->tm_yday) == -1) {
! 				tmp->when = f_time - 1 * SECSPERDAY;
! 				tmtmp.tm_mday++;
! 				tmp->bodun = 1;
! 			} else {
! 				tmp->when = f_time + v2 * SECSPERDAY;
! 				tmp->bodun = 0;
! 			}
! 
  			(void)mktime(&tmtmp);
  			if (strftime(tmp->print_date,
  			    sizeof(tmp->print_date),
  			/*    "%a %b %d", &tm);  Skip weekdays */
  			    "%b %d", &tmtmp) == 0)
  				tmp->print_date[sizeof(tmp->print_date) - 1] = '\0';
  
  			tmp->var   = varp;
  			tmp->next  = NULL;
***************
*** 539,549 ****
  					/*    "%a %b %d", &tm);  Skip weekdays */
  					    "%b %d", &tmtmp) == 0)
  						tmp->print_date[sizeof(tmp->print_date) - 1] = '\0';
! 					if (bodun && tdiff == -1)
! 						strcpy(tmp->prefix,
! 						    "Bodun na ytpo ot: ");
! 					else
! 						tmp->prefix[0] = '\0';
  					tmp->var   = varp;
  					tmp->next  = NULL;
  					if (tmp2)
--- 544,550 ----
  					/*    "%a %b %d", &tm);  Skip weekdays */
  					    "%b %d", &tmtmp) == 0)
  						tmp->print_date[sizeof(tmp->print_date) - 1] = '\0';
! 					tmp->bodun = bodun && tdiff == -1;
  					tmp->var   = varp;
  					tmp->next  = NULL;
  					if (tmp2)