Changes in / [34832c3:b067800] in mainline

Files:

• uspace/app/bdsh/cmds/modules/cp/cp.c (modified) (1 diff)
• uspace/app/bdsh/cmds/modules/mkfile/mkfile.c (modified) (1 diff)
• uspace/app/sysinst/meson.build (modified) (2 diffs)
• uspace/app/sysinst/sysinst.c (modified) (36 diffs)
• uspace/app/sysinst/sysinst.h (modified) (4 diffs)
• uspace/app/uidemo/uidemo.c (modified) (7 diffs)
• uspace/app/uidemo/uidemo.h (modified) (6 diffs)
• uspace/lib/cpp/src/__bits/runtime.cpp (modified) (2 diffs)
• uspace/lib/ext4/src/ops.c (modified) (8 diffs)
• uspace/lib/fdisk/include/types/fdisk.h (modified) (3 diffs)
• uspace/lib/fdisk/src/fdisk.c (modified) (3 diffs)
• uspace/lib/fmgt/include/types/fmgt.h (modified) (2 diffs)
• uspace/lib/fmgt/private/fmgt.h (modified) (1 diff)
• uspace/lib/fmgt/src/copy.c (modified) (3 diffs)
• uspace/lib/fmgt/src/delete.c (modified) (3 diffs)
• uspace/lib/fmgt/src/fmgt.c (modified) (1 diff)
• uspace/lib/fmgt/src/move.c (modified) (3 diffs)
• uspace/lib/fmgt/src/newdir.c (modified) (1 diff)
• uspace/lib/fmgt/src/newfile.c (modified) (6 diffs)
• uspace/lib/fmgt/src/rename.c (modified) (1 diff)
• uspace/lib/fmgt/src/verify.c (modified) (2 diffs)
• uspace/lib/futil/include/futil.h (modified) (2 diffs)
• uspace/lib/futil/src/futil.c (modified) (3 diffs)
• uspace/lib/posix/src/unistd.c (modified) (2 diffs)
• uspace/lib/ui/include/types/ui/progress.h (added)
• uspace/lib/ui/include/ui/progress.h (added)
• uspace/lib/ui/meson.build (modified) (3 diffs)
• uspace/lib/ui/private/progress.h (added)
• uspace/lib/ui/src/progress.c (added)
• uspace/lib/ui/src/wdecor.c (modified) (1 diff)
• uspace/lib/ui/test/progress.c (added)
• uspace/srv/fs/cdfs/cdfs_ops.c (modified) (4 diffs)
• uspace/srv/fs/exfat/exfat_ops.c (modified) (2 diffs)
• uspace/srv/fs/fat/fat_ops.c (modified) (2 diffs)
• uspace/srv/fs/tmpfs/tmpfs_ops.c (modified) (3 diffs)
• version (modified) (1 diff)

uspace/app/bdsh/cmds/modules/cp/cp.c

@@ -45 +45 @@
 
 #define CP_VERSION "0.0.1"
-#define CP_DEFAULT_BUFLEN  1024
+#define CP_DEFAULT_BUFLEN (1024 * 64)
 
 static const char *cmdname = "cp";

uspace/app/bdsh/cmds/modules/mkfile/mkfile.c

@@ -48 +48 @@
 
 /** Number of bytes to write at a time */
-#define BUFFER_SIZE 16384
+#define BUFFER_SIZE (1024 * 64)
 
 static const char *cmdname = "mkfile";

uspace/app/sysinst/meson.build

@@ -1 +1 @@
 #
-# Copyright (c) 2025 Jiri Svoboda
+# Copyright (c) 2026 Jiri Svoboda
 # All rights reserved.
 #
@@ -27 +27 @@
 #
 
