Changeset b82985e in mainline for uspace/app/vol/vol.c

Timestamp:

2018-10-12T13:16:04Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d09eeb2

Parents:

6d00aff

Message:

Inserting volume by path.

File:

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

uspace/app/vol/vol.c

@@ -47 +47 @@
         vcmd_eject,
         vcmd_insert,
+        vcmd_insert_by_path,
         vcmd_help,
         vcmd_list,
@@ -155 +156 @@
 
         rc = vol_part_insert(vol, svc_id);
+        if (rc != EOK) {
+                printf("Error inserting volume.\n");
+                goto out;
+        }
+
+        rc = EOK;
+out:
+        vol_destroy(vol);
+        return rc;
+}
+
+static errno_t vol_cmd_insert_by_path(const char *volspec)
+{
+        vol_t *vol = NULL;
+        errno_t rc;
+
+        rc = vol_create(&vol);
+        if (rc != EOK) {
+                printf("Error contacting volume service.\n");
+                goto out;
+        }
+
+        rc = vol_part_insert_by_path(vol, volspec);
         if (rc != EOK) {
                 printf("Error inserting volume.\n");
@@ -304 +328 @@
         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);
 }
 
@@ -332 +357 @@
                         volspec = argv[i++];
                 } else if (str_cmp(cmd, "insert") == 0) {
-                        vcmd = vcmd_insert;
+                        if (str_cmp(argv[i], "-p") == 0) {
+                                vcmd = vcmd_insert_by_path;
+                                ++i;
+                        } else {
+                                vcmd = vcmd_insert;
+                        }
+
                         if (argc <= i) {
                                 printf("Parameter missing.\n");
@@ -356 +387 @@
                 rc = vol_cmd_insert(volspec);
                 break;
+        case vcmd_insert_by_path:
+                rc = vol_cmd_insert_by_path(volspec);
+                break;
         case vcmd_help:
                 print_syntax();