From ece4edb7ad8fb0590aedf068ffaf7f502d03ac32 Mon Sep 17 00:00:00 2001 From: kaiw Date: Sat, 7 May 2011 10:23:07 +0000 Subject: [PATCH] MFC r208189: Removed ar(1)'s support for compressed archives. This change removes ar(1)'s dependencies on compressor libraries -lz, -lbz2 and -llzma and fixes building HEAD on some versions of FreeBSD[78]. Option -j and -z is now accepted but ignored. Compressed ar(1) archives are not useful without a ld(1) that can read them. Also, the current ar(1) compression scheme prevents random access of archive members and needs to be redesigned anyway. git-svn-id: svn://svn.freebsd.org/base/stable/8@221587 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- usr.bin/ar/Makefile | 11 ++--------- usr.bin/ar/acpyacc.y | 2 +- usr.bin/ar/ar.1 | 8 +++----- usr.bin/ar/ar.c | 4 ++-- usr.bin/ar/ar.h | 1 - usr.bin/ar/read.c | 2 +- usr.bin/ar/write.c | 30 ++---------------------------- 7 files changed, 11 insertions(+), 47 deletions(-) diff --git a/usr.bin/ar/Makefile b/usr.bin/ar/Makefile index b0c5044c9..e79be4f72 100644 --- a/usr.bin/ar/Makefile +++ b/usr.bin/ar/Makefile @@ -5,15 +5,8 @@ SRCS= ar.c acplex.l acpyacc.y read.c util.c write.c y.tab.h WARNS?= 5 -DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBELF} -LDADD= -larchive -lbz2 -lz -lelf - -# Do not depend on liblzma if we are building the bootstrap-tools and -# the local system doesn't include liblzma -.if !defined(BOOTSTRAPPING) || ${BOOTSTRAPPING} >= 800505 -DPADD+= ${LIBLZMA} -LDADD+= -llzma -.endif +DPADD= ${LIBARCHIVE} ${LIBELF} +LDADD= -larchive -lelf CFLAGS+=-I. -I${.CURDIR} diff --git a/usr.bin/ar/acpyacc.y b/usr.bin/ar/acpyacc.y index 686bbe27a..038988214 100644 --- a/usr.bin/ar/acpyacc.y +++ b/usr.bin/ar/acpyacc.y @@ -250,7 +250,7 @@ arscp_open(char *fname) if ((a = archive_read_new()) == NULL) bsdar_errc(bsdar, EX_SOFTWARE, 0, "archive_read_new failed"); - archive_read_support_compression_all(a); + archive_read_support_compression_none(a); archive_read_support_format_ar(a); AC(archive_read_open_file(a, fname, DEF_BLKSZ)); if ((r = archive_read_next_header(a, &entry))) diff --git a/usr.bin/ar/ar.1 b/usr.bin/ar/ar.1 index 743cab2ea..3a8b75373 100644 --- a/usr.bin/ar/ar.1 +++ b/usr.bin/ar/ar.1 @@ -23,7 +23,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 31, 2007 +.Dd May 17, 2010 .Dt AR 1 .Os .Sh NAME @@ -186,8 +186,7 @@ Synonymous with option Synonymous with option .Fl b . .It Fl j -Compress the resulting archive with -.Xr bzip2 1 . +This option is accepted but ignored. .It Fl m Move archive members specified by arguments .Ar files ... @@ -344,8 +343,7 @@ of extraction unless the .Fl o option was specified. .It Fl z -Compress the resulting archive with -.Xr gzip 1 . +This option is accepted but ignored. .El .Sh EXAMPLES To create a new archive diff --git a/usr.bin/ar/ar.c b/usr.bin/ar/ar.c index 35a0380e3..ef80eac0a 100644 --- a/usr.bin/ar/ar.c +++ b/usr.bin/ar/ar.c @@ -178,7 +178,7 @@ main(int argc, char **argv) bsdar->options |= AR_TR; break; case 'j': - bsdar->options |= AR_J; + /* ignored */ break; case 'l': /* ignored, for GNU ar comptibility */ @@ -223,7 +223,7 @@ main(int argc, char **argv) set_mode(bsdar, opt); break; case 'z': - bsdar->options |= AR_Z; + /* ignored */ break; case OPTION_HELP: bsdar_usage(); diff --git a/usr.bin/ar/ar.h b/usr.bin/ar/ar.h index 111f944a8..60fe8e8ef 100644 --- a/usr.bin/ar/ar.h +++ b/usr.bin/ar/ar.h @@ -81,7 +81,6 @@ struct bsdar { const char *addlib; /* target of ADDLIB. */ const char *posarg; /* position arg for modifiers -a, -b. */ char mode; /* program mode */ - char compression; /* compression mode */ int options; /* command line options */ const char *progname; /* program name */ diff --git a/usr.bin/ar/read.c b/usr.bin/ar/read.c index 37bd0a189..8df170dc4 100644 --- a/usr.bin/ar/read.c +++ b/usr.bin/ar/read.c @@ -87,7 +87,7 @@ read_archive(struct bsdar *bsdar, char mode) if ((a = archive_read_new()) == NULL) bsdar_errc(bsdar, EX_SOFTWARE, 0, "archive_read_new failed"); - archive_read_support_compression_all(a); + archive_read_support_compression_none(a); archive_read_support_format_ar(a); AC(archive_read_open_file(a, bsdar->filename, DEF_BLKSZ)); diff --git a/usr.bin/ar/write.c b/usr.bin/ar/write.c index 3d4f93d9a..8b6fbdf5a 100644 --- a/usr.bin/ar/write.c +++ b/usr.bin/ar/write.c @@ -247,7 +247,7 @@ read_objs(struct bsdar *bsdar, const char *archive, int checkargv) if ((a = archive_read_new()) == NULL) bsdar_errc(bsdar, EX_SOFTWARE, 0, "archive_read_new failed"); - archive_read_support_compression_all(a); + archive_read_support_compression_none(a); archive_read_support_format_ar(a); AC(archive_read_open_filename(a, archive, DEF_BLKSZ)); for (;;) { @@ -264,13 +264,6 @@ read_objs(struct bsdar *bsdar, const char *archive, int checkargv) continue; } - /* - * Remember the compression mode of existing archive. - * If neither -j nor -z is specified, this mode will - * be used for resulting archive. - */ - bsdar->compression = archive_compression(a); - name = archive_entry_pathname(entry); /* @@ -360,9 +353,6 @@ write_archive(struct bsdar *bsdar, char mode) pos = NULL; memset(&sb, 0, sizeof(sb)); - /* By default, no compression is assumed. */ - bsdar->compression = ARCHIVE_COMPRESSION_NONE; - /* * Test if the specified archive exists, to figure out * whether we are creating one here. @@ -618,23 +608,7 @@ write_objs(struct bsdar *bsdar) bsdar_errc(bsdar, EX_SOFTWARE, 0, "archive_write_new failed"); archive_write_set_format_ar_svr4(a); - - /* The compression mode of the existing archive is used - * for the result archive or if creating a new archive, we - * do not compress archive by default. This default behavior can - * be overrided by compression mode specified explicitly - * through command line option `-j' or `-z'. - */ - if (bsdar->options & AR_J) - bsdar->compression = ARCHIVE_COMPRESSION_BZIP2; - if (bsdar->options & AR_Z) - bsdar->compression = ARCHIVE_COMPRESSION_GZIP; - if (bsdar->compression == ARCHIVE_COMPRESSION_BZIP2) - archive_write_set_compression_bzip2(a); - else if (bsdar->compression == ARCHIVE_COMPRESSION_GZIP) - archive_write_set_compression_gzip(a); - else - archive_write_set_compression_none(a); + archive_write_set_compression_none(a); AC(archive_write_open_filename(a, bsdar->filename)); -- 2.45.0