Author: se
Date: Sun Nov 1 20:38:35 2020
New Revision: 367255
URL: https://svnweb.freebsd.org/changeset/base/367255
Log:
Fix psoition reporting for calendar data file in system directory
MFC after: 3 days
Modified:
head/usr.bin/calendar/io.c
Modified: head/usr.bin/calendar/io.c
==============================================================================
--- head/usr.bin/calendar/io.c Sun Nov 1 19:13:55 2020 (r367254)
+++ head/usr.bin/calendar/io.c Sun Nov 1 20:38:35 2020 (r367255)
@@ -147,10 +147,22 @@ cal_fopen(const char *file)
return (NULL);
}
+static char*
+cal_path(void)
+{
+ static char buffer[MAXPATHLEN + 10];
+
+ if (cal_dir[0] == '/')
+ snprintf(buffer, sizeof(buffer), "%s/%s", cal_dir, cal_file);
+ else
+ snprintf(buffer, sizeof(buffer), "%s/%s/%s", cal_home, cal_dir,
cal_file);
+ return (buffer);
+}
+
#define WARN0(format) \
- warnx(format " in %s/%s/%s line %d", cal_home, cal_dir, cal_file,
cal_line)
+ warnx(format " in %s line %d", cal_path(), cal_line)
#define WARN1(format, arg1) \
- warnx(format " in %s/%s/%s line %d", arg1, cal_home, cal_dir, cal_file,
cal_line)
+ warnx(format " in %s line %d", arg1, cal_path(), cal_line)
static int
token(char *line, FILE *out, int *skip, int *unskip)
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
