Changes in uspace/lib/futil/src/futil.c [629b480:5df2570] in mainline

File:

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

uspace/lib/futil/src/futil.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -179 +179 @@
                                 futil->cb->create_dir(futil->cb_arg, destp);
                         rc = vfs_link_path(destp, KIND_DIRECTORY, NULL);
-                        if (rc != EOK)
+                        if (rc != EOK && rc != EEXIST)
                                 goto error;
                         rc = futil_rcopy_contents(futil, srcp, destp);
@@ -199 +199 @@
 }
 
-/** Return file contents as a heap-allocated block of bytes.
- *
- * @param futil File utility instance
- * @param srcp File path
- * @param rdata Place to store pointer to data
- * @param rsize Place to store size of data
- *
- * @return EOK on success, ENOENT if failed to open file, EIO on other
- *         I/O error, ENOMEM if out of memory
- */
-errno_t futil_get_file(futil_t *futil, const char *srcp, void **rdata,
-    size_t *rsize)
-{
-        int sf;
-        size_t nr;
-        errno_t rc;
-        size_t fsize;
-        char *data;
-        vfs_stat_t st;
-
-        rc = vfs_lookup_open(srcp, WALK_REGULAR, MODE_READ, &sf);
-        if (rc != EOK)
-                return ENOENT;
-
-        if (vfs_stat(sf, &st) != EOK) {
-                vfs_put(sf);
-                return EIO;
-        }
-
-        fsize = st.size;
-
-        data = calloc(fsize, 1);
-        if (data == NULL) {
-                vfs_put(sf);
-                return ENOMEM;
-        }
-
-        rc = vfs_read(sf, (aoff64_t []) { 0 }, data, fsize, &nr);
-        if (rc != EOK || nr != fsize) {
-                vfs_put(sf);
-                free(data);
-                return EIO;
-        }
-
-        (void) vfs_put(sf);
-        *rdata = data;
-        *rsize = fsize;
-
-        return EOK;
-}
-
 /** @}
  */