Download raw body.
newsyslog: support glob(3)
Hi Jan,
Thanks a lot for your reply!
On Wed Mar 11, 2026 at 12:04 AM CET, Jan Klemkow wrote:
> I tested and reviewed your diff. It works fine for me and I really
> appreciate the globing of filenames here.
After your email, I also went over my diff again and slightly changed
it. It's even shorter now, as I merged the non-globing and globing
cases. Please take another look.
> The general manpage improvements are also good. But, should be part of
> a separate diff. Please, send a new diff, with just the globing part.
Thanks again. When this one is through, I would continue there and send
another diff. There I would also address the optional fields count you
have mentioned.
Thanks,
Alvar
diff --git a/newsyslog.8 b/newsyslog.8
index 391c7c3d99d..e57552b304c 100644
--- a/newsyslog.8
+++ b/newsyslog.8
@@ -180,6 +180,9 @@ follows:
.Bl -tag -width XXXXXXXXXXXXXXXX
.It Ar logfile_name
The full pathname of the system log file to be archived.
+This path might be a
+.Xr glob 7
+pattern, which will be expanded accordingly.
.It Ar owner:group
This optional field specifies the owner and group for the archive file.
The
@@ -442,6 +445,7 @@ default configuration file
.Sh SEE ALSO
.Xr compress 1 ,
.Xr gzip 1 ,
+.Xr glob 7 ,
.Xr syslog 3 ,
.Xr syslogd 8
.Sh AUTHORS
diff --git a/newsyslog.c b/newsyslog.c
index 0be4ed259b9..e37bd4f8ae0 100644
--- a/newsyslog.c
+++ b/newsyslog.c
@@ -88,6 +88,7 @@
#include <err.h>
#include <errno.h>
#include <fcntl.h>
+#include <glob.h>
#include <grp.h>
#include <limits.h>
#include <pwd.h>
@@ -161,6 +162,7 @@ int stat_suffix(char *, size_t, char *, struct stat *,
int (*)(const char *, struct stat *));
off_t sizefile(struct stat *);
int parse_file(struct entrylist *, int *);
+int parse_entry(struct entrylist *, int *, int, struct conf_entry *);
time_t parse8601(char *);
time_t parseDWM(char *);
void child_killer(int);
@@ -470,13 +472,14 @@ int
parse_file(struct entrylist *list, int *nentries)
{
char line[BUFSIZ], *parse, *q, *errline, *group, *tmp, *ep;
- struct conf_entry *working;
- struct stat sb;
+ struct conf_entry *working, *working_glob;
+ size_t i;
int lineno = 0;
int ret = 0;
FILE *f;
const char *errstr;
long l;
+ glob_t g;
if (strcmp(conf, "-") == 0)
f = stdin;
@@ -504,9 +507,6 @@ nextline:
if (working->log == NULL)
err(1, NULL);
- if ((working->logbase = strrchr(working->log, '/')) != NULL)
- working->logbase++;
-
q = parse = missing_field(sob(++parse), errline, lineno);
*(parse = son(parse)) = '\0';
if ((group = strchr(q, ':')) != NULL ||
@@ -739,57 +739,102 @@ nextline:
goto nextline;
}
- /* If there is an arcdir, set working->backdir. */
- if (arcdir != NULL && working->logbase != NULL) {
- if (*arcdir == '/') {
- /* Fully qualified arcdir */
- working->backdir = arcdir;
- } else {
- /* arcdir is relative to log's parent dir */
- *(working->logbase - 1) = '\0';
- if ((asprintf(&working->backdir, "%s/%s",
- working->log, arcdir)) == -1)
- err(1, NULL);
- *(working->logbase - 1) = '/';
- }
- /* Ignore arcdir if it doesn't exist. */
- if (stat(working->backdir, &sb) != 0 ||
- !S_ISDIR(sb.st_mode)) {
- if (working->backdir != arcdir)
- free(working->backdir);
- working->backdir = NULL;
- }
- } else
- working->backdir = NULL;
+ if (glob(working->log, GLOB_NOCHECK | GLOB_NOSORT, NULL, &g)) {
+ warnx("%s:%d: cannot glob(3), %s"
+ " --> skipping",
+ conf, lineno, strerror(errno));
+ ret = 1;
+ goto nextline;
+ }
- /* Make sure we can't oflow PATH_MAX */
- if (working->backdir != NULL) {
- if (snprintf(line, sizeof(line), "%s/%s.%d%s",
- working->backdir, working->logbase,
- working->numlogs, COMPRESS_POSTFIX) >= PATH_MAX) {
- warnx("%s:%d: pathname too long: %s"
- " --> skipping", conf, lineno, q);
- ret = 1;
- goto nextline;
- }
- } else {
- if (snprintf(line, sizeof(line), "%s.%d%s",
- working->log, working->numlogs, COMPRESS_POSTFIX)
- >= PATH_MAX) {
- warnx("%s:%d: pathname too long: %s"
- " --> skipping", conf, lineno,
- working->log);
+ for (i = 0; i < g.gl_pathc; i++) {
+ working_glob = malloc(sizeof(*working));
+ if (working_glob == NULL)
+ err(1, NULL);
+
+ memcpy(working_glob, working, sizeof(*working));
+
+ if ((working_glob->log = strdup(g.gl_pathv[i])) == NULL)
+ err(1, NULL);
+
+ DPRINTF(("%s:%d: expanded logfile name \"%s\" to \"%s\" (%zu/%zu)\n",
+ conf, lineno, working->log, working_glob->log, i+1, g.gl_pathc));
+
+ if (parse_entry(list, nentries, lineno, working_glob)) {
ret = 1;
- goto nextline;
+ /* break instead of goto nextline to free resources below */
+ break;
}
}
- TAILQ_INSERT_TAIL(list, working, next);
- (*nentries)++;
+
+ /*
+ * Original working is duplicated into working_glob in the for loop
+ * above and can be freed now. Every struct char pointer next to log
+ * is identical in each duplicate and still used later.
+ */
+ free(working->log);
+ free(working);
+
+ globfree(&g);
}
(void)fclose(f);
return (ret);
}
+int
+parse_entry(
+ struct entrylist *list, int *nentries,
+ int lineno, struct conf_entry *working
+)
+{
+ char line[BUFSIZ];
+ int linelen;
+ struct stat sb;
+
+ if ((working->logbase = strrchr(working->log, '/')) != NULL)
+ working->logbase++;
+
+ /* If there is an arcdir, set working->backdir. */
+ if (arcdir != NULL && working->logbase != NULL) {
+ if (*arcdir == '/') {
+ /* Fully qualified arcdir */
+ working->backdir = arcdir;
+ } else {
+ /* arcdir is relative to log's parent dir */
+ *(working->logbase - 1) = '\0';
+ if ((asprintf(&working->backdir, "%s/%s",
+ working->log, arcdir)) == -1)
+ err(1, NULL);
+ *(working->logbase - 1) = '/';
+ }
+ /* Ignore arcdir if it doesn't exist. */
+ if (stat(working->backdir, &sb) != 0 ||
+ !S_ISDIR(sb.st_mode)) {
+ if (working->backdir != arcdir)
+ free(working->backdir);
+ working->backdir = NULL;
+ }
+ } else
+ working->backdir = NULL;
+
+ /* Make sure we can't oflow PATH_MAX */
+ if (working->backdir != NULL)
+ linelen = snprintf(line, sizeof(line), "%s/%s.%d%s",
+ working->backdir, working->logbase,
+ working->numlogs, COMPRESS_POSTFIX);
+ else
+ linelen = snprintf(line, sizeof(line), "%s.%d%s",
+ working->log, working->numlogs, COMPRESS_POSTFIX);
+ if (linelen < 0 || linelen >= sizeof(line) || linelen >= PATH_MAX) {
+ warnx("%s:%d: pathname too long: %s --> skipping", conf, lineno, line);
+ return 1;
+ }
+
+ TAILQ_INSERT_TAIL(list, working, next);
+ (*nentries)++;
+ return 0;
+}
+
char *
missing_field(char *p, char *errline, int lineno)
{
newsyslog: support glob(3)