Commit Graph

35 Commits

Author SHA1 Message Date
Andrew Turner
bd9dd0c6c9 The is_delim function works on wchar_t characters not ints, update the
function to take a wchar_t as it's argument.

This fixes the build when wchar_t is not an int, i.e. ARM EABI.
2012-11-24 04:15:25 +00:00
Eitan Adler
18ba28c82c Add 'w' flag to:
Use whitespace (spaces and tabs) as the delimiter.
Consecutive spaces and tabs count as one single field
separator.

Reviewed by:	swildner@dragonflybsd.org
Approved by:	cperciva
Obtained from:	DragonFlyBSD
MFC after:	1 week
2012-11-20 01:57:21 +00:00
Kevin Lo
d334b28625 - Consistenly mention columns and fields
- Add -b to short error messages

Obtained from:	NetBSD
2012-06-11 03:02:40 +00:00
Ed Schouten
41b662c583 Add missing static keywords to cut(1) 2011-11-06 08:14:51 +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
Tim J. Robbins
a2222839a5 When the last line of a file is missing a newline in -f mode, pass a
length argument to mbrtowc() that accounts for the terminating newline
character we add automatically. Failing to do this caused the loop to
unexpectedly run out of characters and incorrectly signal an "Illegal byte
sequence" error.
2004-11-05 10:45:23 +00:00
Tim J. Robbins
3b90bf797f Move some variable declarations to the top of the file. 2004-06-28 06:05:36 +00:00
Tim J. Robbins
f0b4606f3f Silence a warning about an unused argument. 2004-06-27 16:58:56 +00:00
Tim J. Robbins
a5c4bafcd1 Handle multibyte characters when cutting out fields (-f and -d options.) 2004-06-27 16:42:33 +00:00
Tim J. Robbins
0dcb7b75a3 Update a comment that compared the parser with an obsolete draft of
IEEE Std 1003.2-1992. Most of the "extensions" here were actually
required by the final version of the standard.
2004-06-27 15:27:15 +00:00
Tim J. Robbins
364d0a915c Implement the -c option correctly in locales with multibyte characters
instead of treating it as a synonym for -b.
2004-06-27 14:55:07 +00:00
Tim J. Robbins
d900c38411 Make the handling of invalid multibyte sequences more robust by using
mbrlen() instead of mblen().
2004-06-27 10:35:28 +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
David E. O'Brien
77c8bf7cae Consistently use FBSDID 2002-06-30 05:34:21 +00:00
Tim J. Robbins
393cf5088e Don't split multibyte characters when the -n option is specified. 2002-06-08 07:27:21 +00:00
Tim J. Robbins
93738f50e5 style(9): don't initialise variables in their declaration, remove space
after function name, use __unused on unused parameters instead of
initialising them to bogus values.
2002-06-07 09:13:43 +00:00
Tim J. Robbins
f457179a13 Initialise the `positions' array correctly before use. 2002-05-27 02:01:25 +00:00
Tim J. Robbins
204c78a163 When a file name of "-" is given, read from standard input (SUSv3) 2002-05-24 09:56:18 +00:00
Tim J. Robbins
a8522a9bb7 Allow byte/character positions >_POSIX2_LINE_MAX to be specified by
dynamically growing the `positions' array.
2002-05-24 09:11:18 +00:00
Tim J. Robbins
a6ea32c3c5 If processing of one file fails, try to process the remaining files and
exit non-zero instead of immediately exiting. The traditional BSD
behaviour is explicitly forbidden by P1003.2.
2002-05-24 06:03:12 +00:00
Dima Dorfman
41ff7633ea Silence the remaining warnings and clamp down with WARNS=2.
Not objected to by:	-audit
2001-06-07 02:57:58 +00:00
Dima Dorfman
1928e20e95 Teach cut(1) how to handle long lines: convert from fgets(3) to fgetln(3).
PR:		26810
Reviewed by:	dwmalone
2001-04-25 05:42:53 +00:00
Philippe Charnier
39e21a1b64 Remove duplicate FreeBSD Id
Remoce unused #include
Use imperative mode to start flag description
2001-02-06 20:03:48 +00:00
Will Andrews
99557a7988 De-__P()-ify
Reviewed by:	markm
2001-01-28 00:35:40 +00:00
Will Andrews
d8a3fbd50d BDECFLAGS: constify; use proper types. Add $FreeBSD$, clean up #ifndef lint.
Reviewed by:	markm
2001-01-28 00:34:29 +00:00
Eivind Eklund
2c39ae659c Merge from NetBSD: cut.1 rev 1.6 to 1.8
cut.c rev 1.9 to 1.13
* Man page internal cleanups
* 8-bit characters cast to unsigned for is*()
* Misc cleanups for egcs -Wall compatibility
1999-02-02 15:48:04 +00:00
Eivind Eklund
5183fb5330 Bring in use of strsep() to handle bad input better, and clean up
some text.

Obtained from:	Merge from OpenBSD
(cut.1 up to OpenBSD rev 1.3, cut.c up to OpenBSD rev 1.6)
1999-02-02 14:56:55 +00:00
Eivind Eklund
d51c662504 Merge from NetBSD cut.1 rev 1.6 and cut.c rev 1.9, respectively. This
makes us conform to IEEE Std1003.2-1992 (``POSIX.2'').

Obtained from:	NetBSD (but with slight modifications).
1999-02-02 14:26:39 +00:00
Archie Cobbs
fa146c5335 Tweaks to allow compiling -Wall (mostly adding "const" to char rcsid[]). 1998-12-06 22:58:23 +00:00
Philippe Charnier
812bff99b4 Use err(3) instead of local redefinition. Change argument name in man
page to sync with usage string.
1997-06-30 06:48:46 +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
eaf9238016 Fix wrong separator output
Submitted by: julian
Obtained from: newsgroup?
1995-03-21 00:26:32 +00:00
Rodney W. Grimes
9b50d90275 BSD 4.4 Lite Usr.bin Sources 1994-05-27 12:33:43 +00:00