d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1. Don't reject 0145 if started at 22XX.

Browse Source 
Applied suggested fix from Andrew Andrew <andrew@ugh.net.au> with
   some stylistic changes. Thanks.
2. #include <sys/time.h> -> #include <time.h>
3. Removed #include <sys/param.h>
4. Use setlocale(3) and strftime(3) instead of ctime(3).
5. Clean up -Wall warnings.
6. Make sure, time to leave are integral minutes if the argument
   is absolute. (i. e. without "+"). If started at 10:10:55 with
   argument "1020" it computed time to leave as 10:20:55 instead of
   10:20:00.

PR:		5395
This commit is contained in:
helbig 1998-01-06 17:27:09 +00:00
parent 86e2f8774a
commit 642e7e0110
2 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.bin/leave/Makefile
View File

@ -1,5 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $Id$
PROG= leave
CFLAGS+=-Wall
.include <bsd.prog.mk>

49
usr.bin/leave/leave.c
View File

@ -42,13 +42,14 @@ static const char copyright[] =
static char sccsid[] = "@(#)leave.c 8.1 (Berkeley) 6/6/93";
#endif
static const char rcsid[] =
"$Id$";
"$Id: leave.c,v 1.2 1997/07/21 12:04:31 charnier Exp $";
#endif /* not lint */
#include <sys/param.h>
#include <sys/time.h>
#include <err.h>
#include <ctype.h>
#include <locale.h>
#include <stdio.h>
#include <time.h>
#include <unistd.h>
void doalarm __P((u_int));
@ -71,9 +72,12 @@ main(argc, argv)
register char c, *cp;
struct tm *t, *localtime();
time_t now, time();
int plusnow;
int plusnow, t_12_hour;
char buf[50];
if (setlocale(LC_TIME, "") == NULL)
warn("setlocale");
if (argc < 2) {
#define MSG1 "When do you have to leave? "
(void)write(1, MSG1, sizeof(MSG1) - 1);
@ -86,11 +90,8 @@ main(argc, argv)
if (*cp == '+') {
plusnow = 1;
++cp;
} else {
} else
plusnow = 0;
(void)time(&now);
t = localtime(&now);
}
for (hours = 0; (c = *cp) && c != '\n'; ++cp) {
if (!isdigit(c))
@ -105,11 +106,30 @@ main(argc, argv)
if (plusnow)
secs = hours * 60 * 60 + minutes * 60;
else {
if (hours > 23 || t->tm_hour > hours ||
(t->tm_hour == hours && minutes <= t->tm_min))
(void)time(&now);
t = localtime(&now);
if (hours > 23)
usage();
secs = (hours - t->tm_hour) * 60 * 60;
/* Convert tol to 12 hr time (0:00...11:59) */
if (hours > 11)
hours -= 12;
/* Convert tm to 12 hr time (0:00...11:59) */
if (t->tm_hour > 11)
t_12_hour = t->tm_hour - 12;
else
t_12_hour = t->tm_hour;
if (hours < t_12_hour ||
(hours == t_12_hour && minutes <= t->tm_min))
/* Leave time is in the past so we add 12 hrs */
hours += 12;
secs = (hours - t_12_hour) * 60 * 60;
secs += (minutes - t->tm_min) * 60;
secs -= now % 60; /* truncate (now + secs) to min */
}
doalarm(secs);
exit(0);
@ -121,17 +141,18 @@ doalarm(secs)
{
register int bother;
time_t daytime, time();
char tb[80];
int pid;
char *ctime();
if ((pid = fork())) {
(void)time(&daytime);
daytime += secs;
printf("Alarm set for %.16s. (pid %d)\n",
ctime(&daytime), pid);
strftime(tb, sizeof(tb), "%+", localtime(&daytime));
printf("Alarm set for %s. (pid %d)\n", tb, pid);
exit(0);
}
sleep((u_int)2); /* let parent print set message */
secs -= 2;
/*
* if write fails, we've lost the terminal through someone else