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

Timestamp:

2018-10-04T14:53:29Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c5429fe

Parents:

1bb43d5

git-author:

Jiri Svoboda <jiri@…> (2018-10-03 21:51:40)

git-committer:

Jiri Svoboda <jiri@…> (2018-10-04 14:53:29)

Message:

Add vol insert subcommand to re-insert a previously ejected volume.

File:

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

uspace/app/vol/vol.c

@@ -44 +44 @@
 #define NAME "vol"
 
-static char *volspec;
-
 typedef enum {
         vcmd_eject,
+        vcmd_insert,
         vcmd_help,
         vcmd_list,
@@ -127 +126 @@
         if (rc != EOK) {
                 printf("Error ejecting volume.\n");
+                goto out;
+        }
+
+        rc = EOK;
+out:
+        vol_destroy(vol);
+        return rc;
+}
+
+static errno_t vol_cmd_insert(const char *volspec)
+{
+        vol_t *vol = NULL;
+        service_id_t svc_id;
+        errno_t rc;
+
+        rc = loc_service_get_id(volspec, &svc_id, 0);
+        if (rc != EOK) {
+                printf("Error looking up service '%s'.\n", volspec);
+                goto out;
+        }
+
+        rc = vol_create(&vol);
+        if (rc != EOK) {
+                printf("Error contacting volume service.\n");
+                goto out;
+        }
+
+        rc = vol_part_insert(vol, svc_id);
+        if (rc != EOK) {
+                printf("Error inserting volume.\n");
                 goto out;
         }
@@ -215 +244 @@
         printf("  %s                List volumes\n", NAME);
         printf("  %s -h             Print help\n", NAME);
-        printf("  %s eject <volume> Eject volume\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);
 }
 
@@ -221 +251 @@
 {
         char *cmd;
+        char *volspec;
         vol_cmd_t vcmd;
         int i;
@@ -240 +271 @@
                         }
                         volspec = argv[i++];
+                } else if (str_cmp(cmd, "insert") == 0) {
+                        vcmd = vcmd_insert;
+                        if (argc <= i) {
+                                printf("Parameter missing.\n");
+                                goto syntax_error;
+                        }
+                        volspec = argv[i++];
                 } else {
                         printf("Invalid sub-command '%s'.\n", cmd);
@@ -254 +292 @@
         case vcmd_eject:
                 rc = vol_cmd_eject(volspec);
+                break;
+        case vcmd_insert:
+                rc = vol_cmd_insert(volspec);
                 break;
         case vcmd_help: