Module Name: src
Committed By: njoly
Date: Thu Jun 4 17:59:30 UTC 2009
Modified Files:
src/sys/compat/linux32/arch/amd64: syscalls.master
src/sys/compat/linux32/common: linux32_stat.c
Log Message:
Add stat/lstat/fstat syscalls.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/compat/linux32/arch/amd64/syscalls.master
cvs rdiff -u -r1.15 -r1.16 src/sys/compat/linux32/common/linux32_stat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux32/arch/amd64/syscalls.master
diff -u src/sys/compat/linux32/arch/amd64/syscalls.master:1.51 src/sys/compat/linux32/arch/amd64/syscalls.master:1.52
--- src/sys/compat/linux32/arch/amd64/syscalls.master:1.51 Tue Jun 2 16:54:39 2009
+++ src/sys/compat/linux32/arch/amd64/syscalls.master Thu Jun 4 17:59:30 2009
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.51 2009/06/02 16:54:39 njoly Exp $
+ $NetBSD: syscalls.master,v 1.52 2009/06/04 17:59:30 njoly Exp $
; NetBSD i386 COMPAT_LINUX32 system call name/number "master" file.
; (See syscalls.conf to see what it is processed into.)
@@ -204,9 +204,12 @@
netbsd32_itimerval50p_t itv, netbsd32_itimerval50p_t oitv); }
105 NOARGS { int|compat_50_netbsd32||getitimer(int which, \
netbsd32_itimerval50p_t itv); }
-106 UNIMPL stat
-107 UNIMPL lstat
-108 UNIMPL fstat
+106 STD { int|linux32_sys||stat(netbsd32_charp path, \
+ linux32_statp sp); }
+107 STD { int|linux32_sys||lstat(netbsd32_charp path, \
+ linux32_statp sp); }
+108 STD { int|linux32_sys||fstat(int fd, \
+ linux32_statp sp); }
109 STD { int|linux32_sys||olduname(linux32_oldutsnamep_t up); }
110 UNIMPL iopl
111 UNIMPL vhangup
Index: src/sys/compat/linux32/common/linux32_stat.c
diff -u src/sys/compat/linux32/common/linux32_stat.c:1.15 src/sys/compat/linux32/common/linux32_stat.c:1.16
--- src/sys/compat/linux32/common/linux32_stat.c:1.15 Wed Jun 3 15:13:26 2009
+++ src/sys/compat/linux32/common/linux32_stat.c Thu Jun 4 17:59:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_stat.c,v 1.15 2009/06/03 15:13:26 njoly Exp $ */
+/* $NetBSD: linux32_stat.c,v 1.16 2009/06/04 17:59:30 njoly Exp $ */
/*-
* Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_stat.c,v 1.15 2009/06/03 15:13:26 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_stat.c,v 1.16 2009/06/04 17:59:30 njoly Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -74,11 +74,39 @@
#include <compat/linux32/common/linux32_socketcall.h>
#include <compat/linux32/linux32_syscallargs.h>
+static inline void bsd_to_linux32_stat(struct stat *, struct linux32_stat *);
static inline void bsd_to_linux32_stat64(struct stat *, struct linux32_stat64 *);
#define linux_fakedev(x,y) (x)
static inline void
+bsd_to_linux32_stat(struct stat *st, struct linux32_stat *st32)
+{
+ memset(st32, 0, sizeof(*st32));
+ st32->lst_dev = linux_fakedev(st->st_dev, 0);
+ st32->lst_ino = st->st_ino;
+ st32->lst_mode = st->st_mode;
+ if (st->st_nlink >= (1 << 15))
+ st32->lst_nlink = (1 << 15) - 1;
+ else
+ st32->lst_nlink = st->st_nlink;
+ st32->lst_uid = st->st_uid;
+ st32->lst_gid = st->st_gid;
+ st32->lst_rdev = linux_fakedev(st->st_rdev, 0);
+ st32->lst_size = st->st_size;
+ st32->lst_blksize = st->st_blksize;
+ st32->lst_blocks = st->st_blocks;
+ st32->lst_atime = st->st_atime;
+ st32->lst_mtime = st->st_mtime;
+ st32->lst_ctime = st->st_ctime;
+#ifdef LINUX32_STAT_HAS_NSEC
+ st32->lst_atime_nsec = st->st_atimensec;
+ st32->lst_mtime_nsec = st->st_mtimensec;
+ st32->lst_ctime_nsec = st->st_ctimensec;
+#endif
+}
+
+static inline void
bsd_to_linux32_stat64(struct stat *st, struct linux32_stat64 *st32)
{
memset(st32, 0, sizeof(*st32));
@@ -109,6 +137,63 @@
}
int
+linux32_sys_stat(struct lwp *l, const struct linux32_sys_stat_args *uap, register_t *retval)
+{
+ /* {
+ syscallarg(netbsd32_charp) path;
+ syscallarg(linux32_statp) sp;
+ } */
+ int error;
+ struct stat st;
+ struct linux32_stat st32;
+
+ error = do_sys_stat(SCARG_P32(uap, path), FOLLOW, &st);
+ if (error != 0)
+ return error;
+
+ bsd_to_linux32_stat(&st, &st32);
+ return copyout(&st32, SCARG_P32(uap, sp), sizeof(st32));
+}
+
+int
+linux32_sys_lstat(struct lwp *l, const struct linux32_sys_lstat_args *uap, register_t *retval)
+{
+ /* {
+ syscallarg(netbsd32_charp) path;
+ syscallarg(linux32_statp) sp;
+ } */
+ int error;
+ struct stat st;
+ struct linux32_stat st32;
+
+ error = do_sys_stat(SCARG_P32(uap, path), NOFOLLOW, &st);
+ if (error != 0)
+ return error;
+
+ bsd_to_linux32_stat(&st, &st32);
+ return copyout(&st32, SCARG_P32(uap, sp), sizeof(st32));
+}
+
+int
+linux32_sys_fstat(struct lwp *l, const struct linux32_sys_fstat_args *uap, register_t *retval)
+{
+ /* {
+ syscallarg(int) fd;
+ syscallarg(linux32_statp) sp;
+ } */
+ int error;
+ struct stat st;
+ struct linux32_stat st32;
+
+ error = do_sys_fstat(SCARG(uap, fd), &st);
+ if (error != 0)
+ return error;
+
+ bsd_to_linux32_stat(&st, &st32);
+ return copyout(&st32, SCARG_P32(uap, sp), sizeof(st32));
+}
+
+int
linux32_sys_stat64(struct lwp *l, const struct linux32_sys_stat64_args *uap, register_t *retval)
{
/* {
