Changeset 00d26202 in mainline for uspace/lib

Timestamp:

2026-02-13T11:54:37Z (5 weeks ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

a4e4e29

Parents:

cd0dce3

git-author:

Jiri Svoboda <jiri@…> (2026-02-13 18:54:24)

git-committer:

Jiri Svoboda <jiri@…> (2026-02-13 11:54:37)

Message:

Delete files (Navigator + 'delete' command)

Location:

uspace/lib/fmgt

Files:

• include/fmgt.h (modified) (1 diff)
• include/fmgt/delete.h (added)
• include/types/fmgt.h (modified) (2 diffs)
• meson.build (modified) (1 diff)
• src/delete.c (added)
• src/fmgt.c (modified) (3 diffs)

uspace/lib/fmgt/include/fmgt.h

@@ -43 +43 @@
 #include <stdint.h>
 #include "fmgt/copy.h"
+#include "fmgt/delete.h"
 #include "fmgt/flist.h"
 #include "fmgt/move.h"

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

@@ -48 +48 @@
 /** File management progress update */
 typedef struct {
+        /** Progress on individual files is valid. */
+        bool file_progress;
         /** Current file processed bytes */
         char curf_procb[CAPA_BLOCKS_BUFSIZE];
@@ -139 +141 @@
         /** Post an immediate initial progress update */
         bool do_init_update;
+        /** Report file progress. */
+        bool file_progress;
 } fmgt_t;
 

uspace/lib/fmgt/meson.build

@@ -29 +29 @@
 src = files(
         'src/copy.c',
+        'src/delete.c',
         'src/flist.c',
         'src/fmgt.c',

uspace/lib/fmgt/src/fmgt.c

@@ -117 +117 @@
         fmgt->curf_totalb = 0;
         fmgt->curf_progr = false;
+
+        fmgt->file_progress = false;
 }
 
@@ -131 +133 @@
         fmgt->curf_procb = 0;
         fmgt->curf_totalb = 0;
+
+        /*
+         * This function is only called from operations that need to
+         * display byte progress within a file. Set a flag so that
+         * we will report file progress.
+         */
+        fmgt->file_progress = true;
 
         rc = vfs_stat_path(fname, &stat);
@@ -171 +180 @@
                 percent = 100;
 
-        capa_blocks_format_buf(fmgt->curf_procb, 1, progress->curf_procb,
-            sizeof(progress->curf_procb));
-        capa_blocks_format_buf(fmgt->curf_totalb, 1, progress->curf_totalb,
-            sizeof(progress->curf_totalb));
-        snprintf(progress->curf_percent, sizeof(progress->curf_percent), "%u%%",
-            percent);
-        snprintf(progress->total_procf, sizeof(progress->total_procf), "%u",
-            fmgt->total_procf);
-        capa_blocks_format_buf(fmgt->total_procb, 1, progress->total_procb,
-            sizeof(progress->total_procb));
+        progress->file_progress = fmgt->file_progress;
+
+        if (fmgt->file_progress) {
+                capa_blocks_format_buf(fmgt->curf_procb, 1,
+                    progress->curf_procb, sizeof(progress->curf_procb));
+                capa_blocks_format_buf(fmgt->curf_totalb, 1,
+                    progress->curf_totalb, sizeof(progress->curf_totalb));
+                snprintf(progress->curf_percent, sizeof(progress->curf_percent),
+                    "%u%%", percent);
+                capa_blocks_format_buf(fmgt->total_procb, 1,
+                    progress->total_procb, sizeof(progress->total_procb));
+        } else {
+                memset(progress->curf_procb, 0, sizeof(progress->curf_procb));
+                memset(progress->curf_totalb, 0, sizeof(progress->curf_totalb));
+                memset(progress->curf_percent, 0,
+                    sizeof(progress->curf_percent));
+                memset(progress->total_procb, 0, sizeof(progress->total_procb));
+        }
+
+        snprintf(progress->total_procf, sizeof(progress->total_procf),
+            "%u", fmgt->total_procf);
 }