diff options
| -rw-r--r-- | usr.sbin/newsyslog/newsyslog.8 | 10 | ||||
| -rw-r--r-- | usr.sbin/newsyslog/newsyslog.c | 20 |
2 files changed, 29 insertions, 1 deletions
diff --git a/usr.sbin/newsyslog/newsyslog.8 b/usr.sbin/newsyslog/newsyslog.8 index 4d282e18688a..1671a23474fe 100644 --- a/usr.sbin/newsyslog/newsyslog.8 +++ b/usr.sbin/newsyslog/newsyslog.8 @@ -288,6 +288,16 @@ turned over should not be included. The flag means nothing, but can be used as a placeholder when the .Ar path_to_pid_file field is specified. +.Ar G +flag means that the specified +.Ar logfile_name +is a shell pattern, which instructs the +.Nm +to archive all filenames matchins this pattern using the same +options. +See +.Xr glob 3 +for details on matching rules. .It Ar path_to_pid_file This optional field specifies the file name to read to find the daemon process id. If this diff --git a/usr.sbin/newsyslog/newsyslog.c b/usr.sbin/newsyslog/newsyslog.c index 6b2b6256f941..e6e89b030551 100644 --- a/usr.sbin/newsyslog/newsyslog.c +++ b/usr.sbin/newsyslog/newsyslog.c @@ -44,6 +44,7 @@ static const char rcsid[] = #include <err.h> #include <errno.h> #include <fcntl.h> +#include <glob.h> #include <grp.h> #include <paths.h> #include <pwd.h> @@ -68,6 +69,7 @@ static const char rcsid[] = #define CE_BZCOMPACT 8 /* Compact the achived log files with bzip2 */ /* status messages */ #define CE_TRIMAT 4 /* trim at a specific time */ +#define CE_GLOB 16 /* name of the log is file name pattern */ #define NONE -1 @@ -125,6 +127,8 @@ int main(int argc, char **argv) { struct conf_entry *p, *q; + glob_t pglob; + int i; PRS(argc, argv); if (needroot && getuid() && geteuid()) @@ -132,7 +136,19 @@ main(int argc, char **argv) p = q = parse_file(argv + optind); while (p) { - do_entry(p); + if ((p->flags & CE_GLOB) == 0) { + do_entry(p); + } else { + if (glob(p->log, GLOB_NOCHECK, NULL, &pglob) != 0) { + warn("can't expand pattern: %s", p->log); + } else { + for (i = 0; i < pglob.gl_matchc; i++) { + p->log = pglob.gl_pathv[i]; + do_entry(p); + } + globfree(&pglob); + } + } p = p->next; free((char *) q); q = p; @@ -443,6 +459,8 @@ parse_file(char **files) working->flags |= CE_BZCOMPACT; else if ((*q == 'B') || (*q == 'b')) working->flags |= CE_BINARY; + else if ((*q == 'G') || (*q == 'c')) + working->flags |= CE_GLOB; else if (*q != '-') errx(1, "illegal flag in config file -- %c", *q); |