Changeset f9c30b9a in mainline for uspace/lib

Timestamp:

2026-02-11T18:02:17Z (5 weeks ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

cd0dce3

Parents:

59ed424e

Message:

Moving files (Navigator and command line utility).

Location:

uspace/lib/fmgt

Files:

• include/fmgt.h (modified) (2 diffs)
• include/fmgt/move.h (added)
• include/types/fmgt.h (modified) (1 diff)
• meson.build (modified) (2 diffs)
• private/fsops.h (modified) (1 diff)
• src/fsops.c (modified) (1 diff)
• src/move.c (added)
• test/copy.c (modified) (5 diffs)
• test/fsops.c (modified) (1 diff)
• test/main.c (modified) (1 diff)
• test/move.c (added)

uspace/lib/fmgt/include/fmgt.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -44 +44 @@
 #include "fmgt/copy.h"
 #include "fmgt/flist.h"
+#include "fmgt/move.h"
 #include "fmgt/newfile.h"
 #include "fmgt/verify.h"

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

@@ -69 +69 @@
         fmgt_io_open,
         /** Create */
-        fmgt_io_create
+        fmgt_io_create,
+        /** Delete */
+        fmgt_io_delete
 } fmgt_io_op_type_t;
 

uspace/lib/fmgt/meson.build

@@ -32 +32 @@
         'src/fmgt.c',
         'src/fsops.c',
+        'src/move.c',
         'src/newfile.c',
         'src/verify.c',
@@ -43 +44 @@
         'test/fsops.c',
         'test/main.c',
+        'test/move.c',
         'test/newfile.c',
         'test/verify.c',

uspace/lib/fmgt/private/fsops.h

@@ -46 +46 @@
 errno_t fmgt_create_file(fmgt_t *, const char *, int *, fmgt_exists_action_t *);
 errno_t fmgt_create_dir(fmgt_t *, const char *);
+errno_t fmgt_remove(fmgt_t *, const char *);
 errno_t fmgt_read(fmgt_t *, int, const char *, aoff64_t *, void *, size_t,
     size_t *);

uspace/lib/fmgt/src/fsops.c

@@ -166 +166 @@
 }
 
+/** Remove file or empty directory.
+ *
+ * @param fmgt File management object
+ * @param fame File or directory name
+ * @return EOK on success or an error code
+ */
+errno_t fmgt_remove(fmgt_t *fmgt, const char *fname)
+{
+        fmgt_io_error_t err;
+        fmgt_error_action_t action;
+        errno_t rc;
+
+        do {
+                rc = vfs_unlink_path(fname);
+                if (rc == EOK)
+                        break;
+
+                /* I/O error */
+                err.fname = fname;
+                err.optype = fmgt_io_delete;
+                err.rc = rc;
+
+                fmgt_timer_stop(fmgt);
+                action = fmgt_io_error_query(fmgt, &err);
+                fmgt_timer_start(fmgt);
+        } while (action == fmgt_er_retry);
+
+        return rc;
+}
+
 /** Read data from file.
  *

uspace/lib/fmgt/test/copy.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -167 +167 @@
         char *fname;
         char *dname;
+        char *rname;
         FILE *f;
         char *p;
@@ -181 +182 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-        rv = asprintf(&fname, "%s/%s", p, "a");
-        PCUT_ASSERT_TRUE(rv >= 0);
-
-        rv = asprintf(&dname, "%s/%s", p, "b");
+        rv = asprintf(&fname, "%s/a", p);
+        PCUT_ASSERT_TRUE(rv >= 0);
+
+        rv = asprintf(&dname, "%s/b", p);
+        PCUT_ASSERT_TRUE(rv >= 0);
+
+        rv = asprintf(&rname, "%s/b/a", p);
         PCUT_ASSERT_TRUE(rv >= 0);
 
@@ -208 +212 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-        rc = fmgt_flist_append(flist, dname);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
         rc = fmgt_copy(fmgt, flist, dname);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
@@ -217 +218 @@
 
         rv = remove(fname);
+        PCUT_ASSERT_INT_EQUALS(0, rv);
+
+        rv = remove(rname);
         PCUT_ASSERT_INT_EQUALS(0, rv);
 

uspace/lib/fmgt/test/fsops.c

@@ -131 +131 @@
 }
 
+/** Remove file. */
+PCUT_TEST(remove)
+{
+        fmgt_t *fmgt = NULL;
+        char buf[L_tmpnam];
+        FILE *f;
+        char *p;
+        int rv;
+        errno_t rc;
+
+        /* Create name for temporary file */
+        p = tmpnam(buf);
+        PCUT_ASSERT_NOT_NULL(p);
+
+        f = fopen(p, "wb");
+        PCUT_ASSERT_NOT_NULL(f);
+
+        rv = fprintf(f, "X");
+        PCUT_ASSERT_TRUE(rv >= 0);
+
+        rv = fclose(f);
+        PCUT_ASSERT_INT_EQUALS(0, rv);
+
+        rc = fmgt_create(&fmgt);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = fmgt_remove(fmgt, p);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        fmgt_destroy(fmgt);
+}
+
 /** Read data from file. */
 PCUT_TEST(read)

uspace/lib/fmgt/test/main.c

@@ -31 +31 @@
 PCUT_INIT;
 
+PCUT_IMPORT(copy);
 PCUT_IMPORT(flist);
 PCUT_IMPORT(fmgt);
 PCUT_IMPORT(fsops);
+PCUT_IMPORT(move);
 PCUT_IMPORT(newfile);
 PCUT_IMPORT(verify);