Index: head/include/paths.h
===================================================================
--- head/include/paths.h (revision 366961)
+++ head/include/paths.h (revision 366962)
@@ -1,148 +1,151 @@
/*-
* SPDX-License-Identifier: BSD-3-Clause
*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 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. 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.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* @(#)paths.h 8.1 (Berkeley) 6/2/93
* $FreeBSD$
*/
#ifndef _PATHS_H_
#define _PATHS_H_
#include <sys/cdefs.h>
+#define _PATH_LOCALBASE "/usr/local"
+
/* Default search path. */
-#define _PATH_DEFPATH "/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin"
+#define _PATH_DEFPATH "/sbin:/bin:/usr/sbin:/usr/bin:" \
+ _PATH_LOCALBASE "/sbin:" _PATH_LOCALBASE "/bin"
/* All standard utilities path. */
#define _PATH_STDPATH "/usr/bin:/bin:/usr/sbin:/sbin"
/* Locate system binaries. */
#define _PATH_SYSPATH "/sbin:/usr/sbin"
#define _PATH_BSHELL "/bin/sh"
#define _PATH_CAPABILITY "/etc/capability"
#define _PATH_CAPABILITY_DB "/etc/capability.db"
#define _PATH_CONSOLE "/dev/console"
#define _PATH_CP "/bin/cp"
#define _PATH_CSHELL "/bin/csh"
#define _PATH_CSMAPPER "/usr/share/i18n/csmapper"
#define _PATH_DEFTAPE "/dev/sa0"
#define _PATH_DEVGPIOC "/dev/gpioc"
#define _PATH_DEVNULL "/dev/null"
#define _PATH_DEVZERO "/dev/zero"
#define _PATH_DRUM "/dev/drum"
#define _PATH_ESDB "/usr/share/i18n/esdb"
#define _PATH_ETC "/etc"
#define _PATH_FIRMWARE "/usr/share/firmware"
#define _PATH_FTPUSERS "/etc/ftpusers"
#define _PATH_FWMEM "/dev/fwmem"
#define _PATH_GBDE "/sbin/gbde"
#define _PATH_GELI "/sbin/geli"
#define _PATH_HALT "/sbin/halt"
#ifdef COMPAT_32BIT
#define _PATH_I18NMODULE "/usr/lib32/i18n"
#else
#define _PATH_I18NMODULE "/usr/lib/i18n"
#endif
#define _PATH_IFCONFIG "/sbin/ifconfig"
#define _PATH_KMEM "/dev/kmem"
#define _PATH_LIBMAP_CONF "/etc/libmap.conf"
#define _PATH_LOCALE "/usr/share/locale"
#define _PATH_LOGIN "/usr/bin/login"
#define _PATH_MAILDIR "/var/mail"
#define _PATH_MAN "/usr/share/man"
#define _PATH_MDCONFIG "/sbin/mdconfig"
#define _PATH_MEM "/dev/mem"
#define _PATH_MKSNAP_FFS "/sbin/mksnap_ffs"
#define _PATH_MOUNT "/sbin/mount"
#define _PATH_NEWFS "/sbin/newfs"
#define _PATH_NOLOGIN "/var/run/nologin"
#define _PATH_RCP "/bin/rcp"
#define _PATH_REBOOT "/sbin/reboot"
#define _PATH_RLOGIN "/usr/bin/rlogin"
#define _PATH_RM "/bin/rm"
#define _PATH_RSH "/usr/bin/rsh"
#define _PATH_SENDMAIL "/usr/sbin/sendmail"
#define _PATH_SHELLS "/etc/shells"
#define _PATH_TTY "/dev/tty"
#define _PATH_UNIX "don't use _PATH_UNIX"
#define _PATH_UFSSUSPEND "/dev/ufssuspend"
#define _PATH_VI "/usr/bin/vi"
#define _PATH_WALL "/usr/bin/wall"
/* Provide trailing slash, since mostly used for building pathnames. */
#define _PATH_DEV "/dev/"
#define _PATH_TMP "/tmp/"
#define _PATH_VARDB "/var/db/"
#define _PATH_VARRUN "/var/run/"
#define _PATH_VARTMP "/var/tmp/"
#define _PATH_DEVVMM "/dev/vmm/"
#define _PATH_YP "/var/yp/"
#define _PATH_UUCPLOCK "/var/spool/lock/"
/* How to get the correct name of the kernel. */
__BEGIN_DECLS
const char *getbootfile(void);
__END_DECLS
#ifdef RESCUE
#undef _PATH_DEFPATH
#define _PATH_DEFPATH "/rescue:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin"
#undef _PATH_STDPATH
#define _PATH_STDPATH "/rescue:/usr/bin:/bin:/usr/sbin:/sbin"
#undef _PATH_SYSPATH
#define _PATH_SYSPATH "/rescue:/sbin:/usr/sbin"
#undef _PATH_BSHELL
#define _PATH_BSHELL "/rescue/sh"
#undef _PATH_CP
#define _PATH_CP "/rescue/cp"
#undef _PATH_CSHELL
#define _PATH_CSHELL "/rescue/csh"
#undef _PATH_HALT
#define _PATH_HALT "/rescue/halt"
#undef _PATH_IFCONFIG
#define _PATH_IFCONFIG "/rescue/ifconfig"
#undef _PATH_MDCONFIG
#define _PATH_MDCONFIG "/rescue/mdconfig"
#undef _PATH_MOUNT
#define _PATH_MOUNT "/rescue/mount"
#undef _PATH_NEWFS
#define _PATH_NEWFS "/rescue/newfs"
#undef _PATH_RCP
#define _PATH_RCP "/rescue/rcp"
#undef _PATH_REBOOT
#define _PATH_REBOOT "/rescue/reboot"
#undef _PATH_RM
#define _PATH_RM "/rescue/rm"
#undef _PATH_VI
#define _PATH_VI "/rescue/vi"
#undef _PATH_WALL
#define _PATH_WALL "/rescue/wall"
#endif /* RESCUE */
#endif /* !_PATHS_H_ */
Index: head/usr.bin/calendar/io.c
===================================================================
--- head/usr.bin/calendar/io.c (revision 366961)
+++ head/usr.bin/calendar/io.c (revision 366962)
@@ -1,502 +1,502 @@
/*-
* SPDX-License-Identifier: BSD-3-Clause
*
* Copyright (c) 1989, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 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. 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.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* 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
#if 0
#ifndef lint
static char sccsid[] = "@(#)calendar.c 8.3 (Berkeley) 3/25/94";
#endif
#endif
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/wait.h>
#include <ctype.h>
#include <err.h>
#include <errno.h>
#include <langinfo.h>
#include <locale.h>
#include <pwd.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stringlist.h>
#include <time.h>
#include <unistd.h>
#include "pathnames.h"
#include "calendar.h"
enum {
T_OK = 0,
T_ERR,
T_PROCESS,
};
const char *calendarFile = "calendar"; /* default calendar file */
-static const char *calendarHomes[] = {".calendar", _PATH_INCLUDE}; /* HOME */
+static const char *calendarHomes[] = {".calendar", _PATH_INCLUDE_LOCAL, _PATH_INCLUDE}; /* HOME */
static const char *calendarNoMail = "nomail";/* don't sent mail if file exist */
static char path[MAXPATHLEN];
struct fixs neaster, npaskha, ncny, nfullmoon, nnewmoon;
struct fixs nmarequinox, nsepequinox, njunsolstice, ndecsolstice;
static int cal_parse(FILE *in, FILE *out);
static StringList *definitions = NULL;
static struct event *events[MAXCOUNT];
static char *extradata[MAXCOUNT];
static void
trimlr(char **buf)
{
char *walk = *buf;
char *last;
while (isspace(*walk))
walk++;
if (*walk != '\0') {
last = walk + strlen(walk) - 1;
while (last > walk && isspace(*last))
last--;
*(last+1) = 0;
}
*buf = walk;
}
static FILE *
cal_fopen(const char *file)
{
FILE *fp;
char *home = getenv("HOME");
unsigned int i;
if (home == NULL || *home == '\0') {
warnx("Cannot get home directory");
return (NULL);
}
if (chdir(home) != 0) {
warnx("Cannot enter home directory");
return (NULL);
}
for (i = 0; i < nitems(calendarHomes); i++) {
if (chdir(calendarHomes[i]) != 0)
continue;
if ((fp = fopen(file, "r")) != NULL)
return (fp);
}
warnx("can't open calendar file \"%s\"", file);
return (NULL);
}
static int
token(char *line, FILE *out, bool *skip)
{
char *walk, c, a;
if (strncmp(line, "endif", 5) == 0) {
*skip = false;
return (T_OK);
}
if (*skip)
return (T_OK);
if (strncmp(line, "include", 7) == 0) {
walk = line + 7;
trimlr(&walk);
if (*walk == '\0') {
warnx("Expecting arguments after #include");
return (T_ERR);
}
if (*walk != '<' && *walk != '\"') {
warnx("Excecting '<' or '\"' after #include");
return (T_ERR);
}
a = *walk;
walk++;
c = walk[strlen(walk) - 1];
switch(c) {
case '>':
if (a != '<') {
warnx("Unterminated include expecting '\"'");
return (T_ERR);
}
break;
case '\"':
if (a != '\"') {
warnx("Unterminated include expecting '>'");
return (T_ERR);
}
break;
default:
warnx("Unterminated include expecting '%c'",
a == '<' ? '>' : '\"' );
return (T_ERR);
}
walk[strlen(walk) - 1] = '\0';
if (cal_parse(cal_fopen(walk), out))
return (T_ERR);
return (T_OK);
}
if (strncmp(line, "define", 6) == 0) {
if (definitions == NULL)
definitions = sl_init();
walk = line + 6;
trimlr(&walk);
if (*walk == '\0') {
warnx("Expecting arguments after #define");
return (T_ERR);
}
sl_add(definitions, strdup(walk));
return (T_OK);
}
if (strncmp(line, "ifndef", 6) == 0) {
walk = line + 6;
trimlr(&walk);
if (*walk == '\0') {
warnx("Expecting arguments after #ifndef");
return (T_ERR);
}
if (definitions != NULL && sl_find(definitions, walk) != NULL)
*skip = true;
return (T_OK);
}
return (T_PROCESS);
}
#define REPLACE(string, slen, struct_) \
if (strncasecmp(buf, (string), (slen)) == 0 && buf[(slen)]) { \
if (struct_.name != NULL) \
free(struct_.name); \
if ((struct_.name = strdup(buf + (slen))) == NULL) \
errx(1, "cannot allocate memory"); \
struct_.len = strlen(buf + (slen)); \
continue; \
}
static int
cal_parse(FILE *in, FILE *out)
{
char *line = NULL;
char *buf;
size_t linecap = 0;
ssize_t linelen;
ssize_t l;
static int d_first = -1;
static int count = 0;
int i;
int month[MAXCOUNT];
int day[MAXCOUNT];
int year[MAXCOUNT];
bool skip = false;
char dbuf[80];
char *pp, p;
struct tm tm;
int flags;
/* Unused */
tm.tm_sec = 0;
tm.tm_min = 0;
tm.tm_hour = 0;
tm.tm_wday = 0;
if (in == NULL)
return (1);
while ((linelen = getline(&line, &linecap, in)) > 0) {
if (*line == '#') {
switch (token(line+1, out, &skip)) {
case T_ERR:
free(line);
return (1);
case T_OK:
continue;
case T_PROCESS:
break;
default:
break;
}
}
if (skip)
continue;
buf = line;
for (l = linelen;
l > 0 && isspace((unsigned char)buf[l - 1]);
l--)
;
buf[l] = '\0';
if (buf[0] == '\0')
continue;
/*
* Setting LANG in user's calendar was an old workaround
* for 'calendar -a' being run with C locale to properly
* print user's calendars in their native languages.
* Now that 'calendar -a' does fork with setusercontext(),
* and does not run iconv(), this variable has little use.
*/
if (strncmp(buf, "LANG=", 5) == 0) {
(void)setlocale(LC_ALL, buf + 5);
d_first = (*nl_langinfo(D_MD_ORDER) == 'd');
#ifdef WITH_ICONV
if (!doall)
set_new_encoding();
#endif
setnnames();
continue;
}
/* Parse special definitions: Easter, Paskha etc */
REPLACE("Easter=", 7, neaster);
REPLACE("Paskha=", 7, npaskha);
REPLACE("ChineseNewYear=", 15, ncny);
REPLACE("NewMoon=", 8, nnewmoon);
REPLACE("FullMoon=", 9, nfullmoon);
REPLACE("MarEquinox=", 11, nmarequinox);
REPLACE("SepEquinox=", 11, nsepequinox);
REPLACE("JunSolstice=", 12, njunsolstice);
REPLACE("DecSolstice=", 12, ndecsolstice);
if (strncmp(buf, "SEQUENCE=", 9) == 0) {
setnsequences(buf + 9);
continue;
}
/*
* If the line starts with a tab, the data has to be
* added to the previous line
*/
if (buf[0] == '\t') {
for (i = 0; i < count; i++)
event_continue(events[i], buf);
continue;
}
/* Get rid of leading spaces (non-standard) */
while (isspace((unsigned char)buf[0]))
memcpy(buf, buf + 1, strlen(buf));
/* No tab in the line, then not a valid line */
if ((pp = strchr(buf, '\t')) == NULL)
continue;
/* Trim spaces in front of the tab */
while (isspace((unsigned char)pp[-1]))
pp--;
p = *pp;
*pp = '\0';
if ((count = parsedaymonth(buf, year, month, day, &flags,
extradata)) == 0)
continue;
*pp = p;
if (count < 0) {
/* Show error status based on return value */
if (debug)
fprintf(stderr, "Ignored: %s\n", buf);
if (count == -1)
continue;
count = -count + 1;
}
/* Find the last tab */
while (pp[1] == '\t')
pp++;
if (d_first < 0)
d_first = (*nl_langinfo(D_MD_ORDER) == 'd');
for (i = 0; i < count; i++) {
tm.tm_mon = month[i] - 1;
tm.tm_mday = day[i];
tm.tm_year = year[i] - 1900;
(void)strftime(dbuf, sizeof(dbuf),
d_first ? "%e %b" : "%b %e", &tm);
if (debug)
fprintf(stderr, "got %s\n", pp);
events[i] = event_add(year[i], month[i], day[i], dbuf,
((flags &= F_VARIABLE) != 0) ? 1 : 0, pp,
extradata[i]);
}
}
free(line);
fclose(in);
return (0);
}
void
cal(void)
{
FILE *fpin;
FILE *fpout;
int i;
for (i = 0; i < MAXCOUNT; i++)
extradata[i] = (char *)calloc(1, 20);
if ((fpin = opencalin()) == NULL)
return;
if ((fpout = opencalout()) == NULL) {
fclose(fpin);
return;
}
if (cal_parse(fpin, fpout))
return;
event_print_all(fpout);
closecal(fpout);
}
FILE *
opencalin(void)
{
struct stat sbuf;
FILE *fpin;
/* open up calendar file */
if ((fpin = fopen(calendarFile, "r")) == NULL) {
if (doall) {
if (chdir(calendarHomes[0]) != 0)
return (NULL);
if (stat(calendarNoMail, &sbuf) == 0)
return (NULL);
if ((fpin = fopen(calendarFile, "r")) == NULL)
return (NULL);
} else {
fpin = cal_fopen(calendarFile);
}
}
return (fpin);
}
FILE *
opencalout(void)
{
int fd;
/* not reading all calendar files, just set output to stdout */
if (!doall)
return (stdout);
/* set output to a temporary file, so if no output don't send mail */
snprintf(path, sizeof(path), "%s/_calXXXXXX", _PATH_TMP);
if ((fd = mkstemp(path)) < 0)
return (NULL);
return (fdopen(fd, "w+"));
}
void
closecal(FILE *fp)
{
struct stat sbuf;
int nread, pdes[2], status;
char buf[1024];
if (!doall)
return;
rewind(fp);
if (fstat(fileno(fp), &sbuf) || !sbuf.st_size)
goto done;
if (pipe(pdes) < 0)
goto done;
switch (fork()) {
case -1: /* error */
(void)close(pdes[0]);
(void)close(pdes[1]);
goto done;
case 0:
/* child -- set stdin to pipe output */
if (pdes[0] != STDIN_FILENO) {
(void)dup2(pdes[0], STDIN_FILENO);
(void)close(pdes[0]);
}
(void)close(pdes[1]);
execl(_PATH_SENDMAIL, "sendmail", "-i", "-t", "-F",
"\"Reminder Service\"", (char *)NULL);
warn(_PATH_SENDMAIL);
_exit(1);
}
/* parent -- write to pipe input */
(void)close(pdes[0]);
write(pdes[1], "From: \"Reminder Service\" <", 26);
write(pdes[1], pw->pw_name, strlen(pw->pw_name));
write(pdes[1], ">\nTo: <", 7);
write(pdes[1], pw->pw_name, strlen(pw->pw_name));
write(pdes[1], ">\nSubject: ", 11);
write(pdes[1], dayname, strlen(dayname));
write(pdes[1], "'s Calendar\nPrecedence: bulk\n\n", 30);
while ((nread = read(fileno(fp), buf, sizeof(buf))) > 0)
(void)write(pdes[1], buf, nread);
(void)close(pdes[1]);
done: (void)fclose(fp);
(void)unlink(path);
while (wait(&status) >= 0);
}
Index: head/usr.bin/calendar/pathnames.h
===================================================================
--- head/usr.bin/calendar/pathnames.h (revision 366961)
+++ head/usr.bin/calendar/pathnames.h (revision 366962)
@@ -1,37 +1,38 @@
/*-
* SPDX-License-Identifier: BSD-3-Clause
*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 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. 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.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* @(#)pathnames.h 8.1 (Berkeley) 6/6/93
* $FreeBSD$
*/
#include <paths.h>
#define _PATH_INCLUDE "/usr/share/calendar"
+#define _PATH_INCLUDE_LOCAL _PATH_LOCALBASE "/share/calendar"