Commit Graph

113 Commits

Author SHA1 Message Date
Garance A Drosehn
c303328741 Handle a 'const' parameter without using __DECONST().
MFC after:	14 days
2003-10-04 02:24:47 +00:00
Garance A Drosehn
6a1485e2fe Restructure the time processing routines, mainly to fix up the
"will trim at" message printed when the user requests '-v'.  The
previous code would often print the wrong time, such as:
On Sept 22, run:   newsyslog -nv /var/log/wtmp
        And see:   will trim at Mon Sep  1 05:00:00 2003
    correct msg:   will trim at Wed Oct  1 05:00:00 2003

MFC after:	20 days
2003-09-23 00:00:26 +00:00
Garance A Drosehn
526d55a405 Correct the calculation of "a leap year" in parseDWM. The calculation
would only match a leap year every 400 years.  The parseDWM code first
showed up in April 2000, so the first time this bug would cause any
confusion is in Feb 2004.

MFC after:	18 days
2003-09-14 00:56:50 +00:00
Garance A Drosehn
2f8d7c56da Move the parse8601 and parseDWM routines into a new ptime.c file. The
only code-change is to add a "next_time" parameter to both routines (and
that is not used yet).  A later update will make "next_time" more useful.

MFC after:	20 days
2003-09-12 01:33:37 +00:00
Garance A Drosehn
3c0f0ccce7 Switch dotrim() to take advantage of the 'struct conf_entry' that
is already passed in, instead of having the caller copy values from
that struct into additional parameters.

MFC after:	22 days
2003-09-09 21:14:05 +00:00
Garance A Drosehn
1005e972cb Reduce the annoying compiler warnings that pop up when compiling with
gcc 3.3.x and -Wshadow.  Just renames 'log' variables to be 'logname'.

MFC after:	22 days
2003-09-09 20:29:26 +00:00
Garance A Drosehn
1f566014a3 Correct the comment about which timezone-change loses an hour...
MFC after:	23 days
2003-09-09 05:26:27 +00:00
Garance A Drosehn
9b8311cef6 Add a '-D <something>' command line arg, which can be used to set
debugging options.  Initial option is '-D TN=<time>', which can be
used to see how newsyslog would work if run at the specified time.
(time format is ISO 8601, since that is already supported).

MFC after:	23 days
2003-09-09 05:23:06 +00:00
Garance A Drosehn
c31cdd1bd2 Use strtol() instead of strtoul() in parse8601, so we can detect
negative values.  Mainly done to sync this routine with OpenBSD.

Obtained from:	OpenBSD
MFC after:	23 days
2003-09-09 03:04:50 +00:00
Garance A Drosehn
5303adbf2c Fix typo in the previous commit. Was checking wrong variable...
MFC after:	23 days
2003-09-09 02:58:23 +00:00
Garance A Drosehn
32734b8a2f Change parse8601 and parseDWM so they return an alternate error value
for invalid times, and have the caller print the error message.

MFC after:	23 days
2003-09-09 02:50:25 +00:00
Garance A Drosehn
ab76625820 Cosmetic change to move parse8601 right next to parseDWM. No code
is changed.  (that will come in later updates).

MFC after:	23 days
2003-09-09 02:21:53 +00:00
Garance A Drosehn
c877fb5131 When checking the 'user:group' field in newsyslog.conf, freebsd's source
was mistakenly calling the standard isnumber() function to find out if
the given 'user' or 'group' were all numeric.  This meant that only the
first character of the fields were actually checked, so a username of
(say) '3com' would look like a number, and thus get mapped to uid=3 (bin)
instead of username=3com.

This bug was introduced back in freebsd's v1.1.  That initial import
almost matches netbsd's v1.9, except that an internal isnumber()
routine was removed in favor of the standard library version.  The thing
is, that internal routine was checking the entire string, and not just
the first digit.  In OpenBSD, isnumber() was eventually renamed to
isnumberstr() to make the distinction more obvious, and I'm going to
follow that lead.

