Changeset 80e9e5e in mainline for uspace/app

Timestamp:

2011-07-27T01:54:34Z (15 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.

Location:

uspace/app

Files:

• bdsh/cmds/modules/cp/cp.c (modified) (2 diffs)
• bdsh/compl.c (modified) (1 diff)
• taskdump/elf_core.c (modified) (10 diffs)
• taskdump/symtab.c (modified) (6 diffs)

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

@@ -71 +71 @@
         size_t blen, int vb)
 {
-        int fd1, fd2, bytes = 0;
-        off64_t total = 0;
+        int fd1, fd2, bytes;
+        off64_t total;
         int64_t copied = 0;
         char *buff = NULL;
@@ -104 +104 @@
         }
 
-        for (;;) {
-                ssize_t res;
-                size_t written = 0;
-
-                bytes = read(fd1, buff, blen);
-                if (bytes <= 0)
+        while ((bytes = read_all(fd1, buff, blen)) > 0) {
+                if ((bytes = write_all(fd2, buff, bytes)) < 0)
                         break;
                 copied += bytes;
-                res = bytes;
-                do {
-                        /*
-                         * Theoretically, it may not be enough to call write()
-                         * only once. Also the previous read() may have
-                         * returned less data than requested.
-                         */
-                        bytes = write(fd2, buff + written, res);
-                        if (bytes < 0)
-                                goto err;
-                        written += bytes;
-                        res -= bytes;
-                } while (res > 0);
-
-                /* TODO: re-insert assert() once this is stand alone,
-                 * removed as abort() exits the entire shell
-                 */
-                if (res != 0) {
-                        printf("\n%zd more bytes than actually exist were copied\n", res);
-                        goto err;
-                }
         }
 
         if (bytes < 0) {
-err:
                 printf("\nError copying %s, (%d)\n", src, bytes);
                 copied = bytes;

uspace/app/bdsh/compl.c

@@ -280 +280 @@
 
                                 cs->dir = opendir(*cs->path);
+
+                                /* Skip directories that we fail to open. */
+                                if (cs->dir == NULL)
+                                        cs->path++;
                         }
 

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;

uspace/app/taskdump/symtab.c

@@ -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.
@@ -90 +89 @@
 
         rc = read_all(fd, &elf_hdr, sizeof(elf_header_t));
-        if (rc != EOK) {
+        if (rc != sizeof(elf_header_t)) {
                 printf("failed reading elf header\n");
                 free(stab);
@@ -312 +311 @@
 
         rc = read_all(fd, sec_hdr, sizeof(elf_section_header_t));
-        if (rc != EOK)
+        if (rc != sizeof(elf_section_header_t))
                 return EIO;
 
@@ -331 +330 @@
 static int chunk_load(int fd, off64_t start, size_t size, void **ptr)
 {
-        int rc;
-
-        rc = lseek(fd, start, SEEK_SET);
-        if (rc == (off64_t) -1) {
+        ssize_t rc;
+        off64_t offs;
+
+        offs = lseek(fd, start, SEEK_SET);
+        if (offs == (off64_t) -1) {
                 printf("failed seeking chunk\n");
                 *ptr = NULL;
@@ -347 +347 @@
 
         rc = read_all(fd, *ptr, size);
-        if (rc != EOK) {
+        if (rc != (ssize_t) size) {
                 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;
-}
-
 /** @}
  */