Mercurial > hg > toybox
view toys/cat.c @ 293:6baa13382880
Sort was including the trailing comma and getting the order wrong.
(Specifically, it was comparing "sh," with "sha1sum," and putting sha1sum first
in generated/newtoys.h so the binary search wasn't finding sha1sum. Alas, you
can't feed separate beginning and ending delimiters to "sort -t". The fix is
to copy the appropriate field out with sed, duplicate it at the start of the
string where it's easy to compare, and then remove it again with a second
sed after the sort.
author | Rob Landley <rob@landley.net> |
---|---|
date | Mon, 12 May 2008 01:23:19 -0500 |
parents | 1c160cadf5b9 |
children | d1ae502ee190 |
line wrap: on
line source
/* vi: set sw=4 ts=4: * * hello.c - A hello world program. * * Copyright 2006 Rob Landley <rob@landley.net> * * See http://www.opengroup.org/onlinepubs/009695399/utilities/cat.html USE_CAT(NEWTOY(cat, "u", TOYFLAG_BIN)) config CAT bool "cat" default y help usage: cat [-u] [file...] Copy (concatenate) files to stdout. If no files listed, copy from stdin. -u Copy one byte at a time (slow). */ #include "toys.h" static void do_cat(int fd, char *name) { int len, size=toys.optflags ? 1 : sizeof(toybuf); for (;;) { len = xread(fd, toybuf, size); if (len<0) toys.exitval = EXIT_FAILURE; if (len<1) break; xwrite(1, toybuf, len); } } void cat_main(void) { loopfiles(toys.optargs, do_cat); }