Changeset aca1777 in mainline for uspace/lib/futil/src/futil.c

Timestamp:

2025-05-08T17:12:05Z (3 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

2f21cd4

Parents:

1cfce3f (diff), 61f28c4 (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 upstream into helenraid

File:

• uspace/lib/futil/src/futil.c (modified) (4 diffs)

uspace/lib/futil/src/futil.c

@@ -99 +99 @@
                 return EIO;
 
-        rc = vfs_lookup_open(destp, WALK_REGULAR | WALK_MAY_CREATE, MODE_WRITE, &df);
-        if (rc != EOK)
-                return EIO;
+        rc = vfs_lookup_open(destp, WALK_REGULAR | WALK_MAY_CREATE, MODE_WRITE,
+            &df);
+        if (rc != EOK) {
+                vfs_put(sf);
+                return EIO;
+        }
 
         do {
@@ -152 +155 @@
         de = readdir(dir);
         while (de != NULL) {
-                if (asprintf(&srcp, "%s/%s", srcdir, de->d_name) < 0)
-                        return ENOMEM;
-                if (asprintf(&destp, "%s/%s", destdir, de->d_name) < 0)
-                        return ENOMEM;
+                if (asprintf(&srcp, "%s/%s", srcdir, de->d_name) < 0) {
+                        rc = ENOMEM;
+                        goto error;
+                }
+
+                if (asprintf(&destp, "%s/%s", destdir, de->d_name) < 0) {
+                        rc = ENOMEM;
+                        goto error;
+                }
 
                 rc = vfs_stat_path(srcp, &s);
                 if (rc != EOK)
-                        return EIO;
+                        goto error;
 
                 if (s.is_file) {
                         rc = futil_copy_file(futil, srcp, destp);
-                        if (rc != EOK)
-                                return EIO;
+                        if (rc != EOK) {
+                                rc = EIO;
+                                goto error;
+                        }
                 } else if (s.is_directory) {
                         if (futil->cb != NULL && futil->cb->create_dir != NULL)
@@ -170 +180 @@
                         rc = vfs_link_path(destp, KIND_DIRECTORY, NULL);
                         if (rc != EOK)
-                                return EIO;
+                                goto error;
                         rc = futil_rcopy_contents(futil, srcp, destp);
                         if (rc != EOK)
-                                return EIO;
+                                goto error;
                 } else {
-                        return EIO;
+                        rc = EIO;
+                        goto error;
                 }
 
@@ -181 +192 @@
         }
 
-        return EOK;
+        closedir(dir);
+        return EOK;
+error:
+        closedir(dir);
+        return rc;
 }