diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2015-03-05 15:37:14 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-03-06 07:43:49 +0100 |
commit | 7033089ddf4c62fa2cfd4549d2bbfe0c101c65d1 (patch) | |
tree | e9df57419b2a53d6adbeef23bebbc74ef7036d14 /common/environment.c | |
parent | 85799d1b755ad3ea1fd80cecd913eea6b00a5c87 (diff) | |
download | barebox-7033089ddf4c62fa2cfd4549d2bbfe0c101c65d1.tar.gz barebox-7033089ddf4c62fa2cfd4549d2bbfe0c101c65d1.tar.xz |
environment: envfs_{load, save}: add possibility to call with filename and dirname == NULL
This patch moves fallback to default into the envfs_{load,save} functions.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
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 2639411e26..eed4833c8a 100644 --- a/common/environment.c +++ b/common/environment.c @@ -253,6 +253,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; @@ -540,6 +546,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()); |