diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-11-17 22:59:47 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-11-17 22:59:47 +0100 |
| commit | 82c6ac9e07ed24db07699e66848c91b47285e9f1 (patch) | |
| tree | 4bb09293bdf8f386f8375b1dc79f86ae80f16e95 | |
| parent | 186d926c2300e5f4ee4ea8faa4c021303f442c89 (diff) | |
| parent | 90fee398bcaa419467367c81b8cdb951d1b89e65 (diff) | |
| download | barebox-82c6ac9e07ed24db07699e66848c91b47285e9f1.tar.gz barebox-82c6ac9e07ed24db07699e66848c91b47285e9f1.tar.xz | |
Merge branch 'sent/assorted-fixes'
| -rw-r--r-- | commands/mkdir.c | 7 | ||||
| -rw-r--r-- | common/env.c | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/commands/mkdir.c b/commands/mkdir.c index b66795b6e2..45e7408cb6 100644 --- a/commands/mkdir.c +++ b/commands/mkdir.c @@ -45,10 +45,13 @@ static int do_mkdir(struct command *cmdtp, int argc, char *argv[]) return COMMAND_ERROR_USAGE; while (optind < argc) { - if (parent) + if (parent) { ret = make_directory(argv[optind]); - else + if (ret == -EEXIST) + ret = 0; + } else { ret = mkdir(argv[optind], 0); + } if (ret) { printf("could not create %s: %s\n", argv[optind], errno_str()); return 1; diff --git a/common/env.c b/common/env.c index defb26b3b7..05ed71418e 100644 --- a/common/env.c +++ b/common/env.c @@ -247,8 +247,7 @@ int export(const char *varname) if (val) { setenv_raw(context->global, varname, val); setenv_raw(context->local, varname, NULL); - return 0; } - return -1; + return 0; } EXPORT_SYMBOL(export); |