-deps = [ 'block', 'fdisk', 'futil', 'sif', 'system', 'ui' ]
+deps = [ 'block', 'fdisk', 'fmgt', 'sif', 'system', 'ui' ]
 src = files(
         'rdimg.c',

uspace/app/sysinst/sysinst.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -41 +41 @@
 #include <errno.h>
 #include <fdisk.h>
-#include <futil.h>
+#include <fmgt.h>
 #include <gfx/render.h>
 #include <io/log.h>
@@ -75 +75 @@
 #define DEFAULT_DEV_2 "devices/\\hw\\sys\\00:01.0\\ide1\\c0d0"
 //#define DEFAULT_DEV "devices/\\hw\\pci0\\00:01.2\\uhci_rh\\usb01_a1\\mass-storage0\\l0"
+/** Index of partition which we must install to (hardwired in load.cfg) */
+#define INST_PART_IDX 1
+/* File system type cannot be changed without modifying core.img */
+#define INST_FSTYPE fs_ext4
 /** Volume label for the new file system */
 #define INST_VOL_LABEL "HelenOS"
@@ -87 +91 @@
 #define CD_MOUNT_POINT "/vol/" CD_VOL_LABEL
 
-#define BOOT_FILES_SRC CD_MOUNT_POINT
+#define BOOT_FILES_SRC CD_MOUNT_POINT "/boot"
 #define BOOT_BLOCK_IDX 0 /* MBR */
 
 #define CFG_FILES_SRC "/cfg"
-#define CFG_FILES_DEST MOUNT_POINT "/cfg"
+#define CFG_FILES_DEST MOUNT_POINT
 
 static const char *default_devs[] = {
@@ -139 +143 @@
 };
 
+static void sysinst_upgrade_confirm_button(ui_msg_dialog_t *, void *, unsigned);
+static void sysinst_upgrade_confirm_close(ui_msg_dialog_t *, void *);
+
+static ui_msg_dialog_cb_t sysinst_upgrade_confirm_cb = {
+        .button = sysinst_upgrade_confirm_button,
+        .close = sysinst_upgrade_confirm_close
+};
+
 static errno_t sysinst_restart_dlg_create(sysinst_t *);
 static void sysinst_restart_dlg_button(ui_msg_dialog_t *, void *, unsigned);
@@ -151 +163 @@
 static errno_t sysinst_restart(sysinst_t *);
 static void sysinst_progress_destroy(sysinst_progress_t *);
+static void sysinst_progress(sysinst_t *, const char *);
 static void sysinst_action(sysinst_t *, const char *);
 static void sysinst_error(sysinst_t *, const char *);
 static void sysinst_debug(sysinst_t *, const char *);
 
-static void sysinst_futil_copy_file(void *, const char *, const char *);
-static void sysinst_futil_create_dir(void *, const char *);
+static fmgt_exists_action_t sysinst_fmgt_exists_query(void *, fmgt_exists_t *);
+static void sysinst_fmgt_action(void *, fmgt_action_t, const char *,
+    const char *);
+static void sysinst_fmgt_progress(void *, fmgt_progress_t *);
 static errno_t sysinst_eject_dev(sysinst_t *, service_id_t);
 static errno_t sysinst_eject_phys_by_mp(sysinst_t *, const char *);
-
-static futil_cb_t sysinst_futil_cb = {
-        .copy_file = sysinst_futil_copy_file,
-        .create_dir = sysinst_futil_create_dir
+static errno_t sysinst_upgrade_confirm_create(sysinst_t *);
+
+static fmgt_cb_t sysinst_fmgt_cb = {
+        .exists_query = sysinst_fmgt_exists_query,
+        .action = sysinst_fmgt_action,
+        .progress = sysinst_fmgt_progress
 };
 
@@ -247 +264 @@
  */
 static void sysinst_confirm_close(ui_msg_dialog_t *dialog, void *arg)
+{
+        sysinst_t *sysinst = (sysinst_t *) arg;
+
+        ui_msg_dialog_destroy(dialog);
+        ui_quit(sysinst->ui);
+}
+
+/** Upgrade confirm dialog OK button press.
+ *
+ * @param dialog Message dialog
+ * @param arg Argument (sysinst_t *)
+ * @param btn Button number
+ * @param earg Entry argument
+ */
+static void sysinst_upgrade_confirm_button(ui_msg_dialog_t *dialog, void *arg,
+    unsigned btn)
+{
+        sysinst_t *sysinst = (sysinst_t *) arg;
+
+        ui_msg_dialog_destroy(dialog);
+
+        switch (btn) {
+        case 0:
+                /* OK */
+                fibril_mutex_lock(&sysinst->responded_lock);
+                sysinst->responded = true;
+                sysinst->quit = false;
+                fibril_mutex_unlock(&sysinst->responded_lock);
+                fibril_condvar_signal(&sysinst->responded_cv);
+                break;
+        default:
+                /* Cancel */
+                fibril_mutex_lock(&sysinst->responded_lock);
+                sysinst->responded = true;
+                sysinst->quit = true;
+                fibril_mutex_unlock(&sysinst->responded_lock);
+                fibril_condvar_signal(&sysinst->responded_cv);
+                break;
+        }
+}
+
+/** Upgrade confirm dialog close request.
+ *
+ * @param dialog Message dialog
+ * @param arg Argument (sysinst_t *)
+ */
+static void sysinst_upgrade_confirm_close(ui_msg_dialog_t *dialog, void *arg)
 {
         sysinst_t *sysinst = (sysinst_t *) arg;
@@ -350 +414 @@
 }
 
-/** Called when futil is starting to copy a file.
+/** Called when fmgt hits an existing file while copying.
+ *
+ * @param arg Argument (sysinst_t *)
+ * @param exists Information about existing file
+ * @return Existing file recovery action
+ */
+fmgt_exists_action_t sysinst_fmgt_exists_query(void *arg, fmgt_exists_t *exists)
+{
+        sysinst_t *sysinst = (sysinst_t *)arg;
+
+        (void)sysinst;
+        (void)exists->fname;
+
+        sysinst_action(sysinst, exists->fname);
+
+        /*
+         * Before starting fmgt operation, the caller would specify
+         * whether to overwrite existing files.
+         */
+        if (sysinst->overwrite)
+                return fmgt_exr_overwrite;
+        else
+                return fmgt_exr_skip;
+}
+
+/** Called when fmgt is starting to perform action on a file.
+ *
+ * @param arg Argument (sysinst_t *)
+ * @param action Action being performed
+ * @param src Source or only path
+ * @param dest Destination path or @c NULL
+ */
+static void sysinst_fmgt_action(void *arg, fmgt_action_t action,
+    const char *src, const char *dest)
+{
+        sysinst_t *sysinst = (sysinst_t *)arg;
+        char buf[128];
+
+        (void)src;
+
+        switch (action) {
+        case fmgt_ac_create:
+                snprintf(buf, sizeof(buf), "Creating %s.", src);
+                sysinst_action(sysinst, buf);
+                break;
+        case fmgt_ac_copy:
+                snprintf(buf, sizeof(buf), "Copying %s.", dest);
+                sysinst_action(sysinst, buf);
+                break;
+        default:
+                break;
+        }
+}
+
+/** Called by fmgt to update on progress.
  *
  * @param arg Argument (sysinst_t *)
@@ -356 +474 @@
  * @param dest Destination path
  */
-static void sysinst_futil_copy_file(void *arg, const char *src,
-    const char *dest)
+static void sysinst_fmgt_progress(void *arg, fmgt_progress_t *progress)
 {
         sysinst_t *sysinst = (sysinst_t *)arg;
         char buf[128];
 
-        (void)src;
-        snprintf(buf, sizeof(buf), "Copying %s.", dest);
-        sysinst_action(sysinst, buf);
-}
-
-/** Called when futil is about to create a directory.
- *
- * @param arg Argument (sysinst_t *)
- * @param dest Destination path
- */
-static void sysinst_futil_create_dir(void *arg, const char *dest)
-{
-        sysinst_t *sysinst = (sysinst_t *)arg;
-        char buf[128];
-
-        snprintf(buf, sizeof(buf), "Creating %s.", dest);
-        sysinst_action(sysinst, buf);
+        snprintf(buf, sizeof(buf), "Copied %s files, %s; "
+            "current file: %s done.", progress->total_procf,
+            progress->total_procb, progress->curf_percent);
+        sysinst_progress(sysinst, buf);
 }
 
@@ -430 +534 @@
 }
 
+/** Find existing OS partition.
+ *
+ * @param sysinst System installer
+ * @param fdev Destination device
+ * @param rpart Place to store pointer to partition
+ *
+ * @return EOK on success or an error code
+ */
+static errno_t sysinst_existing_os_part_find(sysinst_t *sysinst,
+    fdisk_dev_t *fdev, fdisk_part_t **rpart)
+{
+        fdisk_part_t *part;
+        fdisk_part_info_t pinfo;
+        errno_t rc;
+
+        sysinst_debug(sysinst, "sysinst_existing_os_part_find(): walk partitions");
+
+        part = fdisk_part_first(fdev);
+        while (part != NULL) {
+                rc = fdisk_part_get_info(part, &pinfo);
+                if (rc != EOK) {
+                        sysinst_error(sysinst,
+                            "Error getting partition information.");
+                        goto error;
+                }
+
+                if (pinfo.index == INST_PART_IDX && pinfo.pkind == lpk_primary)
+                        break;
+
+                part = fdisk_part_next(part);
+        }
+
+        /* Partition with index INST_PART_IDX not found? */
+        if (part == NULL)
+                return ENOENT;
+
+        /* Correct file system type? */
+        if (pinfo.fstype != INST_FSTYPE) {
+                /* Not a usable existing partition. */
+                return ENOENT;
+        }
+
+        sysinst_debug(sysinst, "sysinst_existing_os_part_find(): OK");
+        sysinst->psvc_id = pinfo.svc_id;
+        *rpart = part;
+        return EOK;
+error:
+        return rc;
+}
+
+/** Create installation partition.
+ *
+ * @param sysinst System installer
+ * @param fdev Destination device
+ *
+ * @return EOK on success or an error code
+ */
+static errno_t sysinst_inst_part_create(sysinst_t *sysinst, fdisk_dev_t *fdev)
+{
+        fdisk_part_t *part;
+        fdisk_part_spec_t pspec;
+        fdisk_part_info_t pinfo;
+        capa_spec_t capa;
+        errno_t rc;
+
+        sysinst_debug(sysinst, "sysinst_inst_part_create(): get maximum available block");
+
+        rc = fdisk_part_get_max_avail(fdev, spc_pri, &capa);
+        if (rc != EOK) {
+                sysinst_error(sysinst,
+                    "Error getting available capacity.");
+                goto error;
+        }
+
+        fdisk_pspec_init(&pspec);
+        pspec.capacity = capa;
+        pspec.pkind = lpk_primary;
+        pspec.fstype = INST_FSTYPE; /* Cannot be changed without modifying core.img */
+        pspec.mountp = MOUNT_POINT;
+        pspec.index = INST_PART_IDX; /* Cannot be changed without modifying core.img */
+        pspec.label = INST_VOL_LABEL;
+
+        rc = fdisk_part_create(fdev, &pspec, &part);
+        if (rc != EOK) {
+                sysinst_error(sysinst, "Error creating partition.");
+                goto error;
+        }
+
+        rc = fdisk_part_get_info(part, &pinfo);
+        if (rc != EOK) {
+                sysinst_error(sysinst, "Error getting partition information.");
+                goto error;
+        }
+
+        sysinst_debug(sysinst, "sysinst_inst_part_create(): OK");
+        sysinst->psvc_id = pinfo.svc_id;
+        return EOK;
+error:
+        return rc;
+}
+
 /** Label and mount the destination device.
  *
  * @param sysinst System installer
  * @param dev Disk device to label
- * @param psvc_id Place to store service ID of the created partition
  *
  * @return EOK on success or an error code
@@ -443 +647 @@
         fdisk_dev_t *fdev = NULL;
         fdisk_part_t *part;
-        fdisk_part_spec_t pspec;
-        fdisk_part_info_t pinfo;
+        fdisk_label_info_t linfo;
+        bool create_label = false;
         bool dir_created = false;
         bool label_created = false;
-        capa_spec_t capa;
         service_id_t sid;
         errno_t rc;
@@ -483 +686 @@
         sysinst_debug(sysinst, "sysinst_label_dev(): create label");
 
-        rc = fdisk_label_create(fdev, lt_mbr);
-        if (rc != EOK) {
-                sysinst_error(sysinst, "Error creating label.");
-                goto error;
+        rc = fdisk_label_get_info(fdev, &linfo);
+        if (rc != EOK) {
+                sysinst_error(sysinst, "Error analyzing device.");
+                goto error;
+        }
+
+        switch (linfo.ltype) {
+        case lt_none:
+                /* need to create label */
+                create_label = true;
+                break;
+        case lt_mbr:
+                /* MBR label already present */
+                break;
+        default:
+                /* a different type of label already present */
+                sysinst_error(sysinst, "Disk contains unusable label.");
+                goto error;
+        }
+
+        /* Need to create label? */
+        if (create_label) {
+                rc = fdisk_label_create(fdev, lt_mbr);
+                if (rc != EOK) {
+                        sysinst_error(sysinst, "Error creating label.");
+                        goto error;
+                }
         }
 
