Commit Graph

31 Commits

Author SHA1 Message Date
Baptiste Daroussin
7bc60a1616 For half and reverse line feeds, recognize both SUSv2-style escape-digit
and BSD-style escape-control-char sequences in the input stream.

Submitted by:	schwarze at OpenBSD
Discussed with:	schwarze at OpenBSD
Obtained from:	OpenBSD
2015-05-10 11:41:38 +00:00
Baptiste Daroussin
f23ed79b08 Fix about ten integer overflows and underflows and a handful of logic
errors in line number handling.

Submitted by:	ingo at OpenBSD
Discussed with:	ingo at OpenBSD
Obtained from:	OpenBSD
2015-05-08 22:11:54 +00:00
Baptiste Daroussin
e5ea68e766 Capsicumize col(1) 2015-05-02 12:22:24 +00:00
Baptiste Daroussin
a9da03ef30 Use defines to improve clarity
MFC after:	2 weeks
2015-05-01 17:33:32 +00:00
Baptiste Daroussin
f6240da93c col: fixing 25 year old bug
Makes col(1) respect POSIX again for escape sequences as decribed in its manpage
The bug was introduced in CSRG in 1990
This also reverts r280911

Differential Revision:	https://reviews.freebsd.org/D2424
Reviewed by:	jhb
MFC after:	2 weeks
2015-05-01 17:18:07 +00:00
Kevin Lo
18463c7749 Remove bogus cast. 2015-03-31 15:03:58 +00:00
John-Mark Gurney
7e2c0c79fa Fix to col when printing half-line feeds w/ -f option...
Message-Id on openbsd-tech: 20141017195810.GJ132@iris.usta.de
Submitted by:	Ingo Schwarze
Obtained from:	OpenBSD
MFC after:	3 days
2014-10-17 21:09:03 +00:00
Ed Schouten
ab8d971c3a Add missing static keywords to col(1) 2011-11-06 08:14:22 +00:00
Joel Dahl
da52b4caaf Remove the advertising clause from UCB copyrighted files in usr.bin. This
is in accordance with the information provided at
ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change

Also add $FreeBSD$ to a few files to keep svn happy.

Discussed with:	imp, rwatson
2010-12-11 08:32:16 +00:00
Ed Maste
5eb2aa4543 Remove more extraneous ;s. 2010-07-15 00:04:14 +00:00
Stefan Farfeleder
ae66acac87 The variables i and tot don't need to be static. 2006-07-18 07:16:25 +00:00
David Malone
707083753a Avoid shadowing a local scratch variable, 2005-11-13 20:30:13 +00:00
Tim J. Robbins
919480b7be Sort #include directives and remove one duplicate that crept in to the
previous commit.
2004-07-29 07:28:26 +00:00
Tim J. Robbins
c3fae7442e Add support for multibyte characters, loosely based on Bruno Haible's
work in the util-linux package.
2004-07-29 07:23:37 +00:00
David Malone
f4ac32def2 ANSIify function definitions.
Add some constness to avoid some warnings.
Remove use register keyword.
Deal with missing/unneeded extern/prototypes.
Some minor type changes/casts to avoid warnings.

Reviewed by:	md5
2002-09-04 23:29:10 +00:00
Juli Mallett
3a7fc8ce59 Remove local prototypes for main(). 2002-08-19 03:07:56 +00:00
Warner Losh
f1bb2cd2aa remove __P 2002-03-22 01:22:50 +00:00
David Malone
9f5b04e925 Style improvements recommended by Bruce as a follow up to some
of the recent WARNS commits. The idea is:

1) FreeBSD id tags should follow vendor tags.
2) Vendor tags should not be compiled (though copyrights probably should).
3) There should be no blank line between including cdefs and __FBSDIF.
2001-12-10 21:13:08 +00:00
Mark Murray
84c0ff2233 Use __FBSDID(). 2001-12-02 23:34:16 +00:00
David E. O'Brien
44974a7f49 Remove the misnamed `xmalloc' and replace its uses with the realloc (along
with error checking) that it actually was.
2001-07-24 14:14:11 +00:00
Mike Heffner
844518ff93 Add the -p flag to force unknown control sequences to be passed
through unchanged.

Reviewed by:	silence on -audit
Obtained from:	NetBSD
MFC after:	3 weeks
2001-06-17 04:24:16 +00:00
Mike Heffner
f34d0e7447 Use err(3) and style(9) cleanup.
MFC after:	2 weeks
2001-06-17 03:56:00 +00:00
Kris Kennaway
50d6b258b2 Fix a trivial warning and clamp down with WARNS=2
MFC after:	1 week
2001-05-26 22:45:14 +00:00
Dima Dorfman
43d665c0d1 Document the -h option. 2001-05-11 23:53:46 +00:00
Philippe Charnier
a292105ac8 Use errx(). .Nm fixes 2000-03-26 14:23:23 +00:00
Archie Cobbs
fa146c5335 Tweaks to allow compiling -Wall (mostly adding "const" to char rcsid[]). 1998-12-06 22:58:23 +00:00
Warner Losh
1c8af87873 compare return value from getopt against -1 rather than EOF, per the final
posix standard on the topic.
1997-03-29 04:34:07 +00:00
Peter Wemm
df3f5d9dd5 Merge from Lite2 1997-03-11 13:43:33 +00:00
Andrey A. Chernov
8bbd907273 Add setlocale LC_CTYPE 1995-10-24 06:15:05 +00:00
Bruce Evans
f746e67c46 Obtained from: looked at the fix in 1.1.5 and rewrote it
Fix entabbing.
1995-01-17 07:02:31 +00:00
Rodney W. Grimes
9b50d90275 BSD 4.4 Lite Usr.bin Sources 1994-05-27 12:33:43 +00:00