diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-11-29 20:45:23 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-11-29 20:45:23 +0100 |
| commit | e0f4fb2c982d66210dfd5ffaf92912bf1c6c6586 (patch) | |
| tree | 6095eff90c4f335e47dc2454be6edc671dfe5e1b /commands | |
| parent | 97e0b488a94c6f8c9bac5100b0f8542264d555be (diff) | |
| parent | 6fa8c93a5ecefe4effa0e0425441a8ff6b2ce6ab (diff) | |
| download | barebox-e0f4fb2c982d66210dfd5ffaf92912bf1c6c6586.tar.gz barebox-e0f4fb2c982d66210dfd5ffaf92912bf1c6c6586.tar.xz | |
Merge branch 'master' into next
Conflicts:
drivers/ata/disk_drive.c
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'commands')
| -rw-r--r-- | commands/mkdir.c | 7 | ||||
| -rw-r--r-- | commands/mount.c | 2 |
2 files changed, 6 insertions, 3 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/commands/mount.c b/commands/mount.c index 52d1700a78..7cefdbea24 100644 --- a/commands/mount.c +++ b/commands/mount.c @@ -40,7 +40,7 @@ static int do_mount(struct command *cmdtp, int argc, char *argv[]) entry = mtab_next_entry(entry); if (entry) { printf("%s on %s type %s\n", - entry->parent_device ? entry->parent_device->name : "none", + entry->parent_device ? dev_name(entry->parent_device) : "none", entry->path, entry->dev->name); } |