|
Lines 127-132
Link Here
|
| 127 |
struct ptime_data *trim_at; /* Specific time to do trimming */ |
127 |
struct ptime_data *trim_at; /* Specific time to do trimming */ |
| 128 |
unsigned int permissions; /* File permissions on the log */ |
128 |
unsigned int permissions; /* File permissions on the log */ |
| 129 |
int flags; /* CE_COMPACT, CE_BZCOMPACT, CE_BINARY */ |
129 |
int flags; /* CE_COMPACT, CE_BZCOMPACT, CE_BINARY */ |
|
|
130 |
int nuncompact; /* number of rotations that should not |
| 131 |
* be compressed; -1 turns this off */ |
| 130 |
int sig; /* Signal to send */ |
132 |
int sig; /* Signal to send */ |
| 131 |
int def_cfg; /* Using the <default> rule for this file */ |
133 |
int def_cfg; /* Using the <default> rule for this file */ |
| 132 |
struct conf_entry *next;/* Linked list pointer */ |
134 |
struct conf_entry *next;/* Linked list pointer */ |
|
Lines 1187-1192
Link Here
|
| 1187 |
} |
1189 |
} |
| 1188 |
|
1190 |
|
| 1189 |
for (; q && *q && !isspacech(*q); q++) { |
1191 |
for (; q && *q && !isspacech(*q); q++) { |
|
|
1192 |
if (isdigit(*q)) { |
| 1193 |
working->nuncompact = strtol(q, NULL, 10); |
| 1194 |
while(isdigit(*(q+1))) q++; |
| 1195 |
continue; |
| 1196 |
} |
| 1190 |
switch (tolowerch(*q)) { |
1197 |
switch (tolowerch(*q)) { |
| 1191 |
case 'b': |
1198 |
case 'b': |
| 1192 |
working->flags |= CE_BINARY; |
1199 |
working->flags |= CE_BINARY; |
|
Lines 1456-1461
Link Here
|
| 1456 |
(void)rename(zfile1, zfile2); |
1463 |
(void)rename(zfile1, zfile2); |
| 1457 |
} |
1464 |
} |
| 1458 |
change_attrs(zfile2, ent); |
1465 |
change_attrs(zfile2, ent); |
|
|
1466 |
if ((flags & (CE_COMPACT | CE_BZCOMPACT)) && |
| 1467 |
(ent->nuncompact != -1) && |
| 1468 |
(numlogs_c == ent->nuncompact)) { |
| 1469 |
free_or_keep = KEEP_ENT; |
| 1470 |
save_zipwork(ent, NULL, ent->fsize, file2); |
| 1471 |
} |
| 1459 |
} |
1472 |
} |
| 1460 |
|
1473 |
|
| 1461 |
if (ent->numlogs > 0) { |
1474 |
if (ent->numlogs > 0) { |
|
Lines 1494-1500
Link Here
|
| 1494 |
swork = NULL; |
1507 |
swork = NULL; |
| 1495 |
if (ent->pid_file != NULL) |
1508 |
if (ent->pid_file != NULL) |
| 1496 |
swork = save_sigwork(ent); |
1509 |
swork = save_sigwork(ent); |
| 1497 |
if (ent->numlogs > 0 && (flags & (CE_COMPACT | CE_BZCOMPACT))) { |
1510 |
if (ent->numlogs > 0 && (flags & (CE_COMPACT | CE_BZCOMPACT)) |
|
|
1511 |
&& ent->nuncompact == -1) { |
| 1498 |
/* |
1512 |
/* |
| 1499 |
* The zipwork_entry will include a pointer to this |
1513 |
* The zipwork_entry will include a pointer to this |
| 1500 |
* conf_entry, so the conf_entry should not be freed. |
1514 |
* conf_entry, so the conf_entry should not be freed. |