Changes in uspace/app/vol/vol.c [629b480:b82985e] in mainline

File:

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

uspace/app/vol/vol.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2017 Jiri Svoboda
  * All rights reserved.
  *
@@ -36 +36 @@
 #include <io/table.h>
 #include <loc.h>
-#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -54 +53 @@
 } vol_cmd_t;
 
-static errno_t vol_cmd_eject(const char *volspec, bool physical)
+/** 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)
 {
         vol_t *vol = NULL;
@@ -66 +119 @@
         }
 
-        rc = vol_part_by_mp(vol, volspec, &part_id);
+        rc = vol_cmd_part_by_mp(vol, volspec, &part_id);
         if (rc != EOK) {
                 printf("Error looking up volume '%s'.\n", volspec);
@@ -72 +125 @@
         }
 
-        rc = vol_part_eject(vol, part_id, physical ? vef_physical :
-            vef_none);
+        rc = vol_part_eject(vol, part_id);
         if (rc != EOK) {
                 printf("Error ejecting volume.\n");
@@ -271 +323 @@
 {
         printf("Syntax:\n");
-        printf("  %s                 List present volumes\n", NAME);
-        printf("  %s -c              List volume configuration entries\n", NAME);
-        printf("  %s -h              Print help\n", NAME);
-        printf("  %s eject [-s] <mp> Eject volume mounted in a directory\n", NAME);
-        printf("                     -s to eject physically\n");
-        printf("  %s insert <svc>    Insert volume based on service identifier\n", NAME);
-        printf("  %s insert -p <mp>  Insert volume based on filesystem path\n", NAME);
+        printf("  %s                List present volumes\n", NAME);
+        printf("  %s -c             List volume configuration entries\n", NAME);
+        printf("  %s -h             Print help\n", NAME);
+        printf("  %s eject <mp>     Eject volume mounted in a directory\n", NAME);
+        printf("  %s insert <svc>   Insert volume based on service identifier\n", NAME);
+        printf("  %s insert -p <mp> Insert volume based on filesystem path\n", NAME);
 }
 
@@ -285 +336 @@
         char *volspec;
         vol_cmd_t vcmd;
-        bool physical = false;
         int i;
         errno_t rc = EINVAL;
@@ -301 +351 @@
                 } else if (str_cmp(cmd, "eject") == 0) {
                         vcmd = vcmd_eject;
-                        if (str_cmp(argv[i], "-s") == 0) {
-                                physical = true;
-                                ++i;
-                        }
-
                         if (argc <= i) {
                                 printf("Parameter missing.\n");
@@ -337 +382 @@
         switch (vcmd) {
         case vcmd_eject:
-                rc = vol_cmd_eject(volspec, physical);
+                rc = vol_cmd_eject(volspec);
                 break;
         case vcmd_insert: