mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-21 01:03:42 +00:00
Back out the change in rev.1.4 and fix the formatting of the change
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:
parent
5326bef3de
commit
e475c1dd26
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=10884
|
@ -276,7 +276,6 @@ copy_ar(cfp, size)
|
||||||
CF *cfp;
|
CF *cfp;
|
||||||
off_t size;
|
off_t size;
|
||||||
{
|
{
|
||||||
int pad_odd_read;
|
|
||||||
static char pad = '\n';
|
static char pad = '\n';
|
||||||
off_t sz;
|
off_t sz;
|
||||||
int from, nr, nw, off, to;
|
int from, nr, nw, off, to;
|
||||||
|
@ -300,12 +299,8 @@ copy_ar(cfp, size)
|
||||||
error(cfp->rname);
|
error(cfp->rname);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (already_written)
|
if (cfp->flags & RPAD && (size + chdr.lname) & 1 &&
|
||||||
pad_odd_read = (cfp->flags & RPAD) && ((size + chdr.lname) & 1);
|
(nr = read(from, buf, 1)) != 1) {
|
||||||
else
|
|
||||||
pad_odd_read = (cfp->flags & RPAD) && (size & 1);
|
|
||||||
|
|
||||||
if (pad_odd_read && (nr = read(from, buf, 1)) != 1) {
|
|
||||||
if (nr == 0)
|
if (nr == 0)
|
||||||
badfmt();
|
badfmt();
|
||||||
error(cfp->rname);
|
error(cfp->rname);
|
||||||
|
|
Loading…
Reference in a new issue