summaryrefslogtreecommitdiffstats
path: root/common/environment.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2007-07-05 18:01:53 +0200
committerSascha Hauer <sha@octopus.labnet.pengutronix.de>2007-07-05 18:01:53 +0200
commit2eec7c7d41e7395084306335237e2e71fe1a874b (patch)
tree784a6d3ad84c9251f6aed3c20430c9197f00b9b6 /common/environment.c
parenta45e1af1526e4de42200c2a3b22111c49e60e97e (diff)
downloadbarebox-2eec7c7d41e7395084306335237e2e71fe1a874b.tar.gz
barebox-2eec7c7d41e7395084306335237e2e71fe1a874b.tar.xz
svn_rev_427
Diffstat (limited to 'common/environment.c')
-rw-r--r--common/environment.c63
1 files changed, 5 insertions, 58 deletions
diff --git a/common/environment.c b/common/environment.c
index d7e2ff5862..0e1b475e01 100644
--- a/common/environment.c
+++ b/common/environment.c
@@ -1,20 +1,4 @@
-#ifdef HOST
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdint.h>
-#include <limits.h>
-#include <errno.h>
-#include <dirent.h>
-#include <stdlib.h>
-#include <string.h>
-#include <getopt.h>
-#include "../include/envfs.h"
-#define xmalloc malloc
-
-#else
+#ifdef __U_BOOT__
#include <common.h>
#include <command.h>
#include <driver.h>
@@ -110,7 +94,7 @@ out:
return 0;
}
-#ifndef HOST
+#ifdef __U_BOOT__
int do_saveenv(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
char *filename, *dirname;
@@ -133,7 +117,7 @@ U_BOOT_CMD_START(saveenv)
.cmd = do_saveenv,
.usage = "saveenv - save environment to persistent storage\n",
U_BOOT_CMD_END
-#endif
+#endif /* __U_BOOT__ */
int envfs_load(char *filename, char *dirname)
{
@@ -207,7 +191,7 @@ out:
return errno;
}
-#ifndef HOST
+#ifdef __U_BOOT__
int do_loadenv(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
char *filename, *dirname;
@@ -229,41 +213,4 @@ U_BOOT_CMD_START(loadenv)
.cmd = do_loadenv,
.usage = "loadenv - load environment from persistent storage\n",
U_BOOT_CMD_END
-#endif
-
-#ifdef HOST
-int main(int argc, char *argv[])
-{
- int opt;
- int save = 0, load = 0;
- char *filename = NULL, *dirname = NULL;
-
- while((opt = getopt(argc, argv, "sld:f:")) != -1) {
- switch (opt) {
- case 's':
- save = 1;
- break;
- case 'l':
- load = 1;
- break;
- case 'f':
- filename = optarg;
- break;
- case 'd':
- dirname = optarg;
- break;
- }
- }
-
- if (load) {
- printf("loading env\n");
- envfs_load(filename, dirname);
- }
- if (save) {
- printf("saving env\n");
- envfs_save(filename, dirname);
- }
- exit(0);
-}
-
-#endif
+#endif /* __U_BOOT__ */