Changeset 1db44ea7 in mainline for uspace/app/bdsh/cmds/modules

Timestamp:

2011-09-25T18:46:45Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

36cb22f

Parents:

dcc44ca1 (diff), f9d8c3a (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 mainline changes

Location:

uspace/app/bdsh/cmds/modules

Files:

• mkfile/mkfile.c (modified) (6 diffs)
• mount/mount.c (modified) (3 diffs)

uspace/app/bdsh/cmds/modules/mkfile/mkfile.c

@@ -54 +54 @@
 static struct option const long_options[] = {
         {"size", required_argument, 0, 's'},
+        {"sparse", no_argument, 0, 'p'},
         {"help", no_argument, 0, 'h'},
         {0, 0, 0, 0}
@@ -69 +70 @@
                 "  -h, --help       A short option summary\n"
                 "  -s, --size sz    Size of the file\n"
+                "  -p, --sparse     Create a sparse file\n"
                 "\n"
                 "Size is a number followed by 'k', 'm' or 'g' for kB, MB, GB.\n"
@@ -115 +117 @@
         ssize_t file_size;
         ssize_t total_written;
-        ssize_t to_write, rc;
+        ssize_t to_write, rc, rc2 = 0;
         char *file_name;
         void *buffer;
+        bool create_sparse = false;
 
         file_size = 0;
@@ -124 +127 @@
 
         for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
-                c = getopt_long(argc, argv, "s:h", long_options, &opt_ind);
+                c = getopt_long(argc, argv, "ps:h", long_options, &opt_ind);
                 switch (c) {
                 case 'h':
                         help_cmd_mkfile(HELP_LONG);
                         return CMD_SUCCESS;
+                case 'p':
+                        create_sparse = true;
+                        break;
                 case 's':
                         file_size = read_size(optarg);
@@ -154 +160 @@
                 printf("%s: failed to create file %s.\n", cmdname, file_name);
                 return CMD_FAILURE;
+        }
+
+        if (create_sparse && file_size > 0) {
+                const char byte = 0x00;
+
+                if ((rc2 = lseek(fd, file_size - 1, SEEK_SET)) < 0)
+                        goto exit;
+
+                rc2 = write(fd, &byte, sizeof(char));
+                goto exit;
         }
 
@@ -174 +190 @@
         }
 
+        free(buffer);
+exit:
         rc = close(fd);
-        if (rc != 0) {
+
+        if (rc != 0 || rc2 < 0) {
                 printf("%s: Error writing file (%zd).\n", cmdname, rc);
                 return CMD_FAILURE;
         }
-
-        free(buffer);
 
         return CMD_SUCCESS;

uspace/app/bdsh/cmds/modules/mount/mount.c

@@ -43 +43 @@
 static struct option const long_options[] = {
         { "help", no_argument, 0, 'h' },
+        { "instance", required_argument, 0, 'i' },
         { 0, 0, 0, 0 }
 };
@@ -68 +69 @@
         const char *dev = "";
         int rc, c, opt_ind;
+        unsigned int instance = 0;
+        bool instance_set = false;
+        char **t_argv;
 
         argc = cli_count_args(argv);
 
         for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
-                c = getopt_long(argc, argv, "h", long_options, &opt_ind);
+                c = getopt_long(argc, argv, "i:h", long_options, &opt_ind);
                 switch (c) {
                 case 'h':
                         help_cmd_mount(HELP_LONG);
                         return CMD_SUCCESS;
+                case 'i':
+                        instance = (unsigned int) strtol(optarg, NULL, 10);
+                        instance_set = true;
+                        break;
                 }
         }
+
+        if (instance_set) {
+                argc -= 2;
+                t_argv = &argv[2];
+        } else
+                t_argv = &argv[0];
 
         if ((argc < 3) || (argc > 5)) {
@@ -86 +100 @@
         }
         if (argc > 3)
-                dev = argv[3];
+                dev = t_argv[3];
         if (argc == 5)
-                mopts = argv[4];
+                mopts = t_argv[4];
 
-        rc = mount(argv[1], argv[2], dev, mopts, 0);
+        rc = mount(t_argv[1], t_argv[2], dev, mopts, 0, instance);
         if (rc != EOK) {
                 printf("Unable to mount %s filesystem to %s on %s (rc=%d)\n",
-                    argv[1], argv[2], argv[3], rc);
+                    t_argv[1], t_argv[2], t_argv[3], rc);
                 return CMD_FAILURE;
         }