=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/calendar/io.c,v retrieving revision 1.8 retrieving revision 1.29 diff -u -r1.8 -r1.29 --- src/usr.bin/calendar/io.c 1999/11/25 03:46:47 1.8 +++ src/usr.bin/calendar/io.c 2005/04/15 14:28:56 1.29 @@ -1,4 +1,4 @@ -/* $OpenBSD: io.c,v 1.8 1999/11/25 03:46:47 pjanzen Exp $ */ +/* $OpenBSD: io.c,v 1.29 2005/04/15 14:28:56 otto 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. * @@ -43,7 +39,7 @@ #if 0 static const char sccsid[] = "@(#)calendar.c 8.3 (Berkeley) 3/25/94"; #else -static char rcsid[] = "$OpenBSD: io.c,v 1.8 1999/11/25 03:46:47 pjanzen Exp $"; +static const char rcsid[] = "$OpenBSD: io.c,v 1.29 2005/04/15 14:28:56 otto Exp $"; #endif #endif /* not lint */ @@ -57,6 +53,7 @@ #include #include #include +#include #include #include #include @@ -69,10 +66,6 @@ #include "calendar.h" -char *calendarFile = "calendar"; /* default calendar file */ -char *calendarHome = ".calendar"; /* HOME */ -char *calendarNoMail = "nomail"; /* don't sent mail if this file exist */ - struct iovec header[] = { {"From: ", 6}, {NULL, 0}, @@ -85,16 +78,17 @@ void -cal() +cal(void) { - register int printing; - register char *p; + int printing; + char *p; FILE *fp; - int ch, l, i; + int ch, l, i, bodun = 0, bodun_maybe = 0; int var; - char buf[2048 + 1]; + char buf[2048 + 1], *prefix = NULL; struct event *events, *cur_evt, *ev1, *tmp; struct match *m; + size_t nlen; events = NULL; cur_evt = NULL; @@ -105,9 +99,7 @@ *p = '\0'; else while ((ch = getchar()) != '\n' && ch != EOF); - for (l = strlen(buf); - l > 0 && isspace(buf[l - 1]); - l--) + for (l = strlen(buf); l > 0 && isspace(buf[l - 1]); l--) ; buf[l] = '\0'; if (buf[0] == '\0') @@ -115,7 +107,42 @@ if (strncmp(buf, "LANG=", 5) == 0) { (void) setlocale(LC_ALL, buf + 5); setnnames(); + if (!strcmp(buf + 5, "ru_RU.KOI8-R") || + !strcmp(buf + 5, "uk_UA.KOI8-U") || + !strcmp(buf + 5, "by_BY.KOI8-B")) { + bodun_maybe++; + bodun = 0; + if (prefix) + free(prefix); + prefix = NULL; + } else + bodun_maybe = 0; continue; + } 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, '='))) { @@ -126,7 +153,7 @@ if (spev[i].uname != NULL) free(spev[i].uname); if ((spev[i].uname = strdup(p)) == NULL) - errx(1, "cannot allocate memory"); + err(1, NULL); spev[i].ulen = strlen(p); i = NUMEV + 1; } @@ -135,7 +162,7 @@ continue; } if (buf[0] != '\t') { - printing = (m = isnow(buf)) ? 1 : 0; + printing = (m = isnow(buf, bodun)) ? 1 : 0; if ((p = strchr(buf, '\t')) == NULL) { printing = 0; continue; @@ -153,7 +180,7 @@ while (m) { cur_evt = (struct event *) malloc(sizeof(struct event)); if (cur_evt == NULL) - errx(1, "cannot allocate memory"); + err(1, NULL); cur_evt->when = m->when; snprintf(cur_evt->print_date, @@ -163,8 +190,18 @@ cur_evt->desc = ev1->desc; cur_evt->ldesc = NULL; } else { - if ((cur_evt->ldesc = strdup(p)) == NULL) - errx(1, "cannot allocate memory"); + if (m->bodun && prefix) { + int l1 = strlen(prefix); + int l2 = strlen(p); + int len = l1 + l2 + 2; + if ((cur_evt->ldesc = + malloc(len)) == NULL) + err(1, NULL); + snprintf(cur_evt->ldesc, len, + "\t%s %s", prefix, p + 1); + } else if ((cur_evt->ldesc = + strdup(p)) == NULL) + err(1, NULL); cur_evt->desc = &(cur_evt->ldesc); ev1 = cur_evt; } @@ -176,11 +213,10 @@ } } else if (printing) { - if ((ev1->ldesc = realloc(ev1->ldesc, - (2 + strlen(ev1->ldesc) + strlen(buf)))) == NULL) - errx(1, "cannot allocate memory"); - strcat(ev1->ldesc, "\n"); - strcat(ev1->ldesc, buf); + nlen = strlen(ev1->ldesc) + strlen(buf) + 2; + if ((ev1->ldesc = realloc(ev1->ldesc, nlen)) == NULL) + err(1, NULL); + snprintf(ev1->ldesc, nlen, "%s\n%s", ev1->ldesc, buf); } } tmp = events; @@ -292,31 +328,28 @@ return (val); } -char path[MAXPATHLEN]; FILE * -opencal() +opencal(void) { - int fd, pdes[2]; - struct stat sbuf; + int pdes[2], fdin; + struct stat st; /* open up calendar file as stdin */ - if (!freopen(calendarFile, "r", stdin)) { - if (doall) { - if (chdir(calendarHome) != 0) - return (NULL); - if (stat(calendarNoMail, &sbuf) == 0) - return (NULL); - if (!freopen(calendarFile, "r", stdin)) - return (NULL); - } else { - chdir(getenv("HOME")); - if (!(chdir(calendarHome) == 0 && - freopen(calendarFile, "r", stdin))) - errx(1, "no calendar file: ``%s'' or ``~/%s/%s", + 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') + errx(1, "cannot get home directory"); + if (!(chdir(home) == 0 && + chdir(calendarHome) == 0 && + (fdin = open(calendarFile, O_RDONLY)) != -1)) + errx(1, "no calendar file: ``%s'' or ``~/%s/%s''", calendarFile, calendarHome, calendarFile); } } + if (pipe(pdes) < 0) return (NULL); switch (vfork()) { @@ -325,15 +358,27 @@ (void)close(pdes[1]); return (NULL); case 0: - /* child -- stdin already setup, set stdout to pipe input */ + dup2(fdin, STDIN_FILENO); + /* child -- set stdout to pipe input */ if (pdes[1] != STDOUT_FILENO) { (void)dup2(pdes[1], STDOUT_FILENO); (void)close(pdes[1]); } (void)close(pdes[0]); - (void)setuid(geteuid()); - (void)setgid(getegid()); - execl(_PATH_CPP, "cpp", "-P", "-I.", _PATH_INCLUDE, NULL); + /* + * Set stderr to /dev/null. Necessary so that cron does not + * wait for cpp to finish if it's running calendar -a. + */ + if (doall) { + int fderr; + fderr = open(_PATH_DEVNULL, O_WRONLY, 0); + if (fderr == -1) + _exit(0); + (void)dup2(fderr, STDERR_FILENO); + (void)close(fderr); + } + execl(_PATH_CPP, "cpp", "-traditional", "-undef", "-U__GNUC__", + "-P", "-I.", _PATH_INCLUDE, (char *)NULL); warn(_PATH_CPP); _exit(1); } @@ -347,10 +392,7 @@ return (stdout); /* set output to a temporary file, so if no output don't send mail */ - (void)snprintf(path, sizeof(path), "%s/_calXXXXXX", _PATH_TMP); - if ((fd = mkstemp(path)) < 0) - return (NULL); - return (fdopen(fd, "w+")); + return(tmpfile()); } void @@ -381,10 +423,8 @@ (void)close(pdes[0]); } (void)close(pdes[1]); - (void)setuid(geteuid()); - (void)setgid(getegid()); execl(_PATH_SENDMAIL, "sendmail", "-i", "-t", "-F", - "\"Reminder Service\"", NULL); + "\"Reminder Service\"", (char *)NULL); warn(_PATH_SENDMAIL); _exit(1); } @@ -398,8 +438,8 @@ (void)write(pdes[1], buf, nread); (void)close(pdes[1]); done: (void)fclose(fp); - (void)unlink(path); - while (wait(&status) >= 0); + while (wait(&status) >= 0) + ; }