f1f532084a
This patch does probably too much, but it's hard (and very cumbersome/time consuming) to break it out. What is does is this: * each command has one short description, e.g. "list MUX configuration" * made sure the short descriptions start lowercase * each command has one usage. That string contains just the options, e.g. "[-npn]". It's not part of the long help text. * that is, it doesn't say "[OPTIONS]" anymore, every usable option is listed by character in this (short) option string (the long description is in the long help text, as before) * help texts have been reworked, to make them - sometimes smaller - sometimes describe the options better - more often present themselves in a nicer format * all long help texts are now created with BUSYBOX_CMD_HELP_ macros, no more 'static const __maybe_unused char cmd_foobar_help[]' * made sure the long help texts starts uppercase * because cmdtp->name and cmdtp->opts together provide the new usage, all "Usage: foobar" texts have been removed from the long help texts * BUSYBOX_CMD_HELP_TEXT() provides the trailing newline by itself, this is nicer in the source code * BUSYBOX_CMD_HELP_OPT() provides the trailing newline by itself * made sure no line gets longer than 77 characters * delibertely renamed cmdtp->usage, so that we can get compile-time errors (e.g. in out-of-tree modules that use register_command() * the 'help' command can now always emit the usage, even without compiled long help texts * 'help -v' gives a list of commands with their short description, this is similar like the old "help" command before my patchset * 'help -a' gives out help of all commands Signed-off-by: Holger Schurig <holgerschurig@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
95 lines
1.9 KiB
C
95 lines
1.9 KiB
C
/*
|
|
* Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
|
|
*
|
|
* See file CREDITS for list of people who contributed to this
|
|
* project.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2
|
|
* as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
*/
|
|
|
|
/**
|
|
* @file
|
|
* @brief Concatenate files to stdout command
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <command.h>
|
|
#include <fs.h>
|
|
#include <fcntl.h>
|
|
#include <linux/ctype.h>
|
|
#include <errno.h>
|
|
#include <xfuncs.h>
|
|
#include <malloc.h>
|
|
|
|
#define BUFSIZE 1024
|
|
|
|
/**
|
|
* @param[in] argc Argument count from command line
|
|
* @param[in] argv List of input arguments
|
|
*/
|
|
static int do_cat(int argc, char *argv[])
|
|
{
|
|
int ret;
|
|
int fd, i;
|
|
char *buf;
|
|
int err = 0;
|
|
int args = 1;
|
|
|
|
if (argc < 2) {
|
|
perror("cat");
|
|
return 1;
|
|
}
|
|
|
|
buf = xmalloc(BUFSIZE);
|
|
|
|
while (args < argc) {
|
|
fd = open(argv[args], O_RDONLY);
|
|
if (fd < 0) {
|
|
err = 1;
|
|
printf("could not open %s: %s\n", argv[args], errno_str());
|
|
goto out;
|
|
}
|
|
|
|
while((ret = read(fd, buf, BUFSIZE)) > 0) {
|
|
for(i = 0; i < ret; i++) {
|
|
if (isprint(buf[i]) || buf[i] == '\n' || buf[i] == '\t')
|
|
putchar(buf[i]);
|
|
else
|
|
putchar('.');
|
|
}
|
|
if(ctrlc()) {
|
|
err = 1;
|
|
close(fd);
|
|
goto out;
|
|
}
|
|
}
|
|
close(fd);
|
|
args++;
|
|
}
|
|
|
|
out:
|
|
free(buf);
|
|
|
|
return err;
|
|
}
|
|
|
|
BAREBOX_CMD_HELP_START(cat)
|
|
BAREBOX_CMD_HELP_TEXT("Currently only printable characters and NL, TAB are printed.")
|
|
BAREBOX_CMD_HELP_END
|
|
|
|
BAREBOX_CMD_START(cat)
|
|
.cmd = do_cat,
|
|
BAREBOX_CMD_DESC("concatenate file(s) to stdout")
|
|
BAREBOX_CMD_OPTS("FILE...")
|
|
BAREBOX_CMD_GROUP(CMD_GRP_FILE)
|
|
BAREBOX_CMD_HELP(cmd_cat_help)
|
|
BAREBOX_CMD_END
|