From b8dbf68b375ef20745499fe6765cb447a9e70dfb Mon Sep 17 00:00:00 2001 From: Piotr Dymacz Date: Mon, 15 Feb 2016 14:13:57 +0100 Subject: [PATCH] Add some information about the author and clean up code in u-boot/common/command.c --- u-boot/common/command.c | 266 +++++++++++++++++++--------------------- 1 file changed, 125 insertions(+), 141 deletions(-) diff --git a/u-boot/common/command.c b/u-boot/common/command.c index 1289b1d..52876bf 100644 --- a/u-boot/common/command.c +++ b/u-boot/common/command.c @@ -2,54 +2,44 @@ * (C) Copyright 2000-2003 * 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 - */ - -/* - * Command Processor Table + * SPDX-License-Identifier: GPL-2.0 */ +/* Command Processor Table */ #include #include -int do_version(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]){ +int do_version(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ extern char version_string[]; - printf("%s\n\n", version_string); - return(0); + puts("Version and build date:\n"); + printf(" %s\n " __DATE__ ", " __TIME__ "\n\n", version_string); + + puts("Modification by:\n"); + puts(" Piotr Dymacz \n"); + puts(" https://github.com/pepe2k/u-boot_mod\n\n"); + + return 0; } -U_BOOT_CMD(version, 1, 1, do_version, "print U-Boot version\n", NULL); +U_BOOT_CMD(version, 1, 1, do_version, + "print U-Boot version\n", + NULL); #if (CONFIG_COMMANDS & CFG_CMD_ECHO) -int do_echo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]){ +int do_echo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ int i, putnl = 1; - for(i = 1; i < argc; i++){ + for (i = 1; i < argc; i++) { char *p = argv[i], c; - if(i > 1){ + if (i > 1) putc(' '); - } - while((c = *p++) != '\0'){ - if(c == '\\' && *p == 'c'){ + while ((c = *p++) != '\0') { + if (c == '\\' && *p == 'c') { putnl = 0; p++; } else { @@ -58,38 +48,32 @@ int do_echo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]){ } } - if(putnl){ + if (putnl) putc('\n'); - } - return(0); + return 0; } -U_BOOT_CMD(echo, CFG_MAXARGS, 1, do_echo, "echo args to console\n", "[args..]\n" "\t- echo args to console; \\c suppresses newline\n"); -#endif /* CFG_CMD_ECHO */ +U_BOOT_CMD(echo, CFG_MAXARGS, 1, do_echo, + "echo args to console\n", + "[args..]\n" "\t- echo args to console; \\c suppresses newline\n"); +#endif /* CFG_CMD_ECHO */ #ifdef CFG_HUSH_PARSER -int do_test(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]){ - char **ap; +int do_test(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ int left, adv, expr, last_expr, neg, last_cmp; + char **ap; /* args? */ - if (argc < 3){ - return(1); - } - -#if 0 - printf("test:"); - left = 1; - while (argv[left]){ - printf(" %s", argv[left++]); - } -#endif + if (argc < 3) + return 1; last_expr = 0; - left = argc - 1; ap = argv + 1; + left = argc - 1; + ap = argv + 1; - if(left > 0 && strcmp(ap[0], "!") == 0){ + if (left > 0 && strcmp(ap[0], "!") == 0) { neg = 1; ap++; left--; @@ -101,26 +85,25 @@ int do_test(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]){ last_cmp = -1; last_expr = -1; - while(left > 0){ - - if(strcmp(ap[0], "-o") == 0 || strcmp(ap[0], "-a") == 0){ + 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){ + } else if (strcmp(ap[0], "-z") == 0 || strcmp(ap[0], "-n") == 0) { adv = 2; } else { adv = 3; } - if(left < adv){ + if (left < adv) { expr = 1; break; } - if(adv == 1){ - if (strcmp(ap[0], "-o") == 0){ + if (adv == 1) { + if (strcmp(ap[0], "-o") == 0) { last_expr = expr; last_cmp = 0; - } else if(strcmp(ap[0], "-a") == 0){ + } else if (strcmp(ap[0], "-a") == 0) { last_expr = expr; last_cmp = 1; } else { @@ -129,123 +112,124 @@ int do_test(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]){ } } - if(adv == 2){ - if (strcmp(ap[0], "-z") == 0){ + if (adv == 2) { + if (strcmp(ap[0], "-z") == 0) { expr = strlen(ap[1]) == 0 ? 1 : 0; - } else if(strcmp(ap[0], "-n") == 0){ + } else if (strcmp(ap[0], "-n") == 0) { expr = strlen(ap[1]) == 0 ? 0 : 1; } else { expr = 1; break; } - if(last_cmp == 0){ + if (last_cmp == 0) { expr = last_expr || expr; - } else if(last_cmp == 1){ + } else if (last_cmp == 1) { expr = last_expr && expr; } + last_cmp = -1; } - if(adv == 3){ - if(strcmp(ap[1], "=") == 0){ + if (adv == 3) { + if (strcmp(ap[1], "=") == 0) { expr = strcmp(ap[0], ap[2]) == 0; - } else if(strcmp(ap[1], "!=") == 0){ + } else if (strcmp(ap[1], "!=") == 0) { expr = strcmp(ap[0], ap[2]) != 0; - } else if(strcmp(ap[1], ">") == 0){ + } else if (strcmp(ap[1], ">") == 0) { expr = strcmp(ap[0], ap[2]) > 0; - } else if(strcmp(ap[1], "<") == 0){ + } else if (strcmp(ap[1], "<") == 0) { expr = strcmp(ap[0], ap[2]) < 0; - } else if(strcmp(ap[1], "-eq") == 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){ + } 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){ + } 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){ + } 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){ + } 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){ + } 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){ + if (last_cmp == 0) { expr = last_expr || expr; - } else if(last_cmp == 1){ + } else if (last_cmp == 1) { expr = last_expr && expr; } + last_cmp = -1; } ap += adv; left -= adv; } - if(neg){ + if (neg) expr = !expr; - } expr = !expr; -#if 0 - printf(": returns %d\n", expr); -#endif - - return(expr); + return expr; } -U_BOOT_CMD(test, CFG_MAXARGS, 1, do_test, "minimal test like /bin/sh\n", "[args..]\n" -"\t- test functionality\n"); +U_BOOT_CMD(test, CFG_MAXARGS, 1, do_test, + "minimal test like /bin/sh\n", + "[args..]\n\t- test functionality\n"); -int do_exit(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]){ +int do_exit(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ int r = 0; - if(argc > 1){ + if (argc > 1) r = simple_strtoul(argv[1], NULL, 10); - } - return(-r - 2); + return (-r - 2); } -U_BOOT_CMD(exit, 2, 1, do_exit, "exit script\n", "\n\t- exit functionality\n"); +U_BOOT_CMD(exit, 2, 1, do_exit, + "exit script\n", + "\n\t- exit functionality\n"); #endif /* CFG_HUSH_PARSER */ /* * Use puts() instead of printf() to avoid printf buffer overflow * for long help messages */ -int do_help(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]){ +int do_help(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ int i; int rcode = 0; - if(argc == 1){ /*show list of commands */ + /* Show list of commands */ + if (argc == 1) { + /* Pointer arith! */ + int cmd_items = &__u_boot_cmd_end - &__u_boot_cmd_start; - int cmd_items = &__u_boot_cmd_end - &__u_boot_cmd_start; /* pointer arith! */ cmd_tbl_t *cmd_array[cmd_items]; int i, j, swaps, max_len = 0; /* Make array of commands from .uboot_cmd section */ cmdtp = &__u_boot_cmd_start; - for(i = 0; i < cmd_items; i++){ + for (i = 0; i < cmd_items; i++) { cmd_array[i] = cmdtp++; } /* Sort command list (trivial bubble sort) */ - for(i = cmd_items - 1; i > 0; --i){ + for (i = cmd_items - 1; i > 0; --i) { swaps = 0; - for(j = 0; j < i; ++j){ - + for (j = 0; j < i; ++j) { const char *name = cmd_array[j]->name; - if(strlen(name) >= max_len){ + if (strlen(name) >= max_len) max_len = strlen(name); - } - if(strcmp(cmd_array[j]->name, cmd_array[j + 1]->name) > 0){ + if (strcmp(cmd_array[j]->name, cmd_array[j + 1]->name) > 0) { cmd_tbl_t *tmp; tmp = cmd_array[j]; cmd_array[j] = cmd_array[j + 1]; @@ -254,44 +238,40 @@ int do_help(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]){ } } - if(!swaps){ + if (!swaps) break; - } } - /* print short help (usage) */ - for(i = 0; i < cmd_items; i++){ + /* Print short help (usage) */ + for (i = 0; i < cmd_items; i++) { const char *usage = cmd_array[i]->usage; const char *name = cmd_array[i]->name; - /* allow user abort */ - if(ctrlc()){ - return(1); - } + /* Allow user abort */ + if (ctrlc()) + return 1; - if(usage == NULL){ + if (usage == NULL) continue; - } - /* print aligned command name and usage */ + + /* Print aligned command name and usage */ printf("%-*s - ", max_len, name); puts(usage); } - printf("\n"); - - return(0); + puts("\n"); + return 0; } - /* - * command help (long version) - */ - for(i = 1; i < argc; ++i){ - if((cmdtp = find_cmd(argv[i])) != NULL){ + + /* Command help (long version) */ + for (i = 1; i < argc; ++i) { + if ((cmdtp = find_cmd(argv[i])) != NULL) { #ifdef CFG_LONGHELP - /* found - print (long) help info */ + /* Found - print (long) help info */ puts(cmdtp->name); putc(' '); - if(cmdtp->help){ + if (cmdtp->help) { puts(cmdtp->help); } else { puts("- there is no help for this command\n"); @@ -299,10 +279,9 @@ int do_help(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]){ } putc('\n'); -#else /* no long help available */ - if(cmdtp->usage){ +#else + if (cmdtp->usage) puts(cmdtp->usage); - } #endif /* CFG_LONGHELP */ } else { printf("Unknown command '%s' - try 'help' without arguments\n\n", argv[i]); @@ -310,12 +289,13 @@ int do_help(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]){ } } - return(rcode); + return rcode; } -U_BOOT_CMD(help, CFG_MAXARGS, 1, do_help, "print embedded help\n", - "[command ...]\n" - "\t- show help information (for 'command')\n" +U_BOOT_CMD(help, CFG_MAXARGS, 1, do_help, + "print embedded help\n", + "[command ...]\n" + "\t- show help information (for 'command')\n" "\twithout arguments, it prints a short usage message for available commands.\n"); /* This do not ust the U_BOOT_CMD macro as ? can't be used in symbol names */ @@ -325,10 +305,11 @@ cmd_tbl_t __u_boot_cmd_question_mark Struct_Section = {"?", CFG_MAXARGS, 1, do_h cmd_tbl_t __u_boot_cmd_question_mark Struct_Section = {"?", CFG_MAXARGS, 1, do_help, "alias for 'help'\n"}; #endif /* CFG_LONGHELP */ -/*************************************************************************** - * find command table entry for a command +/* + * Find command table entry for a command */ -cmd_tbl_t *find_cmd(const char *cmd){ +cmd_tbl_t *find_cmd(const char *cmd) +{ cmd_tbl_t *cmdtp; cmd_tbl_t *cmdtp_temp = &__u_boot_cmd_start; /*Init value */ const char *p; @@ -341,19 +322,22 @@ cmd_tbl_t *find_cmd(const char *cmd){ */ len = ((p = strchr(cmd, '.')) == NULL) ? strlen(cmd) : (p - cmd); - for(cmdtp = &__u_boot_cmd_start; cmdtp != &__u_boot_cmd_end; cmdtp++){ - if(strncmp(cmd, cmdtp->name, len) == 0){ - if(len == strlen(cmdtp->name)){ - return(cmdtp); /* full match */ - } + for (cmdtp = &__u_boot_cmd_start; cmdtp != &__u_boot_cmd_end; cmdtp++) { + if (strncmp(cmd, cmdtp->name, len) == 0) { + /* Full match? */ + if (len == strlen(cmdtp->name)) + return cmdtp; - cmdtp_temp = cmdtp; /* abbreviated command ? */ + /* Abbreviated command ? */ + cmdtp_temp = cmdtp; n_found++; } } - if(n_found == 1){ /* exactly one match */ + + /* Exactly one match */ + if (n_found == 1) return(cmdtp_temp); - } - return(NULL); /* not found or ambiguous command */ + /* Not found or ambiguous command */ + return NULL; } -- 2.25.1