sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Marc Kleine-Budde 2015-03-05 15:37:14 +01:00 committed by Sascha Hauer
parent 85799d1b75
commit 7033089ddf
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
commands/saveenv.c
View File

@ -27,7 +27,7 @@ static int do_saveenv(int argc, char *argv[])
{
int ret, opt;
unsigned envfs_flags = 0;
char *filename, *dirname;
char *filename = NULL, *dirname = NULL;
printf("saving environment\n");
while ((opt = getopt(argc, argv, "z")) > 0) {
@ -39,15 +39,11 @@ static int do_saveenv(int argc, char *argv[])
}
/* destination and source are given? */
if (argc - optind < 2)
dirname = "/env";
else
if (argc - optind > 1)
dirname = argv[optind + 1];
/* destination only given? */
if (argc - optind < 1)
filename = default_environment_path_get();
else
if (argc - optind > 0)
filename = argv[optind];
ret = envfs_save(filename, dirname, envfs_flags);

12
common/environment.c
View File

@ -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());