Changeset bb4d0b5 in mainline for uspace/app/newfile

Timestamp:

2025-10-18T19:29:40Z (3 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

3e41cc4

Parents:

856a7b49

Message:

Allow user to decide whether to retry or abort when I/O error occurs.

File:

• uspace/app/newfile/newfile.c (modified) (5 diffs)

uspace/app/newfile/newfile.c

@@ -49 +49 @@
 static bool newfile_abort_query(void *);
 static void newfile_progress(void *, fmgt_progress_t *);
+static fmgt_error_action_t newfile_io_error_query(void *, fmgt_io_error_t *);
 
 static bool prog_upd = false;
+static bool nonint = false;
 static bool quiet = false;
 
@@ -57 +59 @@
 static fmgt_cb_t newfile_fmgt_cb = {
         .abort_query = newfile_abort_query,
-        .progress = newfile_progress
+        .io_error_query = newfile_io_error_query,
+        .progress = newfile_progress,
 };
 
@@ -121 +124 @@
 }
 
+/** Called by fmgt to let user choose I/O error recovery action.
+ *
+ * @param arg Argument (not used)
+ * @param err I/O error report
+ * @return Error recovery action.
+ */
+static fmgt_error_action_t newfile_io_error_query(void *arg,
+    fmgt_io_error_t *err)
+{
+        cons_event_t event;
+        kbd_event_t *ev;
+        errno_t rc;
+
+        (void)arg;
+
+        if (nonint)
+                return fmgt_er_abort;
+
+        if (prog_upd)
+                putchar('\n');
+
+        fprintf(stderr, "I/O error %s file '%s' (%s).\n",
+            err->optype == fmgt_io_write ? "writing" : "reading",
+            err->fname, str_error(err->rc));
+        fprintf(stderr, "[A]bort or [R]etry?\n");
+
+        if (con == NULL)
+                return fmgt_er_abort;
+
+        while (true) {
+                rc = console_get_event(con, &event);
+                if (rc != EOK)
+                        return fmgt_er_abort;
+
+                if (event.type == CEV_KEY && event.ev.key.type == KEY_PRESS) {
+                        ev = &event.ev.key;
+                        if ((ev->mods & KM_ALT) == 0 &&
+                            (ev->mods & KM_CTRL) == 0) {
+                                if (ev->c == 'r' || ev->c == 'R')
+                                        return fmgt_er_retry;
+                                if (ev->c == 'a' || ev->c == 'A')
+                                        return fmgt_er_abort;
+                        }
+                }
+
+                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 fmgt_er_abort;
+                        }
+                }
+        }
+}
+
 int main(int argc, char *argv[])
 {
@@ -126 +186 @@
         errno_t rc;
         int i;
-        bool nonint = false;
         bool sparse = false;
         char *fsize = NULL;
@@ -210 +269 @@
         rc = fmgt_new_file(fmgt, fname, nbytes, sparse ? nf_sparse : nf_none);
         if (prog_upd)
-                printf("\n");
+                putchar('\n');
         if (rc != EOK) {
                 printf("Error creating file: %s.\n", str_error(rc));