Address a few minor style and consistency issues in revision 1.32.
Submitted by: Joshua Goodall <joshua@roughtrade.net>
This commit is contained in:
parent
d204693572
commit
a255f2f8fa
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=96113
@ -529,6 +529,8 @@ int
|
||||
extractfile(char *name)
|
||||
{
|
||||
int flags;
|
||||
uid_t uid;
|
||||
gid_t gid;
|
||||
mode_t mode;
|
||||
struct timeval timep[2];
|
||||
struct entry *ep;
|
||||
@ -539,6 +541,8 @@ extractfile(char *name)
|
||||
timep[0].tv_usec = curfile.dip->di_atimensec / 1000;
|
||||
timep[1].tv_sec = curfile.dip->di_mtime;
|
||||
timep[1].tv_usec = curfile.dip->di_mtimensec / 1000;
|
||||
uid = curfile.dip->di_uid;
|
||||
gid = curfile.dip->di_gid;
|
||||
mode = curfile.dip->di_mode;
|
||||
flags = curfile.dip->di_flags;
|
||||
switch (mode & IFMT) {
|
||||
@ -565,14 +569,6 @@ extractfile(char *name)
|
||||
return (genliteraldir(name, curfile.ino));
|
||||
|
||||
case IFLNK:
|
||||
{
|
||||
uid_t uid;
|
||||
gid_t gid;
|
||||
int ret;
|
||||
|
||||
uid = curfile.dip->di_uid;
|
||||
gid = curfile.dip->di_gid;
|
||||
|
||||
lnkbuf[0] = '\0';
|
||||
pathlen = 0;
|
||||
getfile(xtrlnkfile, xtrlnkskip);
|
||||
@ -581,17 +577,13 @@ extractfile(char *name)
|
||||
"%s: zero length symbolic link (ignored)\n", name);
|
||||
return (GOOD);
|
||||
}
|
||||
ret = linkit(lnkbuf, name, SYMLINK);
|
||||
if (ret == GOOD) {
|
||||
if (lchown(name, uid, gid))
|
||||
perror(name);
|
||||
if (lchmod(name, mode))
|
||||
perror(name);
|
||||
lutimes(name, timep);
|
||||
}
|
||||
/* symbolic link doesn't have any flags */
|
||||
return (ret);
|
||||
if (linkit(lnkbuf, name, SYMLINK) == GOOD) {
|
||||
(void) lchown(name, uid, gid);
|
||||
(void) lchmod(name, mode);
|
||||
(void) lutimes(name, timep);
|
||||
return (GOOD);
|
||||
}
|
||||
return (FAIL);
|
||||
|
||||
case IFIFO:
|
||||
vprintf(stdout, "extract fifo %s\n", name);
|
||||
@ -607,9 +599,9 @@ extractfile(char *name)
|
||||
skipfile();
|
||||
return (FAIL);
|
||||
}
|
||||
(void) chown(name, curfile.dip->di_uid, curfile.dip->di_gid);
|
||||
(void) chown(name, uid, gid);
|
||||
(void) chmod(name, mode);
|
||||
utimes(name, timep);
|
||||
(void) utimes(name, timep);
|
||||
(void) chflags(name, flags);
|
||||
skipfile();
|
||||
return (GOOD);
|
||||
@ -629,9 +621,9 @@ extractfile(char *name)
|
||||
skipfile();
|
||||
return (FAIL);
|
||||
}
|
||||
(void) chown(name, curfile.dip->di_uid, curfile.dip->di_gid);
|
||||
(void) chown(name, uid, gid);
|
||||
(void) chmod(name, mode);
|
||||
utimes(name, timep);
|
||||
(void) utimes(name, timep);
|
||||
(void) chflags(name, flags);
|
||||
skipfile();
|
||||
return (GOOD);
|
||||
@ -651,7 +643,7 @@ extractfile(char *name)
|
||||
skipfile();
|
||||
return (FAIL);
|
||||
}
|
||||
(void) fchown(ofile, curfile.dip->di_uid, curfile.dip->di_gid);
|
||||
(void) fchown(ofile, uid, gid);
|
||||
(void) fchmod(ofile, mode);
|
||||
getfile(xtrfile, xtrskip);
|
||||
(void) close(ofile);
|
||||
|
Loading…
Reference in New Issue
Block a user