aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/ar
diff options
context:
space:
mode:
authorBruce Evans <bde@FreeBSD.org>1995-09-18 18:37:09 +0000
committerBruce Evans <bde@FreeBSD.org>1995-09-18 18:37:09 +0000
commite475c1dd2605b29dc2bd929857042181ec1f45cf (patch)
treef9eab6c51186b05a0604dea0f92c956e1bc3fadb /usr.bin/ar
parent5326bef3dea504bf1e33213fdca6903b39e0a8bc (diff)
Notes
Diffstat (limited to 'usr.bin/ar')
-rw-r--r--usr.bin/ar/archive.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/usr.bin/ar/archive.c b/usr.bin/ar/archive.c
index ddd9f8648215c..021e13131adf0 100644
--- a/usr.bin/ar/archive.c
+++ b/usr.bin/ar/archive.c
@@ -276,7 +276,6 @@ copy_ar(cfp, size)
CF *cfp;
off_t size;
{
- int pad_odd_read;
static char pad = '\n';
off_t sz;
int from, nr, nw, off, to;
@@ -300,12 +299,8 @@ copy_ar(cfp, size)
error(cfp->rname);
}
- if (already_written)
- pad_odd_read = (cfp->flags & RPAD) && ((size + chdr.lname) & 1);
- else
- pad_odd_read = (cfp->flags & RPAD) && (size & 1);
-
- if (pad_odd_read && (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);