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

Backed out lseek changes.

Browse Source
This commit is contained in:
Dag-Erling Smørgrav 1998-04-19 22:20:32 +00:00
parent 9feab75ab7
commit 59bad7c53b
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libc/sys/lseek.2
View File

@ -120,7 +120,7 @@ is not an open file descriptor.
is associated with a pipe, socket, or FIFO.
.It Bq Er EINVAL
.Fa Whence
is not a proper value, or the resulting offset is negative.
is not a proper value.
.El
.Sh SEE ALSO
.Xr dup 2 ,

10
sys/kern/vfs_extattr.c
View File

@ -1324,7 +1324,6 @@ lseek(p, uap)
register struct filedesc *fdp = p->p_fd;
register struct file *fp;
struct vattr vattr;
off_t ofs;
int error;
if ((u_int)SCARG(uap, fd) >= fdp->fd_nfiles ||
@ -1334,22 +1333,21 @@ lseek(p, uap)
return (ESPIPE);
switch (SCARG(uap, whence)) {
case L_INCR:
ofs = fp->f_offset + SCARG(uap, offset);
fp->f_offset += SCARG(uap, offset);
break;
case L_XTND:
error=VOP_GETATTR((struct vnode *)fp->f_data, &vattr, cred, p);
if (error)
return (error);
ofs = SCARG(uap, offset) + vattr.va_size;
fp->f_offset = SCARG(uap, offset) + vattr.va_size;
break;
case L_SET:
ofs = SCARG(uap, offset);
fp->f_offset = SCARG(uap, offset);
break;
default:
return (EINVAL);
}
if (ofs < 0) return (EINVAL);
*(off_t *)(p->p_retval) = fp->f_offset = ofs;
*(off_t *)(p->p_retval) = fp->f_offset;
return (0);
}

10
sys/kern/vfs_syscalls.c
View File

@ -1324,7 +1324,6 @@ lseek(p, uap)
register struct filedesc *fdp = p->p_fd;
register struct file *fp;
struct vattr vattr;
off_t ofs;
int error;
if ((u_int)SCARG(uap, fd) >= fdp->fd_nfiles ||
@ -1334,22 +1333,21 @@ lseek(p, uap)
return (ESPIPE);
switch (SCARG(uap, whence)) {
case L_INCR:
ofs = fp->f_offset + SCARG(uap, offset);
fp->f_offset += SCARG(uap, offset);
break;
case L_XTND:
error=VOP_GETATTR((struct vnode *)fp->f_data, &vattr, cred, p);
if (error)
return (error);
ofs = SCARG(uap, offset) + vattr.va_size;
fp->f_offset = SCARG(uap, offset) + vattr.va_size;
break;
case L_SET:
ofs = SCARG(uap, offset);
fp->f_offset = SCARG(uap, offset);
break;
default:
return (EINVAL);
}
if (ofs < 0) return (EINVAL);
*(off_t *)(p->p_retval) = fp->f_offset = ofs;
*(off_t *)(p->p_retval) = fp->f_offset;
return (0);
}