command.c should contain common code related to commands, not miscellaneous command implementations. Signed-off-by: Peter Tyser <ptyser@xes-inc.com>master
parent
db6ab438d6
commit
6b8f5ad10f
@ -0,0 +1,58 @@ |
||||
/*
|
||||
* Copyright 2000-2009 |
||||
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. |
||||
* |
||||
* 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 as |
||||
* published by the Free Software Foundation; either version 2 of |
||||
* the License, or (at your option) any later version. |
||||
* |
||||
* 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. |
||||
* |
||||
* You should have received a copy of the GNU General Public License |
||||
* along with this program; if not, write to the Free Software |
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, |
||||
* MA 02111-1307 USA |
||||
*/ |
||||
|
||||
#include <common.h> |
||||
#include <command.h> |
||||
|
||||
int do_echo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) |
||||
{ |
||||
int i; |
||||
int putnl = 1; |
||||
|
||||
for (i = 1; i < argc; i++) { |
||||
char *p = argv[i], c; |
||||
|
||||
if (i > 1) |
||||
putc(' '); |
||||
while ((c = *p++) != '\0') { |
||||
if (c == '\\' && *p == 'c') { |
||||
putnl = 0; |
||||
p++; |
||||
} else { |
||||
putc(c); |
||||
} |
||||
} |
||||
} |
||||
|
||||
if (putnl) |
||||
putc('\n'); |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
U_BOOT_CMD( |
||||
echo, CONFIG_SYS_MAXARGS, 1, do_echo, |
||||
"echo args to console", |
||||
"[args..]\n" |
||||
" - echo args to console; \\c suppresses newline" |
||||
); |
@ -0,0 +1,42 @@ |
||||
/*
|
||||
* Copyright 2000-2009 |
||||
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. |
||||
* |
||||
* 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 as |
||||
* published by the Free Software Foundation; either version 2 of |
||||
* the License, or (at your option) any later version. |
||||
* |
||||
* 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. |
||||
* |
||||
* You should have received a copy of the GNU General Public License |
||||
* along with this program; if not, write to the Free Software |
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, |
||||
* MA 02111-1307 USA |
||||
*/ |
||||
|
||||
#include <common.h> |
||||
#include <command.h> |
||||
|
||||
int do_exit(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) |
||||
{ |
||||
int r; |
||||
|
||||
r = 0; |
||||
if (argc > 1) |
||||
r = simple_strtoul(argv[1], NULL, 10); |
||||
|
||||
return -r - 2; |
||||
} |
||||
|
||||
U_BOOT_CMD( |
||||
exit, 2, 1, do_exit, |
||||
"exit script", |
||||
"" |
||||
); |
@ -0,0 +1,57 @@ |
||||
/*
|
||||
* Copyright 2000-2009 |
||||
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. |
||||
* |
||||
* 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 as |
||||
* published by the Free Software Foundation; either version 2 of |
||||
* the License, or (at your option) any later version. |
||||
* |
||||
* 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. |
||||
* |
||||
* You should have received a copy of the GNU General Public License |
||||
* along with this program; if not, write to the Free Software |
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, |
||||
* MA 02111-1307 USA |
||||
*/ |
||||
|
||||
#include <common.h> |
||||
#include <command.h> |
||||
|
||||
int do_help(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) |
||||
{ |
||||
return _do_help(&__u_boot_cmd_start, |
||||
&__u_boot_cmd_end - &__u_boot_cmd_start, |
||||
cmdtp, flag, argc, argv); |
||||
} |
||||
|
||||
U_BOOT_CMD( |
||||
help, CONFIG_SYS_MAXARGS, 1, do_help, |
||||
"print online help", |
||||
"[command ...]\n" |
||||
" - show help information (for 'command')\n" |
||||
"'help' prints online help for the monitor commands.\n\n" |
||||
"Without arguments, it prints a short usage message for all commands.\n\n" |
||||
"To get detailed help information for specific commands you can type\n" |
||||
"'help' with one or more command names as arguments." |
||||
); |
||||
|
||||
/* This does not use the U_BOOT_CMD macro as ? can't be used in symbol names */ |
||||
#ifdef CONFIG_SYS_LONGHELP |
||||
cmd_tbl_t __u_boot_cmd_question_mark Struct_Section = { |
||||
"?", CONFIG_SYS_MAXARGS, 1, do_help, |
||||
"alias for 'help'", |
||||
"" |
||||
}; |
||||
#else |
||||
cmd_tbl_t __u_boot_cmd_question_mark Struct_Section = { |
||||
"?", CONFIG_SYS_MAXARGS, 1, do_help, |
||||
"alias for 'help'" |
||||
}; |
||||
#endif /* CONFIG_SYS_LONGHELP */ |
@ -0,0 +1,151 @@ |
||||
/*
|
||||
* Copyright 2000-2009 |
||||
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. |
||||
* |
||||
* 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 as |
||||
* published by the Free Software Foundation; either version 2 of |
||||
* the License, or (at your option) any later version. |
||||
* |
||||
* 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. |
||||
* |
||||
* You should have received a copy of the GNU General Public License |
||||
* along with this program; if not, write to the Free Software |
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, |
||||
* MA 02111-1307 USA |
||||
*/ |
||||
|
||||
#include <common.h> |
||||
#include <command.h> |
||||
|
||||
int do_test(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) |
||||
{ |
||||
char **ap; |
||||
int left, adv, expr, last_expr, neg, last_cmp; |
||||
|
||||
/* args? */ |
||||
if (argc < 3) |
||||
return 1; |
||||
|
||||
#if 0 |
||||
{ |
||||
printf("test:"); |
||||
left = 1; |
||||
while (argv[left]) |
||||
printf(" %s", argv[left++]); |
||||
} |
||||
#endif |
||||
|
||||
last_expr = 0; |
||||
left = argc - 1; ap = argv + 1; |
||||
if (left > 0 && strcmp(ap[0], "!") == 0) { |
||||
neg = 1; |
||||
ap++; |
||||
left--; |
||||
} else |
||||
neg = 0; |
||||
|
||||
expr = -1; |
||||
last_cmp = -1; |
||||
last_expr = -1; |
||||
while (left > 0) { |
||||
|
||||
if (strcmp(ap[0], "-o") == 0 || strcmp(ap[0], "-a") == 0) |
||||
adv = 1; |
||||
else if (strcmp(ap[0], "-z") == 0 || strcmp(ap[0], "-n") == 0) |
||||
adv = 2; |
||||
else |
||||
adv = 3; |
||||
|
||||
if (left < adv) { |
||||
expr = 1; |
||||
break; |
||||
} |
||||
|
||||
if (adv == 1) { |
||||
if (strcmp(ap[0], "-o") == 0) { |
||||
last_expr = expr; |
||||
last_cmp = 0; |
||||
} else if (strcmp(ap[0], "-a") == 0) { |
||||
last_expr = expr; |
||||
last_cmp = 1; |
||||
} else { |
||||
expr = 1; |
||||
break; |
||||
} |
||||
} |
||||
|
||||
if (adv == 2) { |
||||
if (strcmp(ap[0], "-z") == 0) |
||||
expr = strlen(ap[1]) == 0 ? 1 : 0; |
||||
else if (strcmp(ap[0], "-n") == 0) |
||||
expr = strlen(ap[1]) == 0 ? 0 : 1; |
||||
else { |
||||
expr = 1; |
||||
break; |
||||
} |
||||
|
||||
if (last_cmp == 0) |
||||
expr = last_expr || expr; |
||||
else if (last_cmp == 1) |
||||
expr = last_expr && expr; |
||||
last_cmp = -1; |
||||
} |
||||
|
||||
if (adv == 3) { |
||||
if (strcmp(ap[1], "=") == 0) |
||||
expr = strcmp(ap[0], ap[2]) == 0; |
||||
else if (strcmp(ap[1], "!=") == 0) |
||||
expr = strcmp(ap[0], ap[2]) != 0; |
||||
else if (strcmp(ap[1], ">") == 0) |
||||
expr = strcmp(ap[0], ap[2]) > 0; |
||||
else if (strcmp(ap[1], "<") == 0) |
||||
expr = strcmp(ap[0], ap[2]) < 0; |
||||
else if (strcmp(ap[1], "-eq") == 0) |
||||
expr = simple_strtol(ap[0], NULL, 10) == simple_strtol(ap[2], NULL, 10); |
||||
else if (strcmp(ap[1], "-ne") == 0) |
||||
expr = simple_strtol(ap[0], NULL, 10) != simple_strtol(ap[2], NULL, 10); |
||||
else if (strcmp(ap[1], "-lt") == 0) |
||||
expr = simple_strtol(ap[0], NULL, 10) < simple_strtol(ap[2], NULL, 10); |
||||
else if (strcmp(ap[1], "-le") == 0) |
||||
expr = simple_strtol(ap[0], NULL, 10) <= simple_strtol(ap[2], NULL, 10); |
||||
else if (strcmp(ap[1], "-gt") == 0) |
||||
expr = simple_strtol(ap[0], NULL, 10) > simple_strtol(ap[2], NULL, 10); |
||||
else if (strcmp(ap[1], "-ge") == 0) |
||||
expr = simple_strtol(ap[0], NULL, 10) >= simple_strtol(ap[2], NULL, 10); |
||||
else { |
||||
expr = 1; |
||||
break; |
||||
} |
||||
|
||||
if (last_cmp == 0) |
||||
expr = last_expr || expr; |
||||
else if (last_cmp == 1) |
||||
expr = last_expr && expr; |
||||
last_cmp = -1; |
||||
} |
||||
|
||||
ap += adv; left -= adv; |
||||
} |
||||
|
||||
if (neg) |
||||
expr = !expr; |
||||
|
||||
expr = !expr; |
||||
|
||||
debug (": returns %d\n", expr); |
||||
|
||||
return expr; |
||||
} |
||||
|
||||
U_BOOT_CMD( |
||||
test, CONFIG_SYS_MAXARGS, 1, do_test, |
||||
"minimal test like /bin/sh", |
||||
"[args..]" |
||||
); |
@ -0,0 +1,40 @@ |
||||
/*
|
||||
* Copyright 2000-2009 |
||||
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. |
||||
* |
||||
* 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 as |
||||
* published by the Free Software Foundation; either version 2 of |
||||
* the License, or (at your option) any later version. |
||||
* |
||||
* 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. |
||||
* |
||||
* You should have received a copy of the GNU General Public License |
||||
* along with this program; if not, write to the Free Software |
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, |
||||
* MA 02111-1307 USA |
||||
*/ |
||||
|
||||
#include <common.h> |
||||
#include <command.h> |
||||
|
||||
extern char version_string[]; |
||||
|
||||
int do_version(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) |
||||
{ |
||||
printf("\n%s\n", version_string); |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
U_BOOT_CMD( |
||||
version, 1, 1, do_version, |
||||
"print monitor version", |
||||
"" |
||||
); |
Loading…
Reference in new issue