Changeset 84439d7 in mainline for uspace/srv/bd/file_bd/file_bd.c

Timestamp:

2010-12-05T09:34:46Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

75732da

Parents:

56b962d (diff), 35537a7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with development/

File:

• uspace/srv/bd/file_bd/file_bd.c (modified) (4 diffs)

uspace/srv/bd/file_bd/file_bd.c

@@ -56 +56 @@
 #define NAME "file_bd"
 
-static const size_t block_size = 512;
+#define DEFAULT_BLOCK_SIZE 512
+
+static size_t block_size;
 static aoff64_t num_blocks;
 static FILE *img;
@@ -63 +65 @@
 static fibril_mutex_t dev_lock;
 
+static void print_usage(void);
 static int file_bd_init(const char *fname);
 static void file_bd_connection(ipc_callid_t iid, ipc_call_t *icall);
@@ -71 +74 @@
 {
         int rc;
+        char *image_name;
+        char *device_name;
 
         printf(NAME ": File-backed block device driver\n");
 
-        if (argc != 3) {
-                printf("Expected two arguments (image name, device name).\n");
+        block_size = DEFAULT_BLOCK_SIZE;
+
+        ++argv; --argc;
+        while (*argv != NULL && (*argv)[0] == '-') {
+                /* Option */
+                if (str_cmp(*argv, "-b") == 0) {
+                        if (argc < 2) {
+                                printf("Argument missing.\n");
+                                print_usage();
+                                return -1;
+                        }
+
+                        rc = str_size_t(argv[1], NULL, 10, true, &block_size);
+                        if (rc != EOK || block_size == 0) {
+                                printf("Invalid block size '%s'.\n", argv[1]);
+                                print_usage();
+                                return -1;
+                        }
+                        ++argv; --argc;
+                } else {
+                        printf("Invalid option '%s'.\n", *argv);
+                        print_usage();
+                        return -1;
+                }
+                ++argv; --argc;
+        }
+
+        if (argc < 2) {
+                printf("Missing arguments.\n");
+                print_usage();
                 return -1;
         }
 
-        if (file_bd_init(argv[1]) != EOK)
+        image_name = argv[0];
+        device_name = argv[1];
+
+        if (file_bd_init(image_name) != EOK)
                 return -1;
 
-        rc = devmap_device_register(argv[2], &devmap_handle);
+        rc = devmap_device_register(device_name, &devmap_handle);
         if (rc != EOK) {
                 devmap_hangup_phone(DEVMAP_DRIVER);
-                printf(NAME ": Unable to register device %s.\n",
-                        argv[2]);
+                printf(NAME ": Unable to register device '%s'.\n",
+                        device_name);
                 return rc;
         }
@@ -96 +132 @@
         /* Not reached */
         return 0;
+}
+
+static void print_usage(void)
+{
+        printf("Usage: " NAME " [-b <block_size>] <image_file> <device_name>\n");
 }