d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Back out the change in rev.1.4 and fix the formatting of the change

Browse Source 
in rev.1.3.  1.4 just broke 1.3 for the -x case.

This fixes PR 721 and merges archive.c with 4.4Lite2.
This commit is contained in:
Bruce Evans 1995-09-18 18:37:09 +00:00
parent 5326bef3de
commit e475c1dd26
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=10884
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usr.bin/ar/archive.c
View File

@ -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);