Changeset 0cf3d5f in mainline for uspace/lib

Timestamp:

2025-10-10T08:45:43Z (3 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

c3db721

Parents:

cfd04c4

git-author:

Jiri Svoboda <jiri@…> (2025-10-09 18:45:33)

git-committer:

Jiri Svoboda <jiri@…> (2025-10-10 08:45:43)

Message:

Allow creating sparse files in Navigator and newfile.

Location:

uspace/lib/fmgt

Files:

• include/fmgt.h (modified) (1 diff)
• include/types/fmgt.h (modified) (1 diff)
• src/fmgt.c (modified) (2 diffs)
• test/fmgt.c (modified) (5 diffs)

uspace/lib/fmgt/include/fmgt.h

@@ -49 +49 @@
 extern void fmgt_set_init_update(fmgt_t *, bool);
 extern errno_t fmgt_new_file_suggest(char **);
-extern errno_t fmgt_new_file(fmgt_t *, const char *, uint64_t);
+extern errno_t fmgt_new_file(fmgt_t *, const char *, uint64_t, fmgt_nf_flags_t);
 
 #endif

uspace/lib/fmgt/include/types/fmgt.h

@@ -75 +75 @@
 } fmgt_t;
 
+/** New file flags. */
+typedef enum {
+        nf_none = 0x0,
+        nf_sparse = 0x1
+} fmgt_nf_flags_t;
+
 #endif
 

uspace/lib/fmgt/src/fmgt.c

@@ -226 +226 @@
  * @param fname File name
  * @param fsize Size of new file (number of zero bytes to fill in)
+ * @param flags New file flags
  * @return EOK on success or an error code
  */
-errno_t fmgt_new_file(fmgt_t *fmgt, const char *fname, uint64_t fsize)
+errno_t fmgt_new_file(fmgt_t *fmgt, const char *fname, uint64_t fsize,
+    fmgt_nf_flags_t flags)
 {
         int fd;
@@ -254 +256 @@
 
         fmgt_initial_progress_update(fmgt);
+
+        if ((flags & nf_sparse) != 0) {
+                fmgt->curf_procb = fsize - 1;
+                pos = fsize - 1;
+        }
 
         while (fmgt->curf_procb < fsize) {

uspace/lib/fmgt/test/fmgt.c

@@ -116 +116 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-        rc = fmgt_new_file(fmgt, fname, 0);
+        rc = fmgt_new_file(fmgt, fname, 0, nf_none);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -150 +150 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-        rc = fmgt_new_file(fmgt, fname, 20000);
+        rc = fmgt_new_file(fmgt, fname, 20000, nf_none);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -177 +177 @@
 }
 
-/** Initial update provided when requested while creating new file. */
-PCUT_TEST(new_file_init_upd)
+/** New sparse file can be created. */
+PCUT_TEST(new_file_sparse)
 {
         FILE *f = NULL;
@@ -188 +188 @@
         size_t total_rd;
         size_t i;
-        test_resp_t resp;
-        int rv;
-
-        rc = vfs_cwd_set(TEMP_DIR);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = fmgt_create(&fmgt);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        fmgt_set_cb(fmgt, &test_fmgt_cb, (void *)&resp);
-        resp.nupdates = 0;
-
-        fmgt_set_init_update(fmgt, true);
-
-        /* Suggest unique file name. */
-        rc = fmgt_new_file_suggest(&fname);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = fmgt_new_file(fmgt, fname, 20000);
+        int rv;
+
+        rc = vfs_cwd_set(TEMP_DIR);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = fmgt_create(&fmgt);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        /* Suggest unique file name. */
+        rc = fmgt_new_file_suggest(&fname);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = fmgt_new_file(fmgt, fname, 20000, nf_sparse);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -225 +219 @@
         (void)fclose(f);
 
+        /* Remove the file. */
+        rv = remove(fname);
+        PCUT_ASSERT_INT_EQUALS(0, rv);
+
+        free(fname);
+        fmgt_destroy(fmgt);
+}
+
+/** Initial update provided when requested while creating new file. */
+PCUT_TEST(new_file_init_upd)
+{
+        FILE *f = NULL;
+        fmgt_t *fmgt = NULL;
+        char *fname = NULL;
+        char buf[128];
+        errno_t rc;
+        size_t nr;
+        size_t total_rd;
+        size_t i;
+        test_resp_t resp;
+        int rv;
+
+        rc = vfs_cwd_set(TEMP_DIR);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = fmgt_create(&fmgt);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        fmgt_set_cb(fmgt, &test_fmgt_cb, (void *)&resp);
+        resp.nupdates = 0;
+
+        fmgt_set_init_update(fmgt, true);
+
+        /* Suggest unique file name. */
+        rc = fmgt_new_file_suggest(&fname);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = fmgt_new_file(fmgt, fname, 20000, nf_none);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        /* Verify the file. */
+        f = fopen(fname, "rb");
+        PCUT_ASSERT_NOT_NULL(f);
+        total_rd = 0;
+        do {
+                nr = fread(buf, 1, sizeof(buf), f);
+                for (i = 0; i < nr; i++)
+                        PCUT_ASSERT_INT_EQUALS(0, buf[i]);
+
+                total_rd += nr;
+        } while (nr > 0);
+
+        PCUT_ASSERT_INT_EQUALS(20000, total_rd);
+
+        (void)fclose(f);
+
         PCUT_ASSERT_TRUE(resp.nupdates > 0);