@@ -493 +719 @@
         sysinst_debug(sysinst, "sysinst_label_dev(): create partition");
 
-        rc = fdisk_part_get_max_avail(fdev, spc_pri, &capa);
-        if (rc != EOK) {
-                sysinst_error(sysinst,
-                    "Error getting available capacity.");
-                goto error;
-        }
-
-        fdisk_pspec_init(&pspec);
-        pspec.capacity = capa;
-        pspec.pkind = lpk_primary;
-        pspec.fstype = fs_ext4; /* Cannot be changed without modifying core.img */
-        pspec.mountp = MOUNT_POINT;
-        pspec.label = INST_VOL_LABEL;
-
-        rc = fdisk_part_create(fdev, &pspec, &part);
-        if (rc != EOK) {
-                sysinst_error(sysinst, "Error creating partition.");
-                goto error;
-        }
-
-        rc = fdisk_part_get_info(part, &pinfo);
-        if (rc != EOK) {
-                sysinst_error(sysinst, "Error getting partition information.");
-                goto error;
-        }
-
-        sysinst_debug(sysinst, "sysinst_label_dev(): OK");
-        fdisk_dev_close(fdev);
-        fdisk_destroy(fdisk);
-        sysinst->psvc_id = pinfo.svc_id;
+        /* Existing OS partition? */
+        rc = sysinst_existing_os_part_find(sysinst, fdev, &part);
+        if (rc == EOK) {
+                /* Open dialog to confirm that user wants to upgrade. */
+                rc = sysinst_upgrade_confirm_create(sysinst);
+                if (rc != EOK) {
+                        sysinst_error(sysinst, "Cannot create window.");
+                        goto error;
+                }
+
+                fibril_mutex_lock(&sysinst->responded_lock);
+                while (!sysinst->responded)
+                        fibril_condvar_wait(&sysinst->responded_cv,
+                            &sysinst->responded_lock);
+                fibril_mutex_unlock(&sysinst->responded_lock);
+
+                /* User decided not to upgrade existing installation? */
+                if (sysinst->quit) {
+                        (void)vfs_unlink_path(MOUNT_POINT);
+                        return EOK;
+                }
+
+                /* Set mount point for installation partition. */
+                rc = fdisk_part_set_mountp(part, MOUNT_POINT);
+                if (rc != EOK) {
+                        sysinst_error(sysinst, "Cannot mount installation "
+                            "partition.");
+                        goto error;
+                }
+
+                /* performing OS upgrade */
+                sysinst->oper = sio_upgrade;
+                if (sysinst->progress != NULL) {
+                        (void)ui_label_set_text(sysinst->progress->label,
+                            "Upgrading system. Please wait...");
+                        (void)ui_label_paint(sysinst->progress->label);
+                        (void)ui_window_set_caption(sysinst->bgwindow,
+                            "System Upgrade");
+                }
+        } else {
+                /* Create installation partition. */
+                rc = sysinst_inst_part_create(sysinst, fdev);
+                if (rc != EOK)
+                        goto error;
+
+                /* performing initial OS installation */
+                sysinst->oper = sio_install;
+        }
+
         return EOK;
 error:
@@ -568 +813 @@
         char *path = NULL;
         const char **cp;
+        fmgt_flist_t *flist = NULL;
         int rv;
 
@@ -579 +825 @@
 
                 rc = vfs_link_path(path, KIND_DIRECTORY, NULL);
-                if (rc != EOK) {
+                if (rc != EOK && rc != EEXIST) {
                         sysinst_error(sysinst, "Error creating directory.");
                         goto error;
@@ -593 +839 @@
 
         /* Copy initial configuration files */
-        rc = futil_rcopy_contents(sysinst->futil, CFG_FILES_SRC,
-            CFG_FILES_DEST);
+
+        log_msg(LOG_DEFAULT, LVL_NOTE,
+            "sysinst_copy_boot_files(): copy initial configuration files");
+
+        rc = fmgt_flist_create(&flist);
+        if (rc != EOK)
+                goto error;
+
+        rc = fmgt_flist_append(flist, CFG_FILES_SRC);
+        if (rc != EOK)
+                goto error;
+
+        /* Do not overwrite configuration files. */
+        sysinst->overwrite = false;
+        rc = fmgt_copy(sysinst->fmgt, flist, CFG_FILES_DEST);
         if (rc != EOK) {
                 sysinst_error(sysinst, "Error copying initial configuration "
                     "files.");
-                return rc;
-        }
-
+                goto error;
+        }
+
+        fmgt_flist_destroy(flist);
+        log_msg(LOG_DEFAULT, LVL_NOTE,
+            "sysinst_copy_boot_files(): copy initial configuration files OK");
         return EOK;
 error:
+        if (flist != NULL)
+                fmgt_flist_destroy(flist);
         if (path != NULL)
                 free(path);
@@ -614 +878 @@
 static errno_t sysinst_copy_boot_files(sysinst_t *sysinst)
 {
+        fmgt_flist_t *flist = NULL;
         errno_t rc;
 
         log_msg(LOG_DEFAULT, LVL_NOTE,
             "sysinst_copy_boot_files(): copy bootloader files");
-        rc = futil_rcopy_contents(sysinst->futil, BOOT_FILES_SRC, MOUNT_POINT);
+        rc = fmgt_flist_create(&flist);
+        if (rc != EOK)
+                goto error;
+
+        rc = fmgt_flist_append(flist, BOOT_FILES_SRC);
+        if (rc != EOK)
+                goto error;
+
+        /* Overwrite boot files with new ones during upgrade. */
+        sysinst->overwrite = true;
+        rc = fmgt_copy(sysinst->fmgt, flist, MOUNT_POINT);
         if (rc != EOK) {
                 sysinst_error(sysinst, "Error copying bootloader "
                     "files.");
-                return rc;
-        }
-
+                goto error;
+        }
+
+        fmgt_flist_destroy(flist);
         sysinst_debug(sysinst, "sysinst_copy_boot_files(): OK");
         return EOK;
+error:
+        if (flist != NULL)
+                fmgt_flist_destroy(flist);
+        return rc;
 }
 
