]> granicus.if.org Git - strace/blobdiff - file.c
Print struct iovec as a regular structure
[strace] / file.c
diff --git a/file.c b/file.c
index 47f144d9e31797c066e6f220481d6334d8edc4c9..3ea0b5da6165cc5c37a54c71cd5c5cb2b8f6dbe9 100644 (file)
--- a/file.c
+++ b/file.c
 
 #include "defs.h"
 
-#if defined(SPARC) || defined(SPARC64)
-struct stat {
-       unsigned short  st_dev;
-       unsigned int    st_ino;
-       unsigned short  st_mode;
-       short           st_nlink;
-       unsigned short  st_uid;
-       unsigned short  st_gid;
-       unsigned short  st_rdev;
-       unsigned int    st_size;
-       int             st_atime;
-       unsigned int    __unused1;
-       int             st_mtime;
-       unsigned int    __unused2;
-       int             st_ctime;
-       unsigned int    __unused3;
-       int             st_blksize;
-       int             st_blocks;
-       unsigned int    __unused4[2];
-};
-# if defined(SPARC64)
-struct stat_sparc64 {
-       unsigned int    st_dev;
-       unsigned long   st_ino;
-       unsigned int    st_mode;
-       unsigned int    st_nlink;
-       unsigned int    st_uid;
-       unsigned int    st_gid;
-       unsigned int    st_rdev;
-       long            st_size;
-       long            st_atime;
-       long            st_mtime;
-       long            st_ctime;
-       long            st_blksize;
-       long            st_blocks;
-       unsigned long   __unused4[2];
-};
-# endif /* SPARC64 */
-# define stat kernel_stat
-# include <asm/stat.h>
-# undef stat
-#else /* !SPARC && !SPARC64 */
-# undef dev_t
-# undef ino_t
-# undef mode_t
-# undef nlink_t
-# undef uid_t
-# undef gid_t
-# undef off_t
-# undef loff_t
-# define dev_t __kernel_dev_t
-# define ino_t __kernel_ino_t
-# define mode_t __kernel_mode_t
-# define nlink_t __kernel_nlink_t
-# define uid_t __kernel_uid_t
-# define gid_t __kernel_gid_t
-# define off_t __kernel_off_t
-# define loff_t __kernel_loff_t
-
-# include <asm/stat.h>
-
-# undef dev_t
-# undef ino_t
-# undef mode_t
-# undef nlink_t
-# undef uid_t
-# undef gid_t
-# undef off_t
-# undef loff_t
-# define dev_t dev_t
-# define ino_t ino_t
-# define mode_t mode_t
-# define nlink_t nlink_t
-# define uid_t uid_t
-# define gid_t gid_t
-# define off_t off_t
-# define loff_t loff_t
-#endif
-
+#undef dev_t
+#undef ino_t
+#undef mode_t
+#undef nlink_t
+#undef uid_t
+#undef gid_t
+#undef off_t
+#undef loff_t
+#define dev_t __kernel_dev_t
+#define ino_t __kernel_ino_t
+#define mode_t __kernel_mode_t
+#define nlink_t __kernel_nlink_t
+#define uid_t __kernel_uid_t
+#define gid_t __kernel_gid_t
+#define off_t __kernel_off_t
+#define loff_t __kernel_loff_t
+
+#include "asm_stat.h"
+
+#undef dev_t
+#undef ino_t
+#undef mode_t
+#undef nlink_t
+#undef uid_t
+#undef gid_t
+#undef off_t
+#undef loff_t
+#define dev_t dev_t
+#define ino_t ino_t
+#define mode_t mode_t
+#define nlink_t nlink_t
+#define uid_t uid_t
+#define gid_t gid_t
+#define off_t off_t
+#define loff_t loff_t
+
+/* for S_IFMT */
 #define stat libc_stat
 #define stat64 libc_stat64
 #include <sys/stat.h>
