diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-03-09 08:30:24 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-03-09 08:30:24 +0100 |
| commit | ac81a0d8768d75484212b208b6c42f6d11241c16 (patch) | |
| tree | de3cf7aef1dd7892eb17c4a2e998a48b1be39df2 /common/environment.c | |
| parent | c3efa8470b3addb3cfbcfbf2a2be1ed799489623 (diff) | |
| parent | 7033089ddf4c62fa2cfd4549d2bbfe0c101c65d1 (diff) | |
| download | barebox-ac81a0d8768d75484212b208b6c42f6d11241c16.tar.gz barebox-ac81a0d8768d75484212b208b6c42f6d11241c16.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'common/environment.c')
| -rw-r--r-- | common/environment.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/common/environment.c b/common/environment.c index 7e176b3a7e..f6fd781a8a 100644 --- a/common/environment.c +++ b/common/environment.c @@ -256,6 +256,12 @@ int envfs_save(const char *filename, const char *dirname, unsigned flags) void *buf = NULL, *wbuf; struct envfs_entry *env; + if (!filename) + filename = default_environment_path_get(); + + if (!dirname) + dirname = "/env"; + data.writep = NULL; data.base = dirname; @@ -543,6 +549,12 @@ int envfs_load(const char *filename, const char *dir, unsigned flags) int ret = 0; size_t size, rsize; + if (!filename) + filename = default_environment_path_get(); + + if (!dir) + dir = "/env"; + envfd = open(filename, O_RDONLY); if (envfd < 0) { printf("environment load %s: %s\n", filename, errno_str()); |