Changes in uspace/app/taskdump/elf_core.c [ce04ea44:6afc9d7] in mainline

File:

• uspace/app/taskdump/elf_core.c (modified) (15 diffs)

uspace/app/taskdump/elf_core.c

@@ -54 +54 @@
 #include <errno.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <unistd.h>
+#include <fcntl.h>
 #include <mem.h>
 #include <stdint.h>
@@ -61 +63 @@
 #include <macros.h>
 #include <libarch/istate.h>
-#include <vfs/vfs.h>
 
 #include "elf_core.h"
 
 static off64_t align_foff_up(off64_t, uintptr_t, size_t);
-static int write_mem_area(int, aoff64_t *, as_area_info_t *, async_sess_t *);
+static int align_pos(int, size_t);
+static int write_mem_area(int, as_area_info_t *, async_sess_t *);
 
 #define BUFFER_SIZE 0x1000
@@ -95 +97 @@
         elf_note_t note;
         size_t word_size;
-        aoff64_t pos = 0;
 
         int fd;
@@ -123 +124 @@
         }
 
-        fd = vfs_lookup_open(file_name, WALK_REGULAR | WALK_MAY_CREATE,
-            MODE_WRITE);
+        fd = open(file_name, O_CREAT | O_WRONLY, 0644);
         if (fd < 0) {
                 printf("Failed opening file.\n");
@@ -207 +207 @@
         }
 
-        rc = vfs_write(fd, &pos, &elf_hdr, sizeof(elf_hdr));
+        rc = write(fd, &elf_hdr, sizeof(elf_hdr));
         if (rc != sizeof(elf_hdr)) {
                 printf("Failed writing ELF header.\n");
@@ -215 +215 @@
 
         for (i = 0; i < n_ph; ++i) {
-                rc = vfs_write(fd, &pos, &p_hdr[i], sizeof(p_hdr[i]));
+                rc = write(fd, &p_hdr[i], sizeof(p_hdr[i]));
                 if (rc != sizeof(p_hdr[i])) {
                         printf("Failed writing program header.\n");
@@ -223 +223 @@
         }
 
-        pos = p_hdr[0].p_offset;
+        if (lseek(fd, p_hdr[0].p_offset, SEEK_SET) == (off64_t) -1) {
+                printf("Failed writing memory data.\n");
+                free(p_hdr);
+                return EIO;
+        }
 
         /*
@@ -232 +236 @@
         note.type = NT_PRSTATUS;
 
-        rc = vfs_write(fd, &pos, &note, sizeof(elf_note_t));
+        rc = write(fd, &note, sizeof(elf_note_t));
         if (rc != sizeof(elf_note_t)) {
                 printf("Failed writing note header.\n");
@@ -239 +243 @@
         }
 
-        rc = vfs_write(fd, &pos, "CORE", note.namesz);
+        rc = write(fd, "CORE", note.namesz);
         if (rc != (ssize_t) note.namesz) {
                 printf("Failed writing note header.\n");
@@ -246 +250 @@
         }
 
-        pos = ALIGN_UP(pos, word_size);
-
-        rc = vfs_write(fd, &pos, &pr_status, sizeof(elf_prstatus_t));
+        rc = align_pos(fd, word_size);
+        if (rc != EOK) {
+                printf("Failed writing note header.\n");
+                free(p_hdr);
+                return EIO;
+        }
+
+        rc = write(fd, &pr_status, sizeof(elf_prstatus_t));
         if (rc != sizeof(elf_prstatus_t)) {
                 printf("Failed writing register data.\n");
@@ -256 +265 @@
 
         for (i = 1; i < n_ph; ++i) {
-                pos = p_hdr[i].p_offset;
-                if (write_mem_area(fd, &pos, &ainfo[i - 1], sess) != EOK) {
+                if (lseek(fd, p_hdr[i].p_offset, SEEK_SET) == (off64_t) -1) {
+                        printf("Failed writing memory data.\n");
+                        free(p_hdr);
+                        return EIO;
+                }
+                if (write_mem_area(fd, &ainfo[i - 1], sess) != EOK) {
                         printf("Failed writing memory data.\n");
                         free(p_hdr);
@@ -284 +297 @@
  *
  * @param fd   File to write to.
- * @param pos  Pointer to the position to write to.
  * @param area Memory area info structure.
  * @param sess Debugging session.
@@ -291 +303 @@
  *
  */
-static int write_mem_area(int fd, aoff64_t *pos, as_area_info_t *area,
-    async_sess_t *sess)
+static int write_mem_area(int fd, as_area_info_t *area, async_sess_t *sess)
 {
         size_t to_copy;
@@ -310 +321 @@
                 }
 
-                rc = vfs_write(fd, pos, buffer, to_copy);
+                rc = write(fd, buffer, to_copy);
                 if (rc != (ssize_t) to_copy) {
                         printf("Failed writing memory contents.\n");
@@ -323 +334 @@
 }
 
+static int align_pos(int fd, size_t align)
+{
+        off64_t cur_pos;
+        size_t rem, adv;
+
+        cur_pos = lseek(fd, 0, SEEK_CUR);
+        if (cur_pos < 0)
+                return -1;
+
+        rem = cur_pos % align;
+        adv = align - rem;
+
+        cur_pos = lseek(fd, adv, SEEK_CUR);
+        if (cur_pos < 0)
+                return -1;
+
+        return EOK;
+}
+
 /** @}
  */