@@ -740 +1020 @@
 }
 
+/** Return file contents as a heap-allocated block of bytes.
+ *
+ * @param srcp File path
+ * @param rdata Place to store pointer to data
+ * @param rsize Place to store size of data
+ *
+ * @return EOK on success, ENOENT if failed to open file, EIO on other
+ *         I/O error, ENOMEM if out of memory
+ */
+static errno_t sysinst_get_file(const char *srcp, void **rdata, size_t *rsize)
+{
+        int sf;
+        size_t nr;
+        errno_t rc;
+        size_t fsize;
+        char *data;
+        vfs_stat_t st;
+
+        rc = vfs_lookup_open(srcp, WALK_REGULAR, MODE_READ, &sf);
+        if (rc != EOK)
+                return ENOENT;
+
+        if (vfs_stat(sf, &st) != EOK) {
+                vfs_put(sf);
+                return EIO;
+        }
+
+        fsize = st.size;
+
+        data = calloc(fsize, 1);
+        if (data == NULL) {
+                vfs_put(sf);
+                return ENOMEM;
+        }
+
+        rc = vfs_read(sf, (aoff64_t []) { 0 }, data, fsize, &nr);
+        if (rc != EOK || nr != fsize) {
+                vfs_put(sf);
+                free(data);
+                return EIO;
+        }
+
+        (void) vfs_put(sf);
+        *rdata = data;
+        *rsize = fsize;
+
+        return EOK;
+}
+
 /** Copy boot blocks.
  *
@@ -765 +1094 @@
             "sysinst_copy_boot_blocks: Read boot block image.");
 
-        rc = futil_get_file(sysinst->futil,
-            BOOT_FILES_SRC "/boot/grub/i386-pc/boot.img",
+        rc = sysinst_get_file(BOOT_FILES_SRC "/grub/i386-pc/boot.img",
             &boot_img, &boot_img_size);
-        if (rc != EOK || boot_img_size != 512)
+        if (rc != EOK || boot_img_size != 512) {
+                sysinst_error(sysinst, "Error reading boot block image.");
                 return EIO;
+        }
 
         log_msg(LOG_DEFAULT, LVL_NOTE,
             "sysinst_copy_boot_blocks: Read GRUB core image.");
 
-        rc = futil_get_file(sysinst->futil,
-            BOOT_FILES_SRC "/boot/grub/i386-pc/core.img",
+        rc = sysinst_get_file(BOOT_FILES_SRC "/grub/i386-pc/core.img",
             &core_img, &core_img_size);
-        if (rc != EOK)
+        if (rc != EOK) {
+                sysinst_error(sysinst, "Error reading GRUB core image.");
                 return EIO;
+        }
 
         log_msg(LOG_DEFAULT, LVL_NOTE,
@@ -791 +1122 @@
 
         rc = block_init(sid);
-        if (rc != EOK)
+        if (rc != EOK) {
+                sysinst_error(sysinst, "Error opening block device.");
                 return rc;
+        }
 
         log_msg(LOG_DEFAULT, LVL_NOTE,
@@ -798 +1131 @@
 
         rc = block_get_bsize(sid, &bsize);
-        if (rc != EOK)
+        if (rc != EOK) {
+                sysinst_error(sysinst, "Error getting block size.");
                 return rc;
+        }
 
         if (bsize != 512) {
@@ -810 +1145 @@
 
         rc = block_read_direct(sid, BOOT_BLOCK_IDX, 1, bbuf);
-        if (rc != EOK)
+        if (rc != EOK) {
+                sysinst_error(sysinst, "Error reading boot block.");
                 return EIO;
+        }
 
         core_start = 16;
@@ -842 +1179 @@
 
         rc = block_write_direct(sid, BOOT_BLOCK_IDX, 1, bbuf);
-        if (rc != EOK)
+        if (rc != EOK) {
+                sysinst_error(sysinst, "Error writing boot block.");
                 return EIO;
+        }
 
         log_msg(LOG_DEFAULT, LVL_NOTE,
@@ -850 +1189 @@
         /* XXX Must pad last block with zeros */
         rc = block_write_direct(sid, core_start, core_blocks, core_img);
-        if (rc != EOK)
+        if (rc != EOK) {
+                sysinst_error(sysinst, "Error writing GRUB core blocks.");
                 return EIO;
+        }
 
         log_msg(LOG_DEFAULT, LVL_NOTE,
@@ -1004 +1345 @@
         if (rc != EOK)
                 goto error;
+        if (sysinst->quit)
+                return EOK;
 
         clean_dev = true;
@@ -1074 +1417 @@
         sysinst_progress_destroy(sysinst->progress);
         sysinst->progress = NULL;
+
+        /* User decided not to upgrade system? */
+        if (sysinst->quit) {
+                ui_quit(sysinst->ui);
+                return EOK;
+        }
 
         rc = sysinst_restart_dlg_create(sysinst);
@@ -1115 +1464 @@
                 params.rect.p0.y = 0;
                 params.rect.p1.x = 64;
-                params.rect.p1.y = 5;
+                params.rect.p1.y = 7;
         } else {
                 params.rect.p0.x = 0;
                 params.rect.p0.y = 0;
                 params.rect.p1.x = 500;
-                params.rect.p1.y = 60;
+                params.rect.p1.y = 90;
         }
 
@@ -1146 +1495 @@
         }
 
+        /* Installing/upgrading system line */
         rc = ui_label_create(ui_res, "Installing system. Please wait...",
             &progress->label);
@@ -1178 +1528 @@
         }
 
+        /* Action line */
         rc = ui_label_create(ui_res, "",
             &progress->action);
@@ -1189 +1540 @@
                 rect.p0.y = 3;
                 rect.p1.x = arect.p1.x;
+                rect.p1.y = 4;
+        } else {
+                rect.p0.x = arect.p0.x;
+                rect.p0.y = 40;
+                rect.p1.x = arect.p1.x;
+                rect.p1.y = 60;
+        }
+        ui_label_set_rect(progress->action, &rect);
+        ui_label_set_halign(progress->action, gfx_halign_center);
+        ui_label_set_valign(progress->action, gfx_valign_top);
+
+        rc = ui_fixed_add(fixed, ui_label_ctl(progress->action));
+        if (rc != EOK) {
+                sysinst_error(sysinst, "Error adding control to layout.");
+                ui_label_destroy(progress->label);
+                progress->label = NULL;
+                goto error;
+        }
+
+        /* Progress line */
+        rc = ui_label_create(ui_res, "",
+            &progress->progress);
+        if (rc != EOK) {
+                sysinst_error(sysinst, "Error creating label.");
+                goto error;
+        }
+
+        if (ui_is_textmode(sysinst->ui)) {
+                rect.p0.x = arect.p0.x;
+                rect.p0.y = 5;
+                rect.p1.x = arect.p1.x;
                 rect.p1.y = arect.p1.y;
         } else {
                 rect.p0.x = arect.p0.x;
-                rect.p0.y = 30;
+                rect.p0.y = 70;
                 rect.p1.x = arect.p1.x;
                 rect.p1.y = arect.p1.y;
         }
-        ui_label_set_rect(progress->action, &rect);
-        ui_label_set_halign(progress->action, gfx_halign_center);
-        ui_label_set_valign(progress->action, gfx_valign_center);
-
-        rc = ui_fixed_add(fixed, ui_label_ctl(progress->action));
+        ui_label_set_rect(progress->progress, &rect);
+        ui_label_set_halign(progress->progress, gfx_halign_center);
+        ui_label_set_valign(progress->progress, gfx_valign_top);
+
+        rc = ui_fixed_add(fixed, ui_label_ctl(progress->progress));
         if (rc != EOK) {
                 sysinst_error(sysinst, "Error adding control to layout.");
@@ -1246 +1628 @@
 }
 
