Page MenuHomeFreeBSD
Files F151019155

D16509.diff
No OneTemporary
Actions

D16509.diff
View Options

Index: head/usr.sbin/newsyslog/newsyslog.c
===================================================================
--- head/usr.sbin/newsyslog/newsyslog.c
+++ head/usr.sbin/newsyslog/newsyslog.c
@@ -105,7 +105,7 @@
#define COMPRESS_SUFFIX_ZST ".zst"
#endif
-#define COMPRESS_SUFFIX_MAXLEN MAX(MAX(sizeof(COMPRESS_SUFFIX_GZ),sizeof(COMPRESS_SUFFIX_BZ2)),sizeof(COMPRESS_SUFFIX_XZ))
+#define COMPRESS_SUFFIX_MAXLEN MAX(MAX(MAX(sizeof(COMPRESS_SUFFIX_GZ),sizeof(COMPRESS_SUFFIX_BZ2)),sizeof(COMPRESS_SUFFIX_XZ)),sizeof(COMPRESS_SUFFIX_ZST))
/*
* Compression types
@@ -2027,7 +2027,7 @@
char zresult[MAXPATHLEN];
char command[BUFSIZ];
char **args;
- int c;
+ int c, i;
assert(zwork != NULL);
pgm_path = NULL;
@@ -2043,10 +2043,10 @@
(void) strlcat(zresult,
compress_type[c].suffix, sizeof(zresult));
/* the first argument is always NULL, skip it */
- for (c = 1; c < ARGS_NUM; c++) {
- if (compress_type[c].args[c] == NULL)
+ for (i = 1; i < ARGS_NUM; i++) {
+ if (compress_type[c].args[i] == NULL)
break;
- args[c] = compress_type[c].args[c];
+ args[i] = compress_type[c].args[i];
}
break;
}
Index: head/usr.sbin/newsyslog/tests/legacy_test.sh
===================================================================
--- head/usr.sbin/newsyslog/tests/legacy_test.sh
+++ head/usr.sbin/newsyslog/tests/legacy_test.sh
@@ -498,6 +498,12 @@
echo "$LOGFPATH 640 3 * @T00 NCJ" > newsyslog.conf
tests_normal_rotate ".bz2"
+echo "$LOGFPATH 640 3 * @T00 NCX" > newsyslog.conf
+tests_normal_rotate ".xz"
+
+echo "$LOGFPATH 640 3 * @T00 NCY" > newsyslog.conf
+tests_normal_rotate ".zst"
+
# Normal, archive dir
echo "$LOGFPATH 640 3 * @T00 NC" > newsyslog.conf
tests_normal_rotate "" "${TMPDIR}/alog/"
@@ -508,6 +514,12 @@
echo "$LOGFPATH 640 3 * @T00 NCJ" > newsyslog.conf
tests_normal_rotate ".bz2" "${TMPDIR}/alog/"
+echo "$LOGFPATH 640 3 * @T00 NCX" > newsyslog.conf
+tests_normal_rotate ".xz" "${TMPDIR}/alog/"
+
+echo "$LOGFPATH 640 3 * @T00 NCY" > newsyslog.conf
+tests_normal_rotate ".zst" "${TMPDIR}/alog/"
+
# Time based, no archive dir
echo "$LOGFPATH 640 3 * @T00 NC" > newsyslog.conf
tests_time_rotate
@@ -518,6 +530,12 @@
echo "$LOGFPATH 640 3 * @T00 NCJ" > newsyslog.conf
tests_time_rotate "bz2" ""
+echo "$LOGFPATH 640 3 * @T00 NCX" > newsyslog.conf
+tests_time_rotate "xz" ""
+
+echo "$LOGFPATH 640 3 * @T00 NCY" > newsyslog.conf
+tests_time_rotate "zst" ""
+
# Time based, archive dir
echo "$LOGFPATH 640 3 * @T00 NC" > newsyslog.conf
tests_time_rotate "" "${TMPDIR}/alog/"
@@ -527,6 +545,12 @@
echo "$LOGFPATH 640 3 * @T00 NCJ" > newsyslog.conf
tests_time_rotate "bz2" "${TMPDIR}/alog/"
+
+echo "$LOGFPATH 640 3 * @T00 NCX" > newsyslog.conf
+tests_time_rotate "xz" "${TMPDIR}/alog/"
+
+echo "$LOGFPATH 640 3 * @T00 NCY" > newsyslog.conf
+tests_time_rotate "zst" "${TMPDIR}/alog/"
# RFC-5424; Normal, no archive dir
echo "$LOGFPATH5424 640 3 * @T00 NCT" > newsyslog.conf

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 6, 11:58 AM (23 m, 33 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30908264
Default Alt Text
D16509.diff (2 KB)

Event Timeline