Changeset 80e9e5e in mainline for uspace/app/taskdump/elf_core.c

Timestamp:

2011-07-27T01:54:34Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

0837ab4

Parents:

c936c7f (diff), 75aa59a (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.

File:

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

uspace/app/taskdump/elf_core.c

@@ -67 +67 @@
 
 static off64_t align_foff_up(off64_t, uintptr_t, size_t);
-static int write_all(int, const void *, size_t);
 static int align_pos(int, size_t);
 static int write_mem_area(int, as_area_info_t *, async_sess_t *);
@@ -100 +99 @@
 
         int fd;
-        int rc;
+        ssize_t rc;
         unsigned int i;
 
@@ -204 +203 @@
 
         rc = write_all(fd, &elf_hdr, sizeof(elf_hdr));
-        if (rc != EOK) {
+        if (rc != sizeof(elf_hdr)) {
                 printf("Failed writing ELF header.\n");
                 free(p_hdr);
@@ -212 +211 @@
         for (i = 0; i < n_ph; ++i) {
                 rc = write_all(fd, &p_hdr[i], sizeof(p_hdr[i]));
-                if (rc != EOK) {
+                if (rc != sizeof(p_hdr[i])) {
                         printf("Failed writing program header.\n");
                         free(p_hdr);
@@ -233 +232 @@
 
         rc = write_all(fd, &note, sizeof(elf_note_t));
-        if (rc != EOK) {
+        if (rc != sizeof(elf_note_t)) {
                 printf("Failed writing note header.\n");
                 free(p_hdr);
@@ -240 +239 @@
 
         rc = write_all(fd, "CORE", note.namesz);
-        if (rc != EOK) {
+        if (rc != (ssize_t) note.namesz) {
                 printf("Failed writing note header.\n");
                 free(p_hdr);
@@ -254 +253 @@
 
         rc = write_all(fd, &pr_status, sizeof(elf_prstatus_t));
-        if (rc != EOK) {
+        if (rc != sizeof(elf_prstatus_t)) {
                 printf("Failed writing register data.\n");
                 free(p_hdr);
@@ -304 +303 @@
         size_t total;
         uintptr_t addr;
-        int rc;
+        ssize_t rc;
 
         addr = area->start_addr;
@@ -318 +317 @@
 
                 rc = write_all(fd, buffer, to_copy);
-                if (rc != EOK) {
+                if (rc != (ssize_t) to_copy) {
                         printf("Failed writing memory contents.\n");
                         return EIO;
@@ -326 +325 @@
                 total += to_copy;
         }
-
-        return EOK;
-}
-
-/** Write until the buffer is written in its entirety.
- *
- * This function fails if it cannot write exactly @a len bytes to the file.
- *
- * @param fd            The file to write to.
- * @param buf           Data, @a len bytes long.
- * @param len           Number of bytes to write.
- *
- * @return              EOK on error, return value from write() if writing
- *                      failed.
- */
-static int write_all(int fd, const void *data, size_t len)
-{
-        int cnt = 0;
-
-        do {
-                data += cnt;
-                len -= cnt;
-                cnt = write(fd, data, len);
-        } while (cnt > 0 && (len - cnt) > 0);
-
-        if (cnt < 0)
-                return cnt;
-
-        if (len - cnt > 0)
-                return EIO;
 
         return EOK;