+/** Set current progress message.
+ *
+ * @param sysinst System installer
+ * @param progress Progress text
+ */
+static void sysinst_progress(sysinst_t *sysinst, const char *progress)
+{
+        log_msg(LOG_DEFAULT, LVL_NOTE, "%s", progress);
+
+        if (sysinst->progress == NULL)
+                return;
+
+        ui_label_set_text(sysinst->progress->progress, progress);
+        ui_label_paint(sysinst->progress->progress);
+}
+
 /** Set current action message.
  *
@@ -1332 +1730 @@
 }
 
-/** Create restart dialog.
- *
- * @param sysinst System installer
- * @return EOK on success or an error code
- */
-static errno_t sysinst_restart_dlg_create(sysinst_t *sysinst)
+/** Create upgrade confirmation dialog.
+ *
+ * @param sysinst System installer
+ * @return EOK on success or an error code
+ */
+static errno_t sysinst_upgrade_confirm_create(sysinst_t *sysinst)
 {
         ui_msg_dialog_params_t params;
@@ -1344 +1742 @@
 
         ui_msg_dialog_params_init(&params);
+        params.caption = "System upgrade";
+        params.text = "Existing installation found. "
+            "Do you want to upgrade it?";
+        params.choice = umdc_ok_cancel;
+        params.flags |= umdf_topmost | umdf_center;
+
+        rc = ui_msg_dialog_create(sysinst->ui, &params, &dialog);
+        if (rc != EOK)
+                return rc;
+
+        ui_msg_dialog_set_cb(dialog, &sysinst_upgrade_confirm_cb, sysinst);
+        return EOK;
+}
+
+/** Create restart dialog.
+ *
+ * @param sysinst System installer
+ * @return EOK on success or an error code
+ */
+static errno_t sysinst_restart_dlg_create(sysinst_t *sysinst)
+{
+        ui_msg_dialog_params_t params;
+        ui_msg_dialog_t *dialog;
+        errno_t rc;
+
+        ui_msg_dialog_params_init(&params);
         params.caption = "Restart System";
-        params.text = "Installation complete. Restart the system?";
+
+        if (sysinst->oper == sio_install)
+                params.text = "Installation complete. Restart the system?";
+        else
+                params.text = "Upgrade complete. Restart the system?";
+
         params.choice = umdc_ok_cancel;
         params.flags |= umdf_topmost | umdf_center;
@@ -1373 +1802 @@
                 return ENOMEM;
 
-        rc = futil_create(&sysinst_futil_cb, (void *)sysinst, &sysinst->futil);
+        fibril_condvar_initialize(&sysinst->responded_cv);
+        fibril_mutex_initialize(&sysinst->responded_lock);
+
+        rc = fmgt_create(&sysinst->fmgt);
         if (rc != EOK) {
                 printf("Out of memory.\n");
                 goto error;
         }
+
+        fmgt_set_cb(sysinst->fmgt, &sysinst_fmgt_cb, (void *)sysinst);
+        fmgt_set_init_update(sysinst->fmgt, true);
 
         rc = ui_create(display_spec, &ui);
@@ -1421 +1856 @@
         }
 
-        (void)sysinst_confirm_create(sysinst);
+        rc = sysinst_confirm_create(sysinst);
+        if (rc != EOK) {
+                printf("Error creating window.\n");
+                goto error;
+        }
 
         ui_run(ui);
@@ -1434 +1873 @@
         return EOK;
 error:
-        if (sysinst->futil != NULL)
-                futil_destroy(sysinst->futil);
+        if (sysinst->fmgt != NULL)
+                fmgt_destroy(sysinst->fmgt);
         if (sysinst->system != NULL)
                 system_close(sysinst->system);

uspace/app/sysinst/sysinst.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -37 +37 @@
 #define SYSINST_H
 
-#include <futil.h>
+#include <fibril_synch.h>
+#include <fmgt.h>
 #include <gfx/color.h>
 #include <loc.h>
+#include <stdbool.h>
 #include <system.h>
 #include <ui/fixed.h>
@@ -52 +54 @@
         ui_label_t *label;
         ui_label_t *action;
+        ui_label_t *progress;
 } sysinst_progress_t;
+
+/** Installer operation */
+typedef enum {
+        /** initial OS installation */
+        sio_install,
+        /** OS upgrade */
+        sio_upgrade
+} sysinst_oper_t;
 
 /** System installer. */
@@ -63 +74 @@
         /** Service ID of destination partition. */
         sysarg_t psvc_id;
-        futil_t *futil;
+        /** operation being performed */
+        sysinst_oper_t oper;
+        fmgt_t *fmgt;
+        /** @c true after user responds to interactive query. */
+        bool responded;
+        /** Signalled when @c responded changes */
+        fibril_condvar_t responded_cv;
+        /** Synchronize access to @c responded */
+        fibril_mutex_t responded_lock;
+        /** User decided to quit installation. */
+        bool quit;
         char errmsg[128];
+        /** Allow overwriting files in current copy operation. */
+        bool overwrite;
 } sysinst_t;
 

uspace/app/uidemo/uidemo.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -33 +33 @@
  */
 
+#include <fibril_synch.h>
 #include <gfx/bitmap.h>
 #include <gfx/coord.h>
@@ -60 +61 @@
 #include "uidemo.h"
 
+enum {
+        scrollbar_update_interval_ms = 1000,
+        ui_demo_progress_step = 17
+};
+
 static errno_t bitmap_moire(gfx_bitmap_t *, gfx_coord_t, gfx_coord_t);
 
@@ -714 +720 @@
         (void) demo;
         ui_msg_dialog_destroy(dialog);
+}
+
+static void ui_demo_timer_fun(void *arg)
+{
+        ui_demo_t *demo = (ui_demo_t *) arg;
+
+        if (demo->progress_value < 100) {
+                demo->progress_value += ui_demo_progress_step;
+                if (demo->progress_value > 100)
+                        demo->progress_value = 100;
+        } else {
+                demo->progress_value = 0;
+        }
+
+        ui_progress_set_value(demo->progress, demo->progress_value);
+
+        if (ui_tab_is_selected(demo->tbars)) {
+                ui_lock(demo->ui);
+                ui_progress_paint(demo->progress);
+                ui_unlock(demo->ui);
+        }
+
+        fibril_timer_set(demo->timer, 1000 * scrollbar_update_interval_ms,
+            ui_demo_timer_fun, (void *)demo);
 }
 
@@ -956 +986 @@
         }
 
