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

Look in getlocalbase() for the calendar-data package data

Browse Source 
Fix d20d655018 where getlocalbase()
wasn't used to fill out the printf(3) format of _PATH_INCLUDE_LOCAL.

Differential Revision:	https://reviews.freebsd.org/D38975
Reviewed by:	imp
This commit is contained in:
David E. O'Brien 2023-03-07 19:51:27 -08:00 committed by Oscar Zhao
parent 2596f678be
commit 93717f776b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usr.bin/calendar/io.c
View File

@ -151,9 +151,12 @@ cal_fopen(const char *file)
}
warnx("can't open calendar file \"%s\"", file);
if (!warned && stat(_PATH_INCLUDE_LOCAL, &sb) != 0) {
warnx("calendar data files now provided by calendar-data pkg.");
warned = true;
if (!warned) {
snprintf(path, sizeof(path), _PATH_INCLUDE_LOCAL, getlocalbase());
if (stat(path, &sb) != 0) {
warnx("calendar data files now provided by calendar-data pkg.");
warned = true;
}
}
return (NULL);