no more minix cut, printf

This commit is contained in:
Ben Gras 2010-06-22 21:19:42 +00:00
parent 86e323da6b
commit 2ac57865cb
7 changed files with 2 additions and 848 deletions

View file

@ -20,7 +20,7 @@ SUBDIR= aal add_route adduser advent arp ash at autil awk \
mdb mesg mined mkdep mkdir mkdist mkfifo mkfs mknod \
mkproto modem mount mt netconf newroot nice nm nohup \
nonamed od packit packman passwd paste patch pax \
ping postinstall poweroff pr prep printf printroot \
ping postinstall poweroff pr prep printroot \
profile progressbar proto pr_routes ps pwd pwdauth \
ramdisk rarpd rawspeed rcp rdate readall readclock \
readfs reboot remsync rev rget rlogin rlogind rmdir \

View file

@ -1,4 +0,0 @@
PROG= cut
MAN=
.include <minix.prog.mk>

View file

@ -1,321 +0,0 @@
/* cut - extract columns from a file or stdin. Author: Michael J. Holme
*
* Copyright 1989, Michael John Holme, All rights reserved.
* This code may be freely distributed, provided that this notice
* remains intact.
*
* V1.1: 6th September 1989
*
* Bugs, criticisms, etc,
* c/o Mark Powell
* JANET sq79@uk.ac.liv
* ARPA sq79%liv.ac.uk@nsfnet-relay.ac.uk
* UUCP ...!mcvax!ukc!liv.ac.uk!sq79
*-------------------------------------------------------------------------
* Changed for POSIX1003.2/Draft10 conformance
* Thomas Brupbacher (tobr@mw.lpc.ethz.ch), September 1990.
* Changes:
* - separation of error messages ( stderr) and output (stdout).
* - support for -b and -n (no effect, -b acts as -c)
* - support for -s
*-------------------------------------------------------------------------
*/
#include <sys/types.h>
#include <ctype.h>
#include <string.h>
#include <errno.h>
#include <stdlib.h>
#include <stdio.h>
#define MAX_FIELD 80 /* Pointers to the beginning of each field
* are stored in columns[], if a line holds
* more than MAX_FIELD columns the array
* boundary is exceed. But unlikely at 80 */
#define MAX_ARGS 32 /* Maximum number of fields following -f or
* -c switches */
int args[MAX_ARGS * 2];
int num_args;
/* Lots of new defines, should easen maintainance... */
#define DUMP_STDIN 0 /* define for mode: no options */
#define OPTIONF 1 /* define for mode: option -f */
#define OPTIONC 2 /* define for mode: option -c */
#define OPTIONB 3 /* define for mode: option -b */
#define NOTSET 0 /* option not selected */
#define SET 1 /* option selected */
/* Defines for the warnings */
#define DELIMITER_NOT_APPLICABLE 0
#define OVERRIDING_PREVIOUS_MODE 1
#define OPTION_NOT_APPLICABLE 2
#define UNKNOWN_OPTION 3
#define FILE_NOT_READABLE 4
/* Defines for the fatal errors */
#define SYNTAX_ERROR 101
#define POSITION_ERROR 102
#define USAGE 103
#define LINE_TO_LONG_ERROR 104
#define RANGE_ERROR 105
#define MAX_FIELDS_EXEEDED_ERROR 106
#define MAX_ARGS_EXEEDED_ERROR 107
int mode; /* 0 = dump stdin to stdout, 1=-f, 2=-c */
int flag_i; /* SET = -i set on command line */
int flag_s; /* SET = -s set on command line */
char delim = '\t'; /* default delimiting character */
FILE *fd;
char *name;
char line[BUFSIZ];
int exit_status;
_PROTOTYPE(int main, (int argc, char **argv));
_PROTOTYPE(void warn, (int warn_number, char *option));
_PROTOTYPE(void cuterror, (int err));
_PROTOTYPE(void get_args, (void));
_PROTOTYPE(void cut, (void));
void warn(warn_number, option)
int warn_number;
char *option;
{
static char *warn_msg[] = {
"%s: Option -d allowed only with -f\n",
"%s: -%s overrides earlier option\n",
"%s: -%s not allowed in current mode\n",
"%s: Cannot open %s\n"
};
fprintf(stderr, warn_msg[warn_number], name, option);
exit_status = warn_number + 1;
}
void cuterror(err)
int err;
{
static char *err_mes[] = {
"%s: syntax error\n",
"%s: position must be >0\n",
"%s: usage: cut [-f args [-i] [-d x]]|[-c args] [filename [...]]\n",
"%s: line longer than BUFSIZ\n",
"%s: range must not decrease from left to right\n",
"%s: MAX_FIELD exceeded\n",
"%s: MAX_ARGS exceeded\n"
};
fprintf(stderr, err_mes[err - 101], name);
exit(err);
}
void get_args()
{
int i = 0;
int arg_ptr = 0;
int flag;
num_args = 0;
do {
if (num_args == MAX_ARGS) cuterror(MAX_ARGS_EXEEDED_ERROR);
if (!isdigit(line[i]) && line[i] != '-') cuterror(SYNTAX_ERROR);
args[arg_ptr] = 1;
args[arg_ptr + 1] = BUFSIZ;
flag = 1;
while (line[i] != ',' && line[i] != 0) {
if (isdigit(line[i])) {
args[arg_ptr] = 0;
while (isdigit(line[i]))
args[arg_ptr] = 10 * args[arg_ptr] + line[i++] - '0';
if (!args[arg_ptr]) cuterror(POSITION_ERROR);
arg_ptr++;
} else if (line[i] != '-') {
cuterror(SYNTAX_ERROR);
}
if (line[i] == '-') {
arg_ptr |= 1;
i++;
flag = 0;
}
}
if (flag && arg_ptr & 1) args[arg_ptr] = args[arg_ptr - 1];
if (args[num_args * 2] > args[num_args * 2 + 1])
cuterror(RANGE_ERROR);
num_args++;
arg_ptr = num_args * 2;
}
while (line[i++]);
}
void cut()
{
int i, j, length, maxcol;
char *columns[MAX_FIELD];
while (fgets(line, BUFSIZ, fd)) {
length = strlen(line) - 1;
*(line + length) = 0;
switch (mode) {
case DUMP_STDIN: printf("%s", line); break;
case OPTIONF:
maxcol = 0;
columns[maxcol++] = line;
for (i = 0; i < length; i++) {
if (*(line + i) == delim) {
*(line + i) = 0;
if (maxcol == MAX_FIELD)
cuterror(MAX_FIELDS_EXEEDED_ERROR);
columns[maxcol] = line + i + 1;
while (*(line + i + 1) == delim && flag_i) {
columns[maxcol]++;
i++;
}
maxcol++;
}
}
if (maxcol == 1) {
if (flag_s != SET) printf("%s", line);
} else {
for (i = 0; i < num_args; i++) {
for (j = args[i * 2]; j <= args[i * 2 + 1]; j++)
if (j <= maxcol) {
printf("%s", columns[j - 1]);
if (i != num_args - 1 || j != args[i * 2 + 1])
putchar(delim);
}
}
}
break;
case OPTIONC:
for (i = 0; i < num_args; i++) {
for (j = args[i * 2]; j <= (args[i * 2 + 1] > length ? length :
args[i * 2 + 1]); j++)
putchar(*(line + j - 1));
}
}
if (maxcol == 1 && flag_s == SET);
else
putchar('\n');
}
}
int main(argc, argv)
int argc;
char *argv[];
{
char *linearg;
int i = 1;
int numberFilenames = 0;
name = argv[0];
if (argc == 1) cuterror(USAGE);
while (i < argc) {
if (argv[i][0] == '-') {
switch (argv[i++][1]) {
case 'd':
if (mode == OPTIONC || mode == OPTIONB)
warn(DELIMITER_NOT_APPLICABLE, "d");
delim = argv[i - 1][2] ?
argv[i - 1][2] : argv[i++][0];
break;
case 'f':
linearg = argv[i - 1][2] ?
(argv[i - 1] + 2) : argv[i++];
sprintf(line, "%s", linearg);
if (mode == OPTIONC || mode == OPTIONB)
warn(OVERRIDING_PREVIOUS_MODE, "f");
mode = OPTIONF;
break;
case 'b':
linearg = argv[i - 1][2] ?
(argv[i - 1] + 2) : argv[i++];
sprintf(line, "%s", linearg);
if (mode == OPTIONF || mode == OPTIONC)
warn(OVERRIDING_PREVIOUS_MODE, "b");
mode = OPTIONB;
break;
case 'c':
linearg = argv[i - 1][2] ?
(argv[i - 1] + 2) : argv[i++];
sprintf(line, "%s", linearg);
if (mode == OPTIONF || mode == OPTIONB)
warn(OVERRIDING_PREVIOUS_MODE, "c");
mode = OPTIONC;
break;
case 'i': flag_i = SET; break;
case 's': flag_s = SET; break;
case '\0': /* - means: read from stdin */
numberFilenames++;
break;
case 'n': /* needed for Posix, but no effect here */
if (mode != OPTIONB)
warn(OPTION_NOT_APPLICABLE, "n");
break;
default:
warn(UNKNOWN_OPTION, &(argv[i - 1][1]));
}
} else {
i++;
numberFilenames++;
}
}
/* Here follow the checks, if the selected options are reasonable. */
if (mode == OPTIONB) /* since in Minix char := byte */
mode = OPTIONC;
/* Flag -s is only allowed with -f, otherwise warn and reset flag_s */
if (flag_s == SET && (mode == OPTIONB || mode == OPTIONC)) {
warn(OPTION_NOT_APPLICABLE, "s");
flag_s = NOTSET;
}
/* Flag -i is only allowed with -f, otherwise warn and reset flag_i */
if (flag_i == SET && mode == OPTIONF) {
warn(OPTION_NOT_APPLICABLE, "s");
flag_i = NOTSET;
}
get_args();
if (numberFilenames != 0) {
i = 1;
while (i < argc) {
if (argv[i][0] == '-') {
switch (argv[i][1]) {
case 'f':
case 'c':
case 'b':
case 'd': i += argv[i][2] ? 1 : 2; break;
case 'n':
case 'i':
case 's': i++; break;
case '\0':
fd = stdin;
i++;
cut();
break;
default: i++;
}
} else {
if ((fd = fopen(argv[i++], "r")) == NULL) {
warn(FILE_NOT_READABLE, argv[i - 1]);
} else {
cut();
fclose(fd);
}
}
}
} else {
fd = stdin;
cut();
}
return(exit_status);
}

