Module Name: src
Committed By: christos
Date: Sun Jun 17 03:52:33 UTC 2012
Modified Files:
src/usr.bin/newsyslog: newsyslog.8 newsyslog.c
Log Message:
PR/46608: Jim Bernard: Add xz conversion "X"
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/usr.bin/newsyslog/newsyslog.8
cvs rdiff -u -r1.59 -r1.60 src/usr.bin/newsyslog/newsyslog.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/newsyslog/newsyslog.8
diff -u src/usr.bin/newsyslog/newsyslog.8:1.36 src/usr.bin/newsyslog/newsyslog.8:1.37
--- src/usr.bin/newsyslog/newsyslog.8:1.36 Fri Dec 21 14:45:33 2007
+++ src/usr.bin/newsyslog/newsyslog.8 Sat Jun 16 23:52:32 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: newsyslog.8,v 1.36 2007/12/21 19:45:33 snj Exp $
+.\" $NetBSD: newsyslog.8,v 1.37 2012/06/17 03:52:32 christos Exp $
.\"
.\" Copyright (c) 1999, 2000 Andrew Doran <a...@netbsd.org>
.\" All rights reserved.
@@ -40,7 +40,7 @@
.\"
.\" from FreeBSD: newsyslog.8,v 1.14.2.1 1999/02/25 18:38:33 wollman Exp
.\"
-.Dd December 21, 2007
+.Dd June 16, 2012
.Dt NEWSYSLOG 8
.Os
.Sh NAME
@@ -334,6 +334,10 @@ should not be compressed.
Archived log files should be compressed with
.Xr bzip2 1
to save space.
+.It Sy x
+Archived log files should be compressed with
+.Xr xz 1
+to save space.
.It Sy z
Archived log files should be compressed with
.Xr gzip 1
Index: src/usr.bin/newsyslog/newsyslog.c
diff -u src/usr.bin/newsyslog/newsyslog.c:1.59 src/usr.bin/newsyslog/newsyslog.c:1.60
--- src/usr.bin/newsyslog/newsyslog.c:1.59 Fri Aug 21 04:20:19 2009
+++ src/usr.bin/newsyslog/newsyslog.c Sat Jun 16 23:52:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: newsyslog.c,v 1.59 2009/08/21 08:20:19 manu Exp $ */
+/* $NetBSD: newsyslog.c,v 1.60 2012/06/17 03:52:32 christos Exp $ */
/*
* Copyright (c) 1999, 2000 Andrew Doran <a...@netbsd.org>
@@ -55,7 +55,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: newsyslog.c,v 1.59 2009/08/21 08:20:19 manu Exp $");
+__RCSID("$NetBSD: newsyslog.c,v 1.60 2012/06/17 03:52:32 christos Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -121,6 +121,7 @@ static struct compressor compress[] =
{NULL, "", "", ""}, /* 0th compressor is "no compression" */
{"/usr/bin/gzip", "-f", ".gz", "Z"},
{"/usr/bin/bzip2", "-9f", ".bz2", "J"},
+ {"/usr/bin/xz", "-f", ".xz", "X"},
};
#define _PATH_NEWSYSLOGCONF "/etc/newsyslog.conf"
@@ -377,7 +378,7 @@ parse_cfgline(struct conf_entry *log, FI
case 'P':
log->flags |= CE_PLAIN0;
break;
- case 'J': case 'Z':
+ case 'J': case 'X': case 'Z':
for (ziptype = __arraycount(compress); --ziptype; ) {
if (*compress[ziptype].flag == qq)
break;
