Merge git://git.denx.de/u-boot into u-boot

[u-boot] / tools / env / fw_env_main.c

diff --git a/tools/env/fw_env_main.c b/tools/env/fw_env_main.c
index 696e30efda4bea6df0959f2ec07eedc10219c8cb..7f631c4494b67839fcf13bc182d2545e3a737b1e 100644 (file)
--- a/tools/env/fw_env_main.c
+++ b/tools/env/fw_env_main.c
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2000
+ * (C) Copyright 2000-2008
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
@@ -25,15 +25,16 @@
  * Command line user interface to firmware (=U-Boot) environment.
  *
  * Implements:
- *     fw_printenv [ name ... ]
- *             - prints the values of the environment variables
- *               "name", or the whole environment if no names are
- *               specified
+ *     fw_printenv [[ -n name ] | [ name ... ]]
+ *              - prints the value of a single environment variable
+ *                "name", the ``name=value'' pairs of one or more
+ *                environment variables "name", or the whole
+ *                environment if no names are specified.
  *     fw_setenv name [ value ... ]
  *             - If a name without any values is given, the variable
  *               with this name is deleted from the environment;
  *               otherwise, all "value" arguments are concatenated,
- *               separated by sinlge blank characters, and the
+ *               separated by single blank characters, and the
  *               resulting string is assigned to the environment
  *               variable "name"
  */
@@ -58,16 +59,18 @@ main(int argc, char *argv[])
 
        if (strcmp(cmdname, CMD_PRINTENV) == 0) {
 
-                       fw_printenv (argc, argv);
+               if (fw_printenv (argc, argv) != 0)
+                       return (EXIT_FAILURE);
 
-                       return (EXIT_SUCCESS);
+               return (EXIT_SUCCESS);
 
        } else if (strcmp(cmdname, CMD_SETENV) == 0) {
 
-                       if (fw_setenv (argc, argv) != 0)
-                               return (EXIT_FAILURE);
+               if (fw_setenv (argc, argv) != 0)
+                       return (EXIT_FAILURE);
+
+               return (EXIT_SUCCESS);
 
-                       return (EXIT_SUCCESS);
        }
 
        fprintf (stderr,