+        rc = ui_tab_create(demo.tabset, "Bars", &demo.tbars);
+        if (rc != EOK) {
+                printf("Error creating tab.\n");
+                return rc;
+        }
+
         rc = ui_fixed_add(demo.fixed, ui_tab_set_ctl(demo.tabset));
         if (rc != EOK) {
@@ -1429 +1465 @@
         ui_tab_add(demo.tlists, ui_fixed_ctl(demo.lfixed));
 
+        rc = ui_fixed_create(&demo.bars_fixed);
+        if (rc != EOK) {
+                printf("Error creating fixed layout.\n");
+                return rc;
+        }
+
+        rc = ui_progress_create(ui_res, 0, &demo.progress);
+        if (rc != EOK) {
+                printf("Error creating entry.\n");
+                return rc;
+        }
+
+        /* FIXME: Auto layout */
+        if (ui_is_textmode(ui)) {
+                rect.p0.x = 4;
+                rect.p0.y = 5;
+                rect.p1.x = 42;
+                rect.p1.y = 6;
+        } else {
+                rect.p0.x = 15;
+                rect.p0.y = 88;
+                rect.p1.x = 243;
+                rect.p1.y = 113;
+        }
+
+        ui_progress_set_rect(demo.progress, &rect);
+
+        rc = ui_fixed_add(demo.bars_fixed, ui_progress_ctl(demo.progress));
+        if (rc != EOK) {
+                printf("Error adding control to layout.\n");
+                return rc;
+        }
+
+        ui_tab_add(demo.tbars, ui_fixed_ctl(demo.bars_fixed));
+
         ui_window_add(window, ui_fixed_ctl(demo.fixed));
 
+        demo.timer = fibril_timer_create(NULL);
+        if (demo.timer == NULL) {
+                printf("Error creating timer.\n");
+                return ENOMEM;
+        }
+
+        fibril_timer_set(demo.timer, 1000 * scrollbar_update_interval_ms,
+            ui_demo_timer_fun, (void *)&demo);
+
         rc = ui_window_paint(window);
         if (rc != EOK) {
@@ -1438 +1518 @@
 
         ui_run(ui);
+
+        fibril_timer_clear(demo.timer);
+        fibril_timer_destroy(demo.timer);
 
         ui_window_destroy(window);

uspace/app/uidemo/uidemo.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -38 +38 @@
 
 #include <display.h>
+#include <fibril_synch.h>
 #include <ui/checkbox.h>
 #include <ui/entry.h>
@@ -46 +47 @@
 #include <ui/menubar.h>
 #include <ui/pbutton.h>
+#include <ui/progress.h>
 #include <ui/rbutton.h>
 #include <ui/scrollbar.h>
@@ -61 +63 @@
         ui_fixed_t *bfixed;
         ui_fixed_t *lfixed;
+        ui_fixed_t *bars_fixed;
         ui_menu_bar_t *mbar;
         ui_menu_t *mfile;
@@ -69 +72 @@
         ui_tab_t *tbasic;
         ui_tab_t *tlists;
+        ui_tab_t *tbars;
         ui_entry_t *entry;
         ui_image_t *image;
@@ -83 +87 @@
         ui_scrollbar_t *vscrollbar;
         ui_list_t *list;
+        ui_progress_t *progress;
+        unsigned progress_value;
+        fibril_timer_t *timer;
 } ui_demo_t;
 

uspace/lib/cpp/src/__bits/runtime.cpp

@@ -1 +1 @@
 /*
+ * Copyright (c) 2026 Jiri Svoboda
  * Copyright (c) 2018 Jaroslav Jindrak
  * All rights reserved.
@@ -71 +72 @@
     }
 
+    /**
+     * Called when an object destructor exits due to an exception
+     * during stack unwinding.
+     */
+    extern "C" void __cxa_call_terminate()
+    {
+        std::terminate();
+    }
+
 #ifdef __arm__
     extern "C" int __aeabi_atexit(void* p, void (*f)(void*), void* d)

uspace/lib/ext4/src/ops.c

@@ -64 +64 @@
 static bool ext4_is_dots(const uint8_t *, size_t);
 static errno_t ext4_instance_get(service_id_t, ext4_instance_t **);
+static errno_t handle_sparse_or_unallocated_fblock(ext4_filesystem_t *,
+    ext4_inode_ref_t *, uint32_t, uint32_t, uint32_t *, int *, bool *);
 
 /* Forward declarations of ext4 libfs operations. */
@@ -158 +160 @@
 }
 
-/*
- * Ext4 libfs operations.
- */
-
 /** Get instance from internal table by service_id.
  *
@@ -170 +168 @@
  *
  */
-errno_t ext4_instance_get(service_id_t service_id, ext4_instance_t **inst)
+static errno_t ext4_instance_get(service_id_t service_id, ext4_instance_t **inst)
 {
         fibril_mutex_lock(&instance_list_mutex);
@@ -190 +188 @@
         return EINVAL;
 }
+
+/*
+ * Ext4 libfs operations.
+ */
 
 /** Get root node of filesystem specified by service_id.
@@ -1284 +1286 @@
     size_t *wbytes, aoff64_t *nsize)
 {
-        fs_node_t *fn;
+        fs_node_t *fn = NULL;
         errno_t rc2;
+        bool fblock_allocated = false;
+        ext4_inode_ref_t *inode_ref = NULL;
+
         errno_t rc = ext4_node_get(&fn, service_id, index);
         if (rc != EOK)
@@ -1314 +1319 @@
 
         /* Load inode */
-        ext4_inode_ref_t *inode_ref = enode->inode_ref;
+        inode_ref = enode->inode_ref;
         rc = ext4_filesystem_get_inode_data_block_index(inode_ref, iblock,
             &fblock);
@@ -1322 +1327 @@
         }
 
-        /* Check for sparse file */
+        /* Handle sparse or unallocated block */
         if (fblock == 0) {
-                if ((ext4_superblock_has_feature_incompatible(fs->superblock,
-                    EXT4_FEATURE_INCOMPAT_EXTENTS)) &&
-                    (ext4_inode_has_flag(inode_ref->inode, EXT4_INODE_FLAG_EXTENTS))) {
-                        uint32_t last_iblock =
-                            ext4_inode_get_size(fs->superblock, inode_ref->inode) /
-                            block_size;
-
-                        while (last_iblock < iblock) {
-                                rc = ext4_extent_append_block(inode_ref, &last_iblock,
-                                    &fblock, true);
-                                if (rc != EOK) {
-                                        async_answer_0(&call, rc);
-                                        goto exit;
-                                }
-                        }
-
-                        rc = ext4_extent_append_block(inode_ref, &last_iblock,
-                            &fblock, false);
-                        if (rc != EOK) {
-                                async_answer_0(&call, rc);
-                                goto exit;
-                        }
-                } else {
-                        rc = ext4_balloc_alloc_block(inode_ref, &fblock);
-                        if (rc != EOK) {
-                                async_answer_0(&call, rc);
-                                goto exit;
-                        }
-
-                        rc = ext4_filesystem_set_inode_data_block_index(inode_ref,
-                            iblock, fblock);
-                        if (rc != EOK) {
-                                ext4_balloc_free_block(inode_ref, fblock);
-                                async_answer_0(&call, rc);
-                                goto exit;
-                        }
+                rc = handle_sparse_or_unallocated_fblock(fs, inode_ref,
+                    block_size, iblock, &fblock, &flags, &fblock_allocated);
+                if (rc != EOK) {
+                        async_answer_0(&call, rc);
+                        goto exit;
                 }
-
-                flags = BLOCK_FLAGS_NOREAD;
-                inode_ref->dirty = true;
         }
 
@@ -1402 +1373 @@
 
 exit:
+        if (rc != EOK && fblock_allocated)
+                ext4_balloc_free_block(inode_ref, fblock);
+
         rc2 = ext4_node_put(fn);
         return rc == EOK ? rc2 : rc;
+}
+
+/** Handle sparse or unallocated block.
+ *
+ * @param fs            Filesystem handle
+ * @param inode_ref     I-node reference
+ * @param block_size    Filesystem block size
+ * @param iblock        Logical block
+ * @param fblock        Place to store allocated block address
+ * @param flags         BLOCK_FLAGS to update
+ * @param allocated     Place to store whether new block was allocated
+ *
+ * @return Error code
+ *
+ */
+static errno_t handle_sparse_or_unallocated_fblock(ext4_filesystem_t *fs,
+    ext4_inode_ref_t *inode_ref, uint32_t block_size, uint32_t iblock,
+    uint32_t *fblock, int *flags, bool *allocated)
+{
+        errno_t rc;
+
+        /* Check for sparse file */
+        if ((ext4_superblock_has_feature_incompatible(fs->superblock,
+            EXT4_FEATURE_INCOMPAT_EXTENTS)) &&
+            (ext4_inode_has_flag(inode_ref->inode, EXT4_INODE_FLAG_EXTENTS))) {
+                uint32_t last_iblock =
+                    ext4_inode_get_size(fs->superblock, inode_ref->inode) /
+                    block_size;
+
+                while (last_iblock < iblock) {
+                        rc = ext4_extent_append_block(inode_ref, &last_iblock,
+                            fblock, true);
+                        if (rc != EOK)
+                                return rc;
+                }
+
+                rc = ext4_extent_append_block(inode_ref, &last_iblock, fblock,
+                    false);
+                if (rc != EOK)
+                        return rc;
+
+                *allocated = false;
+        } else { /* Allocate new block */
+                rc = ext4_balloc_alloc_block(inode_ref, fblock);
+                if (rc != EOK)
+                        return rc;
+
+                rc = ext4_filesystem_set_inode_data_block_index(inode_ref,
+                    iblock, *fblock);
+                if (rc != EOK) {
+                        ext4_balloc_free_block(inode_ref, *fblock);
+                        return rc;
+                }
+
+                *allocated = true;
+        }
+
+        *flags = BLOCK_FLAGS_NOREAD;
+        inode_ref->dirty = true;
+
+        return EOK;
 }
 

