Changeset 8e3498b in mainline for uspace/app

Timestamp:

2017-12-04T18:44:24Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bde5c04

Parents:

40feeac

Message:

vfs_read/write() should return error code separately from number of bytes transferred.

Location:

uspace/app

Files:

• bdsh/cmds/modules/cat/cat.c (modified) (3 diffs)
• bdsh/cmds/modules/cmp/cmp.c (modified) (3 diffs)
• bdsh/cmds/modules/cp/cp.c (modified) (17 diffs)
• bdsh/cmds/modules/mkfile/mkfile.c (modified) (7 diffs)
• sysinst/futil.c (modified) (6 diffs)
• taskdump/elf_core.c (modified) (8 diffs)
• taskdump/symtab.c (modified) (5 diffs)
• tester/mm/pager1.c (modified) (2 diffs)
• tester/vfs/vfs1.c (modified) (2 diffs)
• viewer/viewer.c (modified) (1 diff)
• websrv/websrv.c (modified) (2 diffs)

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

@@ -180 +180 @@
     off64_t head, off64_t tail, bool tail_first)
 {
-        int fd, bytes = 0, count = 0, reads = 0;
+        int fd, count = 0, reads = 0;
+        size_t bytes;
         char *buff = NULL;
-        int i;
+        size_t i;
         size_t offset = 0, copied_bytes = 0;
         off64_t file_size = 0, length = 0;
         aoff64_t pos = 0;
+        int rc;
 
         bool reading_stdin = dash_represents_stdin && (str_cmp(fname, "-") == 0);
@@ -250 +252 @@
                 }
                 
-                bytes = vfs_read(fd, &pos, buff + copied_bytes, bytes_to_read);
+                rc = vfs_read(fd, &pos, buff + copied_bytes, bytes_to_read,
+                    &bytes);
                 copied_bytes = 0;
 
-                if (bytes > 0) {
+                if (rc == EOK && bytes > 0) {
                         buff[bytes] = '\0';
                         offset = 0;
@@ -284 +287 @@
                 if (reading_stdin)
                         fflush(stdout);
-        } while (bytes > 0 && !should_quit && (count < length || length == CAT_FULL_FILE));
+        } while (rc == EOK && bytes > 0 && !should_quit && (count < length || length == CAT_FULL_FILE));
 
         vfs_put(fd);
