Changes in uspace/app/bdsh/cmds/modules/mkfile/mkfile.c [8d2dd7f2:cde999a] in mainline

File:

• uspace/app/bdsh/cmds/modules/mkfile/mkfile.c (modified) (8 diffs)

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

@@ -31 +31 @@
 #include <stdlib.h>
 #include <stdint.h>
+#include <str_error.h>
 #include <dirent.h>
 #include <macros.h>
@@ -85 +86 @@
  *
  * @param str   String containing the size specification.
- * @return      Non-negative size in bytes on success, -1 on failure.
+ * @param rsize Place to store size in bytes
+ * @return      EOK on success or an error code
  */
-static ssize_t read_size(const char *str)
+static int read_size(const char *str, size_t *rsize)
 {
-        ssize_t number, unit;
+        size_t number, unit;
         char *ep;
 
         number = strtol(str, &ep, 10);
-        if (ep[0] == '\0')
-                return number;
+        if (ep[0] == '\0') {
+                *rsize = number;
+                return EOK;
+        }
 
         if (ep[1] != '\0')
-                    return -1;
+                    return EINVAL;
 
         switch (tolower(ep[0])) {
@@ -103 +107 @@
         case 'm': unit = 1024*1024; break;
         case 'g': unit = 1024*1024*1024; break;
-        default: return -1;
-        }
-
-        return number * unit;
+        default: return EINVAL;
+        }
+
+        *rsize = number * unit;
+        return EOK;
 }
 
@@ -114 +119 @@
         int c, opt_ind;
         int fd;
-        ssize_t file_size;
-        ssize_t total_written;
-        ssize_t to_write, rc, rc2 = 0;
+        size_t file_size;
+        size_t total_written;
+        size_t to_write;
+        size_t nwritten;
+        int rc;
         char *file_name;
         void *buffer;
@@ -136 +143 @@
                         break;
                 case 's':
-                        file_size = read_size(optarg);
-                        if (file_size < 0) {
+                        rc = read_size(optarg, &file_size);
+                        if (rc != EOK) {
                                 printf("%s: Invalid file size specification.\n",
                                     cmdname);
@@ -156 +163 @@
         file_name = argv[optind];
 
-        fd = vfs_lookup_open(file_name, WALK_REGULAR | WALK_MUST_CREATE, MODE_WRITE);
-        if (fd < 0) {
+        rc = vfs_lookup_open(file_name, WALK_REGULAR | WALK_MUST_CREATE, MODE_WRITE, &fd);
+        if (rc != EOK) {
                 printf("%s: failed to create file %s.\n", cmdname, file_name);
                 return CMD_FAILURE;
@@ -166 +173 @@
                 
                 pos = file_size - 1;
-                rc2 = vfs_write(fd, &pos, &byte, sizeof(char));
-                if (rc2 < 0) {
+                rc = vfs_write(fd, &pos, &byte, sizeof(char), &nwritten);
+                if (rc != EOK) {
                         vfs_put(fd);
                         goto error;
@@ -183 +190 @@
         while (total_written < file_size) {
                 to_write = min(file_size - total_written, BUFFER_SIZE);
-                rc = vfs_write(fd, &pos, buffer, to_write);
-                if (rc <= 0) {
-                        printf("%s: Error writing file (%d).\n", cmdname, errno);
+                rc = vfs_write(fd, &pos, buffer, to_write, &nwritten);
+                if (rc != EOK) {
+                        printf("%s: Error writing file (%s).\n", cmdname, str_error(rc));
                         vfs_put(fd);
                         free(buffer);
                         return CMD_FAILURE;
                 }
-                total_written += rc;
+                total_written += nwritten;
         }
 
         free(buffer);
 
-        if (vfs_put(fd) < 0)
+        rc = vfs_put(fd);
+        if (rc != EOK)
                 goto error;
 
         return CMD_SUCCESS;
 error:
-        printf("%s: Error writing file (%d).\n", cmdname, errno);
+        printf("%s: Error writing file (%s).\n", cmdname, str_error(rc));
         return CMD_FAILURE;
 }