Changed bb_regcomp to xregcomp and #if 0'ed out destroy_cmd_strs in sed.c

[oweals/busybox.git] / ar.c

diff --git a/ar.c b/ar.c
index e58b7395ddfd0504578fd09f3c232d66ae4020f6..a43cc1dffa87f230ada949f0b857638a9ec69d5d 100644 (file)
--- a/ar.c
+++ b/ar.c
@@ -35,11 +35,11 @@
 #include "internal.h"
 
 #define AR_BLOCK_SIZE 60
-#define AR_PRESERVE_DATE 1
-#define AR_VERBOSE       2
-#define AR_DISPLAY       4
-#define AR_EXT_TO_FILE   8
-#define AR_EXT_TO_STDOUT 16
+#define AR_PRESERVE_DATE 1     /* preserve original dates */
+#define AR_VERBOSE       2     /* be verbose */
+#define AR_DISPLAY       4     /* display contents */
+#define AR_EXT_TO_FILE   8     /* extract contents of archive */
+#define AR_EXT_TO_STDOUT 16    /* extract to stdout */
 
 #define BB_DECLARE_EXTERN
 #define bb_need_io_error
@@ -158,12 +158,12 @@ static int copySubFile(int srcFd, int dstFd, int copySize)
                        readSize = copySize;
                writeSize = fullRead(srcFd, buffer, readSize);
                if (writeSize <= 0) {
-                       errorMsg(io_error, "copySubFile :", strerror(errno));
+                       errorMsg(io_error, "copySubFile", strerror(errno));
                        return (FALSE);
                }
                doneSize = fullWrite(dstFd, buffer, writeSize);
                if (doneSize <= 0) {
-                       errorMsg(io_error, "copySubFile :", strerror(errno));
+                       errorMsg(io_error, "copySubFile", strerror(errno));
                        return (FALSE);
                }
                copySize -= doneSize;
@@ -220,7 +220,7 @@ static int getArFd(char *filename)
                return (FALSE);
        }
         if (fullRead(arFd, arVersion, 8) <= 0) {
-                errorMsg( "ar: Unexpected EOF in archive\n");
+                errorMsg( "Unexpected EOF in archive\n");
                 return (FALSE);
         }
         if (strncmp(arVersion,"!<arch>",7) != 0) {
@@ -302,20 +302,20 @@ extern int ar_main(int argc, char **argv)
                ++opt_ptr;
        while ((c = *opt_ptr++) != '\0') {
                switch (c) {
-               case 'o':                               /* preserver original dates */
-                       funct = funct | 1;
+               case 'o':
+                       funct = funct | AR_PRESERVE_DATE;
                        break;
-               case 'p':                               /* extract to stdout */
-                       funct = funct | 16;
+               case 'v':
+                       funct = funct | AR_VERBOSE;
                        break;
-               case 't':                               /* display contents */
-                       funct = funct | 4;
+               case 't':
+                       funct = funct | AR_DISPLAY;
                        break;
-               case 'x':                               /* extract contents of archive */
-                       funct = funct | 8;
+               case 'x':
+                       funct = funct | AR_EXT_TO_FILE;
                        break;
-               case 'v':                               /* be verbose */
-                       funct = funct | 2;
+               case 'p':
+                       funct = funct | AR_EXT_TO_STDOUT;
                        break;
                default:
                        usage(ar_usage);