-        if (bytes == -1) {
+        if (rc != EOK) {
                 printf("Error reading %s\n", fname);
                 free(buff);

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

@@ -72 +72 @@
 static int cmp_files(const char *fn0, const char *fn1)
 {
-        int rc = 0;
+        int rc = EOK;
         const char *fn[2] = {fn0, fn1};
         int fd[2] = {-1, -1};
         char buffer[2][CMP_BUFLEN];
-        ssize_t offset[2];
+        size_t offset[2];
         aoff64_t pos[2] = {};
 
@@ -90 +90 @@
         do {
                 for (int i = 0; i < 2; i++) {
-                        offset[i] = 0;
-                        ssize_t size;
-                        do {
-                                size = vfs_read(fd[i], &pos[i],
-                                    buffer[i] + offset[i],
-                                    CMP_BUFLEN - offset[i]);
-                                if (size < 0) {
-                                        rc = size;
-                                        printf("Error reading from %s\n",
-                                            fn[i]);
-                                        goto end;
-                                }
-                                offset[i] += size;
-                        } while (size && offset[i] < CMP_BUFLEN);
+                        rc = vfs_read(fd[i], &pos[i], buffer[i], CMP_BUFLEN,
+                            &offset[i]);
+                        if (rc != EOK) {
+                                printf("Error reading from %s\n",
+                                    fn[i]);
+                                goto end;
+                        }
                 }
 
                 if (offset[0] != offset[1] ||
                     memcmp(buffer[0], buffer[1], offset[0]) != 0) {
+                        printf("Return 1\n");
                         rc = 1;
                         goto end;
@@ -149 +143 @@
 
         rc = cmp_files(argv[optind], argv[optind + 1]);
-        if (rc)
+        if (rc != EOK)
                 return CMD_FAILURE;
         else

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

@@ -66 +66 @@
 } dentry_type_t;
 
-static int64_t copy_file(const char *src, const char *dest,
+static int copy_file(const char *src, const char *dest,
     size_t blen, int vb);
 
@@ -175 +175 @@
 }
 
-static int64_t do_copy(const char *src, const char *dest,
+static int do_copy(const char *src, const char *dest,
     size_t blen, int vb, int recursive, int force, int interactive)
 {
-        int r = -1;
+        int rc = EOK;
         char dest_path[PATH_MAX];
         char src_path[PATH_MAX];
@@ -217 +217 @@
                                 printf("The dest directory %s does not exists",
                                     dest_path);
+                                rc = ENOENT;
                                 goto exit;
                         }
@@ -224 +225 @@
                         printf("Cannot overwrite existing directory %s\n",
                             dest_path);
+                        rc = EEXIST;
                         goto exit;
                 } else if (dest_type == TYPE_FILE) {
@@ -233 +235 @@
                          */
                         if (force && !interactive) {
-                                if (vfs_unlink_path(dest_path) != EOK) {
+                                rc = vfs_unlink_path(dest_path);
+                                if (rc != EOK) {
                                         printf("Unable to remove %s\n",
                                             dest_path);
@@ -244 +247 @@
                                 if (overwrite) {
                                         printf("Overwriting file: %s\n", dest_path);
-                                        if (vfs_unlink_path(dest_path) != EOK) {
+                                        rc = vfs_unlink_path(dest_path);
+                                        if (rc != EOK) {
                                                 printf("Unable to remove %s\n", dest_path);
                                                 goto exit;
@@ -250 +254 @@
                                 } else {
                                         printf("Not overwriting file: %s\n", dest_path);
-                                        r = 0;
+                                        rc = EOK;
                                         goto exit;
                                 }
                         } else {
                                 printf("File already exists: %s\n", dest_path);
+                                rc = EEXIST;
                                 goto exit;
                         }
@@ -260 +265 @@
 
                 /* call copy_file and exit */
-                r = (copy_file(src, dest_path, blen, vb) < 0);
+                rc = (copy_file(src, dest_path, blen, vb) < 0);
 
         } else if (src_type == TYPE_DIR) {
@@ -268 +273 @@
                         printf("Cannot copy the %s directory without the "
                             "-r option\n", src);
+                        rc = EINVAL;
                         goto exit;
                 } else if (dest_type == TYPE_FILE) {
                         printf("Cannot overwrite a file with a directory\n");
+                        rc = EEXIST;
                         goto exit;
                 }
@@ -293 +300 @@
                                 merge_paths(dest_path, PATH_MAX, src_dirname);
 
-                                if (vfs_link_path(dest_path, KIND_DIRECTORY,
-                                    NULL) != EOK) {
+                                rc = vfs_link_path(dest_path, KIND_DIRECTORY,
+                                    NULL);
+                                if (rc != EOK) {
                                         printf("Unable to create "
                                             "dest directory %s\n", dest_path);
@@ -308 +316 @@
                          * e.g. cp -r /src /data/new_dir_src
                          */
-                        if (vfs_link_path(dest_path, KIND_DIRECTORY,
-                            NULL) != EOK) {
+                        rc = vfs_link_path(dest_path, KIND_DIRECTORY, NULL);
+                        if (rc != EOK) {
                                 printf("Unable to create "
                                     "dest directory %s\n", dest_path);
@@ -321 +329 @@
                         /* Something strange is happening... */
                         printf("Unable to open src %s directory\n", src);
+                        rc = ENOENT;
                         goto exit;
                 }
@@ -348 +357 @@
                                 printf("Cannot copy a directory "
                                     "into itself\n");
+                                rc = EEXIST;
                                 goto exit;
                         }
@@ -355 +365 @@
 
                         /* Recursively call do_copy() */
-                        r = do_copy(src_dent, dest_dent, blen, vb, recursive,
+                        rc = do_copy(src_dent, dest_dent, blen, vb, recursive,
                             force, interactive);
-                        if (r)
+                        if (rc != EOK)
                                 goto exit;
 
@@ -367 +377 @@
         if (dir)
                 closedir(dir);
-        return r;
-}
-
-static int64_t copy_file(const char *src, const char *dest,
+        return rc;
+}
+
+static int copy_file(const char *src, const char *dest,
         size_t blen, int vb)
 {
-        int fd1, fd2, bytes;
+        int fd1, fd2;
+        size_t rbytes, wbytes;
+        int rc;
         off64_t total;
-        int64_t copied = 0;
         char *buff = NULL;
         aoff64_t posr = 0, posw = 0;
@@ -410 +421 @@
                 printf("Unable to allocate enough memory to read %s\n",
                     src);
-                copied = -1;
+                rc = ENOMEM;
                 goto out;
         }
 
-        while ((bytes = vfs_read(fd1, &posr, buff, blen)) > 0) {
-                if ((bytes = vfs_write(fd2, &posw, buff, bytes)) < 0)
-                        break;
-                copied += bytes;
-        }
-
-        if (bytes < 0) {
-                printf("\nError copying %s, (%d)\n", src, bytes);
-                copied = bytes;
+        while ((rc = vfs_read(fd1, &posr, buff, blen, &rbytes)) == EOK &&
+            rbytes > 0) {
+                if ((rc = vfs_write(fd2, &posw, buff, rbytes, &wbytes)) != EOK)
+                        break;
+        }
+
+        if (rc != EOK) {
+                printf("\nError copying %s, (%d)\n", src, rc);
+                return rc;
         }
 
@@ -430 +441 @@
         if (buff)
                 free(buff);
-        return copied;
+        return rc;
 }
 

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

@@ -85 +85 @@
  *
  * @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 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 +106 @@
         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 +118 @@
         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 +142 @@
                         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);
@@ -166 +172 @@
                 
                 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 +189 @@
         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) {
+                rc = vfs_write(fd, &pos, buffer, to_write, &nwritten);
+                if (rc != EOK) {
                         printf("%s: Error writing file (%d).\n", cmdname, errno);
                         vfs_put(fd);
@@ -190 +196 @@
                         return CMD_FAILURE;
                 }
-                total_written += rc;
+                total_written += nwritten;
         }
 

uspace/app/sysinst/futil.c

@@ -57 +57 @@
 {
         int sf, df;
-        ssize_t nr, nw;
+        size_t nr, nw;
         int rc;
         aoff64_t posr = 0, posw = 0;
@@ -72 +72 @@
 
         do {
-                nr = vfs_read(sf, &posr, buf, BUF_SIZE);
+                rc = vfs_read(sf, &posr, buf, BUF_SIZE, &nr);
+                if (rc != EOK)
+                        goto error;
                 if (nr == 0)
                         break;
-                if (nr < 0)
-                        return EIO;
-
-                nw = vfs_write(df, &posw, buf, nr);
-                if (nw <= 0)
-                        return EIO;
-        } while (true);
+
+                rc= vfs_write(df, &posw, buf, nr, &nw);
+                if (rc != EOK)
+                        goto error;
+
+        } while (nr == BUF_SIZE);
 
         (void) vfs_put(sf);
@@ -90 +91 @@
 
         return EOK;
+error:
+        vfs_put(sf);
+        vfs_put(df);
+        return rc;
 }
 
@@ -156 +161 @@
 {
         int sf;
-        ssize_t nr;
+        size_t nr;
+        int rc;
         size_t fsize;
         char *data;
@@ -168 +174 @@
                 vfs_put(sf);
                 return EIO;
-        }       
+        }
 
         fsize = st.size;
@@ -178 +184 @@
         }
 
-        nr = vfs_read(sf, (aoff64_t []) { 0 }, data, fsize);
-        if (nr != (ssize_t)fsize) {
+        rc = vfs_read(sf, (aoff64_t []) { 0 }, data, fsize, &nr);
+        if (rc != EOK || nr != fsize) {
                 vfs_put(sf);
                 free(data);

uspace/app/taskdump/elf_core.c

@@ -97 +97 @@
 
         int fd;
-        ssize_t rc;
+        int rc;
+        size_t nwr;
         unsigned int i;
 
@@ -206 +207 @@
         }
 
-        rc = vfs_write(fd, &pos, &elf_hdr, sizeof(elf_hdr));
-        if (rc != sizeof(elf_hdr)) {
+        rc = vfs_write(fd, &pos, &elf_hdr, sizeof(elf_hdr), &nwr);
+        if (rc != EOK) {
                 printf("Failed writing ELF header.\n");
                 free(p_hdr);
@@ -214 +215 @@
 
         for (i = 0; i < n_ph; ++i) {
-                rc = vfs_write(fd, &pos, &p_hdr[i], sizeof(p_hdr[i]));
-                if (rc != sizeof(p_hdr[i])) {
+                rc = vfs_write(fd, &pos, &p_hdr[i], sizeof(p_hdr[i]), &nwr);
+                if (rc != EOK) {
                         printf("Failed writing program header.\n");
                         free(p_hdr);
@@ -231 +232 @@
         note.type = NT_PRSTATUS;
 
-        rc = vfs_write(fd, &pos, &note, sizeof(elf_note_t));
-        if (rc != sizeof(elf_note_t)) {
+        rc = vfs_write(fd, &pos, &note, sizeof(elf_note_t), &nwr);
+        if (rc != EOK) {
                 printf("Failed writing note header.\n");
                 free(p_hdr);
@@ -238 +239 @@
         }
 
-        rc = vfs_write(fd, &pos, "CORE", note.namesz);
-        if (rc != (ssize_t) note.namesz) {
+        rc = vfs_write(fd, &pos, "CORE", note.namesz, &nwr);
+        if (rc != EOK) {
                 printf("Failed writing note header.\n");
                 free(p_hdr);
@@ -247 +248 @@
         pos = ALIGN_UP(pos, word_size);
 
-        rc = vfs_write(fd, &pos, &pr_status, sizeof(elf_prstatus_t));
-        if (rc != sizeof(elf_prstatus_t)) {
+        rc = vfs_write(fd, &pos, &pr_status, sizeof(elf_prstatus_t), &nwr);
+        if (rc != EOK) {
                 printf("Failed writing register data.\n");
                 free(p_hdr);
@@ -296 +297 @@
         size_t total;
         uintptr_t addr;
-        ssize_t rc;
+        int rc;
+        size_t nwr;
 
         addr = area->start_addr;
@@ -309 +311 @@
                 }
 
-                rc = vfs_write(fd, pos, buffer, to_copy);
-                if (rc != (ssize_t) to_copy) {
+                rc = vfs_write(fd, pos, buffer, to_copy, &nwr);
+                if (rc != EOK) {
                         printf("Failed writing memory contents.\n");
                         return EIO;

uspace/app/taskdump/symtab.c

@@ -71 +71 @@
         int fd;
         int rc;
+        size_t nread;
         int i;
 
@@ -88 +89 @@
         }
 
-        rc = vfs_read(fd, &pos, &elf_hdr, sizeof(elf_header_t));
-        if (rc != sizeof(elf_header_t)) {
+        rc = vfs_read(fd, &pos, &elf_hdr, sizeof(elf_header_t), &nread);
+        if (rc != EOK || nread != sizeof(elf_header_t)) {
                 printf("failed reading elf header\n");
                 free(stab);
@@ -304 +305 @@
 {
         int rc;
+        size_t nread;
         aoff64_t pos = elf_hdr->e_shoff + idx * sizeof(elf_section_header_t);
 
-        rc = vfs_read(fd, &pos, sec_hdr, sizeof(elf_section_header_t));
-        if (rc != sizeof(elf_section_header_t))
+        rc = vfs_read(fd, &pos, sec_hdr, sizeof(elf_section_header_t), &nread);
+        if (rc != EOK || nread != sizeof(elf_section_header_t))
                 return EIO;
 
@@ -326 +328 @@
 static int chunk_load(int fd, off64_t start, size_t size, void **ptr)
 {
-        ssize_t rc;
+        int rc;
+        size_t nread;
         aoff64_t pos = start;
 
@@ -335 +338 @@
         }
 
-        rc = vfs_read(fd, &pos, *ptr, size);
-        if (rc != (ssize_t) size) {
+        rc = vfs_read(fd, &pos, *ptr, size, &nread);
+        if (rc != EOK || nread != size) {
                 printf("failed reading chunk\n");
                 free(*ptr);

uspace/app/tester/mm/pager1.c

@@ -44 +44 @@
 static void *create_paged_area(size_t size)
 {
+        size_t nwr;
+        int rc;
+
         TPRINTF("Creating temporary file...\n");
 
@@ -52 +55 @@
         (void) vfs_unlink_path(TEST_FILE);
 
-        if (vfs_write(fd, (aoff64_t []) {0}, text, sizeof(text)) < 0) {
+        rc = vfs_write(fd, (aoff64_t []) {0}, text, sizeof(text), &nwr);
+        if (rc != EOK) {
                 vfs_put(fd);
                 return NULL;

uspace/app/tester/vfs/vfs1.c

@@ -84 +84 @@
         
         size_t size = sizeof(text);
-        ssize_t cnt = vfs_write(fd0, &pos, text, size);
-        if (cnt < 0)
+        size_t cnt;
+        rc  = vfs_write(fd0, &pos, text, size, &cnt);
+        if (rc != EOK)
                 return "write() failed";
         TPRINTF("Written %zd bytes\n", cnt);
@@ -93 +94 @@
         char buf[BUF_SIZE];
         TPRINTF("read..\n");
-        while ((cnt = vfs_read(fd0, &pos, buf, BUF_SIZE))) {
-                TPRINTF("read returns %zd\n", cnt);
-                if (cnt < 0)
+        while ((rc = vfs_read(fd0, &pos, buf, BUF_SIZE, &cnt))) {
+                TPRINTF("read returns rc = %d, cnt = %zu\n", rc, cnt);
+                if (rc != EOK)
                         return "read() failed";
                 
-                int _cnt = (int) cnt;
-                if (_cnt != cnt) {
+                int icnt = (int) cnt;
+                if ((size_t) icnt != cnt) {
                         /* Count overflow, just to be sure. */
                         TPRINTF("Read %zd bytes\n", cnt);
                 } else {
-                        TPRINTF("Read %zd bytes: \"%.*s\"\n", cnt, _cnt, buf);
+                        TPRINTF("Read %zd bytes: \"%.*s\"\n", cnt, icnt, buf);
                 }
         }

uspace/app/viewer/viewer.c

@@ -126 +126 @@
         }
 
-        ssize_t rd = vfs_read(fd, (aoff64_t []) {0}, tga, stat.size);
-        if ((rd < 0) || (rd != (ssize_t) stat.size)) {
+        size_t nread;
+        rc = vfs_read(fd, (aoff64_t []) {0}, tga, stat.size, &nread);
+        if (rc != EOK || nread != stat.size) {
                 free(tga);
                 vfs_put(fd);

uspace/app/websrv/websrv.c

@@ -247 +247 @@
         char *fname = NULL;
         int rc;
+        size_t nr;
         int fd = -1;
         
@@ -279 +280 @@
         aoff64_t pos = 0;
         while (true) {
-                ssize_t nr = vfs_read(fd, &pos, fbuf, BUFFER_SIZE);
+                rc = vfs_read(fd, &pos, fbuf, BUFFER_SIZE, &nr);
+                if (rc != EOK)
+                        goto out;
+                
                 if (nr == 0)
                         break;
-                
-                if (nr < 0) {
-                        rc = EIO;
-                        goto out;
-                }
                 
                 rc = tcp_conn_send(conn, fbuf, nr);