sbase

commit 76ca226e8181fdbdef16ac5900effc2bcfd1cf7a
parent 699f246239907f244221ca288eb5ef35d2340fd8
Author: FRIGN <dev@frign.de>
Date:   Sun, 18 Jan 2015 11:30:31 +0100

Add mandoc-manpage for cut(1) and clean up code

and mark it as finished in README.

Diffstat:
M
README
 | 
2
+-
M
cut.1
 | 
126
+++++++++++++++++++++++++++++++++++++++++++------------------------------------
M
cut.c
 | 
24
++++++++++++------------

3 files changed, 81 insertions(+), 71 deletions(-)
diff --git a/README b/README
@@ -21,7 +21,7 @@ The following tools are implemented (* == finished):
 * comm            yes                             none
   cp              no                              -H, -i, -L
 * cron            non-posix                       none
-  cut             yes                             none
+* cut             yes                             none
   date            yes                             none
   dirname         yes                             none
   du              no                              -H, -L, -x
diff --git a/cut.1 b/cut.1
@@ -1,60 +1,70 @@
-.TH CUT 1 sbase\-VERSION
-.SH NAME
-cut \- extract columns of data
-.SH SYNOPSIS
-.B cut \-b
-.I list
-.RB [ \-n ]
-.RI [ file ...]
-.br
-.B cut \-c
-.I list
-.RI [ file ...]
-.br
-.B cut \-f
-.I list
-.RB [ \-d
-.IR delim ]
-.RB [ \-s ]
-.RI [ file ...]
-.SH DESCRIPTION
-.B cut
-out bytes, characters, or delimited fields from each line of the given
-files and write to stdout. With no file, or when file is `-', cut reads
-from stdin.
-.P
-.I list
-is a comma or space separated list of numbers and ranges where numbering
-starts from 1. Ranges are on the form `N-M'. If N or M is missing, the
-beginning or end of line is assumed. Numbers and ranges may be repeated,
-overlapping, and in any order. Selected input is written in the same
-order that it is read, and is written exactly once.
-.SH OPTIONS
-.TP
-.BI \-b \ list
-The
-.I list
-specifies byte positions.
-.TP
-.BI \-c \ list
-The
-.I list
-specifies character positions.
-.TP
-.BI \-d \ delim
+.Dd January 18, 2015
+.Dt CUT 1 sbase\-VERSION
+.Sh NAME
+.Nm cut
+.Nd extract columns of data
+.Sh SYNOPSIS
+.Nm cut
+.Fl b Ar list
+.Op Fl n
+.Op Ar file ...
+.Nm cut
+.Fl c Ar list
+.Op Ar file ...
+.Nm cut
+.Fl f Ar list
+.Op Fl d Ar delim
+.Op Fl s
+.Op Ar file ...
+.Sh DESCRIPTION
+.Nm
+out bytes, characters or delimited fields from each line of
+.Ar file
+and write to stdout.
+.Pp
+If no
+.Ar file
+is given or
+.Ar file
+is '-',
+.Nm
+reads from stdin.
+.Pp
+.Ar list
+is a comma or space separated list of numbers and ranges starting
+from 1. Ranges have the form 'N-M'. If N or M is missing,
+beginning or end of line is assumed. Numbers and ranges
+may be repeated, overlapping and in any order.
+.Pp
+Selected input is written in the same order it is read
+and is written exactly once.
+.Sh OPTIONS
+.Bl -tag -width Ds
+.It Fl b Ar list | Fl c Ar list
+.Ar list
+specifies byte | character positions.
+.It Fl n
+Do not split multibyte characters. A character is written when its
+last byte is selected.
+.It Fl f Ar list
+.Ar list
+specifies field numbers. Lines not containing field
+delimiters are passed through, unless
+.Fl s
+is specified.
+.It Fl d Ar delim
 Use first byte of
-.I delim
-as field delimiter, instead of tab.
-.TP
-.BI \-f \ list
-The
-.I list
-specifies field numbers. Lines not containing field delimiters are
-passed through untouched.
-.TP
-.B \-n
-Do not split characters. A character is output if its last byte is
-selected.
-.TP
-.B \-s
+.Ar delim
+as field delimiter. Default is \et.
+.It Fl s
 Suppress lines not containing field delimiters.
+.El
+.Sh STANDARDS
+The
+.Nm
+utility is compliant with the
+.St -p1003.1-2008
+specification.
+.Pp
+The possibility of separating numbers and ranges with a space
+is an extension to that specification.
diff --git a/cut.c b/cut.c
@@ -6,14 +6,6 @@
 #include "text.h"
 #include "util.h"
 
-static void
-usage(void)
-{
-	eprintf("usage: cut -b list [-n] [file...]\n"
-	        "       cut -c list [file...]\n"
-	        "       cut -f list [-d delim] [-s] [file...]\n");
-}
-
 typedef struct Range {
 	size_t min, max;
 	struct Range *next;
@@ -135,6 +127,14 @@ cut(FILE *fp)
 	}
 }
 
+static void
+usage(void)
+{
+	eprintf("usage: cut -b list [-n] [file ...]\n"
+	        "       cut -c list [file ...]\n"
+	        "       cut -f list [-d delim] [-s] [file ...]\n");
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -163,12 +163,12 @@ main(int argc, char *argv[])
 	if (!mode)
 		usage();
 
-	if (!argc) {
+	if (!argc)
 		cut(stdin);
-	} else for (; argc--; argv++) {
-		if (!strcmp(*argv, "-")) {
+	else for (; argc--; argv++) {
+		if (!strcmp(*argv, "-"))
 			cut(stdin);
-		} else {
+		else {
 			if (!(fp = fopen(*argv, "r"))) {
 				weprintf("fopen %s:", *argv);
 				continue;