Make sure that argv[] argument pointers are not modified.

[karo-tx-uboot.git] / common / cmd_nvedit.c

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index d2ef2176031f5b515bad193021e99b220efb2489..13325bc8363bcd0f1bb19eafd445c910cda19a58 100644 (file)
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -139,7 +139,7 @@ static int printenv(char *name, int state)
        return i;
 }
 
        return i;
 }
 

-int do_printenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_printenv (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])

 {
        int i;
        int rcode = 0;
 {
        int i;
        int rcode = 0;


@@ -173,7 +173,7 @@ int do_printenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
  * This function will ONLY work with a in-RAM copy of the environment
  */
 
  * This function will ONLY work with a in-RAM copy of the environment
  */
 

-int _do_setenv (int flag, int argc, char *argv[])
+int _do_setenv (int flag, int argc, char * const argv[])

 {
        int   i, len, oldval;
        int   console = -1;
 {
        int   i, len, oldval;
        int   console = -1;


@@ -390,7 +390,7 @@ int _do_setenv (int flag, int argc, char *argv[])
 
 int setenv (char *varname, char *varvalue)
 {
 
 int setenv (char *varname, char *varvalue)
 {

-       char *argv[4] = { "setenv", varname, varvalue, NULL };
+       char * const argv[4] = { "setenv", varname, varvalue, NULL };

        if ((varvalue == NULL) || (varvalue[0] == '\0'))
                return _do_setenv (0, 2, argv);
        else
        if ((varvalue == NULL) || (varvalue[0] == '\0'))
                return _do_setenv (0, 2, argv);
        else


@@ -400,12 +400,12 @@ int setenv (char *varname, char *varvalue)
 #ifdef CONFIG_HAS_UID
 void forceenv (char *varname, char *varvalue)
 {
 #ifdef CONFIG_HAS_UID
 void forceenv (char *varname, char *varvalue)
 {

-       char *argv[4] = { "forceenv", varname, varvalue, NULL };
+       char * const argv[4] = { "forceenv", varname, varvalue, NULL };

        _do_setenv (0xdeaf4add, 3, argv);
 }
 #endif
 
        _do_setenv (0xdeaf4add, 3, argv);
 }
 #endif
 

-int do_setenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_setenv (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])

 {
        if (argc < 2) {
                cmd_usage(cmdtp);
 {
        if (argc < 2) {
                cmd_usage(cmdtp);


@@ -420,7 +420,7 @@ int do_setenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
  */
 
 #if defined(CONFIG_CMD_ASKENV)
  */
 
 #if defined(CONFIG_CMD_ASKENV)

-int do_askenv ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_askenv ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])

 {
        extern char console_buffer[CONFIG_SYS_CBSIZE];
        char message[CONFIG_SYS_CBSIZE];
 {
        extern char console_buffer[CONFIG_SYS_CBSIZE];
        char message[CONFIG_SYS_CBSIZE];


@@ -497,7 +497,7 @@ int do_askenv ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
  * Interactively edit an environment variable
  */
 #if defined(CONFIG_CMD_EDITENV)
  * Interactively edit an environment variable
  */
 #if defined(CONFIG_CMD_EDITENV)

-int do_editenv(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_editenv(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])

 {
        char buffer[CONFIG_SYS_CBSIZE];
        char *init_val;
 {
        char buffer[CONFIG_SYS_CBSIZE];
        char *init_val;


@@ -576,7 +576,7 @@ int getenv_r (char *name, char *buf, unsigned len)
 
 #if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_ENV_IS_NOWHERE)
 
 
 #if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_ENV_IS_NOWHERE)
 

-int do_saveenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_saveenv (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])

 {
        extern char * env_name_spec;
 
 {
        extern char * env_name_spec;
 


@@ -660,7 +660,7 @@ U_BOOT_CMD(
 #endif
 
 #if defined(CONFIG_CMD_RUN)
 #endif
 
 #if defined(CONFIG_CMD_RUN)

-int do_run (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
+int do_run (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);

 U_BOOT_CMD(
        run,    CONFIG_SYS_MAXARGS,     1,      do_run,
        "run commands in an environment variable",
 U_BOOT_CMD(
        run,    CONFIG_SYS_MAXARGS,     1,      do_run,
        "run commands in an environment variable",