I believe this also happens to remove the last references to isnumber()
in the entire freebsd base system.

Obtained from:	OpenBSD, by a long circuitous route
MFC after:	5 days
2003-08-19 03:53:03 +00:00
Garance A Drosehn
0d5a03997a Fix an 'bad file descriptor' error which would come up when using
the 'C' flag on an entry that also specifies 'user:group' info.

Submitted by:	Riccardo Torrini <riccardo@torrini.org> in -current
MFC after:	4 days
2003-08-02 23:03:37 +00:00
Garance A Drosehn
4adea93613 Fix age_old_log checking so that it will notice log files which were
rotated and then compressed with bzip2 instead of gzip.  Otherwise,
any file which had a time-interval specified for 'when' and also
specified the 'J' flag would be rotated every time newsyslog was run.
(this is a quick-fix, trying to beat the code-freeze for 5.1-release)

PR:		bin/51519
MFC after:	1 week
2003-05-05 23:38:03 +00:00
Garance A Drosehn
bedb455962 Slightly improve the checking of the 'size' field, so people will get
a warning message if they switch the values for 'size' and 'when'.

MFC after:	1 week
2003-05-05 22:27:37 +00:00
David E. O'Brien
b728350ee6 Use __FBSDID over rcsid[]. Protect copyright[] where needed. 2003-05-03 21:06:42 +00:00
Garance A Drosehn
28045703cc Add a -C (create) option for newsyslog, and a 'C' flag for entries in the
config file.  If the -C option is specified once, then newsyslog will create
any entries which specify the 'C' option.  If -C is given twice, then
newsyslog will create all missing log files.  Some of this code comes
from NetBSD, although this implementation does not exactly match theirs.

Reviewed by:	freebsd-arch
MFC after:	10 days
2003-04-27 23:37:31 +00:00
Garance A Drosehn
bc6c007686 Document support for the new 'U' flag, which was implemented back in March
as revision 1.64 of newsyslog.c.  I plan to MFC these changes next week.

MFC after:	1 week
2003-04-24 20:50:01 +00:00
Garance A Drosehn
3d3e9b01a1 Document support for the new -s and -R command-line options, and
the 'N' flag.  These were coded in March as revisions 1.55 and 1.56
of newsyslog.c.  I intend to MFC all the matching changes next week.
This also reorganizes the description of the 'flags' field to give
list of the valid flags, instead of a long paragraph explaining
each of the possible values.

Obtained from:	NetBSD (in spirit at least, for -s and N)
MFC after:	1 week
2003-04-24 01:34:40 +00:00
Garance A Drosehn
356e4049da Document support for the <default> entry, which was implemented in
revision 1.50 of newsyslog.c , back in February.  I intend to MFC
those changes soon.

MFC after:	4 days
2003-04-23 21:26:12 +00:00
Garance A Drosehn
9ffd2d77ef Fix interactions between entries for a specific file vs entries for
a filename pattern, and also wrt filenames given on the command line.
Now if a file is listed as a specific entry, it will not *also* be
processed by an entry specifying a pattern.  And filename-patterns
will now only match existing files (ignoring directories, etc).

MFC after:	3 weeks
2003-03-09 03:19:52 +00:00
Garance A Drosehn
4ebd61a3cf The processing of files given on the command-line will work a little better
if we return the entire worklist, instead of just the last entry.  A minor
fix to revision 1.57.

MFC after:	15 days
2003-03-09 00:29:40 +00:00
Garance A Drosehn
ae77078c25 Add a config-file flag of 'U' or 'u' to indicate that the pid-file
will contain the pid for a process group.  This means the file must
contain a negative value (as would be needed in the 'kill' commmand).
I still need to write man-page update before MFC-ing.

This started by rewriting the get_pid() routine.  Later I looked at
what OpenBSD has, and included a few ideas from their send_signal()
routine.  So, parts of this change are from OpenBSD, even though
OpenBSD does not actually have a 'U' flag.