View file

@ -1,4 +0,0 @@
PROG= printf
MAN=
.include <minix.prog.mk>

View file

@ -1,471 +0,0 @@
#if ever
static char sccsid[] = "@(#)printf.c (U of Maryland) FLB 6-Jan-1987";
static char RCSid[] = "@(#)$Header$";
#endif
/*
* Printf - Duplicate the C library routine of the same name, but from
* the shell command level.
*
* Fred Blonder <fred@Mimsy.umd.edu>
*
* To Compile:
% cc -s -O printf.c -o printf
*
* $Log$
* Revision 1.1 2005/04/21 14:55:31 beng
* Initial revision
*
* Revision 1.1.1.1 2005/04/20 13:33:30 beng
* Initial import of minix 2.0.4
*
* Revision 1.4 87/01/29 20:52:30 fred
* Re-installed backslash-notation conversion for string & char arguments.
*
* Revision 1.3 87/01/29 20:44:23 fred
* Converted to portable algorithm.
* Added Roman format for integers.
* 29-Jan-87 FLB
*
* Revision 1.2 87/01/09 19:10:57 fred
* Fixed bug in argument-count error-checking.
* Changed backslash escapes within strings to correspond to ANSII C
* draft standard. (9-Jan-87 FLB)
*
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#define EX_OK 0
#define EX_USAGE 1
int ctrl(char *s);
#define atoi(a) strtoul((a), NULL, 0)
/****************************************************************************/
int main(int argc, char *argv[])
{
register char *cp, *conv_spec, **argp, **ep;
char *ctor(int x);
if (argc < 2) {
fprintf(stderr,
"printf: Usage: printf <format-string> [ arg1 . . . ]\n");
exit(EX_USAGE);
}
argp = &argv[2]; /* Point at first arg (if any) beyond format string. */
ep = &argv[argc]; /* Point beyond last arg. */
ctrl(argv[1]); /* Change backslash notation to control chars in fmt string. */
/* Scan format string for conversion specifications, and do appropriate
conversion on the corresponding argument. */
for (cp = argv[1]; *cp; cp++) {
register int dynamic_count;
/* Look for next conversion spec. */
while (*cp && *cp != '%') {
putchar(*cp++);
}
if (!*cp) /* End of format string */
break;
dynamic_count = 0; /* Begin counting dynamic field width specs. */
conv_spec = cp++; /* Remember where this conversion begins. */
for (;*cp; cp++) { /* Scan until conversion character. */
char conv_buf[BUFSIZ]; /* Save conversion string here. */
register int conv_len; /* Length of ``conv_buf''. */
switch (*cp) { /* Field-width spec.: Keep scanning. */
case '.': case '0': case '1': case '2': case '3':
case '4': case '5': case '6': case '7': case '8':
case '9':
continue;
case '*': /* Dynamic field-width spec */
dynamic_count++;
continue;
case 's': /* String */
if (&argp[dynamic_count] >= ep) {
fprintf(stderr,
"printf: Not enough args for format.\n"
);
exit(EX_USAGE);
}
(void) strncpy(conv_buf, conv_spec,
conv_len = cp - conv_spec + 1);
conv_buf[conv_len] = '\0';
switch (dynamic_count) {
case 0:
ctrl(*argp);
printf(conv_buf, *argp++);
break;
case 1:
{
register int a1;
a1 = atoi(*argp++);
ctrl(*argp);
printf(conv_buf, a1, *argp++);
}
break;
case 2:
{
register int a1, a2;
a1 = atoi(*argp++);
a2 = atoi(*argp++);
ctrl(*argp);
printf(conv_buf, a1, a2, *argp++);
}
break;
}
goto out;
case 'c': /* Char */
if (&argp[dynamic_count] >= ep) {
fprintf(stderr,
"printf: Not enough args for format.\n"
);
exit(EX_USAGE);
}
(void) strncpy(conv_buf, conv_spec,
conv_len = cp - conv_spec + 1);
conv_buf[conv_len] = '\0';
switch (dynamic_count) {
case 0:
ctrl(*argp);
printf(conv_buf, **argp++);
break;
case 1:
{
register int a1;
a1 = atoi(*argp++);
ctrl(*argp);
printf(conv_buf, a1, **argp++);
}
break;
case 2:
{
register int a1, a2;
a1 = atoi(*argp++);
a2 = atoi(*argp++);
ctrl(*argp);
printf(conv_buf, a1, a2, **argp++);
}
break;
}
goto out;
case 'd': /* Integer */
case 'o':
case 'x':
case 'X':
case 'u':
if (&argp[dynamic_count] >= ep) {
fprintf(stderr,
"printf: Not enough args for format.\n"
);
exit(EX_USAGE);
}
(void) strncpy(conv_buf, conv_spec,
conv_len = cp - conv_spec + 1);
conv_buf[conv_len] = '\0';
switch (dynamic_count) {
case 0:
printf(conv_buf, atoi(*argp++));
break;
case 1:
{
register int a1;
a1 = atoi(*argp++);
printf(conv_buf, a1, atoi(*argp++));
}
break;
case 2:
{
register int a1, a2;
a1 = atoi(*argp++);
a2 = atoi(*argp++);
printf(conv_buf, a1, a2, atoi(*argp++));
}
break;
}
goto out;
case 'f': /* Real */
case 'e':
case 'g':
if (&argp[dynamic_count] >= ep) {
fprintf(stderr,
"printf: Not enough args for format.\n"
);
exit(EX_USAGE);
}
(void) strncpy(conv_buf, conv_spec,
conv_len = cp - conv_spec + 1);
conv_buf[conv_len] = '\0';
switch (dynamic_count) {
case 0:
printf(conv_buf, atof(*argp++));
break;
case 1:
{
register int a1;
a1 = atoi(*argp++);
printf(conv_buf, a1, atof(*argp++));
}
break;
case 2:
{
register int a1, a2;
a1 = atoi(*argp++);
a2 = atoi(*argp++);
printf(conv_buf, a1, a2, atof(*argp++));
}
break;
}
goto out;
case 'r': /* Roman (Well, why not?) */
if (&argp[dynamic_count] >= ep) {
fprintf(stderr,
"printf: Not enough args for format.\n"
);
exit(EX_USAGE);
}
(void) strncpy(conv_buf, conv_spec,
conv_len = cp - conv_spec + 1);
conv_buf[conv_len] = '\0';
conv_buf[conv_len - 1] = 's';
switch (dynamic_count) {
case 0:
printf(conv_buf,
ctor(atoi(*argp++)));
break;
case 1:
{
register int a1;
a1 = atoi(*argp++);
printf(conv_buf, a1,
ctor(atoi(*argp++)));
}
break;
case 2:
{
register int a1, a2;
a1 = atoi(*argp++);
a2 = atoi(*argp++);
printf(conv_buf, a1, a2,
ctor(atoi(*argp++)));
}
break;
}
goto out;
case '%': /* Boring */
putchar('%');
break;
default: /* Probably an error, but let user
have his way. */
continue;
}
}
out: ;
}
exit(EX_OK);
}
/****************************************************************************/
/* Convert backslash notation to control characters, in place. */
int ctrl(char *s)
{
register char *op;
static int val;
for (op = s; *s; s++)
if (*s == '\\')
switch (*++s) {
case '\0': /* End-of-string: user goofed */
goto out;
case '\\': /* Backslash */
*op++ = '\\';
break;
case 'n': /* newline */
*op++ = '\n';
break;
case 't': /* horizontal tab */
*op++ = '\t';
break;
case 'r': /* carriage-return */
*op++ = '\r';
break;
case 'f': /* form-feed */
*op++ = '\f';
break;
case 'b': /* backspace */
*op++ = '\b';
break;
case 'v': /* vertical tab */
*op++ = '\13';
break;
case 'a': /* WARNING! DANGER! DANGER! DANGER! */
*op++ = '\7';
break;
case '0': case '1': case '2': case '3':
case '4': case '5': case '6': case '7':
{ /* octal constant */
register int digits;
val = 0;
(void) sscanf(s, "%3o", &val);
*op++ = val;
for (digits = 3; s[1] &&
strchr("01234567", s[1])
&& --digits > 0;
s++);
}
break;
case 'x': /* hex constant */
case 'X':
s++;
{
register int digits;
val = 0;
(void) sscanf(s, "%3x", &val);
*op++ = val;
for (digits = 3; *s && s[1] &&
strchr("0123456789abcdefABCDEF",
s[1])
&& --digits > 0;
s++);
}
break;
}
else
*op++ = *s;
out:
*op = '\0';
}
/****************************************************************************/
/* Convert integer to Roman Numerals. (Have have you survived without it?) */
struct roman {
unsigned r_mag;
char r_units, r_fives;
} roman[] = {
{ 1000, 'M', '\0', },
{ 100, 'C', 'D', },
{ 10, 'X', 'L', },
{ 1, 'I', 'V', },
};
char *ctor(int x)
{
register struct roman *mp;
static char buf[BUFSIZ];
register char *cp = buf;
/* I've never actually seen a roman numeral with a minus-sign.
Probably ought to print out some appropriate latin phrase instead. */
if (x < 0) {
*cp++ = '-';
x = -x;
}
for (mp = roman; x; mp++) {
register unsigned units;
units = x / mp->r_mag;
x = x % mp->r_mag;
if (cp > &buf[BUFSIZ-2])
return "???";
if (units == 9 && mp > roman) { /* Do inverse notation: Eg: ``IX''. */
*cp++ = mp->r_units;
*cp++ = mp[-1].r_units;
}
else if (units == 4 && mp->r_fives) {
/* Inverse notation for half-decades: Eg: ``IV'' */
*cp++ = mp->r_units;
*cp++ = mp->r_fives;
}
else { /* Additive notation */
if (units >= 5 && mp->r_fives) {
*cp++ = mp->r_fives;
units -= 5;
}
while (units--) {
*cp++ = mp->r_units;
if (cp > &buf[BUFSIZ-5])
return "???";
}
}
}
*cp = '\0';
return buf;
}
/****************************************************************************/

