Changes in uspace/app/bdsh/cmds/modules/mkdir/mkdir.c [6afc9d7:738b549] in mainline

File:

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

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

@@ -89 +89 @@
 {
         /* Ensure we would always work with absolute and canonified path. */
-        char *path = vfs_absolutize(user_path, NULL);
+        char *path = 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) {
-                if (mkdir(path, 0) != 0) {
+                rc = mkdir(path, 0);
+                if (rc != EOK) {
                         cli_error(CL_EFAIL, "%s: could not create %s (%s)",
-                            cmdname, path, str_error(errno));
+                            cmdname, path, str_error(rc));
                         ret = 1;
                 }
@@ -135 +137 @@
                         char slash_char = path[prev_off];
                         path[prev_off] = 0;
-
-                        if (mkdir(path, 0) != 0 && errno != EEXIST) {
+                        rc = mkdir(path, 0);
+                        if (rc == EEXIST) {
+                                rc = EOK;
+                        }
+
+                        if (rc != EOK) {
                                 cli_error(CL_EFAIL, "%s: could not create %s (%s)",
-                                    cmdname, path, str_error(errno));
+                                    cmdname, path, str_error(rc));
                                 ret = 1;
                                 goto leave;
@@ -146 +152 @@
                 }
                 /* Create the final directory. */
-                if (mkdir(path, 0) != 0) {
+                rc = mkdir(path, 0);
+                if (rc != EOK) {
                         cli_error(CL_EFAIL, "%s: could not create %s (%s)",
-                            cmdname, path, str_error(errno));
+                            cmdname, path, str_error(rc));
                         ret = 1;
                 }
@@ -166 +173 @@
         argc = cli_count_args(argv);
 
-        for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
+        for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
                 c = getopt_long(argc, argv, "pvhVfm:", long_options, &opt_ind);
                 switch (c) {
@@ -207 +214 @@
 
         if (follow && (argv[optind] != NULL)) {
-                if (chdir(argv[optind]) != 0)
-                        printf("%s: Error switching to directory.", cmdname);
+                chdir(argv[optind]);
         }