PR:		bin/28435
Reviewed by:	no objections on freebsd-arch
MFC after:	3 weeks
2003-03-08 20:07:01 +00:00
Garance A Drosehn
a42568171f Prefix all -n (noaction) "unix cmds" with tab, thus making it much easier
to sort out noaction messages from -v (verbose) messages.  This also
improves a few noaction messages.

Obtained from:	OpenBSD
MFC after:	3 weeks
2003-03-07 21:29:34 +00:00
Garance A Drosehn
40fe458d04 Move the -s (nosignal) processing, as newsyslog needs to print out a
warning message if -s is specified and it rotates a file that expects
to be compressed.  This warning message is not printed if -R is also
specified, because we assume a -sR request is coming from the process
which would have been signaled, and that it has already released the
logfile.

Indirectly noticed by:	sheldonh
2003-03-07 21:06:32 +00:00
Garance A Drosehn
69ea8786d6 Add missing 'static' on two routines, so they match their declarations.
PR:		29363 (a small part of)
Submitted by:	dinoex
MFC after:	3 weeks
2003-03-03 15:31:35 +00:00
Garance A Drosehn
d4948dc25e A variety of cosmetic changes, mostly to (slightly) reduce diffs with
OpenBSD.  Except for one added '\n', the object code is not changed.

MFC after:	3 weeks
2003-03-03 02:53:35 +00:00
Garance A Drosehn
2f5d9e2994 Collapse two more parameters to dotrim() into the 'ent' parameter that is
already there.  This should not effect anything.

MFC after:	3 weeks
2003-03-03 01:58:33 +00:00
Garance A Drosehn
e2fe500ec5 Change to using uid_t and gid_t instead of int. Also change this won't
bother doing a chmod() if neither of these two fields are set.

Obtained from:	OpenBSD
MFC after:	3 weeks
2003-03-03 01:23:34 +00:00
Garance A Drosehn
7cf31d2ff5 Fix the interactions between specific log files given on the command line,
and config-file entries which specify a filename-pattern (glob).  It is
still not perfectly-right, but at least it isn't completely-wrong.

Reviewed by:	no objections on freebsd-arch
MFC after:	3 weeks
MFC addendum:	(or after the code-freeze of 4.x is lifted)
2003-03-03 00:01:51 +00:00
Garance A Drosehn
9fb022b6d6 Add a command-line option of '-R somename', which indicates that newsyslog
should rotate all files given on the command, even if they don't seem to
need to be rotated.  This would be used by some other command that decides
the given log file(s) should be rotated, but wants the "how" of that rotation
to be determined by entries to newsyslog.  Wes expects to change syslogd to
take advantage of this.  Man page will be updated after we're sure this is
all working the way we want it to.

Reviewed by:	no objections on freebsd-arch
MFC after:	3 weeks
MFC addendum:	(or after the code-freeze of 4.x is lifted)
2003-03-02 23:23:11 +00:00
Garance A Drosehn
f2c3715aa7 Add a command-line option of '-s', which indicates that newsyslog should
not send a signal to any processes.  Also add a config-file flag of 'N' or
'n', which indicates that the given logfile has no process which needs a
signal when it is rotated.  Both of these are based on changes NetBSD
has made, although the implementation is somewhat different.

PR:		bin/36553  (2nd half)
Reviewed by:	no objections on freebsd-arch
Obtained from:	NetBSD (in spirit, at least)
MFC after:	3 weeks
2003-03-02 22:05:17 +00:00
Garance A Drosehn
5ac30d6d34 Fix an error which caused 'free(): error: chunk is already free'
if an entry in the config file included flag 'G'.

MFC after:	3 weeks
2003-02-26 03:20:38 +00:00
Garance A Drosehn
39d0141328 Check the value given for number-of-logs to keep in config-file entries,
and error-out if the value is negative (avoiding an infinite loop).

PR:		bin/30654 (part of it)
MFC after:	3 weeks
2003-02-24 02:28:46 +00:00
Garance A Drosehn
27f1bc0c71 1) Fix so -a honors the -n ("do nothing") option. Before, if the directory
given for -a did not exist, then newsyslog would always try to create
   it, even if -n was specified.
