Changeset c3db721 in mainline for uspace/app/newfile

Timestamp:

2025-10-10T20:35:05Z (5 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

c1383cd

Parents:

0cf3d5f

Message:

Allow aborting file management operation.

Location:

uspace/app/newfile

Files:

• meson.build (modified) (1 diff)
• newfile.c (modified) (6 diffs)

uspace/app/newfile/meson.build

@@ -27 +27 @@
 #
 
-deps = [ 'fmgt' ]
+deps = [ 'console', 'fmgt', 'input' ]
 src = files('newfile.c')

uspace/app/newfile/newfile.c

@@ -36 +36 @@
 #include <errno.h>
 #include <fmgt.h>
+#include <io/console.h>
+#include <io/cons_event.h>
+#include <io/kbd_event.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -44 +47 @@
 #define NAME  "newfile"
 
+static bool newfile_abort_query(void *);
 static void newfile_progress(void *, fmgt_progress_t *);
 
@@ -49 +53 @@
 static bool quiet = false;
 
+static console_ctrl_t *con;
+
 static fmgt_cb_t newfile_fmgt_cb = {
+        .abort_query = newfile_abort_query,
         .progress = newfile_progress
 };
@@ -62 +69 @@
         printf("\t-q           quiet\n");
         printf("\t-size=<cap>  file size (<number>[<kB>|<MB>|...])\n");
+}
+
+/** Called by fmgt to query for user abort.
+ *
+ * @param arg Argument (not used)
+ * @return @c true iff user requested abort
+ */
+static bool newfile_abort_query(void *arg)
+{
+        cons_event_t event;
+        kbd_event_t *ev;
+        errno_t rc;
+        usec_t timeout;
+
+        if (con == NULL)
+                return false;
+
+        timeout = 0;
+        rc = console_get_event_timeout(con, &event, &timeout);
+        if (rc != EOK)
+                return false;
+
+        if (event.type == CEV_KEY && event.ev.key.type == KEY_PRESS) {
+                ev = &event.ev.key;
+                if ((ev->mods & KM_ALT) == 0 &&
+                    (ev->mods & KM_SHIFT) == 0 &&
+                    (ev->mods & KM_CTRL) != 0) {
+                        if (ev->key == KC_C)
+                                return true;
+                }
+        }
+
+        return false;
 }
 
@@ -93 +133 @@
         uint64_t nbytes = 0;
 
+        con = console_init(stdin, stdout);
+
         i = 1;
         while (i < argc && argv[i][0] == '-') {
@@ -167 +209 @@
 
         rc = fmgt_new_file(fmgt, fname, nbytes, sparse ? nf_sparse : nf_none);
+        if (prog_upd)
+                printf("\n");
         if (rc != EOK) {
                 printf("Error creating file: %s.\n", str_error(rc));
                 goto error;
         }
-
-        if (prog_upd)
-                printf("\n");
 
         free(fname);