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

Fix the getdents() emulation, the Linux ELF libraries use this, and

Browse Source 
this code was not quite right (linux has a readdir and getdents syscall,
with the same args. readdir only returns one entry and uses a mutant
dirent structure.  This code was also returning the mutant form for
getdents as well.  My fault for missing this before.)
This commit is contained in:
peter 1996-03-10 22:27:51 +00:00
parent a8eb1245c4
commit abd3e18f4a
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/compat/linux/linux_file.c
View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: linux_file.c,v 1.5 1995/12/15 03:06:50 peter Exp $
* $Id: linux_file.c,v 1.6 1996/03/02 19:37:53 peter Exp $
*/
#include <sys/param.h>
@ -497,8 +497,16 @@ linux_getdents(struct proc *p, struct linux_getdents_args *args, int *retval)
break;
}
linux_dirent.dino = (long) bdp->d_fileno;
linux_dirent.doff = (linux_off_t) linuxreclen;
linux_dirent.dreclen = (u_short) bdp->d_namlen;
if (justone) {
/*
* old linux-style readdir usage.
*/
linux_dirent.doff = (linux_off_t) linuxreclen;
linux_dirent.dreclen = (u_short) bdp->d_namlen;
} else {
linux_dirent.doff = (linux_off_t) off;
linux_dirent.dreclen = (u_short) linuxreclen;
}
strcpy(linux_dirent.dname, bdp->d_name);
if ((error = copyout((caddr_t)&linux_dirent, outp, linuxreclen))) {
goto out;

14
sys/i386/linux/linux_file.c
View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: linux_file.c,v 1.5 1995/12/15 03:06:50 peter Exp $
* $Id: linux_file.c,v 1.6 1996/03/02 19:37:53 peter Exp $
*/
#include <sys/param.h>
@ -497,8 +497,16 @@ linux_getdents(struct proc *p, struct linux_getdents_args *args, int *retval)
break;
}
linux_dirent.dino = (long) bdp->d_fileno;
linux_dirent.doff = (linux_off_t) linuxreclen;
linux_dirent.dreclen = (u_short) bdp->d_namlen;
if (justone) {
/*
* old linux-style readdir usage.
*/
linux_dirent.doff = (linux_off_t) linuxreclen;
linux_dirent.dreclen = (u_short) bdp->d_namlen;
} else {
linux_dirent.doff = (linux_off_t) off;
linux_dirent.dreclen = (u_short) linuxreclen;
}
strcpy(linux_dirent.dname, bdp->d_name);
if ((error = copyout((caddr_t)&linux_dirent, outp, linuxreclen))) {
goto out;