This commit is contained in:
Connor Lane Smith 2011-05-29 21:30:44 +01:00
parent 6427386b02
commit 430b453c4d
4 changed files with 125 additions and 6 deletions

View File

@ -5,7 +5,7 @@ LIB = util/afgets.o util/agetcwd.o util/concat.o util/enmasse.o util/eprintf.o \
util/recurse.o util/recurse.o
SRC = basename.c cat.c chmod.c chown.c date.c dirname.c echo.c false.c grep.c \ SRC = basename.c cat.c chmod.c chown.c date.c dirname.c echo.c false.c grep.c \
head.c ln.c ls.c mkdir.c mkfifo.c pwd.c rm.c sleep.c tail.c tee.c \ head.c ln.c ls.c mkdir.c mkfifo.c nl.c pwd.c rm.c sleep.c tail.c tee.c \
touch.c true.c wc.c touch.c true.c wc.c
OBJ = $(SRC:.c=.o) $(LIB) OBJ = $(SRC:.c=.o) $(LIB)
BIN = $(SRC:.c=) BIN = $(SRC:.c=)
@ -13,13 +13,13 @@ MAN = $(SRC:.c=.1)
all: $(BIN) all: $(BIN)
$(OBJ): util.h $(OBJ): util.h config.mk
$(BIN): util.a $(BIN): util.a
cat.o grep.o tail.o: text.h cat.o grep.o tail.o: text.h
.o: .o:
@echo CC -o $@ @echo LD -o $@
@$(CC) -o $@ $< util.a $(LDFLAGS) @$(LD) -o $@ $< util.a $(LDFLAGS)
.c.o: .c.o:
@echo CC -c $< @echo CC -c $<

View File

@ -1,9 +1,15 @@
# sbase version # sbase version
VERSION = 0.0 VERSION = 0.0
#CC = cc #CC = gcc
#CC = musl-gcc #CC = musl-gcc
LD = $(CC)
CPPFLAGS = -D_POSIX_C_SOURCE=200112L CPPFLAGS = -D_POSIX_C_SOURCE=200112L
CFLAGS = -Os -ansi -Wall -pedantic $(CPPFLAGS) CFLAGS = -Os -ansi -Wall -pedantic $(CPPFLAGS)
LDFLAGS = -s -static LDFLAGS = -s -static
#CC = tcc
#LD = $(CC)
#CPPFLAGS = -D_POSIX_C_SOURCE=200112L
#CFLAGS = -Os -Wall $(CPPFLAGS)
#LDFLAGS =

44
nl.1 Normal file
View File

@ -0,0 +1,44 @@
.TH NL 1 sbase\-VERSION
.SH NAME
nl \- number lines
.SH SYNOPSIS
.B nl
.RB [ \-b
.IR mode ]
.RB [ \-i
.IR increment ]
.RB [ \-s
.IR separator ]
.RI [ file ...]
.SH DESCRIPTION
.B nl
reads each file in sequence and writes it to stdout with non-empty lines
numbered. If no file is given, nl reads from stdin.
.SH OPTIONS
.TP
.BI \-b " mode"
defines which lines will be numbered:
.RS
.TP
.B a
all lines.
.TP
.B n
no lines.
.TP
.BI p pattern
only lines which match
.IR pattern ,
a regular expression as defined in
.IR regex (7).
.TP
.B t
only non-empty lines (default).
.RE
.TP
.BI \-i " increment"
defines the increment between numbered lines.
.TP
.BI \-s " separator"
defines the string used to separate line numbers and lines. By default this is
a tab.

69
nl.c Normal file
View File

@ -0,0 +1,69 @@
/* See LICENSE file for copyright and license details. */
#include <regex.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include "text.h"
#include "util.h"
static void nl(FILE *, const char *);
static char mode = 't';
static const char *sep = "\t";
static long incr = 1;
static regex_t preg;
int
main(int argc, char *argv[])
{
char c, *end;
FILE *fp;
while((c = getopt(argc, argv, "b:i:s:")) != -1)
switch(c) {
case 'b':
mode = optarg[0];
if(optarg[0] == 'p')
regcomp(&preg, &optarg[1], REG_NOSUB);
else if(!strchr("ant", optarg[0]) || optarg[1] != '\0')
eprintf("usage: %s [-b mode] [file...]\n", argv[0]);
break;
case 'i':
incr = strtol(optarg, &end, 0);
if(*end != '\0')
eprintf("%s: not a number\n", optarg);
break;
case 's':
sep = optarg;
break;
default:
exit(EXIT_FAILURE);
}
if(optind == argc)
nl(stdin, "<stdin>");
else for(; optind < argc; optind++) {
if(!(fp = fopen(argv[optind], "r")))
eprintf("fopen %s:", argv[optind]);
nl(fp, argv[optind]);
fclose(fp);
}
return EXIT_SUCCESS;
}
void
nl(FILE *fp, const char *str)
{
char *buf = NULL;
long n = 0;
size_t size = 0;
while(afgets(&buf, &size, fp))
if((mode == 'a')
|| (mode == 'p' && !regexec(&preg, buf, 0, NULL, 0))
|| (mode == 't' && buf[0] != '\n'))
printf("%6ld%s%s", n += incr, sep, buf);
else
printf(" %s", buf);
free(buf);
}