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

Make olstat() consistent with lstat() - so they both return the same

Browse Source 
owner..

Submitted by:	Kirk McKusick
This commit is contained in:
David Greenman 1994-09-02 04:14:44 +00:00
parent 2c7a40c7ca
commit 2fc62994a0
2 changed files with 74 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
sys/kern/vfs_extattr.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94
* $Id: vfs_syscalls.c,v 1.3 1994/08/02 07:43:31 davidg Exp $ * $Id: vfs_syscalls.c,v 1.4 1994/08/20 16:03:14 davidg Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -1096,18 +1096,48 @@ olstat(p, uap, retval)
register struct olstat_args *uap; register struct olstat_args *uap;
int *retval; int *retval;
{ {
struct stat sb; struct vnode *vp, *dvp;
struct stat sb, sb1;
struct ostat osb; struct ostat osb;
int error; int error;
struct nameidata nd; struct nameidata nd;
NDINIT(&nd, LOOKUP, NOFOLLOW | LOCKLEAF, UIO_USERSPACE, uap->path, p); NDINIT(&nd, LOOKUP, NOFOLLOW | LOCKLEAF | LOCKPARENT, UIO_USERSPACE,
uap->path, p);
if (error = namei(&nd)) if (error = namei(&nd))
return (error); return (error);
error = vn_stat(nd.ni_vp, &sb, p); /*
vput(nd.ni_vp); * For symbolic links, always return the attributes of its
if (error) * containing directory, except for mode, size, and links.
return (error); */
vp = nd.ni_vp;
dvp = nd.ni_dvp;
if (vp->v_type != VLNK) {
if (dvp == vp)
vrele(dvp);
else
vput(dvp);
error = vn_stat(vp, &sb, p);
vput(vp);
if (error)
return (error);
} else {
error = vn_stat(dvp, &sb, p);
vput(dvp);
if (error) {
vput(vp);
return (error);
}
error = vn_stat(vp, &sb1, p);
vput(vp);
if (error)
return (error);
sb.st_mode &= ~S_IFDIR;
sb.st_mode |= S_IFLNK;
sb.st_nlink = sb1.st_nlink;
sb.st_size = sb1.st_size;
sb.st_blocks = sb1.st_blocks;
}
cvtstat(&sb, &osb); cvtstat(&sb, &osb);
error = copyout((caddr_t)&osb, (caddr_t)uap->ub, sizeof (osb)); error = copyout((caddr_t)&osb, (caddr_t)uap->ub, sizeof (osb));
return (error); return (error);

44
sys/kern/vfs_syscalls.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94
* $Id: vfs_syscalls.c,v 1.3 1994/08/02 07:43:31 davidg Exp $ * $Id: vfs_syscalls.c,v 1.4 1994/08/20 16:03:14 davidg Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -1096,18 +1096,48 @@ olstat(p, uap, retval)
register struct olstat_args *uap; register struct olstat_args *uap;
int *retval; int *retval;
{ {
struct stat sb; struct vnode *vp, *dvp;
struct stat sb, sb1;
struct ostat osb; struct ostat osb;
int error; int error;
struct nameidata nd; struct nameidata nd;
NDINIT(&nd, LOOKUP, NOFOLLOW | LOCKLEAF, UIO_USERSPACE, uap->path, p); NDINIT(&nd, LOOKUP, NOFOLLOW | LOCKLEAF | LOCKPARENT, UIO_USERSPACE,
uap->path, p);
if (error = namei(&nd)) if (error = namei(&nd))
return (error); return (error);
error = vn_stat(nd.ni_vp, &sb, p); /*
vput(nd.ni_vp); * For symbolic links, always return the attributes of its
if (error) * containing directory, except for mode, size, and links.
return (error); */
vp = nd.ni_vp;
dvp = nd.ni_dvp;
if (vp->v_type != VLNK) {
if (dvp == vp)
vrele(dvp);
else
vput(dvp);
error = vn_stat(vp, &sb, p);
vput(vp);
if (error)
return (error);
} else {
error = vn_stat(dvp, &sb, p);
vput(dvp);
if (error) {
vput(vp);
return (error);
}
error = vn_stat(vp, &sb1, p);
vput(vp);
if (error)
return (error);
sb.st_mode &= ~S_IFDIR;
sb.st_mode |= S_IFLNK;
sb.st_nlink = sb1.st_nlink;
sb.st_size = sb1.st_size;
sb.st_blocks = sb1.st_blocks;
}
cvtstat(&sb, &osb); cvtstat(&sb, &osb);
error = copyout((caddr_t)&osb, (caddr_t)uap->ub, sizeof (osb)); error = copyout((caddr_t)&osb, (caddr_t)uap->ub, sizeof (osb));
return (error); return (error);