Changeset 2330

Timestamp:

12/14/11 01:38:28 (18 months ago)

Author:

jkoshy

Message:

Code cleanups in ar: use the elftc_copyfile() helper function
to copy file contents.

Reviewed by: kaiwang27
Ticket(s): #284, #367

Files:

• trunk/ar/acpyacc.y (modified) (5 diffs)

trunk/ar/acpyacc.y

@@ -32 +32 @@
 #include <sys/queue.h>
 #include <sys/stat.h>
+
 #include <archive.h>
 #include <archive_entry.h>
@@ -42 +43 @@
 #include <unistd.h>
 
+#include "libelftc.h"
+
 #include "ar.h"
 
@@ -62 +65 @@
 static void     arscp_addmod(struct list *list);
 static void     arscp_clear(void);
-static int      arscp_copy(int ifd, int ofd);
 static void     arscp_create(char *in, char *out);
 static void     arscp_delete(struct list *list);
@@ -296 +298 @@
                  * input archive.
                  */
-                if ((ifd = open(in, O_RDONLY)) < 0) {
-                        bsdar_warnc(bsdar, errno, "open failed");
+                if ((ifd = open(in, O_RDONLY)) < 0 ||
+                    elftc_copyfile(ifd, ofd) < 0) {
+                        bsdar_warnc(bsdar, errno, "'OPEN' failed");
+                        (void) close(ofd);
+                        if (ifd != -1)
+                                (void) close(ifd);
                         return;
                 }
-                if (arscp_copy(ifd, ofd)) {
-                        bsdar_warnc(bsdar, 0, "arscp_copy failed");
-                        return;
-                }
-                close(ifd);
-                close(ofd);
+                (void) close(ifd);
+                (void) close(ofd);
         } else {
                 /*
@@ -325 +327 @@
         target = out;
         bsdar->filename = tmpac;
-}
-
-/*
- * A file copying implementation using mmap().
- */
-static int
-arscp_copy(int ifd, int ofd)
-{
-        struct stat              sb;
-        char                    *buf, *p;
-        ssize_t                  w;
-        size_t                   bytes;
-
-        if (fstat(ifd, &sb) < 0) {
-                bsdar_warnc(bsdar, errno, "fstate failed");
-                return (1);
-        }
-        if ((p = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, ifd,
-            (off_t)0)) == MAP_FAILED) {
-                bsdar_warnc(bsdar, errno, "mmap failed");
-                return (1);
-        }
-        for (buf = p, bytes = sb.st_size; bytes > 0; bytes -= w) {
-                w = write(ofd, buf, bytes);
-                if (w <= 0) {
-                        bsdar_warnc(bsdar, errno, "write failed");
-                        break;
-                }
-        }
-        if (munmap(p, sb.st_size) < 0)
-                bsdar_errc(bsdar, errno, "munmap failed");
-        if (bytes > 0)
-                return (1);
-
-        return (0);
 }