Changes in uspace/lib/futil/src/futil.c [5df2570:04e520e] in mainline

File:

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

uspace/lib/futil/src/futil.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2026 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -47 +47 @@
 static char buf[BUF_SIZE];
 
-/** Create file utility instance.
- *
- * @param cb Callback functions
- * @param arg Argument to callback functions
- * @param rfutil Place to store pointer to new file utility instance
- * @return EOK on succcess, ENOMEM if out of memory.
- */
-errno_t futil_create(futil_cb_t *cb, void *arg, futil_t **rfutil)
-{
-        futil_t *futil;
-
-        futil = calloc(1, sizeof(futil_t));
-        if (futil == NULL)
-                return ENOMEM;
-
-        futil->cb = cb;
-        futil->cb_arg = arg;
-        *rfutil = futil;
-        return EOK;
-}
-
-/** Destroy file utility instance.
- *
- * @param futil File utility instance
- */
-void futil_destroy(futil_t *futil)
-{
-        free(futil);
-}
-
 /** Copy file.
  *
- * @param futil File utility instance
  * @param srcp Source path
  * @param dstp Destination path
@@ -85 +54 @@
  * @return EOK on success, EIO on I/O error
  */
-errno_t futil_copy_file(futil_t *futil, const char *srcp, const char *destp)
+errno_t futil_copy_file(const char *srcp, const char *destp)
 {
         int sf, df;
@@ -92 +61 @@
         aoff64_t posr = 0, posw = 0;
 
-        if (futil->cb != NULL && futil->cb->copy_file != NULL)
-                futil->cb->copy_file(futil->cb_arg, srcp, destp);
+        printf("Copy '%s' to '%s'.\n", srcp, destp);
 
         rc = vfs_lookup_open(srcp, WALK_REGULAR, MODE_READ, &sf);
@@ -99 +67 @@
                 return EIO;
 
-        rc = vfs_lookup_open(destp, WALK_REGULAR | WALK_MAY_CREATE, MODE_WRITE,
-            &df);
-        if (rc != EOK) {
-                vfs_put(sf);
-                return EIO;
-        }
+        rc = vfs_lookup_open(destp, WALK_REGULAR | WALK_MAY_CREATE, MODE_WRITE, &df);
+        if (rc != EOK)
+                return EIO;
 
         do {
@@ -134 +99 @@
 /** Copy contents of srcdir (recursively) into destdir.
  *
- * @param futil File utility instance
  * @param srcdir Source directory
  * @param destdir Destination directory
@@ -140 +104 @@
  * @return EOK on success, ENOMEM if out of memory, EIO on I/O error
  */
-errno_t futil_rcopy_contents(futil_t *futil, const char *srcdir,
-    const char *destdir)
+errno_t futil_rcopy_contents(const char *srcdir, const char *destdir)
 {
         DIR *dir;
@@ -155 +118 @@
         de = readdir(dir);
         while (de != NULL) {
-                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;
-                }
+                if (asprintf(&srcp, "%s/%s", srcdir, de->d_name) < 0)
+                        return ENOMEM;
+                if (asprintf(&destp, "%s/%s", destdir, de->d_name) < 0)
+                        return ENOMEM;
 
                 rc = vfs_stat_path(srcp, &s);
                 if (rc != EOK)
-                        goto error;
+                        return EIO;
 
                 if (s.is_file) {
-                        rc = futil_copy_file(futil, srcp, destp);
-                        if (rc != EOK) {
-                                rc = EIO;
-                                goto error;
-                        }
+                        rc = futil_copy_file(srcp, destp);
+                        if (rc != EOK)
+                                return EIO;
                 } else if (s.is_directory) {
-                        if (futil->cb != NULL && futil->cb->create_dir != NULL)
-                                futil->cb->create_dir(futil->cb_arg, destp);
+                        printf("Create directory '%s'\n", destp);
                         rc = vfs_link_path(destp, KIND_DIRECTORY, NULL);
-                        if (rc != EOK && rc != EEXIST)
-                                goto error;
-                        rc = futil_rcopy_contents(futil, srcp, destp);
                         if (rc != EOK)
-                                goto error;
+                                return EIO;
+                        rc = futil_rcopy_contents(srcp, destp);
+                        if (rc != EOK)
+                                return EIO;
                 } else {
-                        rc = EIO;
-                        goto error;
+                        return EIO;
                 }
 
@@ -192 +146 @@
         }
 
-        closedir(dir);
         return EOK;
-error:
-        closedir(dir);
-        return rc;
 }
 
+/** Return file contents as a heap-allocated block of bytes.
+ *
+ * @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(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;
+}
+
 /** @}
  */