X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/ed554bc5e4201344d7eaad78263566e79428759c..fd88f5c5678c80ff5e338adc372d28a52ad20530:/usr/src/usr.bin/ar/archive.c

diff --git a/usr/src/usr.bin/ar/archive.c b/usr/src/usr.bin/ar/archive.c
index 10897d9dfa..9dd6b2077f 100644
--- a/usr/src/usr.bin/ar/archive.c
+++ b/usr/src/usr.bin/ar/archive.c
@@ -35,7 +35,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)archive.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)archive.c	8.4 (Berkeley) 4/27/95";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -221,7 +221,7 @@ put_arobj(cfp, sb)
 		if (options & AR_TR) {
 			if (lname > OLDARMAXNAME) {
 				(void)fflush(stdout);
-				warnx("warning: %s truncated to %.*s\n",
+				warnx("warning: %s truncated to %.*s",
 				    name, OLDARMAXNAME, name);
 				(void)fflush(stderr);
 			}
@@ -299,7 +299,8 @@ copy_ar(cfp, size)
 		error(cfp->rname);
 	}
 
-	if (cfp->flags & RPAD && size & 1 && (nr = read(from, buf, 1)) != 1) {
+	if (cfp->flags & RPAD && (size + chdr.lname) & 1 &&
+	    (nr = read(from, buf, 1)) != 1) {
 		if (nr == 0)
 			badfmt();
 		error(cfp->rname);