Changes in uspace/app/taskdump/symtab.c [8fd04ba9:ed903174] in mainline

File:

• uspace/app/taskdump/symtab.c (modified) (8 diffs)

uspace/app/taskdump/symtab.c

@@ -36 +36 @@
  */
 
-#include <elf/elf.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -44 +43 @@
 #include <fcntl.h>
 
+#include <elf.h>
 #include "include/symtab.h"
 
@@ -50 +50 @@
     elf_section_header_t *shdr);
 static int chunk_load(int fd, off64_t start, size_t size, void **ptr);
+static int read_all(int fd, void *buf, size_t len);
 
 /** Load symbol table from an ELF file.
@@ -89 +90 @@
 
         rc = read_all(fd, &elf_hdr, sizeof(elf_header_t));
-        if (rc != sizeof(elf_header_t)) {
+        if (rc != EOK) {
                 printf("failed reading elf header\n");
                 free(stab);
@@ -311 +312 @@
 
         rc = read_all(fd, sec_hdr, sizeof(elf_section_header_t));
-        if (rc != sizeof(elf_section_header_t))
+        if (rc != EOK)
                 return EIO;
 
@@ -330 +331 @@
 static int chunk_load(int fd, off64_t start, size_t size, void **ptr)
 {
-        ssize_t rc;
-        off64_t offs;
-
-        offs = lseek(fd, start, SEEK_SET);
-        if (offs == (off64_t) -1) {
+        int rc;
+
+        rc = lseek(fd, start, SEEK_SET);
+        if (rc == (off64_t) -1) {
                 printf("failed seeking chunk\n");
                 *ptr = NULL;
@@ -347 +347 @@
 
         rc = read_all(fd, *ptr, size);
-        if (rc != (ssize_t) size) {
+        if (rc != EOK) {
                 printf("failed reading chunk\n");
                 free(*ptr);
@@ -357 +357 @@
 }
 
+/** Read until the buffer is read in its entirety.
+ *
+ * This function fails if it cannot read exactly @a len bytes from the file.
+ *
+ * @param fd            The file to read from.
+ * @param buf           Buffer for storing data, @a len bytes long.
+ * @param len           Number of bytes to read.
+ *
+ * @return              EOK on error, EIO if file is short or return value
+ *                      from read() if reading failed.
+ */
+static int read_all(int fd, void *buf, size_t len)
+{
+        int cnt = 0;
+
+        do {
+                buf += cnt;
+                len -= cnt;
+                cnt = read(fd, buf, len);
+        } while (cnt > 0 && (len - cnt) > 0);
+
+        if (cnt < 0)
+                return cnt;
+
+        if (len - cnt > 0)
+                return EIO;
+
+        return EOK;
+}
+
 /** @}
  */