emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch from Matt Kraai <kraai@alumni.carnegiemellon.edu> to

Browse Source 
simplify ar.c and make it more readable.
 -Erik
This commit is contained in:
Eric Andersen 2000-07-05 17:21:58 +00:00
parent 2086e3d679
commit 57ebebfb01
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ar.c
View File

@ -35,11 +35,11 @@
#include "internal.h" #include "internal.h"
#define AR_BLOCK_SIZE 60 #define AR_BLOCK_SIZE 60
#define AR_PRESERVE_DATE 1 #define AR_PRESERVE_DATE 1 /* preserve original dates */
#define AR_VERBOSE 2 #define AR_VERBOSE 2 /* be verbose */
#define AR_DISPLAY 4 #define AR_DISPLAY 4 /* display contents */
#define AR_EXT_TO_FILE 8 #define AR_EXT_TO_FILE 8 /* extract contents of archive */
#define AR_EXT_TO_STDOUT 16 #define AR_EXT_TO_STDOUT 16 /* extract to stdout */
#define BB_DECLARE_EXTERN #define BB_DECLARE_EXTERN
#define bb_need_io_error #define bb_need_io_error
@ -302,20 +302,20 @@ extern int ar_main(int argc, char **argv)
++opt_ptr; ++opt_ptr;
while ((c = *opt_ptr++) != '\0') { while ((c = *opt_ptr++) != '\0') {
switch (c) { switch (c) {
case 'o': /* preserver original dates */ case 'o':
funct = funct | 1; funct = funct | AR_PRESERVE_DATE;
break; break;
case 'p': /* extract to stdout */ case 'v':
funct = funct | 16; funct = funct | AR_VERBOSE;
break; break;
case 't': /* display contents */ case 't':
funct = funct | 4; funct = funct | AR_DISPLAY;
break; break;
case 'x': /* extract contents of archive */ case 'x':
funct = funct | 8; funct = funct | AR_EXT_TO_FILE;
break; break;
case 'v': /* be verbose */ case 'p':
funct = funct | 2; funct = funct | AR_EXT_TO_STDOUT;
break; break;
default: default:
usage(ar_usage); usage(ar_usage);

30
archival/ar.c
View File

@ -35,11 +35,11 @@
#include "internal.h" #include "internal.h"
#define AR_BLOCK_SIZE 60 #define AR_BLOCK_SIZE 60
#define AR_PRESERVE_DATE 1 #define AR_PRESERVE_DATE 1 /* preserve original dates */
#define AR_VERBOSE 2 #define AR_VERBOSE 2 /* be verbose */
#define AR_DISPLAY 4 #define AR_DISPLAY 4 /* display contents */
#define AR_EXT_TO_FILE 8 #define AR_EXT_TO_FILE 8 /* extract contents of archive */
#define AR_EXT_TO_STDOUT 16 #define AR_EXT_TO_STDOUT 16 /* extract to stdout */
#define BB_DECLARE_EXTERN #define BB_DECLARE_EXTERN
#define bb_need_io_error #define bb_need_io_error
@ -302,20 +302,20 @@ extern int ar_main(int argc, char **argv)
++opt_ptr; ++opt_ptr;
while ((c = *opt_ptr++) != '\0') { while ((c = *opt_ptr++) != '\0') {
switch (c) { switch (c) {
case 'o': /* preserver original dates */ case 'o':
funct = funct | 1; funct = funct | AR_PRESERVE_DATE;
break; break;
case 'p': /* extract to stdout */ case 'v':
funct = funct | 16; funct = funct | AR_VERBOSE;
break; break;
case 't': /* display contents */ case 't':
funct = funct | 4; funct = funct | AR_DISPLAY;
break; break;
case 'x': /* extract contents of archive */ case 'x':
funct = funct | 8; funct = funct | AR_EXT_TO_FILE;
break; break;
case 'v': /* be verbose */ case 'p':
funct = funct | 2; funct = funct | AR_EXT_TO_STDOUT;
break; break;
default: default:
usage(ar_usage); usage(ar_usage);