=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/calendar/io.c,v retrieving revision 1.19 retrieving revision 1.36 diff -u -r1.19 -r1.36 --- src/usr.bin/calendar/io.c 2001/11/19 19:02:13 1.19 +++ src/usr.bin/calendar/io.c 2013/11/26 13:18:53 1.36 @@ -1,4 +1,4 @@ -/* $OpenBSD: io.c,v 1.19 2001/11/19 19:02:13 mpech Exp $ */ +/* $OpenBSD: io.c,v 1.36 2013/11/26 13:18:53 deraadt Exp $ */ /* * Copyright (c) 1989, 1993, 1994 @@ -12,11 +12,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -33,20 +29,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char copyright[] = -"@(#) Copyright (c) 1989, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#ifndef lint -#if 0 -static const char sccsid[] = "@(#)calendar.c 8.3 (Berkeley) 3/25/94"; -#else -static char rcsid[] = "$OpenBSD: io.c,v 1.19 2001/11/19 19:02:13 mpech Exp $"; -#endif -#endif /* not lint */ - #include #include #include @@ -71,27 +53,25 @@ struct iovec header[] = { - {"From: ", 6}, - {NULL, 0}, - {" (Reminder Service)\nTo: ", 24}, - {NULL, 0}, - {"\nSubject: ", 10}, - {NULL, 0}, - {"'s Calendar\nPrecedence: bulk\n\n", 30}, + { "From: ", 6 }, + { NULL, 0 }, + { " (Reminder Service)\nTo: ", 24 }, + { NULL, 0 }, + { "\nSubject: ", 10 }, + { NULL, 0 }, + { "'s Calendar\nPrecedence: bulk\n", 29 }, + { "Auto-Submitted: auto-generated\n\n", 32 }, }; void -cal() +cal(void) { - int printing; - char *p; - FILE *fp; - int ch, l, i, bodun = 0, bodun_maybe = 0; - int var; - char buf[2048 + 1], *prefix = NULL; + int ch, l, i, bodun = 0, bodun_maybe = 0, var, printing; struct event *events, *cur_evt, *ev1, *tmp; + char buf[2048 + 1], *prefix = NULL, *p; struct match *m; + FILE *fp; events = NULL; cur_evt = NULL; @@ -121,30 +101,50 @@ } else bodun_maybe = 0; continue; - } - if (bodun_maybe && strncmp(buf, "BODUN=", 6) == 0) { + } else if (strncmp(buf, "CALENDAR=", 9) == 0) { + char *ep; + + if (buf[9] == '\0') + calendar = 0; + else if (!strcasecmp(buf + 9, "julian")) { + calendar = JULIAN; + errno = 0; + julian = strtoul(buf + 14, &ep, 10); + if (buf[0] == '\0' || *ep != '\0') + julian = 13; + if ((errno == ERANGE && julian == ULONG_MAX) || + julian > 14) + errx(1, "Julian calendar offset is too large"); + } else if (!strcasecmp(buf + 9, "gregorian")) + calendar = GREGORIAN; + else if (!strcasecmp(buf + 9, "lunar")) + calendar = LUNAR; + } else if (bodun_maybe && strncmp(buf, "BODUN=", 6) == 0) { bodun++; if (prefix) free(prefix); if ((prefix = strdup(buf + 6)) == NULL) err(1, NULL); + continue; } /* User defined names for special events */ if ((p = strchr(buf, '='))) { for (i = 0; i < NUMEV; i++) { - if (strncasecmp(buf, spev[i].name, spev[i].nlen) == 0 && - (p - buf == spev[i].nlen) && buf[spev[i].nlen + 1]) { - p++; - if (spev[i].uname != NULL) - free(spev[i].uname); - if ((spev[i].uname = strdup(p)) == NULL) - err(1, NULL); - spev[i].ulen = strlen(p); - i = NUMEV + 1; + if (strncasecmp(buf, spev[i].name, + spev[i].nlen) == 0 && + (p - buf == spev[i].nlen) && + buf[spev[i].nlen + 1]) { + p++; + if (spev[i].uname != NULL) + free(spev[i].uname); + if ((spev[i].uname = strdup(p)) == NULL) + err(1, NULL); + spev[i].ulen = strlen(p); + i = NUMEV + 1; + } } - } - if (i > NUMEV) - continue; + if (i > NUMEV) + continue; } if (buf[0] != '\t') { printing = (m = isnow(buf, bodun)) ? 1 : 0; @@ -163,45 +163,41 @@ ev1 = NULL; while (m) { - cur_evt = (struct event *) malloc(sizeof(struct event)); - if (cur_evt == NULL) - err(1, NULL); - - cur_evt->when = m->when; - snprintf(cur_evt->print_date, - sizeof(cur_evt->print_date), "%s%c", - m->print_date, (var + m->var) ? '*' : ' '); - if (ev1) { - cur_evt->desc = ev1->desc; - cur_evt->ldesc = NULL; - } else { - if (m->bodun && prefix) { - int l1 = strlen(prefix); - int l2 = strlen(p); - if ((cur_evt->ldesc = - malloc(l1 + l2)) == NULL) - err(1, "malloc"); - sprintf(cur_evt->ldesc, - "\t%s %s", prefix, p + 1); - } else if ((cur_evt->ldesc = - strdup(p)) == NULL) + cur_evt = malloc(sizeof(struct event)); + if (cur_evt == NULL) err(1, NULL); - cur_evt->desc = &(cur_evt->ldesc); - ev1 = cur_evt; + + cur_evt->when = m->when; + snprintf(cur_evt->print_date, + sizeof(cur_evt->print_date), "%s%c", + m->print_date, (var + m->var) ? '*' : ' '); + if (ev1) { + cur_evt->desc = ev1->desc; + cur_evt->ldesc = NULL; + } else { + if (m->bodun && prefix) { + if (asprintf(&cur_evt->ldesc, + "\t%s %s", prefix, + p + 1) == -1) + err(1, NULL); + } else if ((cur_evt->ldesc = + strdup(p)) == NULL) + err(1, NULL); + cur_evt->desc = &(cur_evt->ldesc); + ev1 = cur_evt; + } + insert(&events, cur_evt); + foo = m; + m = m->next; + free(foo); } - insert(&events, cur_evt); - foo = m; - m = m->next; - free(foo); - } } - } - else if (printing) { - if ((ev1->ldesc = realloc(ev1->ldesc, - (2 + strlen(ev1->ldesc) + strlen(buf)))) == NULL) + } else if (printing) { + if (asprintf(&p, "%s\n%s", ev1->ldesc, + buf) == -1) err(1, NULL); - strcat(ev1->ldesc, "\n"); - strcat(ev1->ldesc, buf); + free(ev1->ldesc); + ev1->ldesc = p; } } tmp = events; @@ -221,34 +217,34 @@ } int -getfield(p, endp, flags) - char *p, **endp; - int *flags; +getfield(char *p, char **endp, int *flags) { int val, var, i; char *start, savech; - for (; !isdigit(*p) && !isalpha(*p) && *p != '*' && *p != '\t'; ++p) + for (; !isdigit((unsigned char)*p) && !isalpha((unsigned char)*p) && + *p != '*' && *p != '\t'; ++p) ; if (*p == '*') { /* `*' is every month */ *flags |= F_ISMONTH; *endp = p+1; return (-1); /* means 'every month' */ } - if (isdigit(*p)) { + if (isdigit((unsigned char)*p)) { val = strtol(p, &p, 10); /* if 0, it's failure */ - for (; !isdigit(*p) && !isalpha(*p) && *p != '*'; ++p) + for (; !isdigit((unsigned char)*p) && + !isalpha((unsigned char)*p) && *p != '*'; ++p) ; *endp = p; return (val); } - for (start = p; isalpha(*++p);) + for (start = p; isalpha((unsigned char)*++p);) ; /* Sunday-1 */ if (*p == '+' || *p == '-') - for(; isdigit(*++p);) - ; + for(; isdigit((unsigned char)*++p); ) + ; savech = *p; *p = '\0'; @@ -259,16 +255,16 @@ /* Day */ else if ((val = getday(start)) != 0) { - *flags |= F_ISDAY; + *flags |= F_ISDAY; - /* variable weekday */ - if ((var = getdayvar(start)) != 0) { - if (var <= 5 && var >= -4) - val += var * 10; + /* variable weekday */ + if ((var = getdayvar(start)) != 0) { + if (var <= 5 && var >= -4) + val += var * 10; #ifdef DEBUG - printf("var: %d\n", var); + printf("var: %d\n", var); #endif - } + } } /* Try specials (Easter, Paskha, ...) */ @@ -289,25 +285,26 @@ switch(*start) { case '-': case '+': - var = atoi(start); - if (var > 365 || var < -365) - return (0); /* Someone is just being silly */ - val += (NUMEV + 1) * var; - /* We add one to the matching event and multiply by - * (NUMEV + 1) so as not to return 0 if there's a match. - * val will overflow if there is an obscenely large - * number of special events. */ - break; + var = atoi(start); + if (var > 365 || var < -365) + return (0); /* Someone is just being silly */ + val += (NUMEV + 1) * var; + /* We add one to the matching event and multiply by + * (NUMEV + 1) so as not to return 0 if there's a match. + * val will overflow if there is an obscenely large + * number of special events. */ + break; } - *flags |= F_SPECIAL; + *flags |= F_SPECIAL; } if (!(*flags & F_SPECIAL)) { - /* undefined rest */ + /* undefined rest */ *p = savech; return (0); } } - for (*p = savech; !isdigit(*p) && !isalpha(*p) && *p != '*' && *p != '\t'; ++p) + for (*p = savech; !isdigit((unsigned char)*p) && + !isalpha((unsigned char)*p) && *p != '*' && *p != '\t'; ++p) ; *endp = p; return (val); @@ -315,13 +312,14 @@ FILE * -opencal() +opencal(void) { - int pdes[2]; - int fdin; + int pdes[2], fdin; + struct stat st; /* open up calendar file as stdin */ - if ((fdin = open(calendarFile, O_RDONLY)) == -1) { + if ((fdin = open(calendarFile, O_RDONLY)) == -1 || + fstat(fdin, &st) == -1 || !S_ISREG(st.st_mode)) { if (!doall) { char *home = getenv("HOME"); if (home == NULL || *home == '\0') @@ -333,6 +331,7 @@ calendarFile, calendarHome, calendarFile); } } + if (pipe(pdes) < 0) return (NULL); switch (vfork()) { @@ -348,7 +347,8 @@ (void)close(pdes[1]); } (void)close(pdes[0]); - /* Set stderr to /dev/null. Necessary so that cron does not + /* + * Set stderr to /dev/null. Necessary so that cron does not * wait for cpp to finish if it's running calendar -a. */ if (doall) { @@ -359,7 +359,8 @@ (void)dup2(fderr, STDERR_FILENO); (void)close(fderr); } - execl(_PATH_CPP, "cpp", "-P", "-I.", _PATH_INCLUDE, (char *)NULL); + execl(_PATH_CPP, "cpp", "-traditional", "-undef", "-U__GNUC__", + "-P", "-I.", _PATH_INCLUDE, (char *)NULL); warn(_PATH_CPP); _exit(1); } @@ -377,8 +378,7 @@ } void -closecal(fp) - FILE *fp; +closecal(FILE *fp) { struct stat sbuf; int nread, pdes[2], status; @@ -414,7 +414,7 @@ header[1].iov_base = header[3].iov_base = pw->pw_name; header[1].iov_len = header[3].iov_len = strlen(pw->pw_name); - writev(pdes[1], header, 7); + writev(pdes[1], header, 8); while ((nread = read(fileno(fp), buf, sizeof(buf))) > 0) (void)write(pdes[1], buf, nread); (void)close(pdes[1]); @@ -425,9 +425,7 @@ void -insert(head, cur_evt) - struct event **head; - struct event *cur_evt; +insert(struct event **head, struct event *cur_evt) { struct event *tmp, *tmp2;