Date: Sun, 1 Nov 2020 20:38:35 +0000 (UTC) From: =?UTF-8?Q?Stefan_E=c3=9fer?= <se@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r367255 - head/usr.bin/calendar Message-ID: <202011012038.0A1KcZQv076167@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011012038.0A1KcZQv076167>