[Midnightbsd-cvs] src [6875] trunk/usr.bin/ar: link ar against libz

[laffer1 at midnightbsd.org]

Revision: 6875
          http://svnweb.midnightbsd.org/src/?rev=6875
Author:   laffer1
Date:     2014-10-15 21:24:08 -0400 (Wed, 15 Oct 2014)
Log Message:
-----------
link ar against libz

Modified Paths:
--------------
    trunk/usr.bin/ar/Makefile
    trunk/usr.bin/ar/acplex.l
    trunk/usr.bin/ar/acpyacc.y
    trunk/usr.bin/ar/ar.h
    trunk/usr.bin/ar/read.c
    trunk/usr.bin/ar/write.c

Modified: trunk/usr.bin/ar/Makefile
===================================================================
--- trunk/usr.bin/ar/Makefile	2014-10-12 20:52:13 UTC (rev 6874)
+++ trunk/usr.bin/ar/Makefile	2014-10-16 01:24:08 UTC (rev 6875)
@@ -5,9 +5,11 @@
 PROG=	ar
 SRCS=	ar.c acplex.l acpyacc.y read.c util.c write.c y.tab.h
 
-DPADD=	${LIBARCHIVE} ${LIBELF}
-LDADD=	-larchive -lelf
+DPADD=	${LIBARCHIVE} ${LIBELF} ${LIBZ}
+LDADD=	-larchive -lelf -lz
 
+NO_WMISSING_VARIABLE_DECLARATIONS=
+
 CFLAGS+=-I. -I${.CURDIR}
 
 .if ${MK_SHARED_TOOLCHAIN} == "no"

Modified: trunk/usr.bin/ar/acplex.l
===================================================================
--- trunk/usr.bin/ar/acplex.l	2014-10-12 20:52:13 UTC (rev 6874)
+++ trunk/usr.bin/ar/acplex.l	2014-10-16 01:24:08 UTC (rev 6875)
@@ -36,14 +36,16 @@
 
 #include "y.tab.h"
 
-#define YY_NO_UNPUT
-#define YY_NO_INPUT
 int lineno = 1;
 
 int	yylex(void);
 
+#define	YY_DECL	int yylex(void)
+
 %}
 
+%option nounput
+%option noinput
 %option noyywrap
 
 %%

Modified: trunk/usr.bin/ar/acpyacc.y
===================================================================
--- trunk/usr.bin/ar/acpyacc.y	2014-10-12 20:52:13 UTC (rev 6874)
+++ trunk/usr.bin/ar/acpyacc.y	2014-10-16 01:24:08 UTC (rev 6875)
@@ -250,13 +250,12 @@
 
 	if ((a = archive_read_new()) == NULL)
 		bsdar_errc(bsdar, EX_SOFTWARE, 0, "archive_read_new failed");
-	archive_read_support_compression_none(a);
 	archive_read_support_format_ar(a);
-	AC(archive_read_open_file(a, fname, DEF_BLKSZ));
+	AC(archive_read_open_filename(a, fname, DEF_BLKSZ));
 	if ((r = archive_read_next_header(a, &entry)))
 		bsdar_warnc(bsdar, 0, "%s", archive_error_string(a));
 	AC(archive_read_close(a));
-	AC(archive_read_finish(a));
+	AC(archive_read_free(a));
 	if (r != ARCHIVE_OK)
 		return;
 	arscp_create(fname, fname);
@@ -312,7 +311,7 @@
 		archive_write_set_format_ar_svr4(a);
 		AC(archive_write_open_fd(a, ofd));
 		AC(archive_write_close(a));
-		AC(archive_write_finish(a));
+		AC(archive_write_free(a));
 	}
 
 	/* Override previous target, if any. */

Modified: trunk/usr.bin/ar/ar.h
===================================================================
--- trunk/usr.bin/ar/ar.h	2014-10-12 20:52:13 UTC (rev 6874)
+++ trunk/usr.bin/ar/ar.h	2014-10-16 01:24:08 UTC (rev 6875)
@@ -111,7 +111,7 @@
 };
 
 void	bsdar_errc(struct bsdar *, int _eval, int _code,
-	    const char *fmt, ...);
+	    const char *fmt, ...) __dead2;
 void	bsdar_warnc(struct bsdar *, int _code, const char *fmt, ...);
 void	ar_mode_d(struct bsdar *bsdar);
 void	ar_mode_m(struct bsdar *bsdar);

Modified: trunk/usr.bin/ar/read.c
===================================================================
--- trunk/usr.bin/ar/read.c	2014-10-12 20:52:13 UTC (rev 6874)
+++ trunk/usr.bin/ar/read.c	2014-10-16 01:24:08 UTC (rev 6875)
@@ -87,9 +87,8 @@
 
 	if ((a = archive_read_new()) == NULL)
 		bsdar_errc(bsdar, EX_SOFTWARE, 0, "archive_read_new failed");
-	archive_read_support_compression_none(a);
 	archive_read_support_format_ar(a);
-	AC(archive_read_open_file(a, bsdar->filename, DEF_BLKSZ));
+	AC(archive_read_open_filename(a, bsdar->filename, DEF_BLKSZ));
 
 	for (;;) {
 		r = archive_read_next_header(a, &entry);
@@ -200,5 +199,5 @@
 		}
 	}
 	AC(archive_read_close(a));
-	AC(archive_read_finish(a));
+	AC(archive_read_free(a));
 }

Modified: trunk/usr.bin/ar/write.c
===================================================================
--- trunk/usr.bin/ar/write.c	2014-10-12 20:52:13 UTC (rev 6874)
+++ trunk/usr.bin/ar/write.c	2014-10-16 01:24:08 UTC (rev 6875)
@@ -277,7 +277,6 @@
 
 	if ((a = archive_read_new()) == NULL)
 		bsdar_errc(bsdar, EX_SOFTWARE, 0, "archive_read_new failed");
-	archive_read_support_compression_none(a);
 	archive_read_support_format_ar(a);
 	AC(archive_read_open_filename(a, archive, DEF_BLKSZ));
 	for (;;) {
@@ -363,7 +362,7 @@
 		TAILQ_INSERT_TAIL(&bsdar->v_obj, obj, objs);
 	}
 	AC(archive_read_close(a));
-	AC(archive_read_finish(a));
+	AC(archive_read_free(a));
 }
 
 /*
@@ -628,7 +627,6 @@
 		bsdar_errc(bsdar, EX_SOFTWARE, 0, "archive_write_new failed");
 
 	archive_write_set_format_ar_svr4(a);
-	archive_write_set_compression_none(a);
 
 	AC(archive_write_open_filename(a, bsdar->filename));
 
@@ -682,7 +680,7 @@
 	}
 
 	AC(archive_write_close(a));
-	AC(archive_write_finish(a));
+	AC(archive_write_free(a));
 }
 
 /*