@@ -119,137 +77,50 @@ struct stat_sparc64 {
 #undef st_mtime
 #undef st_ctime
 
-#ifdef MAJOR_IN_SYSMACROS
+#if defined MAJOR_IN_SYSMACROS
 # include <sys/sysmacros.h>
-#endif
-
-#ifdef MAJOR_IN_MKDEV
+#elif defined MAJOR_IN_MKDEV
 # include <sys/mkdev.h>
 #endif
 
 /* several stats */
 
-#if defined(SPARC) || defined(SPARC64)
-typedef struct {
-       int     tv_sec;
-       int     tv_nsec;
-} timestruct_t;
+#include "printstat.h"
 
-struct solstat {
-       unsigned        st_dev;
-       int             st_pad1[3];     /* network id */
-       unsigned        st_ino;
-       unsigned        st_mode;
-       unsigned        st_nlink;
-       unsigned        st_uid;
-       unsigned        st_gid;
-       unsigned        st_rdev;
-       int             st_pad2[2];
-       int             st_size;
-       int             st_pad3;        /* st_size, off_t expansion */
-       timestruct_t    st_atime;
-       timestruct_t    st_mtime;
-       timestruct_t    st_ctime;
-       int             st_blksize;
-       int             st_blocks;
-       char            st_fstype[16];
-       int             st_pad4[8];     /* expansion area */
+/* all locally defined structures provide these fields */
+#undef HAVE_STRUCT_STAT_ST_ATIME_NSEC
+#define HAVE_STRUCT_STAT_ST_ATIME_NSEC 1
+#undef HAVE_STRUCT_STAT_ST_CTIME_NSEC
+#define HAVE_STRUCT_STAT_ST_CTIME_NSEC 1
+#undef HAVE_STRUCT_STAT_ST_MTIME_NSEC
+#define HAVE_STRUCT_STAT_ST_MTIME_NSEC 1
+
+#undef STAT32_PERSONALITY
+#if SUPPORTED_PERSONALITIES > 1
+# if defined AARCH64 || defined X86_64 || defined X32
+struct stat32 {
+       unsigned int    st_dev;
+       unsigned int    st_ino;
+       unsigned short  st_mode;
+       unsigned short  st_nlink;
+       unsigned short  st_uid;
+       unsigned short  st_gid;
+       unsigned int    st_rdev;
+       unsigned int    st_size;
+       unsigned int    st_blksize;
+       unsigned int    st_blocks;
+       unsigned int    st_atime;
+       unsigned int    st_atime_nsec;
+       unsigned int    st_mtime;
+       unsigned int    st_mtime_nsec;
+       unsigned int    st_ctime;
+       unsigned int    st_ctime_nsec;
+       unsigned int    __unused4;
+       unsigned int    __unused5;
 };
-
-static void
-printstatsol(struct tcb *tcp, long addr)
-{
-       struct solstat statbuf;
-
-       if (umove(tcp, addr, &statbuf) < 0) {
-               tprints("{...}");
-               return;
-       }
-       if (!abbrev(tcp)) {
-               tprintf("{st_dev=makedev(%lu, %lu), st_ino=%lu, st_mode=%s, ",
-                       (unsigned long) ((statbuf.st_dev >> 18) & 0x3fff),
-                       (unsigned long) (statbuf.st_dev & 0x3ffff),
-                       (unsigned long) statbuf.st_ino,
-                       sprintmode(statbuf.st_mode));
-               tprintf("st_nlink=%lu, st_uid=%lu, st_gid=%lu, ",
-                       (unsigned long) statbuf.st_nlink,
-                       (unsigned long) statbuf.st_uid,
-                       (unsigned long) statbuf.st_gid);
-               tprintf("st_blksize=%lu, ", (unsigned long) statbuf.st_blksize);
-               tprintf("st_blocks=%lu, ", (unsigned long) statbuf.st_blocks);
-       }
-       else
-               tprintf("{st_mode=%s, ", sprintmode(statbuf.st_mode));
-       switch (statbuf.st_mode & S_IFMT) {
-       case S_IFCHR: case S_IFBLK:
-               tprintf("st_rdev=makedev(%lu, %lu), ",
-                       (unsigned long) ((statbuf.st_rdev >> 18) & 0x3fff),
-                       (unsigned long) (statbuf.st_rdev & 0x3ffff));
-               break;
-       default:
-               tprintf("st_size=%u, ", statbuf.st_size);
-               break;
-       }
-       if (!abbrev(tcp)) {
-               tprintf("st_atime=%s, ", sprinttime(statbuf.st_atime.tv_sec));
-               tprintf("st_mtime=%s, ", sprinttime(statbuf.st_mtime.tv_sec));
-               tprintf("st_ctime=%s}", sprinttime(statbuf.st_ctime.tv_sec));
-       }
-       else
-               tprints("...}");
-}
-
-# if defined(SPARC64)
-static void
-printstat_sparc64(struct tcb *tcp, long addr)
-{
-       struct stat_sparc64 statbuf;
-
-       if (umove(tcp, addr, &statbuf) < 0) {
-               tprints("{...}");
-               return;
-       }
-
-       if (!abbrev(tcp)) {
-               tprintf("{st_dev=makedev(%lu, %lu), st_ino=%lu, st_mode=%s, ",
-                       (unsigned long) major(statbuf.st_dev),
-                       (unsigned long) minor(statbuf.st_dev),
-                       (unsigned long) statbuf.st_ino,
-                       sprintmode(statbuf.st_mode));
-               tprintf("st_nlink=%lu, st_uid=%lu, st_gid=%lu, ",
-                       (unsigned long) statbuf.st_nlink,
-                       (unsigned long) statbuf.st_uid,
-                       (unsigned long) statbuf.st_gid);
-               tprintf("st_blksize=%lu, ",
-                       (unsigned long) statbuf.st_blksize);
-               tprintf("st_blocks=%lu, ",
-                       (unsigned long) statbuf.st_blocks);
-       }
-       else
-               tprintf("{st_mode=%s, ", sprintmode(statbuf.st_mode));
-       switch (statbuf.st_mode & S_IFMT) {
-       case S_IFCHR: case S_IFBLK:
-               tprintf("st_rdev=makedev(%lu, %lu), ",
-                       (unsigned long) major(statbuf.st_rdev),
-                       (unsigned long) minor(statbuf.st_rdev));
-               break;
-       default:
-               tprintf("st_size=%lu, ", statbuf.st_size);
-               break;
-       }
-       if (!abbrev(tcp)) {
-               tprintf("st_atime=%s, ", sprinttime(statbuf.st_atime));
-               tprintf("st_mtime=%s, ", sprinttime(statbuf.st_mtime));
-               tprintf("st_ctime=%s}", sprinttime(statbuf.st_ctime));
-       }
-       else
-               tprints("...}");
-}
-# endif /* SPARC64 */
-#endif /* SPARC[64] */
-
-#if defined POWERPC64
-struct stat_powerpc32 {
+#  define STAT32_PERSONALITY 1
+# elif defined POWERPC64
+struct stat32 {
        unsigned int    st_dev;
        unsigned int    st_ino;
        unsigned int    st_mode;
@@ -269,99 +140,139 @@ struct stat_powerpc32 {
        unsigned int    __unused4;
        unsigned int    __unused5;
 };
+#  define STAT32_PERSONALITY 1
+# elif defined SPARC64
+struct stat32 {
+       unsigned short  st_dev;
+       unsigned int    st_ino;
+       unsigned short  st_mode;
+       unsigned short  st_nlink;
+       unsigned short  st_uid;
+       unsigned short  st_gid;
+       unsigned short  st_rdev;
+       unsigned int    st_size;
+       unsigned int    st_atime;
+       unsigned int    st_atime_nsec;
+       unsigned int    st_mtime;
+       unsigned int    st_mtime_nsec;
+       unsigned int    st_ctime;
+       unsigned int    st_ctime_nsec;
+       unsigned int    st_blksize;
+       unsigned int    st_blocks;
+       unsigned int    __unused4[2];
+};
+#  define STAT32_PERSONALITY 0
+# elif defined SPARC
+#  /* no 64-bit personalities */
+# elif defined TILE
+#  /* no 32-bit stat */
+# else
+#  warning FIXME: check whether struct stat32 definition is needed for this architecture!
+# endif /* X86_64 || X32 || POWERPC64 */
+#endif /* SUPPORTED_PERSONALITIES > 1 */
+
+#ifdef STAT32_PERSONALITY
+# define DO_PRINTSTAT do_printstat32
+# define STRUCT_STAT struct stat32
+# undef HAVE_STRUCT_STAT_ST_FLAGS
+# undef HAVE_STRUCT_STAT_ST_FSTYPE
+# undef HAVE_STRUCT_STAT_ST_GEN
+# include "printstat.h"
+#endif /* STAT32_PERSONALITY */
 
-static void
-printstat_powerpc32(struct tcb *tcp, long addr)
-{
-       struct stat_powerpc32 statbuf;
-
-       if (umove(tcp, addr, &statbuf) < 0) {
-               tprints("{...}");
-               return;
-       }
+#if defined(SPARC) || defined(SPARC64)
 
-       if (!abbrev(tcp)) {
-               tprintf("{st_dev=makedev(%u, %u), st_ino=%u, st_mode=%s, ",
-                       major(statbuf.st_dev), minor(statbuf.st_dev),
-                       statbuf.st_ino,
-                       sprintmode(statbuf.st_mode));
-               tprintf("st_nlink=%u, st_uid=%u, st_gid=%u, ",
-                       statbuf.st_nlink, statbuf.st_uid, statbuf.st_gid);
-               tprintf("st_blksize=%u, ", statbuf.st_blksize);
-               tprintf("st_blocks=%u, ", statbuf.st_blocks);
-       }
-       else
-               tprintf("{st_mode=%s, ", sprintmode(statbuf.st_mode));
-       switch (statbuf.st_mode & S_IFMT) {
-       case S_IFCHR: case S_IFBLK:
-               tprintf("st_rdev=makedev(%lu, %lu), ",
-                       (unsigned long) major(statbuf.st_rdev),
-                       (unsigned long) minor(statbuf.st_rdev));
-               break;
-       default:
-               tprintf("st_size=%u, ", statbuf.st_size);
-               break;
-       }
-       if (!abbrev(tcp)) {
-               tprintf("st_atime=%s, ", sprinttime(statbuf.st_atime));
-               tprintf("st_mtime=%s, ", sprinttime(statbuf.st_mtime));
-               tprintf("st_ctime=%s}", sprinttime(statbuf.st_ctime));
-       }
-       else
-               tprints("...}");
-}
-#endif /* POWERPC64 */
+struct solstat {
+       unsigned        st_dev;
+       unsigned int    st_pad1[3];     /* network id */
+       unsigned        st_ino;
+       unsigned        st_mode;
+       unsigned        st_nlink;
+       unsigned        st_uid;
+       unsigned        st_gid;
+       unsigned        st_rdev;
+       unsigned int    st_pad2[2];
+       unsigned int    st_size;
+       unsigned int    st_pad3;        /* st_size, off_t expansion */
+       unsigned int    st_atime;
+       unsigned int    st_atime_nsec;
+       unsigned int    st_mtime;
+       unsigned int    st_mtime_nsec;
+       unsigned int    st_ctime;
+       unsigned int    st_ctime_nsec;
+       unsigned int    st_blksize;
+       unsigned int    st_blocks;
+       char            st_fstype[16];
+       unsigned int    st_pad4[8];     /* expansion area */
+};
 
-#include "printstat.h"
+# define DO_PRINTSTAT  do_printstat_sol
+# define STRUCT_STAT   struct solstat
+# define STAT_MAJOR(x) (((x) >> 18) & 0x3fff)
+# define STAT_MINOR(x) ((x) & 0x3ffff)
+# undef HAVE_STRUCT_STAT_ST_FLAGS
+# undef HAVE_STRUCT_STAT_ST_FSTYPE
+# undef HAVE_STRUCT_STAT_ST_GEN
+# include "printstat.h"
+#endif /* SPARC || SPARC64 */
 
 static void
 printstat(struct tcb *tcp, long addr)
 {
        struct stat statbuf;
 
-       if (!addr) {
-               tprints("NULL");
-               return;
-       }
-       if (syserror(tcp) || !verbose(tcp)) {
-               tprintf("%#lx", addr);
+#ifdef STAT32_PERSONALITY
+       if (current_personality == STAT32_PERSONALITY) {
+               struct stat32 statbuf;
+
+               if (!umove_or_printaddr(tcp, addr, &statbuf))
+                       do_printstat32(tcp, &statbuf);
                return;
        }
+#endif
 
 #if defined(SPARC) || defined(SPARC64)
        if (current_personality == 1) {
-               printstatsol(tcp, addr);
-               return;
-       }
-# ifdef SPARC64
-       else if (current_personality == 2) {
-               printstat_sparc64(tcp, addr);
-               return;
-       }
-# endif
-#endif /* SPARC[64] */
+               struct solstat statbuf;
 
-#if defined POWERPC64
-       if (current_personality == 1) {
-               printstat_powerpc32(tcp, addr);
+               if (!umove_or_printaddr(tcp, addr, &statbuf))
+                       do_printstat_sol(tcp, &statbuf);
                return;
        }
-#endif
+#endif /* SPARC || SPARC64 */
 
-       if (umove(tcp, addr, &statbuf) < 0) {
-               tprints("{...}");
-               return;
+       if (!umove_or_printaddr(tcp, addr, &statbuf))
+               do_printstat(tcp, &statbuf);
+}
+
+SYS_FUNC(stat)
+{
+       if (entering(tcp)) {
+               printpath(tcp, tcp->u_arg[0]);
+               tprints(", ");
+       } else {
+               printstat(tcp, tcp->u_arg[1]);
        }
+       return 0;
+}
 
-       do_printstat(tcp, &statbuf);
+SYS_FUNC(fstat)
+{
+       if (entering(tcp)) {
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
+       } else {
+               printstat(tcp, tcp->u_arg[1]);
+       }
+       return 0;
 }
 
-#if !defined HAVE_STAT64 && (defined AARCH64 || defined X86_64 || defined X32)
+#if defined STAT32_PERSONALITY && !defined HAVE_STRUCT_STAT64
+# if defined AARCH64 || defined X86_64 || defined X32
 /*
  * Linux x86_64 and x32 have unified `struct stat' but their i386 personality
  * needs `struct stat64'.
  * linux/arch/x86/include/uapi/asm/stat.h defines `struct stat64' only for i386.
- * __GNUC__ is needed for the required __attribute__ below.
  *
  * Similarly, aarch64 has a unified `struct stat' but its arm personality
  * needs `struct stat64' (unlike x86, it shouldn't be packed).
@@ -387,17 +298,20 @@ struct stat64 {
        unsigned int    st_ctime_nsec;
        unsigned long long      st_ino;
 }
-# if defined X86_64 || defined X32
-   __attribute__((packed))
-#  define STAT64_SIZE  96
-#else
-#  define STAT64_SIZE  104
-# endif
+#  if defined X86_64 || defined X32
+  ATTRIBUTE_PACKED
+#   define STAT64_SIZE 96
+#  else
+#   define STAT64_SIZE 104
+#  endif
 ;
-# define HAVE_STAT64   1
-#endif /* AARCH64 || X86_64 || X32 */
+#  define HAVE_STRUCT_STAT64   1
+# else /* !(AARCH64 || X86_64 || X32) */
+#  warning FIXME: check whether struct stat64 definition is needed for this architecture!
+# endif
+#endif /* STAT32_PERSONALITY && !HAVE_STRUCT_STAT64 */
 
-#ifdef HAVE_STAT64
+#ifdef HAVE_STRUCT_STAT64
 
 # define DO_PRINTSTAT do_printstat64
 # define STRUCT_STAT struct stat64
@@ -411,151 +325,74 @@ printstat64(struct tcb *tcp, long addr)
 {
        struct stat64 statbuf;
 
-#ifdef STAT64_SIZE
+# ifdef STAT64_SIZE
        (void) sizeof(char[sizeof statbuf == STAT64_SIZE ? 1 : -1]);
-#endif
-
-       if (!addr) {
-               tprints("NULL");
-               return;
-       }
-       if (syserror(tcp) || !verbose(tcp)) {
-               tprintf("%#lx", addr);
-               return;
-       }
-
-#if defined(SPARC) || defined(SPARC64)
-       if (current_personality == 1) {
-               printstatsol(tcp, addr);
-               return;
-       }
-# ifdef SPARC64
-       else if (current_personality == 2) {
-               printstat_sparc64(tcp, addr);
-               return;
-       }
 # endif
-#endif /* SPARC[64] */
 
-#if defined AARCH64
-       if (current_personality != 0) {
+# ifdef STAT32_PERSONALITY
+       if (current_personality != STAT32_PERSONALITY) {
                printstat(tcp, addr);
                return;
        }
-#endif
-#if defined X86_64 || defined X32
-       if (current_personality != 1) {
-               printstat(tcp, addr);
-               return;
-       }
-#endif
+# endif /* STAT32_PERSONALITY */
 
-       if (umove(tcp, addr, &statbuf) < 0) {
-               tprints("{...}");
-               return;
-       }
-
-       do_printstat64(tcp, &statbuf);
+       if (!umove_or_printaddr(tcp, addr, &statbuf))
+               do_printstat64(tcp, &statbuf);
 }
-#endif /* HAVE_STAT64 */
 
-#if defined(HAVE_STRUCT___OLD_KERNEL_STAT)
-static void
-convertoldstat(const struct __old_kernel_stat *oldbuf, struct stat *newbuf)
-{
-       newbuf->st_dev = oldbuf->st_dev;
-       newbuf->st_ino = oldbuf->st_ino;
-       newbuf->st_mode = oldbuf->st_mode;
-       newbuf->st_nlink = oldbuf->st_nlink;
-       newbuf->st_uid = oldbuf->st_uid;
-       newbuf->st_gid = oldbuf->st_gid;
-       newbuf->st_rdev = oldbuf->st_rdev;
-       newbuf->st_size = oldbuf->st_size;
-       newbuf->st_atime = oldbuf->st_atime;
-       newbuf->st_mtime = oldbuf->st_mtime;
-       newbuf->st_ctime = oldbuf->st_ctime;
-       newbuf->st_blksize = 0; /* not supported in old_stat */
-       newbuf->st_blocks = 0; /* not supported in old_stat */
-}
-
-static void
-printoldstat(struct tcb *tcp, long addr)
-{
-       struct __old_kernel_stat statbuf;
-       struct stat newstatbuf;
-
-       if (!addr) {
-               tprints("NULL");
-               return;
-       }
-       if (syserror(tcp) || !verbose(tcp)) {
-               tprintf("%#lx", addr);
-               return;
-       }
-
-# if defined(SPARC) || defined(SPARC64)
-       if (current_personality == 1) {
-               printstatsol(tcp, addr);
-               return;
-       }
-# endif
-
-       if (umove(tcp, addr, &statbuf) < 0) {
-               tprints("{...}");
-               return;
-       }
-
-       convertoldstat(&statbuf, &newstatbuf);
-       do_printstat(tcp, &newstatbuf);
-}
-#endif
-
-int
-sys_stat(struct tcb *tcp)
+SYS_FUNC(stat64)
 {
        if (entering(tcp)) {
                printpath(tcp, tcp->u_arg[0]);
                tprints(", ");
        } else {
-               printstat(tcp, tcp->u_arg[1]);
+               printstat64(tcp, tcp->u_arg[1]);
        }
        return 0;
 }
 
-int
-sys_stat64(struct tcb *tcp)
+SYS_FUNC(fstat64)
 {
-#ifdef HAVE_STAT64
        if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
+               printfd(tcp, tcp->u_arg[0]);
                tprints(", ");
        } else {
                printstat64(tcp, tcp->u_arg[1]);
        }
        return 0;
+}
+
 #else
-       return printargs(tcp);
-#endif
+
+SYS_FUNC(stat64)
+{
+       return sys_stat(tcp);
+}
+
+SYS_FUNC(fstat64)
+{
+       return sys_fstat(tcp);
 }
 
-int
-sys_newfstatat(struct tcb *tcp)
+#endif /* HAVE_STRUCT_STAT64 */
+
+SYS_FUNC(newfstatat)
 {
        if (entering(tcp)) {
                print_dirfd(tcp, tcp->u_arg[0]);
                printpath(tcp, tcp->u_arg[1]);
                tprints(", ");
        } else {
-#ifdef POWERPC64
-               if (current_personality == 0)
-                       printstat(tcp, tcp->u_arg[2]);
-               else
+#if defined STAT32_PERSONALITY
+               if (current_personality == STAT32_PERSONALITY)
                        printstat64(tcp, tcp->u_arg[2]);
-#elif defined HAVE_STAT64
+               else
+                       printstat(tcp, tcp->u_arg[2]);
+#elif defined HAVE_STRUCT_STAT64
                printstat64(tcp, tcp->u_arg[2]);
 #else
                printstat(tcp, tcp->u_arg[2]);
-#endif
+#endif /* STAT32_PERSONALITY || HAVE_STRUCT_STAT64 */
                tprints(", ");
                printflags(at_flags, tcp->u_arg[3], "AT_???");
        }
@@ -563,50 +400,58 @@ sys_newfstatat(struct tcb *tcp)
 }
 
 #if defined(HAVE_STRUCT___OLD_KERNEL_STAT)
-int
-sys_oldstat(struct tcb *tcp)
+
+static void
+convertoldstat(const struct __old_kernel_stat *oldbuf, struct stat *newbuf)
 {
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprints(", ");
-       } else {
-               printoldstat(tcp, tcp->u_arg[1]);
-       }
-       return 0;
+       memset(newbuf, 0, sizeof(*newbuf));
+       newbuf->st_dev = oldbuf->st_dev;
+       newbuf->st_ino = oldbuf->st_ino;
+       newbuf->st_mode = oldbuf->st_mode;
+       newbuf->st_nlink = oldbuf->st_nlink;
+       newbuf->st_uid = oldbuf->st_uid;
+       newbuf->st_gid = oldbuf->st_gid;
+       newbuf->st_rdev = oldbuf->st_rdev;
+       newbuf->st_size = oldbuf->st_size;
+       newbuf->st_atime = oldbuf->st_atime;
+       newbuf->st_mtime = oldbuf->st_mtime;
+       newbuf->st_ctime = oldbuf->st_ctime;
 }
-#endif
 
-int
-sys_fstat(struct tcb *tcp)
+static void
+printoldstat(struct tcb *tcp, long addr)
 {
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-       } else {
-               printstat(tcp, tcp->u_arg[1]);
+       struct __old_kernel_stat statbuf;
+       struct stat newstatbuf;
+
+# if defined(SPARC) || defined(SPARC64)
+       if (current_personality == 1) {
+               struct solstat statbuf;
+
+               if (!umove_or_printaddr(tcp, addr, &statbuf))
+                       do_printstat_sol(tcp, &statbuf);
+               return;
+       }
+# endif
+
+       if (!umove_or_printaddr(tcp, addr, &statbuf)) {
+               convertoldstat(&statbuf, &newstatbuf);
+               do_printstat(tcp, &newstatbuf);
        }
-       return 0;
 }
 
-int
-sys_fstat64(struct tcb *tcp)
+SYS_FUNC(oldstat)
 {
-#ifdef HAVE_STAT64
        if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
+               printpath(tcp, tcp->u_arg[0]);
                tprints(", ");
        } else {
-               printstat64(tcp, tcp->u_arg[1]);
+               printoldstat(tcp, tcp->u_arg[1]);
        }
        return 0;
-#else
-       return printargs(tcp);
-#endif
 }
 
-#if defined(HAVE_STRUCT___OLD_KERNEL_STAT)
-int
-sys_oldfstat(struct tcb *tcp)
+SYS_FUNC(oldfstat)
 {
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
@@ -616,12 +461,12 @@ sys_oldfstat(struct tcb *tcp)
        }
        return 0;
 }
-#endif
+
+#endif /* HAVE_STRUCT___OLD_KERNEL_STAT */
 
 #if defined(SPARC) || defined(SPARC64)
 
-int
-sys_xstat(struct tcb *tcp)
+SYS_FUNC(xstat)
 {
        if (entering(tcp)) {
                tprintf("%ld, ", tcp->u_arg[0]);
@@ -633,8 +478,7 @@ sys_xstat(struct tcb *tcp)
        return 0;
 }
 
-int
-sys_fxstat(struct tcb *tcp)
+SYS_FUNC(fxstat)
 {
        if (entering(tcp)) {
                tprintf("%ld, ", tcp->u_arg[0]);