uspace/lib/fdisk/include/types/fdisk.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2015 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -155 +155 @@
         /** File system type */
         vol_fstype_t fstype;
+        /** Partition index, default/0 = assign automatically */
+        int index;
         /** Volume label */
         const char *label;
@@ -171 +173 @@
         /** File system type */
         vol_fstype_t fstype;
+        /** Partition index */
+        int index;
         /** Volume label */
         char *label;

uspace/lib/fdisk/src/fdisk.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -673 +673 @@
         info->fstype = part->fstype;
         info->pkind = part->pkind;
+        info->index = part->index;
         info->label = part->label;
         info->svc_id = part->svc_id;
@@ -1031 +1032 @@
 
         if (pspec->pkind != lpk_logical) {
-                rc = fdisk_part_get_free_idx(dev, &index);
-                if (rc != EOK)
-                        return EIO;
+                if (pspec->index == 0) {
+                        /* allocate first free index */
+                        rc = fdisk_part_get_free_idx(dev, &index);
+                        if (rc != EOK)
+                                return EIO;
+                } else {
+                        /* user-specified index */
+                        index = pspec->index;
+                }
         } else {
                 index = 0;

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

@@ -114 +114 @@
 } fmgt_exists_action_t;
 
+/** Action being performed. */
+typedef enum {
+        /** copying file */
+        fmgt_ac_copy,
+        /** creating file or directory */
+        fmgt_ac_create,
+        /** deleting file or directory */
+        fmgt_ac_delete,
+        /** moving file */
+        fmgt_ac_move,
+        /** renaming file */
+        fmgt_ac_rename,
+        /** verifying file */
+        fmgt_ac_verify,
+} fmgt_action_t;
+
 /** File management callbacks */
 typedef struct {
@@ -119 +135 @@
         fmgt_error_action_t (*io_error_query)(void *, fmgt_io_error_t *);
         fmgt_exists_action_t (*exists_query)(void *, fmgt_exists_t *);
+        void (*action)(void *, fmgt_action_t, const char *, const char *);
         void (*progress)(void *, fmgt_progress_t *);
 } fmgt_cb_t;

uspace/lib/fmgt/private/fmgt.h

@@ -54 +54 @@
 extern void fmgt_initial_progress_update(fmgt_t *);
 extern void fmgt_final_progress_update(fmgt_t *);
+extern void fmgt_report_action(fmgt_t *, fmgt_action_t, const char *,
+    const char *);
 
 #endif

uspace/lib/fmgt/src/copy.c

@@ -64 +64 @@
 
         (void)dest;
+        fmgt_report_action(fmgt, fmgt_ac_create, dest, NULL);
         return fmgt_create_dir(fmgt, dest, false);
 }
@@ -86 +87 @@
         char *buffer;
         errno_t rc;
+
+        fmgt_report_action(fmgt, fmgt_ac_copy, src, dest);
 
         buffer = calloc(BUFFER_SIZE, 1);
@@ -171 +174 @@
         fmgt_initial_progress_update(fmgt);
         rc = fmgt_walk(&params);
+        fmgt_timer_stop(fmgt);
         fmgt_final_progress_update(fmgt);
         return rc;

uspace/lib/fmgt/src/delete.c

@@ -64 +64 @@
         errno_t rc;
 
+        fmgt_report_action(fmgt, fmgt_ac_delete, src, NULL);
+
         /* Remove original file. */
         rc = fmgt_remove(fmgt, src);
@@ -85 +87 @@
         fmgt_t *fmgt = (fmgt_t *)walk->params->arg;
         (void)dest;
+        fmgt_report_action(fmgt, fmgt_ac_delete, src, NULL);
         return fmgt_remove(fmgt, src);
 }
@@ -110 +113 @@
         fmgt_initial_progress_update(fmgt);
         rc = fmgt_walk(&params);
+        fmgt_timer_stop(fmgt);
         fmgt_final_progress_update(fmgt);
         return rc;

uspace/lib/fmgt/src/fmgt.c

@@ -218 +218 @@
 }
 
+/** Report action being performed to the caller.
+ *
+ * @param fmgt File management object
+ * @param action Action we started performing
+ * @param src Source (or only) path
+ * @param dest Destination path or @c NULL
+ */
+void fmgt_report_action(fmgt_t *fmgt, fmgt_action_t action, const char *src,
+    const char *dest)
+{
+        if (fmgt->cb != NULL && fmgt->cb->action != NULL) {
+                fmgt->cb->action(fmgt->cb_arg, action, src, dest);
+        }
+}
+
 /** Provide initial progress update (if required).
  *

uspace/lib/fmgt/src/move.c

@@ -89 +89 @@
         errno_t rc;
 
+        fmgt_report_action(fmgt, fmgt_ac_move, src, dest);
+
         buffer = calloc(BUFFER_SIZE, 1);
         if (buffer == NULL)
@@ -166 +168 @@
 
         (void)dest;
+        fmgt_report_action(fmgt, fmgt_ac_delete, src, NULL);
         return fmgt_remove(fmgt, src);
 }
@@ -195 +198 @@
         fmgt_initial_progress_update(fmgt);
         rc = fmgt_walk(&params);
+        fmgt_timer_stop(fmgt);
         fmgt_final_progress_update(fmgt);
         return rc;

uspace/lib/fmgt/src/newdir.c

@@ -84 +84 @@
         errno_t rc;
 
+        fmgt_report_action(fmgt, fmgt_ac_create, dname, NULL);
+
         /* Clear statistics. */
         fmgt_progress_init(fmgt);

uspace/lib/fmgt/src/newfile.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -98 +98 @@
         errno_t rc;
 
+        fmgt_report_action(fmgt, fmgt_ac_create, fname, NULL);
+
         buffer = calloc(BUFFER_SIZE, 1);
         if (buffer == NULL)
@@ -112 +114 @@
         fmgt_progress_init(fmgt);
         fmgt_initial_progress_update(fmgt);
+        fmgt_timer_start(fmgt);
 
         /* Create sparse file? */
@@ -142 +145 @@
                         free(buffer);
                         vfs_put(fd);
+                        fmgt_timer_stop(fmgt);
                         fmgt_final_progress_update(fmgt);
                         return rc;
@@ -152 +156 @@
                         free(buffer);
                         vfs_put(fd);
+                        fmgt_timer_stop(fmgt);
                         fmgt_final_progress_update(fmgt);
                         return EINTR;
