Changeset 629b480 in mainline for uspace/app/vol/vol.c

Timestamp:

2025-04-25T20:48:07Z (3 weeks ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

0526285, 21cd0c8, 32cb7cd, 4ae6a23, 68c4b28, 9ea3a41, a4f8c3f, abd1eff, cbaf408, f7f60e70

Parents:

4b9213d

Message:

Assorted installer fixes.

File:

• uspace/app/vol/vol.c (modified) (2 diffs)

uspace/app/vol/vol.c

@@ -54 +54 @@
 } vol_cmd_t;
 
-/** Find volume by current mount point. */
-static errno_t vol_cmd_part_by_mp(vol_t *vol, const char *mp,
-    service_id_t *rid)
-{
-        vol_part_info_t vinfo;
-        service_id_t *part_ids = NULL;
-        char *canon_mp_buf = NULL;
-        char *canon_mp;
-        size_t nparts;
-        size_t i;
-        errno_t rc;
-
-        canon_mp_buf = str_dup(mp);
-        if (canon_mp_buf == NULL) {
-                printf("Out of memory.\n");
-                rc = ENOMEM;
-                goto out;
-        }
-
-        canon_mp = vfs_absolutize(canon_mp_buf, NULL);
-        if (canon_mp == NULL) {
-                printf("Invalid volume path '%s'.\n", mp);
-                rc = EINVAL;
-                goto out;
-        }
-
-        rc = vol_get_parts(vol, &part_ids, &nparts);
-        if (rc != EOK) {
-                printf("Error getting list of volumes.\n");
-                goto out;
-        }
-
-        for (i = 0; i < nparts; i++) {
-                rc = vol_part_info(vol, part_ids[i], &vinfo);
-                if (rc != EOK) {
-                        printf("Error getting volume information.\n");
-                        rc = EIO;
-                        goto out;
-                }
-
-                if (str_cmp(vinfo.cur_mp, canon_mp) == 0) {
-                        *rid = part_ids[i];
-                        rc = EOK;
-                        goto out;
-                }
-        }
-
-        rc = ENOENT;
-out:
-        free(part_ids);
-        free(canon_mp_buf);
-        return rc;
-}
-
 static errno_t vol_cmd_eject(const char *volspec, bool physical)
 {
@@ -120 +66 @@
         }
 
-        rc = vol_cmd_part_by_mp(vol, volspec, &part_id);
+        rc = vol_part_by_mp(vol, volspec, &part_id);
         if (rc != EOK) {
                 printf("Error looking up volume '%s'.\n", volspec);