Changeset ff381a7 in mainline for uspace/app/bdsh/cmds/modules/mkdir/mkdir.c

Timestamp:

2015-11-02T20:54:19Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/app/bdsh/cmds/modules/mkdir/mkdir.c (modified) (5 diffs)

uspace/app/bdsh/cmds/modules/mkdir/mkdir.c

@@ -89 +89 @@
 {
         /* Ensure we would always work with absolute and canonified path. */
-        char *path = absolutize(user_path, NULL);
+        char *path = vfs_absolutize(user_path, NULL);
         if (path == NULL) {
                 cli_error(CL_ENOMEM, "%s: path too big?", cmdname);
@@ -95 +95 @@
         }
 
-        int rc;
         int ret = 0;
 
         if (!create_parents) {
-                rc = mkdir(path, 0);
-                if (rc != EOK) {
+                if (mkdir(path, 0) != 0) {
                         cli_error(CL_EFAIL, "%s: could not create %s (%s)",
-                            cmdname, path, str_error(rc));
+                            cmdname, path, str_error(errno));
                         ret = 1;
                 }
@@ -137 +135 @@
                         char slash_char = path[prev_off];
                         path[prev_off] = 0;
-                        rc = mkdir(path, 0);
-                        if (rc == EEXIST) {
-                                rc = EOK;
-                        }
-
-                        if (rc != EOK) {
+
+                        if (mkdir(path, 0) != 0 && errno != EEXIST) {
                                 cli_error(CL_EFAIL, "%s: could not create %s (%s)",
-                                    cmdname, path, str_error(rc));
+                                    cmdname, path, str_error(errno));
                                 ret = 1;
                                 goto leave;
@@ -152 +146 @@
                 }
                 /* Create the final directory. */
-                rc = mkdir(path, 0);
-                if (rc != EOK) {
+                if (mkdir(path, 0) != 0) {
                         cli_error(CL_EFAIL, "%s: could not create %s (%s)",
-                            cmdname, path, str_error(rc));
+                            cmdname, path, str_error(errno));
                         ret = 1;
                 }
@@ -214 +207 @@
 
         if (follow && (argv[optind] != NULL)) {
-                chdir(argv[optind]);
+                if (chdir(argv[optind]) != 0)
+                        printf("%s: Error switching to directory.", cmdname);
         }