@@ -159 +164 @@
         free(buffer);
         vfs_put(fd);
+        fmgt_timer_stop(fmgt);
         fmgt_final_progress_update(fmgt);
         return EOK;

uspace/lib/fmgt/src/rename.c

@@ -50 +50 @@
         errno_t rc;
 
+        fmgt_report_action(fmgt, fmgt_ac_rename, old_path, new_name);
+
         /* Clear statistics. */
         fmgt_progress_init(fmgt);

uspace/lib/fmgt/src/verify.c

@@ -68 +68 @@
 
         (void)unused;
+        fmgt_report_action(fmgt, fmgt_ac_verify, fname, NULL);
 
         buffer = calloc(BUFFER_SIZE, 1);
@@ -143 +144 @@
         fmgt_initial_progress_update(fmgt);
         rc = fmgt_walk(&params);
+        fmgt_timer_stop(fmgt);
         fmgt_final_progress_update(fmgt);
         return rc;

uspace/lib/futil/include/futil.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -46 +46 @@
 extern errno_t futil_copy_file(futil_t *, const char *, const char *);
 extern errno_t futil_rcopy_contents(futil_t *, const char *, const char *);
-extern errno_t futil_get_file(futil_t *, const char *, void **, size_t *);
 
 #endif

uspace/lib/futil/src/futil.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -179 +179 @@
                                 futil->cb->create_dir(futil->cb_arg, destp);
                         rc = vfs_link_path(destp, KIND_DIRECTORY, NULL);
-                        if (rc != EOK)
+                        if (rc != EOK && rc != EEXIST)
                                 goto error;
                         rc = futil_rcopy_contents(futil, srcp, destp);
@@ -199 +199 @@
 }
 
-/** Return file contents as a heap-allocated block of bytes.
- *
- * @param futil File utility instance
- * @param srcp File path
- * @param rdata Place to store pointer to data
- * @param rsize Place to store size of data
- *
- * @return EOK on success, ENOENT if failed to open file, EIO on other
- *         I/O error, ENOMEM if out of memory
- */
-errno_t futil_get_file(futil_t *futil, const char *srcp, void **rdata,
-    size_t *rsize)
-{
-        int sf;
-        size_t nr;
-        errno_t rc;
-        size_t fsize;
-        char *data;
-        vfs_stat_t st;
-
-        rc = vfs_lookup_open(srcp, WALK_REGULAR, MODE_READ, &sf);
-        if (rc != EOK)
-                return ENOENT;
-
-        if (vfs_stat(sf, &st) != EOK) {
-                vfs_put(sf);
-                return EIO;
-        }
-
-        fsize = st.size;
-
-        data = calloc(fsize, 1);
-        if (data == NULL) {
-                vfs_put(sf);
-                return ENOMEM;
-        }
-
-        rc = vfs_read(sf, (aoff64_t []) { 0 }, data, fsize, &nr);
-        if (rc != EOK || nr != fsize) {
-                vfs_put(sf);
-                free(data);
-                return EIO;
-        }
-
-        (void) vfs_put(sf);
-        *rdata = data;
-        *rsize = fsize;
-
-        return EOK;
-}
-
 /** @}
  */

uspace/lib/posix/src/unistd.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * Copyright (c) 2011 Jiri Zarevucky
  * Copyright (c) 2011 Petr Koupy
@@ -60 +60 @@
 
 /* Array of environment variable strings (NAME=VALUE). */
-char **environ = NULL;
+static char *environ_initial[] = { NULL };
+char **environ = environ_initial;
 
 /**

uspace/lib/ui/meson.build

@@ -1 +1 @@
 #
-# Copyright (c) 2023 Jiri Svoboda
+# Copyright (c) 2026 Jiri Svoboda
 # All rights reserved.
 #
@@ -49 +49 @@
         'src/pbutton.c',
         'src/popup.c',
+        'src/progress.c',
         'src/promptdialog.c',
         'src/rbutton.c',
@@ -85 +86 @@
         'test/popup.c',
         'test/promptdialog.c',
+        'test/progress.c',
         'test/rbutton.c',
         'test/resource.c',

uspace/lib/ui/src/wdecor.c

@@ -1369 +1369 @@
         fmt.valign = gfx_valign_top;
 
-        rc = gfx_puttext(&pbutton->rect.p0, &fmt, "[\u25a0]");
+        rc = gfx_puttext(&pbutton->rect.p0, &fmt, "[X]");
         if (rc != EOK)
                 return rc;

uspace/srv/fs/cdfs/cdfs_ops.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * Copyright (c) 2011 Martin Decky
  * All rights reserved.
@@ -341 +341 @@
 
         ht_link_t *link = hash_table_find(&nodes, &key);
-        if (link) {
-                cdfs_node_t *node =
-                    hash_table_get_inst(link, cdfs_node_t, nh_link);
-
-                *rfn = FS_NODE(node);
-        } else
+        if (!link) {
                 *rfn = NULL;
-
+                return EBADF;
+        }
+
+        cdfs_node_t *node = hash_table_get_inst(link, cdfs_node_t, nh_link);
+        *rfn = FS_NODE(node);
         return EOK;
 }
@@ -395 +394 @@
         errno_t rc = cdfs_root_get(&rootfn, fs->service_id);
 
-        assert(rc == EOK);
+        assert(rc == EOK || rc == EBADF);
 
         if (!rootfn)
@@ -1354 +1353 @@
                 cdfs_node_t *node = hash_table_get_inst(item, cdfs_node_t, nh_link);
 
-                if (!node->opened) {
+                /* Remove closed, but root node is always in memory. */
+                if (!node->opened && node->index != 0) {
                         hash_table_remove_item(&nodes, item);
 

uspace/srv/fs/exfat/exfat_ops.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * Copyright (c) 2008 Jakub Jermar
  * Copyright (c) 2011 Oleg Romanenko
@@ -573 +573 @@
         if (!idxp) {
                 *rfn = NULL;
-                return EOK;
+                return EBADF;
         }
         /* idxp->lock held */

uspace/srv/fs/fat/fat_ops.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * Copyright (c) 2008 Jakub Jermar
  * Copyright (c) 2011 Oleg Romanenko
@@ -436 +436 @@
         if (!idxp) {
                 *rfn = NULL;
-                return EOK;
+                return EBADF;
         }
         /* idxp->lock held */

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2026 Jiri Svoboda
  * Copyright (c) 2008 Jakub Jermar
  * All rights reserved.
@@ -276 +277 @@
         ht_link_t *lnk = hash_table_find(&nodes, &key);
 
-        if (lnk) {
-                tmpfs_node_t *nodep;
-                nodep = hash_table_get_inst(lnk, tmpfs_node_t, nh_link);
-                *rfn = FS_NODE(nodep);
-        } else {
+        if (lnk == NULL) {
                 *rfn = NULL;
-        }
+                return EBADF;
+        }
+
+        tmpfs_node_t *nodep;
+        nodep = hash_table_get_inst(lnk, tmpfs_node_t, nh_link);
+        *rfn = FS_NODE(nodep);
         return EOK;
 }
@@ -320 +322 @@
 
         rc = tmpfs_root_get(&rootfn, service_id);
-        assert(rc == EOK);
-        if (!rootfn)
+        assert(rc == EOK || rc == EBADF);
+        if (rootfn == NULL)
                 nodep->index = TMPFS_SOME_ROOT;
         else

version

@@ -30 +30 @@
 HELENOS_RELEASE = 0.14.1
 HELENOS_CODENAME = Aladar
-HELENOS_COPYRIGHT = Copyright (c) 2001-2024 HelenOS project
+HELENOS_COPYRIGHT = Copyright (c) 2001-2026 HelenOS project