2) When -a processing *does* create the directory, have it check the result
   from mkdir(), and immediately error-out if that failed.

PR:		bin/46974
MFC after:	3 weeks
2003-02-24 02:09:02 +00:00
Garance A Drosehn
debfc5e11d Minor style fix. Add parenthesis around 'return' values.
Reviewed by:	md5
MFC after:	3 weeks
2003-02-24 01:05:05 +00:00
Garance A Drosehn
93943fff46 Add the idea of a "default rotate action", which will be used if a file is
specified at runtime, but that filename is not listed in the newsyslog.conf
file.  This default-action can be changed by having a line in newsyslog.conf
with the filename of "<default>".  Before this change, the program would
quietly ignore the given file.  An update to the man page will be written
after I finish some other updates to newsyslog.c.

Reviewed by:	no objections from freebsd-arch
MFC after:	3 weeks
2003-02-24 00:51:41 +00:00
Jens Schweikhardt
57bd0fc6e8 english(4) police. 2002-12-27 12:15:40 +00:00
Tom Rhodes
35c45e664a Make newsyslog(8) print the correct date when the logs are turned over.
PR:		46395
Submitted by:	maxim
MFC:		eventually
2002-12-21 22:27:26 +00:00
Maxim Sobolev
bffa911730 Add a new W' flag, that when used in conjunction with the Z' flag or the
`J' flag means that newsyslog should wait for previously started compression
jobs to complete before starting a new one for this entry.  When it is used
along with the `G' flag, in the case when several logfiles match the pattern
and should be compressed, the newsyslog will compress logs one by one,
ensuring that only one compression job is running at a time.

This prevents newsyslog(8) from overloading system by starting several
compression jobs on big files simultaneously.

Sponsored by:	Porta Software Ltd
MFC after:	2 weeks
2002-12-15 19:28:02 +00:00
Maxim Sobolev
4ea03b3140 Backout unapproved WARNS level change occasionally slipped into previous
commit.

Big pointy hat to:	sobomax
2002-12-11 01:21:57 +00:00
Maxim Sobolev
f2562be03e - Allow comments to be placed at the end of configuration line.
Sponsored by:   Porta Software Ltd
Approved by:    re
MFC after:      2 weeks
2002-12-11 01:19:56 +00:00
Ruslan Ermilov
c041c1e0d9 mdoc(7) police: markup fixes.
Approved by:	re
2002-11-27 15:31:08 +00:00
Maxim Sobolev
2e01a2be1e Add a new newsyslog.conf flag - 'G', which if set tells newsyslog(8) that
the specified filename of the log to be rotated is in fact shell glob
pattern. In this case, all files matching this pattern will be rotated
using the same options. Useful in the case when there is no pre-defined
name for the logfiles (e.g. xtradius, samba etc).

Sponsored by:	PortaOne Software Ltd
MFC after:	2 weeks
2002-11-14 08:43:07 +00:00
Maxim Konovalov
a9a25f59fa Fix getopt(3) optstring: remove a flag we does not handle.
PR:		bin/44066
Submitted by:	Stefan Farfeleder <e0026813@stud3.tuwien.ac.at>
MFC after:	1 week
2002-10-16 14:20:20 +00:00
Philippe Charnier
490d5836b5 The .Nm utility 2002-07-14 14:47:15 +00:00
Maxim Konovalov
21ee796112 Remove the last EOF spaces I missed in rev. 1.43.
MFC after:	1 week
2002-07-01 13:18:52 +00:00
Maxim Konovalov
cc37581539 style(9): sort includes, remove EOL spaces.
MFC after:	1 week
2002-05-03 21:03:37 +00:00
Maxim Konovalov
021e53b8df wait(2) for compress_log() processes to complete before exit.
Spotted by:	Grigoriy Strokin <grg@isabase.philol.msu.ru>
Reviewed by:	-current
MFC after:	1 month
2002-05-03 20:53:37 +00:00