Changeset 81805e0 in mainline

Timestamp:

2025-12-17T14:03:10Z (7 days ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Parents:

79b77ce

Message:

Display correct error message in Navigator, too.

Location:

uspace/app

Files:

• copy/copy.c (modified) (2 diffs)
• nav/nav.c (modified) (1 diff)

uspace/app/copy/copy.c

@@ -133 +133 @@
         cons_event_t event;
         kbd_event_t *ev;
-        const char *opstr = NULL;
+        const char *fmt = NULL;
         errno_t rc;
 
@@ -146 +146 @@
         switch (err->optype) {
         case fmgt_io_read:
-                opstr = "reading";
+                fmt = "Error reading file %s. (%s)\n";
                 break;
         case fmgt_io_write:
-                opstr = "writing";
+                fmt = "Error writing file %s. (%s)\n";
                 break;
         case fmgt_io_create:
-                opstr = "creating";
+                fmt = "Error creating %s. (%s)\n";
                 break;
         case fmgt_io_open:
-                opstr = "opening";
-                break;
-        }
-
-        fprintf(stderr, "I/O error %s file '%s' (%s).\n", opstr, err->fname,
-            str_error(err->rc));
+                fmt = "Error opening %s. (%s)\n";
+                break;
+        }
+
+        fprintf(stderr, fmt, err->fname, str_error(err->rc));
         fprintf(stderr, "[A]bort or [R]etry?\n");
 

uspace/app/nav/nav.c

@@ -749 +749 @@
         fmgt_error_action_t err_act;
         char *text1;
+        const char *fmt = NULL;
         errno_t rc;
         int rv;
 
+        switch (err->optype) {
+        case fmgt_io_write:
+                fmt = "Error reading file %s.";
+                break;
+        case fmgt_io_read:
+                fmt = "Error writing file %s.";
+                break;
+        case fmgt_io_open:
+                fmt = "Error opening %s.";
+                break;
+        case fmgt_io_create:
+                fmt = "Error creating %s.";
+                break;
+        }
+
         io_err_dlg_params_init(&params);
-        rv = asprintf(&text1, err->optype == fmgt_io_write ?
-            "Error writing file %s." : "Error reading file %s.",
-            err->fname);
+        rv = asprintf(&text1, fmt, err->fname);
         if (rv < 0)
                 return fmgt_er_abort;