View file

@ -2,7 +2,7 @@ MAN= acd.1 anm.1 ar.1 ash.1 asize.1 at.1 banner.1 basename.1 \
bsfilt.1 cal.1 \
calendar.1 cat.1 cawf.1 cc.1 cdiff.1 chgrp.1 \
chmem.1 chmod.1 cksum.1 clear.1 cmp.1 comm.1 compress.1 \
cp.1 crc.1 crontab.1 ctags.1 cut.1 dd.1 dev2name.1 \
cp.1 crc.1 crontab.1 ctags.1 dd.1 dev2name.1 \
df.1 dhrystone.1 diff.1 dosdir.1 dosread.1 doswrite.1 du.1 \
dumpcore.1 easypack.1 echo.1 ed.1 eject.1 elvis.1 elvrec.1 \
env.1 expand.1 expr.1 factor.1 file.1 \

View file

@ -1,46 +0,0 @@
.TH CUT 1
.SH NAME
cut \- select out columns of a file
.SH SYNOPSIS
\fBcut \fR[\fB\-b \fR|\fB \-c\fR] \fIlist\fR [\fIfile...\fR]\fR
.br
\fBcut \-f \fIlist\fR [\fB\-d \fIdelim\fR] [\fB \-s\fR]\fR [\fIfile...\fR]
.br
.de FL
.TP
\\fB\\$1\\fR
\\$2
..
.de EX
.TP 20
\\fB\\$1\\fR
# \\$2
..
.SH OPTIONS
.FL "\-b" "Cut specified bytes."
.FL "\-c" "Select out specific characters."
.FL "\-d" "Change the column delimiter to \fIdelim\fR."
.FL "\-f" "Select out specific fields that are separated by the delimiter character (see \fIdelim\fR)."
.FL "\-i" "Runs of delimiters count as one."
.FL "\-s" "Suppress lines with no delimiter characters, when used with the \-f option. Lines with no delimiters are passed through untouched."
.SH EXAMPLES
.EX "cut \-f 2 file" "Extract field 2"
.EX "cut \-c 1\-2,5 file" "Extract character columns 1, 2, and 5"
.EX "cut \-c 1\-5,7\- file" "Extract all columns except 6"
.SH DESCRIPTION
.PP
\fICut\fR extracts one or more fields or columns from a file and writes them on
standard output.
If the \fB\-f\fR flag is used, the fields are separated by a delimiter
character, normally a tab, but can be changed using the \fB\-d\fR flag.
If the \fB\-c\fR flag is used, specific columns can be specified.
The list can be comma or BLANK separated. The \fB\-f\fR and
\fB\-c\fR flags are mutually exclusive.
Note: The POSIX1003.2 standard requires the option \fB\-b\fR to cut out
specific bytes in a file. It is intended for systems with multi byte
characters (e.g. kanji), since MINIX uses only one byte characters,
this option is equivalent to \fB\-c\fR. For the same reason, the option
\-n has no effect and is not listed in this manual page.
.SH "SEE ALSO"
.BR sed (1),
.BR awk (1x).