diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-05-16 20:23:44 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-05-16 20:23:44 +0200 |
| commit | e741110f5a4089f22dbaae97443753acd4851bdd (patch) | |
| tree | 86acf2e6c390d633da5be4a4ea4e1c6d024c4bec /commands | |
| parent | 9115339720c3df3c9b40dae7adbef137362efcc0 (diff) | |
| parent | 0d188aca536284f3c9650d8857c43c0dd5a81c2c (diff) | |
| download | barebox-e741110f5a4089f22dbaae97443753acd4851bdd.tar.gz barebox-e741110f5a4089f22dbaae97443753acd4851bdd.tar.xz | |
Merge branch 'master' into next
Diffstat (limited to 'commands')
| -rw-r--r-- | commands/echo.c | 6 | ||||
| -rw-r--r-- | commands/i2c.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/commands/echo.c b/commands/echo.c index 114c1ba662..a19d99292f 100644 --- a/commands/echo.c +++ b/commands/echo.c @@ -115,9 +115,9 @@ BAREBOX_CMD_HELP_START(echo) BAREBOX_CMD_HELP_USAGE("echo [OPTIONS] [STRING]\n") BAREBOX_CMD_HELP_SHORT("Display a line of text.\n") BAREBOX_CMD_HELP_OPT ("-n", "do not output the trailing newline\n") -BAREBOX_CMD_HELP_OPT ("-a", "FIXME\n") -BAREBOX_CMD_HELP_OPT ("-o", "FIXME\n") -BAREBOX_CMD_HELP_OPT ("-e", "FIXME\n") +BAREBOX_CMD_HELP_OPT ("-a <file>", "instead of outputting to stdout append to <file>\n") +BAREBOX_CMD_HELP_OPT ("-o <file>", "instead of outputting to stdout overwrite <file>\n") +BAREBOX_CMD_HELP_OPT ("-e", "recognize escape sequences\n") BAREBOX_CMD_HELP_END /** diff --git a/commands/i2c.c b/commands/i2c.c index 36d80f3a4e..763db8a1ab 100644 --- a/commands/i2c.c +++ b/commands/i2c.c @@ -177,7 +177,7 @@ static int do_i2c_read(int argc, char *argv[]) } } - if ((addr < 0) || (reg < 0) || (count == 0) || (addr > 0x7F)) + if ((addr < 0) || (reg < 0) || (count < 1) || (addr > 0x7F)) return COMMAND_ERROR_USAGE; adapter = i2c_get_adapter(bus); |