]> granicus.if.org Git - strace/blobdiff - file.c
Fix ILP32 personality preadv/pwritev offset decoding on LP64 architectures
[strace] / file.c
diff --git a/file.c b/file.c
index 58585f382edfa6269b05c9cbc68603a6f868dc37..ae74d5ab82b78655c34a5cd6195499f2930a1fd5 100644 (file)
--- a/file.c
+++ b/file.c
  */
 
 #include "defs.h"
-#include <dirent.h>
-#include <sys/swap.h>
 
-#ifdef LINUXSPARC
-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
-#elif defined(X32)
-struct stat {
-       unsigned long long      st_dev;
-       unsigned long long      st_ino;
-       unsigned long long      st_nlink;
-
-       unsigned int            st_mode;
-       unsigned int            st_uid;
-       unsigned int            st_gid;
-       unsigned int            __pad0;
-       unsigned long long      st_rdev;
-       long long               st_size;
-       long long               st_blksize;
-       long long               st_blocks;
-
-       unsigned long long      st_atime;
-       unsigned long long      st_atime_nsec;
-       unsigned long long      st_mtime;
-       unsigned long long      st_mtime_nsec;
-       unsigned long long      st_ctime;
-       unsigned long long      st_ctime_nsec;
-       long long               __unused[3];
-};
-#else
-# 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
-
-#ifdef HPPA    /* asm-parisc/stat.h defines stat64 */
-# undef stat64
-#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>
@@ -146,2579 +76,482 @@ struct stat {
 #undef st_atime
 #undef st_mtime
 #undef st_ctime
-#ifdef HPPA
-# define stat64 hpux_stat64
-#endif
-
-#include <fcntl.h>
-#ifdef HAVE_SYS_VFS_H
-# include <sys/vfs.h>
-#endif
-#ifdef HAVE_LINUX_XATTR_H
-# include <linux/xattr.h>
-#else
-# define XATTR_CREATE 1
-# define XATTR_REPLACE 2
-#endif
-
-#if HAVE_LONG_LONG_OFF_T
-/*
- * Ugly hacks for systems that have typedef long long off_t
- */
-# define stat64 stat
-# define HAVE_STAT64 1 /* Ugly hack */
-# define sys_stat64    sys_stat
-# define sys_fstat64   sys_fstat
-# define sys_lstat64   sys_lstat
-# define sys_truncate64        sys_truncate
-# define sys_ftruncate64       sys_ftruncate
-#endif
 
-#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
 
-#ifdef HAVE_SYS_ASYNCH_H
-# include <sys/asynch.h>
-#endif
+/* several stats */
 
-struct kernel_dirent {
-       unsigned long   d_ino;
-       unsigned long   d_off;
-       unsigned short  d_reclen;
-       char            d_name[1];
-};
+#include "printstat.h"
 
-const struct xlat open_access_modes[] = {
-       { O_RDONLY,     "O_RDONLY"      },
-       { O_WRONLY,     "O_WRONLY"      },
-       { O_RDWR,       "O_RDWR"        },
-#ifdef O_ACCMODE
-       { O_ACCMODE,    "O_ACCMODE"     },
-#endif
-       { 0,            NULL            },
+#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;
 };
-
-const struct xlat open_mode_flags[] = {
-       { O_CREAT,      "O_CREAT"       },
-       { O_EXCL,       "O_EXCL"        },
-       { O_NOCTTY,     "O_NOCTTY"      },
-       { O_TRUNC,      "O_TRUNC"       },
-       { O_APPEND,     "O_APPEND"      },
-       { O_NONBLOCK,   "O_NONBLOCK"    },
-#ifdef O_SYNC
-       { O_SYNC,       "O_SYNC"        },
-#endif
-#ifdef O_ASYNC
-       { O_ASYNC,      "O_ASYNC"       },
-#endif
-#ifdef O_DSYNC
-       { O_DSYNC,      "O_DSYNC"       },
-#endif
-#ifdef O_RSYNC
-       { O_RSYNC,      "O_RSYNC"       },
-#endif
-#if defined(O_NDELAY) && (O_NDELAY != O_NONBLOCK)
-       { O_NDELAY,     "O_NDELAY"      },
-#endif
-#ifdef O_PRIV
-       { O_PRIV,       "O_PRIV"        },
-#endif
-#ifdef O_DIRECT
-       { O_DIRECT,     "O_DIRECT"      },
-#endif
-#ifdef O_LARGEFILE
-# if O_LARGEFILE == 0          /* biarch platforms in 64-bit mode */
-#  undef O_LARGEFILE
-#  ifdef SPARC64
-#   define O_LARGEFILE 0x40000
-#  elif defined X86_64 || defined S390X
-#   define O_LARGEFILE 0100000
+#  ifdef AARCH64
+#   define STAT32_PERSONALITY 0
+#  else
+#   define STAT32_PERSONALITY 1
 #  endif
-# endif
-# ifdef O_LARGEFILE
-       { O_LARGEFILE,  "O_LARGEFILE"   },
-# endif
-#endif
-#ifdef O_DIRECTORY
-       { O_DIRECTORY,  "O_DIRECTORY"   },
-#endif
-#ifdef O_NOFOLLOW
-       { O_NOFOLLOW,   "O_NOFOLLOW"    },
-#endif
-#ifdef O_NOATIME
-       { O_NOATIME,    "O_NOATIME"     },
-#endif
-#ifdef O_CLOEXEC
-       { O_CLOEXEC,    "O_CLOEXEC"     },
-#endif
-#ifdef FNDELAY
-       { FNDELAY,      "FNDELAY"       },
-#endif
-#ifdef FAPPEND
-       { FAPPEND,      "FAPPEND"       },
-#endif
-#ifdef FMARK
-       { FMARK,        "FMARK"         },
-#endif
-#ifdef FDEFER
-       { FDEFER,       "FDEFER"        },
-#endif
-#ifdef FASYNC
-       { FASYNC,       "FASYNC"        },
-#endif
-#ifdef FSHLOCK
-       { FSHLOCK,      "FSHLOCK"       },
-#endif
-#ifdef FEXLOCK
-       { FEXLOCK,      "FEXLOCK"       },
-#endif
-#ifdef FCREAT
-       { FCREAT,       "FCREAT"        },
-#endif
-#ifdef FTRUNC
-       { FTRUNC,       "FTRUNC"        },
-#endif
-#ifdef FEXCL
-       { FEXCL,        "FEXCL"         },
-#endif
-#ifdef FNBIO
-       { FNBIO,        "FNBIO"         },
-#endif
-#ifdef FSYNC
-       { FSYNC,        "FSYNC"         },
-#endif
-#ifdef FNOCTTY
-       { FNOCTTY,      "FNOCTTY"       },
-#endif
-#ifdef O_SHLOCK
-       { O_SHLOCK,     "O_SHLOCK"      },
-#endif
-#ifdef O_EXLOCK
-       { O_EXLOCK,     "O_EXLOCK"      },
-#endif
-       { 0,            NULL            },
-};
-
-#ifndef AT_FDCWD
-# define AT_FDCWD                -100
-#endif
-
-/* The fd is an "int", so when decoding x86 on x86_64, we need to force sign
- * extension to get the right value.  We do this by declaring fd as int here.
- */
-static void
-print_dirfd(struct tcb *tcp, int fd)
-{
-       if (fd == AT_FDCWD)
-               tprints("AT_FDCWD, ");
-       else {
-               printfd(tcp, fd);
-               tprints(", ");
-       }
-}
-
-/*
- * low bits of the open(2) flags define access mode,
- * other bits are real flags.
- */
-const char *
-sprint_open_modes(mode_t flags)
-{
-       static char outstr[(1 + ARRAY_SIZE(open_mode_flags)) * sizeof("O_LARGEFILE")];
-       char *p;
-       char sep;
-       const char *str;
-       const struct xlat *x;
-
-       sep = ' ';
-       p = stpcpy(outstr, "flags");
-       str = xlookup(open_access_modes, flags & 3);
-       if (str) {
-               *p++ = sep;
-               p = stpcpy(p, str);
-               flags &= ~3;
-               if (!flags)
-                       return outstr;
-               sep = '|';
-       }
-
-       for (x = open_mode_flags; x->str; x++) {
-               if ((flags & x->val) == x->val) {
-                       *p++ = sep;
-                       p = stpcpy(p, x->str);
-                       flags &= ~x->val;
-                       if (!flags)
-                               return outstr;
-                       sep = '|';
-               }
-       }
-       /* flags is still nonzero */
-       *p++ = sep;
-       sprintf(p, "%#x", flags);
-       return outstr;
-}
-
-void
-tprint_open_modes(mode_t flags)
-{
-       tprints(sprint_open_modes(flags) + sizeof("flags"));
-}
-
-static int
-decode_open(struct tcb *tcp, int offset)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[offset]);
-               tprints(", ");
-               /* flags */
-               tprint_open_modes(tcp->u_arg[offset + 1]);
-               if (tcp->u_arg[offset + 1] & O_CREAT) {
-                       /* mode */
-                       tprintf(", %#lo", tcp->u_arg[offset + 2]);
-               }
-       }
-       return 0;
-}
-
-int
-sys_open(struct tcb *tcp)
-{
-       return decode_open(tcp, 0);
-}
-
-int
-sys_openat(struct tcb *tcp)
-{
-       if (entering(tcp))
-               print_dirfd(tcp, tcp->u_arg[0]);
-       return decode_open(tcp, 1);
-}
-
-#ifdef LINUXSPARC
-static const struct xlat openmodessol[] = {
-       { 0,            "O_RDWR"        },
-       { 1,            "O_RDONLY"      },
-       { 2,            "O_WRONLY"      },
-       { 0x80,         "O_NONBLOCK"    },
-       { 8,            "O_APPEND"      },
-       { 0x100,        "O_CREAT"       },
-       { 0x200,        "O_TRUNC"       },
-       { 0x400,        "O_EXCL"        },
-       { 0x800,        "O_NOCTTY"      },
-       { 0x10,         "O_SYNC"        },
-       { 0x40,         "O_DSYNC"       },
-       { 0x8000,       "O_RSYNC"       },
-       { 4,            "O_NDELAY"      },
-       { 0x1000,       "O_PRIV"        },
-       { 0,            NULL            },
-};
-
-int
-solaris_open(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               /* flags */
-               printflags(openmodessol, tcp->u_arg[1] + 1, "O_???");
-               if (tcp->u_arg[1] & 0x100) {
-                       /* mode */
-                       tprintf(", %#lo", tcp->u_arg[2]);
-               }
-       }
-       return 0;
-}
-
-#endif
-
-int
-sys_creat(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprintf(", %#lo", tcp->u_arg[1]);
-       }
-       return 0;
-}
-
-static const struct xlat access_flags[] = {
-       { F_OK,         "F_OK",         },
-       { R_OK,         "R_OK"          },
-       { W_OK,         "W_OK"          },
-       { X_OK,         "X_OK"          },
-#ifdef EFF_ONLY_OK
-       { EFF_ONLY_OK,  "EFF_ONLY_OK"   },
-#endif
-#ifdef EX_OK
-       { EX_OK,        "EX_OK"         },
-#endif
-       { 0,            NULL            },
+# elif defined POWERPC64
+struct stat32 {
+       unsigned int    st_dev;
+       unsigned int    st_ino;
+       unsigned int    st_mode;
+       unsigned short  st_nlink;
+       unsigned int    st_uid;
+       unsigned int    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 int
-decode_access(struct tcb *tcp, int offset)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[offset]);
-               tprints(", ");
-               printflags(access_flags, tcp->u_arg[offset + 1], "?_OK");
-       }
-       return 0;
-}
-
-int
-sys_access(struct tcb *tcp)
-{
-       return decode_access(tcp, 0);
-}
-
-int
-sys_faccessat(struct tcb *tcp)
-{
-       if (entering(tcp))
-               print_dirfd(tcp, tcp->u_arg[0]);
-       return decode_access(tcp, 1);
-}
-
-int
-sys_umask(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               tprintf("%#lo", tcp->u_arg[0]);
-       }
-       return RVAL_OCTAL;
-}
-
-static const struct xlat whence[] = {
-       { SEEK_SET,     "SEEK_SET"      },
-       { SEEK_CUR,     "SEEK_CUR"      },
-       { SEEK_END,     "SEEK_END"      },
-       { 0,            NULL            },
+#  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"
 
-#if defined(LINUX_MIPSN32)
-int
-sys_lseek(struct tcb *tcp)
-{
-       long long offset;
-       int _whence;
-
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               offset = tcp->ext_arg[1];
-               _whence = tcp->u_arg[2];
-               if (_whence == SEEK_SET)
-                       tprintf("%llu, ", offset);
-               else
-                       tprintf("%lld, ", offset);
-               printxval(whence, _whence, "SEEK_???");
-       }
-       return RVAL_LUDECIMAL;
-}
-#else
-int
-sys_lseek(struct tcb *tcp)
-{
-       off_t offset;
-       int _whence;
-
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               offset = tcp->u_arg[1];
-               _whence = tcp->u_arg[2];
-               if (_whence == SEEK_SET)
-                       tprintf("%lu, ", offset);
-               else
-                       tprintf("%ld, ", offset);
-               printxval(whence, _whence, "SEEK_???");
-       }
-       return RVAL_UDECIMAL;
-}
-#endif
-
-int
-sys_llseek(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               /*
-                * This one call takes explicitly two 32-bit arguments hi, lo,
-                * rather than one 64-bit argument for which LONG_LONG works
-                * appropriate for the native byte order.
-                */
-               if (tcp->u_arg[4] == SEEK_SET)
-                       tprintf(", %llu, ",
-                               ((long long int) tcp->u_arg[1]) << 32 |
-                               (unsigned long long) (unsigned) tcp->u_arg[2]);
-               else
-                       tprintf(", %lld, ",
-                               ((long long int) tcp->u_arg[1]) << 32 |
-                               (unsigned long long) (unsigned) tcp->u_arg[2]);
-       }
-       else {
-               long long int off;
-               if (syserror(tcp) || umove(tcp, tcp->u_arg[3], &off) < 0)
-                       tprintf("%#lx, ", tcp->u_arg[3]);
-               else
-                       tprintf("[%llu], ", off);
-               printxval(whence, tcp->u_arg[4], "SEEK_???");
-       }
-       return 0;
-}
-
-int
-sys_readahead(struct tcb *tcp)
+static void
+printstat32(struct tcb *tcp, long addr)
 {
-       if (entering(tcp)) {
-               int argn;
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               argn = printllval(tcp, "%lld", 1);
-               tprintf(", %ld", tcp->u_arg[argn]);
-       }
-       return 0;
-}
-
-#ifndef HAVE_LONG_LONG_OFF_T
-int
-sys_truncate(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprintf(", %lu", tcp->u_arg[1]);
-       }
-       return 0;
-}
-#endif
-
-#if _LFS64_LARGEFILE || HAVE_LONG_LONG_OFF_T
-int
-sys_truncate64(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               printllval(tcp, ", %llu", 1);
-       }
-       return 0;
-}
-#endif
-
-#ifndef HAVE_LONG_LONG_OFF_T
-int
-sys_ftruncate(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprintf(", %lu", tcp->u_arg[1]);
-       }
-       return 0;
-}
-#endif
-
-#if _LFS64_LARGEFILE || HAVE_LONG_LONG_OFF_T
-int
-sys_ftruncate64(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printllval(tcp, "%llu", 1);
-       }
-       return 0;
-}
-#endif
-
-/* several stats */
-
-static const struct xlat modetypes[] = {
-       { S_IFREG,      "S_IFREG"       },
-       { S_IFSOCK,     "S_IFSOCK"      },
-       { S_IFIFO,      "S_IFIFO"       },
-       { S_IFLNK,      "S_IFLNK"       },
-       { S_IFDIR,      "S_IFDIR"       },
-       { S_IFBLK,      "S_IFBLK"       },
-       { S_IFCHR,      "S_IFCHR"       },
-       { 0,            NULL            },
-};
-
-static const char *
-sprintmode(int mode)
-{
-       static char buf[sizeof("S_IFSOCK|S_ISUID|S_ISGID|S_ISVTX|%o")
-                       + sizeof(int)*3
-                       + /*paranoia:*/ 8];
-       const char *s;
-
-       if ((mode & S_IFMT) == 0)
-               s = "";
-       else if ((s = xlookup(modetypes, mode & S_IFMT)) == NULL) {
-               sprintf(buf, "%#o", mode);
-               return buf;
-       }
-       s = buf + sprintf(buf, "%s%s%s%s", s,
-               (mode & S_ISUID) ? "|S_ISUID" : "",
-               (mode & S_ISGID) ? "|S_ISGID" : "",
-               (mode & S_ISVTX) ? "|S_ISVTX" : "");
-       mode &= ~(S_IFMT|S_ISUID|S_ISGID|S_ISVTX);
-       if (mode)
-               sprintf((char*)s, "|%#o", mode);
-       s = (*buf == '|') ? buf + 1 : buf;
-       return *s ? s : "0";
-}
-
-static char *
-sprinttime(time_t t)
-{
-       struct tm *tmp;
-       static char buf[sizeof("yyyy/mm/dd-hh:mm:ss")];
-
-       if (t == 0) {
-               strcpy(buf, "0");
-               return buf;
-       }
-       tmp = localtime(&t);
-       if (tmp)
-               snprintf(buf, sizeof buf, "%02d/%02d/%02d-%02d:%02d:%02d",
-                       tmp->tm_year + 1900, tmp->tm_mon + 1, tmp->tm_mday,
-                       tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
-       else
-               snprintf(buf, sizeof buf, "%lu", (unsigned long) t);
-
-       return buf;
-}
-
-#ifdef LINUXSPARC
-typedef struct {
-       int     tv_sec;
-       int     tv_nsec;
-} timestruct_t;
-
-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 */
-};
-
-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 /* LINUXSPARC */
-
-#if defined POWERPC64
-struct stat_powerpc32 {
-       unsigned int    st_dev;
-       unsigned int    st_ino;
-       unsigned int    st_mode;
-       unsigned short  st_nlink;
-       unsigned int    st_uid;
-       unsigned int    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
-printstat_powerpc32(struct tcb *tcp, long addr)
-{
-       struct stat_powerpc32 statbuf;
-
-       if (umove(tcp, addr, &statbuf) < 0) {
-               tprints("{...}");
-               return;
-       }
-
-       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 */
-
-static const struct xlat fileflags[] = {
-       { 0,            NULL            },
-};
-
-#ifndef HAVE_LONG_LONG_OFF_T
-static void
-realprintstat(struct tcb *tcp, struct stat *statbuf)
-{
-       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);
-#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
-               tprintf("st_blksize=%lu, ", (unsigned long) statbuf->st_blksize);
-#endif
-#ifdef HAVE_STRUCT_STAT_ST_BLOCKS
-               tprintf("st_blocks=%lu, ", (unsigned long) statbuf->st_blocks);
-#endif
-       }
-       else
-               tprintf("{st_mode=%s, ", sprintmode(statbuf->st_mode));
-       switch (statbuf->st_mode & S_IFMT) {
-       case S_IFCHR: case S_IFBLK:
-#ifdef HAVE_STRUCT_STAT_ST_RDEV
-               tprintf("st_rdev=makedev(%lu, %lu), ",
-                       (unsigned long) major(statbuf->st_rdev),
-                       (unsigned long) minor(statbuf->st_rdev));
-#else /* !HAVE_STRUCT_STAT_ST_RDEV */
-               tprintf("st_size=makedev(%lu, %lu), ",
-                       (unsigned long) major(statbuf->st_size),
-                       (unsigned long) minor(statbuf->st_size));
-#endif /* !HAVE_STRUCT_STAT_ST_RDEV */
-               break;
-       default:
-               tprintf("st_size=%lu, ", (unsigned long) 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));
-#if HAVE_STRUCT_STAT_ST_FLAGS
-               tprints(", st_flags=");
-               printflags(fileflags, statbuf->st_flags, "UF_???");
-#endif
-#if HAVE_STRUCT_STAT_ST_ACLCNT
-               tprintf(", st_aclcnt=%d", statbuf->st_aclcnt);
-#endif
-#if HAVE_STRUCT_STAT_ST_LEVEL
-               tprintf(", st_level=%ld", statbuf->st_level);
-#endif
-#if HAVE_STRUCT_STAT_ST_FSTYPE
-               tprintf(", st_fstype=%.*s",
-                       (int) sizeof statbuf->st_fstype, statbuf->st_fstype);
-#endif
-#if HAVE_STRUCT_STAT_ST_GEN
-               tprintf(", st_gen=%u", statbuf->st_gen);
-#endif
-               tprints("}");
-       }
-       else
-               tprints("...}");
-}
-
-static void
-printstat(struct tcb *tcp, long addr)
-{
-       struct stat statbuf;
-
-       if (!addr) {
-               tprints("NULL");
-               return;
-       }
-       if (syserror(tcp) || !verbose(tcp)) {
-               tprintf("%#lx", addr);
-               return;
-       }
-
-#ifdef LINUXSPARC
-       if (current_personality == 1) {
-               printstatsol(tcp, addr);
-               return;
-       }
-#ifdef SPARC64
-       else if (current_personality == 2) {
-               printstat_sparc64(tcp, addr);
-               return;
-       }
-#endif
-#endif /* LINUXSPARC */
-
-#if defined POWERPC64
-       if (current_personality == 1) {
-               printstat_powerpc32(tcp, addr);
-               return;
-       }
-#endif
-
-       if (umove(tcp, addr, &statbuf) < 0) {
-               tprints("{...}");
-               return;
-       }
-
-       realprintstat(tcp, &statbuf);
-}
-#endif /* !HAVE_LONG_LONG_OFF_T */
-
-#if !defined HAVE_STAT64 && defined X86_64
-/*
- * Linux x86_64 has unified `struct stat' but its i386 biarch needs
- * `struct stat64'.  Its <asm-i386/stat.h> definition expects 32-bit `long'.
- * <linux/include/asm-x86_64/ia32.h> is not in the public includes set.
- * __GNUC__ is needed for the required __attribute__ below.
- */
-struct stat64 {
-       unsigned long long      st_dev;
-       unsigned char   __pad0[4];
-       unsigned int    __st_ino;
-       unsigned int    st_mode;
-       unsigned int    st_nlink;
-       unsigned int    st_uid;
-       unsigned int    st_gid;
-       unsigned long long      st_rdev;
-       unsigned char   __pad3[4];
-       long long       st_size;
-       unsigned int    st_blksize;
-       unsigned long long      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 long long      st_ino;
-} __attribute__((packed));
-# define HAVE_STAT64   1
-# define STAT64_SIZE   96
-#endif
-
-#ifdef HAVE_STAT64
-static void
-printstat64(struct tcb *tcp, long addr)
-{
-       struct stat64 statbuf;
-
-#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;
-       }
-
-#ifdef LINUXSPARC
-       if (current_personality == 1) {
-               printstatsol(tcp, addr);
-               return;
-       }
-# ifdef SPARC64
-       else if (current_personality == 2) {
-               printstat_sparc64(tcp, addr);
-               return;
-       }
-# endif
-#endif /* LINUXSPARC */
-
-#if defined X86_64
-       if (current_personality != 1) {
-               printstat(tcp, addr);
-               return;
-       }
-#endif
+       struct stat32 statbuf;
 
        if (umove(tcp, addr, &statbuf) < 0) {
                tprints("{...}");
-               return;
-       }
-
-       if (!abbrev(tcp)) {
-#ifdef HAVE_LONG_LONG
-               tprintf("{st_dev=makedev(%lu, %lu), st_ino=%llu, st_mode=%s, ",
-#else
-               tprintf("{st_dev=makedev(%lu, %lu), st_ino=%lu, st_mode=%s, ",
-#endif
-                       (unsigned long) major(statbuf.st_dev),
-                       (unsigned long) minor(statbuf.st_dev),
-#ifdef HAVE_LONG_LONG
-                       (unsigned long long) statbuf.st_ino,
-#else
-                       (unsigned long) statbuf.st_ino,
-#endif
-                       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);
-#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
-               tprintf("st_blksize=%lu, ",
-                       (unsigned long) statbuf.st_blksize);
-#endif /* HAVE_STRUCT_STAT_ST_BLKSIZE */
-#ifdef HAVE_STRUCT_STAT_ST_BLOCKS
-               tprintf("st_blocks=%lu, ", (unsigned long) statbuf.st_blocks);
-#endif /* HAVE_STRUCT_STAT_ST_BLOCKS */
-       }
-       else
-               tprintf("{st_mode=%s, ", sprintmode(statbuf.st_mode));
-       switch (statbuf.st_mode & S_IFMT) {
-       case S_IFCHR: case S_IFBLK:
-#ifdef HAVE_STRUCT_STAT_ST_RDEV
-               tprintf("st_rdev=makedev(%lu, %lu), ",
-                       (unsigned long) major(statbuf.st_rdev),
-                       (unsigned long) minor(statbuf.st_rdev));
-#else /* !HAVE_STRUCT_STAT_ST_RDEV */
-               tprintf("st_size=makedev(%lu, %lu), ",
-                       (unsigned long) major(statbuf.st_size),
-                       (unsigned long) minor(statbuf.st_size));
-#endif /* !HAVE_STRUCT_STAT_ST_RDEV */
-               break;
-       default:
-#ifdef HAVE_LONG_LONG
-               tprintf("st_size=%llu, ", (unsigned long long) statbuf.st_size);
-#else
-               tprintf("st_size=%lu, ", (unsigned long) statbuf.st_size);
-#endif
-               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));
-#if HAVE_STRUCT_STAT_ST_FLAGS
-               tprints(", st_flags=");
-               printflags(fileflags, statbuf.st_flags, "UF_???");
-#endif
-#if HAVE_STRUCT_STAT_ST_ACLCNT
-               tprintf(", st_aclcnt=%d", statbuf.st_aclcnt);
-#endif
-#if HAVE_STRUCT_STAT_ST_LEVEL
-               tprintf(", st_level=%ld", statbuf.st_level);
-#endif
-#if HAVE_STRUCT_STAT_ST_FSTYPE
-               tprintf(", st_fstype=%.*s",
-                       (int) sizeof statbuf.st_fstype, statbuf.st_fstype);
-#endif
-#if HAVE_STRUCT_STAT_ST_GEN
-               tprintf(", st_gen=%u", statbuf.st_gen);
-#endif
-               tprints("}");
-       }
-       else
-               tprints("...}");
-}
-#endif /* HAVE_STAT64 */
-
-#if defined(HAVE_STRUCT___OLD_KERNEL_STAT) && !defined(HAVE_LONG_LONG_OFF_T)
-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;
-       }
-
-# ifdef LINUXSPARC
-       if (current_personality == 1) {
-               printstatsol(tcp, addr);
-               return;
-       }
-# endif
-
-       if (umove(tcp, addr, &statbuf) < 0) {
-               tprints("{...}");
-               return;
-       }
-
-       convertoldstat(&statbuf, &newstatbuf);
-       realprintstat(tcp, &newstatbuf);
-}
-#endif
-
-#ifndef HAVE_LONG_LONG_OFF_T
-int
-sys_stat(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprints(", ");
-       } else {
-               printstat(tcp, tcp->u_arg[1]);
-       }
-       return 0;
-}
-#endif
-
-int
-sys_stat64(struct tcb *tcp)
-{
-#ifdef HAVE_STAT64
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprints(", ");
-       } else {
-               printstat64(tcp, tcp->u_arg[1]);
-       }
-       return 0;
-#else
-       return printargs(tcp);
-#endif
-}
-
-#ifndef AT_SYMLINK_NOFOLLOW
-# define AT_SYMLINK_NOFOLLOW   0x100
-#endif
-#ifndef AT_REMOVEDIR
-# define AT_REMOVEDIR          0x200
-#endif
-#ifndef AT_SYMLINK_FOLLOW
-# define AT_SYMLINK_FOLLOW     0x400
-#endif
-#ifndef AT_NO_AUTOMOUNT
-# define AT_NO_AUTOMOUNT       0x800
-#endif
-#ifndef AT_EMPTY_PATH
-# define AT_EMPTY_PATH         0x1000
-#endif
-
-static const struct xlat at_flags[] = {
-       { AT_SYMLINK_NOFOLLOW,  "AT_SYMLINK_NOFOLLOW"   },
-       { AT_REMOVEDIR,         "AT_REMOVEDIR"          },
-       { AT_SYMLINK_FOLLOW,    "AT_SYMLINK_FOLLOW"     },
-       { AT_NO_AUTOMOUNT,      "AT_NO_AUTOMOUNT"       },
-       { AT_EMPTY_PATH,        "AT_EMPTY_PATH"         },
-       { 0,                    NULL                    }
-};
-
-int
-sys_newfstatat(struct tcb *tcp)
-{
-       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
-                       printstat64(tcp, tcp->u_arg[2]);
-#elif defined HAVE_STAT64
-               printstat64(tcp, tcp->u_arg[2]);
-#else
-               printstat(tcp, tcp->u_arg[2]);
-#endif
-               tprints(", ");
-               printflags(at_flags, tcp->u_arg[3], "AT_???");
-       }
-       return 0;
-}
-
-#if defined(HAVE_STRUCT___OLD_KERNEL_STAT) && !defined(HAVE_LONG_LONG_OFF_T)
-int
-sys_oldstat(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprints(", ");
-       } else {
-               printoldstat(tcp, tcp->u_arg[1]);
-       }
-       return 0;
-}
-#endif
-
-#ifndef HAVE_LONG_LONG_OFF_T
-int
-sys_fstat(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-       } else {
-               printstat(tcp, tcp->u_arg[1]);
-       }
-       return 0;
-}
-#endif
-
-int
-sys_fstat64(struct tcb *tcp)
-{
-#ifdef HAVE_STAT64
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-       } else {
-               printstat64(tcp, tcp->u_arg[1]);
-       }
-       return 0;
-#else
-       return printargs(tcp);
-#endif
-}
-
-#if defined(HAVE_STRUCT___OLD_KERNEL_STAT) && !defined(HAVE_LONG_LONG_OFF_T)
-int
-sys_oldfstat(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-       } else {
-               printoldstat(tcp, tcp->u_arg[1]);
-       }
-       return 0;
-}
-#endif
-
-#ifndef HAVE_LONG_LONG_OFF_T
-int
-sys_lstat(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprints(", ");
-       } else {
-               printstat(tcp, tcp->u_arg[1]);
-       }
-       return 0;
-}
-#endif
-
-int
-sys_lstat64(struct tcb *tcp)
-{
-#ifdef HAVE_STAT64
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprints(", ");
-       } else {
-               printstat64(tcp, tcp->u_arg[1]);
-       }
-       return 0;
-#else
-       return printargs(tcp);
-#endif
-}
-
-#if defined(HAVE_STRUCT___OLD_KERNEL_STAT) && !defined(HAVE_LONG_LONG_OFF_T)
-int
-sys_oldlstat(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprints(", ");
-       } else {
-               printoldstat(tcp, tcp->u_arg[1]);
-       }
-       return 0;
-}
-#endif
-
-#if defined(LINUXSPARC)
-
-int
-sys_xstat(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-               printpath(tcp, tcp->u_arg[1]);
-               tprints(", ");
-       } else {
-# ifdef _STAT64_VER
-               if (tcp->u_arg[0] == _STAT64_VER)
-                       printstat64(tcp, tcp->u_arg[2]);
-               else
-# endif
-               printstat(tcp, tcp->u_arg[2]);
-       }
-       return 0;
-}
-
-int
-sys_fxstat(struct tcb *tcp)
-{
-       if (entering(tcp))
-               tprintf("%ld, %ld, ", tcp->u_arg[0], tcp->u_arg[1]);
-       else {
-# ifdef _STAT64_VER
-               if (tcp->u_arg[0] == _STAT64_VER)
-                       printstat64(tcp, tcp->u_arg[2]);
-               else
-# endif
-               printstat(tcp, tcp->u_arg[2]);
-       }
-       return 0;
-}
-
-int
-sys_lxstat(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-               printpath(tcp, tcp->u_arg[1]);
-               tprints(", ");
-       } else {
-# ifdef _STAT64_VER
-               if (tcp->u_arg[0] == _STAT64_VER)
-                       printstat64(tcp, tcp->u_arg[2]);
-               else
-# endif
-               printstat(tcp, tcp->u_arg[2]);
-       }
-       return 0;
-}
-
-int
-sys_xmknod(struct tcb *tcp)
-{
-       int mode = tcp->u_arg[2];
-
-       if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-               printpath(tcp, tcp->u_arg[1]);
-               tprintf(", %s", sprintmode(mode));
-               switch (mode & S_IFMT) {
-               case S_IFCHR: case S_IFBLK:
-                       tprintf(", makedev(%lu, %lu)",
-                               (unsigned long) ((tcp->u_arg[3] >> 18) & 0x3fff),
-                               (unsigned long) (tcp->u_arg[3] & 0x3ffff));
-                       break;
-               default:
-                       break;
-               }
-       }
-       return 0;
-}
-
-# ifdef HAVE_SYS_ACL_H
-
-#  include <sys/acl.h>
-
-static const struct xlat aclcmds[] = {
-#  ifdef SETACL
-       { SETACL,       "SETACL"        },
-#  endif
-#  ifdef GETACL
-       { GETACL,       "GETACL"        },
-#  endif
-#  ifdef GETACLCNT
-       { GETACLCNT,    "GETACLCNT"     },
-#  endif
-#  ifdef ACL_GET
-       { ACL_GET,      "ACL_GET"       },
-#  endif
-#  ifdef ACL_SET
-       { ACL_SET,      "ACL_SET"       },
-#  endif
-#  ifdef ACL_CNT
-       { ACL_CNT,      "ACL_CNT"       },
-#  endif
-       { 0,            NULL            },
-};
-
-int
-sys_acl(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printxval(aclcmds, tcp->u_arg[1], "???ACL???");
-               tprintf(", %ld", tcp->u_arg[2]);
-               /*
-                * FIXME - dump out the list of aclent_t's pointed to
-                * by "tcp->u_arg[3]" if it's not NULL.
-                */
-               if (tcp->u_arg[3])
-                       tprintf(", %#lx", tcp->u_arg[3]);
-               else
-                       tprints(", NULL");
-       }
-       return 0;
-}
-
-int
-sys_facl(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-               printxval(aclcmds, tcp->u_arg[1], "???ACL???");
-               tprintf(", %ld", tcp->u_arg[2]);
-               /*
-                * FIXME - dump out the list of aclent_t's pointed to
-                * by "tcp->u_arg[3]" if it's not NULL.
-                */
-               if (tcp->u_arg[3])
-                       tprintf(", %#lx", tcp->u_arg[3]);
-               else
-                       tprints(", NULL");
-       }
-       return 0;
-}
-
-static const struct xlat aclipc[] = {
-#  ifdef IPC_SHM
-       { IPC_SHM,      "IPC_SHM"       },
-#  endif
-#  ifdef IPC_SEM
-       { IPC_SEM,      "IPC_SEM"       },
-#  endif
-#  ifdef IPC_MSG
-       { IPC_MSG,      "IPC_MSG"       },
-#  endif
-       { 0,            NULL            },
-};
-
-int
-sys_aclipc(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printxval(aclipc, tcp->u_arg[0], "???IPC???");
-               tprintf(", %#lx, ", tcp->u_arg[1]);
-               printxval(aclcmds, tcp->u_arg[2], "???ACL???");
-               tprintf(", %ld", tcp->u_arg[3]);
-               /*
-                * FIXME - dump out the list of aclent_t's pointed to
-                * by "tcp->u_arg[4]" if it's not NULL.
-                */
-               if (tcp->u_arg[4])
-                       tprintf(", %#lx", tcp->u_arg[4]);
-               else
-                       tprints(", NULL");
-       }
-       return 0;
-}
-
-# endif /* HAVE_SYS_ACL_H */
-
-#endif /* LINUXSPARC */
-
-static const struct xlat fsmagic[] = {
-       { 0x73757245,   "CODA_SUPER_MAGIC"      },
-       { 0x012ff7b7,   "COH_SUPER_MAGIC"       },
-       { 0x1373,       "DEVFS_SUPER_MAGIC"     },
-       { 0x1cd1,       "DEVPTS_SUPER_MAGIC"    },
-       { 0x414A53,     "EFS_SUPER_MAGIC"       },
-       { 0xef51,       "EXT2_OLD_SUPER_MAGIC"  },
-       { 0xef53,       "EXT2_SUPER_MAGIC"      },
-       { 0x137d,       "EXT_SUPER_MAGIC"       },
-       { 0xf995e849,   "HPFS_SUPER_MAGIC"      },
-       { 0x9660,       "ISOFS_SUPER_MAGIC"     },
-       { 0x137f,       "MINIX_SUPER_MAGIC"     },
-       { 0x138f,       "MINIX_SUPER_MAGIC2"    },
-       { 0x2468,       "MINIX2_SUPER_MAGIC"    },
-       { 0x2478,       "MINIX2_SUPER_MAGIC2"   },
-       { 0x4d44,       "MSDOS_SUPER_MAGIC"     },
-       { 0x564c,       "NCP_SUPER_MAGIC"       },
-       { 0x6969,       "NFS_SUPER_MAGIC"       },
-       { 0x9fa0,       "PROC_SUPER_MAGIC"      },
-       { 0x002f,       "QNX4_SUPER_MAGIC"      },
-       { 0x52654973,   "REISERFS_SUPER_MAGIC"  },
-       { 0x02011994,   "SHMFS_SUPER_MAGIC"     },
-       { 0x517b,       "SMB_SUPER_MAGIC"       },
-       { 0x012ff7b6,   "SYSV2_SUPER_MAGIC"     },
-       { 0x012ff7b5,   "SYSV4_SUPER_MAGIC"     },
-       { 0x00011954,   "UFS_MAGIC"             },
-       { 0x54190100,   "UFS_CIGAM"             },
-       { 0x012ff7b4,   "XENIX_SUPER_MAGIC"     },
-       { 0x012fd16d,   "XIAFS_SUPER_MAGIC"     },
-       { 0x62656572,   "SYSFS_MAGIC"           },
-       { 0,            NULL                    },
-};
-
-static const char *
-sprintfstype(int magic)
-{
-       static char buf[32];
-       const char *s;
-
-       s = xlookup(fsmagic, magic);
-       if (s) {
-               sprintf(buf, "\"%s\"", s);
-               return buf;
-       }
-       sprintf(buf, "%#x", magic);
-       return buf;
-}
-
-static void
-printstatfs(struct tcb *tcp, long addr)
-{
-       struct statfs statbuf;
-
-       if (syserror(tcp) || !verbose(tcp)) {
-               tprintf("%#lx", addr);
-               return;
-       }
-       if (umove(tcp, addr, &statbuf) < 0) {
-               tprints("{...}");
-               return;
-       }
-#ifdef ALPHA
-
-       tprintf("{f_type=%s, f_fbsize=%u, f_blocks=%u, f_bfree=%u, ",
-               sprintfstype(statbuf.f_type),
-               statbuf.f_bsize, statbuf.f_blocks, statbuf.f_bfree);
-       tprintf("f_bavail=%u, f_files=%u, f_ffree=%u, f_fsid={%d, %d}, f_namelen=%u",
-               statbuf.f_bavail, statbuf.f_files, statbuf.f_ffree,
-               statbuf.f_fsid.__val[0], statbuf.f_fsid.__val[1],
-               statbuf.f_namelen);
-#else /* !ALPHA */
-       tprintf("{f_type=%s, f_bsize=%lu, f_blocks=%lu, f_bfree=%lu, ",
-               sprintfstype(statbuf.f_type),
-               (unsigned long)statbuf.f_bsize,
-               (unsigned long)statbuf.f_blocks,
-               (unsigned long)statbuf.f_bfree);
-       tprintf("f_bavail=%lu, f_files=%lu, f_ffree=%lu, f_fsid={%d, %d}",
-               (unsigned long)statbuf.f_bavail,
-               (unsigned long)statbuf.f_files,
-               (unsigned long)statbuf.f_ffree,
-               statbuf.f_fsid.__val[0], statbuf.f_fsid.__val[1]);
-       tprintf(", f_namelen=%lu", (unsigned long)statbuf.f_namelen);
-#endif /* !ALPHA */
-#ifdef _STATFS_F_FRSIZE
-       tprintf(", f_frsize=%lu", (unsigned long)statbuf.f_frsize);
-#endif
-       tprints("}");
-}
-
-int
-sys_statfs(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprints(", ");
-       } else {
-               printstatfs(tcp, tcp->u_arg[1]);
-       }
-       return 0;
-}
-
-int
-sys_fstatfs(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-       } else {
-               printstatfs(tcp, tcp->u_arg[1]);
-       }
-       return 0;
-}
-
-#if defined HAVE_STATFS64
-static void
-printstatfs64(struct tcb *tcp, long addr)
-{
-       struct statfs64 statbuf;
-
-       if (syserror(tcp) || !verbose(tcp)) {
-               tprintf("%#lx", addr);
-               return;
-       }
-       if (umove(tcp, addr, &statbuf) < 0) {
-               tprints("{...}");
-               return;
-       }
-       tprintf("{f_type=%s, f_bsize=%llu, f_blocks=%llu, f_bfree=%llu, ",
-               sprintfstype(statbuf.f_type),
-               (unsigned long long)statbuf.f_bsize,
-               (unsigned long long)statbuf.f_blocks,
-               (unsigned long long)statbuf.f_bfree);
-       tprintf("f_bavail=%llu, f_files=%llu, f_ffree=%llu, f_fsid={%d, %d}",
-               (unsigned long long)statbuf.f_bavail,
-               (unsigned long long)statbuf.f_files,
-               (unsigned long long)statbuf.f_ffree,
-               statbuf.f_fsid.__val[0], statbuf.f_fsid.__val[1]);
-       tprintf(", f_namelen=%lu", (unsigned long)statbuf.f_namelen);
-#ifdef _STATFS_F_FRSIZE
-       tprintf(", f_frsize=%llu", (unsigned long long)statbuf.f_frsize);
-#endif
-#ifdef _STATFS_F_FLAGS
-       tprintf(", f_flags=%llu", (unsigned long long)statbuf.f_flags);
-#endif
-       tprints("}");
-}
-
-struct compat_statfs64 {
-       uint32_t f_type;
-       uint32_t f_bsize;
-       uint64_t f_blocks;
-       uint64_t f_bfree;
-       uint64_t f_bavail;
-       uint64_t f_files;
-       uint64_t f_ffree;
-       fsid_t f_fsid;
-       uint32_t f_namelen;
-       uint32_t f_frsize;
-       uint32_t f_flags;
-       uint32_t f_spare[4];
-}
-#if defined(X86_64) || defined(IA64)
-  __attribute__ ((packed, aligned(4)))
-#endif
-;
-
-static void
-printcompat_statfs64(struct tcb *tcp, long addr)
-{
-       struct compat_statfs64 statbuf;
-
-       if (syserror(tcp) || !verbose(tcp)) {
-               tprintf("%#lx", addr);
-               return;
-       }
-       if (umove(tcp, addr, &statbuf) < 0) {
-               tprints("{...}");
-               return;
-       }
-       tprintf("{f_type=%s, f_bsize=%lu, f_blocks=%llu, f_bfree=%llu, ",
-               sprintfstype(statbuf.f_type),
-               (unsigned long)statbuf.f_bsize,
-               (unsigned long long)statbuf.f_blocks,
-               (unsigned long long)statbuf.f_bfree);
-       tprintf("f_bavail=%llu, f_files=%llu, f_ffree=%llu, f_fsid={%d, %d}",
-               (unsigned long long)statbuf.f_bavail,
-               (unsigned long long)statbuf.f_files,
-               (unsigned long long)statbuf.f_ffree,
-               statbuf.f_fsid.__val[0], statbuf.f_fsid.__val[1]);
-       tprintf(", f_namelen=%lu", (unsigned long)statbuf.f_namelen);
-       tprintf(", f_frsize=%lu", (unsigned long)statbuf.f_frsize);
-       tprintf(", f_flags=%lu}", (unsigned long)statbuf.f_frsize);
-}
-
-int
-sys_statfs64(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprintf(", %lu, ", tcp->u_arg[1]);
-       } else {
-               if (tcp->u_arg[1] == sizeof(struct statfs64))
-                       printstatfs64(tcp, tcp->u_arg[2]);
-               else if (tcp->u_arg[1] == sizeof(struct compat_statfs64))
-                       printcompat_statfs64(tcp, tcp->u_arg[2]);
-               else
-                       tprints("{???}");
-       }
-       return 0;
-}
-
-int
-sys_fstatfs64(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprintf(", %lu, ", tcp->u_arg[1]);
-       } else {
-               if (tcp->u_arg[1] == sizeof(struct statfs64))
-                       printstatfs64(tcp, tcp->u_arg[2]);
-               else if (tcp->u_arg[1] == sizeof(struct compat_statfs64))
-                       printcompat_statfs64(tcp, tcp->u_arg[2]);
-               else
-                       tprints("{???}");
-       }
-       return 0;
-}
-#endif
-
-#if defined(ALPHA)
-int
-osf_statfs(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprints(", ");
-       } else {
-               printstatfs(tcp, tcp->u_arg[1]);
-               tprintf(", %lu", tcp->u_arg[2]);
-       }
-       return 0;
-}
-
-int
-osf_fstatfs(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               tprintf("%lu, ", tcp->u_arg[0]);
-       } else {
-               printstatfs(tcp, tcp->u_arg[1]);
-               tprintf(", %lu", tcp->u_arg[2]);
-       }
-       return 0;
-}
-#endif
-
-/* directory */
-int
-sys_chdir(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-       }
-       return 0;
-}
-
-static int
-decode_mkdir(struct tcb *tcp, int offset)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[offset]);
-               tprintf(", %#lo", tcp->u_arg[offset + 1]);
-       }
-       return 0;
-}
-
-int
-sys_mkdir(struct tcb *tcp)
-{
-       return decode_mkdir(tcp, 0);
-}
-
-int
-sys_mkdirat(struct tcb *tcp)
-{
-       if (entering(tcp))
-               print_dirfd(tcp, tcp->u_arg[0]);
-       return decode_mkdir(tcp, 1);
-}
-
-int
-sys_link(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printpath(tcp, tcp->u_arg[1]);
-       }
-       return 0;
-}
-
-int
-sys_linkat(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               print_dirfd(tcp, tcp->u_arg[0]);
-               printpath(tcp, tcp->u_arg[1]);
-               tprints(", ");
-               print_dirfd(tcp, tcp->u_arg[2]);
-               printpath(tcp, tcp->u_arg[3]);
-               tprints(", ");
-               printflags(at_flags, tcp->u_arg[4], "AT_???");
-       }
-       return 0;
-}
-
-int
-sys_unlinkat(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               print_dirfd(tcp, tcp->u_arg[0]);
-               printpath(tcp, tcp->u_arg[1]);
-               tprints(", ");
-               printflags(at_flags, tcp->u_arg[2], "AT_???");
-       }
-       return 0;
-}
-
-int
-sys_symlinkat(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               print_dirfd(tcp, tcp->u_arg[1]);
-               printpath(tcp, tcp->u_arg[2]);
-       }
-       return 0;
-}
-
-static int
-decode_readlink(struct tcb *tcp, int offset)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[offset]);
-               tprints(", ");
-       } else {
-               if (syserror(tcp))
-                       tprintf("%#lx", tcp->u_arg[offset + 1]);
-               else
-                       /* Used to use printpathn(), but readlink
-                        * neither includes NUL in the returned count,
-                        * nor actually writes it into memory.
-                        * printpathn() would decide on printing
-                        * "..." continuation based on garbage
-                        * past return buffer's end.
-                        */
-                       printstr(tcp, tcp->u_arg[offset + 1], tcp->u_rval);
-               tprintf(", %lu", tcp->u_arg[offset + 2]);
-       }
-       return 0;
-}
-
-int
-sys_readlink(struct tcb *tcp)
-{
-       return decode_readlink(tcp, 0);
-}
-
-int
-sys_readlinkat(struct tcb *tcp)
-{
-       if (entering(tcp))
-               print_dirfd(tcp, tcp->u_arg[0]);
-       return decode_readlink(tcp, 1);
-}
-
-int
-sys_renameat(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               print_dirfd(tcp, tcp->u_arg[0]);
-               printpath(tcp, tcp->u_arg[1]);
-               tprints(", ");
-               print_dirfd(tcp, tcp->u_arg[2]);
-               printpath(tcp, tcp->u_arg[3]);
-       }
-       return 0;
-}
-
-int
-sys_chown(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               printuid(", ", tcp->u_arg[1]);
-               printuid(", ", tcp->u_arg[2]);
-       }
-       return 0;
-}
-
-int
-sys_fchownat(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               print_dirfd(tcp, tcp->u_arg[0]);
-               printpath(tcp, tcp->u_arg[1]);
-               printuid(", ", tcp->u_arg[2]);
-               printuid(", ", tcp->u_arg[3]);
-               tprints(", ");
-               printflags(at_flags, tcp->u_arg[4], "AT_???");
-       }
-       return 0;
-}
-
-int
-sys_fchown(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               printuid(", ", tcp->u_arg[1]);
-               printuid(", ", tcp->u_arg[2]);
-       }
-       return 0;
-}
-
-static int
-decode_chmod(struct tcb *tcp, int offset)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[offset]);
-               tprintf(", %#lo", tcp->u_arg[offset + 1]);
-       }
-       return 0;
-}
-
-int
-sys_chmod(struct tcb *tcp)
-{
-       return decode_chmod(tcp, 0);
-}
-
-int
-sys_fchmodat(struct tcb *tcp)
-{
-       if (entering(tcp))
-               print_dirfd(tcp, tcp->u_arg[0]);
-       return decode_chmod(tcp, 1);
-}
-
-int
-sys_fchmod(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprintf(", %#lo", tcp->u_arg[1]);
-       }
-       return 0;
-}
-
-#ifdef ALPHA
-int
-sys_osf_utimes(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printtv_bitness(tcp, tcp->u_arg[1], BITNESS_32,  0);
-       }
-       return 0;
-}
-#endif
-
-static int
-decode_utimes(struct tcb *tcp, int offset, int special)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[offset]);
-               tprints(", ");
-               if (tcp->u_arg[offset + 1] == 0)
-                       tprints("NULL");
-               else {
-                       tprints("{");
-                       printtv_bitness(tcp, tcp->u_arg[offset + 1],
-                                       BITNESS_CURRENT, special);
-                       tprints(", ");
-                       printtv_bitness(tcp, tcp->u_arg[offset + 1]
-                                       + sizeof(struct timeval),
-                                       BITNESS_CURRENT, special);
-                       tprints("}");
-               }
-       }
-       return 0;
-}
-
-int
-sys_utimes(struct tcb *tcp)
-{
-       return decode_utimes(tcp, 0, 0);
-}
-
-int
-sys_futimesat(struct tcb *tcp)
-{
-       if (entering(tcp))
-               print_dirfd(tcp, tcp->u_arg[0]);
-       return decode_utimes(tcp, 1, 0);
-}
-
-int
-sys_utimensat(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               print_dirfd(tcp, tcp->u_arg[0]);
-               decode_utimes(tcp, 1, 1);
-               tprints(", ");
-               printflags(at_flags, tcp->u_arg[3], "AT_???");
-       }
-       return 0;
-}
-
-int
-sys_utime(struct tcb *tcp)
-{
-       union {
-               long utl[2];
-               int uti[2];
-       } u;
-       unsigned wordsize = current_wordsize;
-
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               if (!tcp->u_arg[1])
-                       tprints("NULL");
-               else if (!verbose(tcp))
-                       tprintf("%#lx", tcp->u_arg[1]);
-               else if (umoven(tcp, tcp->u_arg[1], 2 * wordsize, (char *) &u) < 0)
-                       tprints("[?, ?]");
-               else if (wordsize == sizeof u.utl[0]) {
-                       tprintf("[%s,", sprinttime(u.utl[0]));
-                       tprintf(" %s]", sprinttime(u.utl[1]));
-               }
-               else if (wordsize == sizeof u.uti[0]) {
-                       tprintf("[%s,", sprinttime(u.uti[0]));
-                       tprintf(" %s]", sprinttime(u.uti[1]));
-               }
-               else
-                       abort();
-       }
-       return 0;
-}
-
-static int
-decode_mknod(struct tcb *tcp, int offset)
-{
-       int mode = tcp->u_arg[offset + 1];
-
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[offset]);
-               tprintf(", %s", sprintmode(mode));
-               switch (mode & S_IFMT) {
-               case S_IFCHR:
-               case S_IFBLK:
-#ifdef LINUXSPARC
-                       if (current_personality == 1)
-                               tprintf(", makedev(%lu, %lu)",
-                               (unsigned long) ((tcp->u_arg[offset + 2] >> 18) & 0x3fff),
-                               (unsigned long) (tcp->u_arg[offset + 2] & 0x3ffff));
-                       else
-#endif
-                               tprintf(", makedev(%lu, %lu)",
-                               (unsigned long) major(tcp->u_arg[offset + 2]),
-                               (unsigned long) minor(tcp->u_arg[offset + 2]));
-                       break;
-               default:
-                       break;
-               }
-       }
-       return 0;
-}
-
-int
-sys_mknod(struct tcb *tcp)
-{
-       return decode_mknod(tcp, 0);
-}
-
-int
-sys_mknodat(struct tcb *tcp)
-{
-       if (entering(tcp))
-               print_dirfd(tcp, tcp->u_arg[0]);
-       return decode_mknod(tcp, 1);
-}
-
-static void
-printdir(struct tcb *tcp, long addr)
-{
-       struct dirent d;
-
-       if (!verbose(tcp)) {
-               tprintf("%#lx", addr);
-               return;
-       }
-       if (umove(tcp, addr, &d) < 0) {
-               tprints("{...}");
-               return;
-       }
-       tprintf("{d_ino=%ld, ", (unsigned long) d.d_ino);
-       tprints("d_name=");
-       printpathn(tcp, (long) ((struct dirent *) addr)->d_name, d.d_reclen);
-       tprints("}");
-}
-
-int
-sys_readdir(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-       } else {
-               if (syserror(tcp) || tcp->u_rval == 0 || !verbose(tcp))
-                       tprintf("%#lx", tcp->u_arg[1]);
-               else
-                       printdir(tcp, tcp->u_arg[1]);
-               /* Not much point in printing this out, it is always 1. */
-               if (tcp->u_arg[2] != 1)
-                       tprintf(", %lu", tcp->u_arg[2]);
-       }
-       return 0;
-}
-
-static const struct xlat direnttypes[] = {
-       { DT_UNKNOWN,   "DT_UNKNOWN"    },
-       { DT_FIFO,      "DT_FIFO"       },
-       { DT_CHR,       "DT_CHR"        },
-       { DT_DIR,       "DT_DIR"        },
-       { DT_BLK,       "DT_BLK"        },
-       { DT_REG,       "DT_REG"        },
-       { DT_LNK,       "DT_LNK"        },
-       { DT_SOCK,      "DT_SOCK"       },
-       { DT_WHT,       "DT_WHT"        },
-       { 0,            NULL            },
-};
-
-int
-sys_getdents(struct tcb *tcp)
-{
-       int i, len, dents = 0;
-       char *buf;
-
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               return 0;
-       }
-       if (syserror(tcp) || !verbose(tcp)) {
-               tprintf("%#lx, %lu", tcp->u_arg[1], tcp->u_arg[2]);
-               return 0;
-       }
-       len = tcp->u_rval;
-       /* Beware of insanely large or negative values in tcp->u_rval */
-       if (tcp->u_rval > 1024*1024)
-               len = 1024*1024;
-       if (tcp->u_rval < 0)
-               len = 0;
-       buf = len ? malloc(len) : NULL;
-       if (len && !buf)
-               die_out_of_memory();
-       if (umoven(tcp, tcp->u_arg[1], len, buf) < 0) {
-               tprintf("%#lx, %lu", tcp->u_arg[1], tcp->u_arg[2]);
-               free(buf);
-               return 0;
-       }
-       if (!abbrev(tcp))
-               tprints("{");
-       for (i = 0; i < len;) {
-               struct kernel_dirent *d = (struct kernel_dirent *) &buf[i];
-               if (!abbrev(tcp)) {
-                       tprintf("%s{d_ino=%lu, d_off=%lu, ",
-                               i ? " " : "", d->d_ino, d->d_off);
-                       tprintf("d_reclen=%u, d_name=\"%s\"}",
-                               d->d_reclen, d->d_name);
-               }
-               if (!d->d_reclen) {
-                       tprints("/* d_reclen == 0, problem here */");
-                       break;
-               }
-               i += d->d_reclen;
-               dents++;
-       }
-       if (!abbrev(tcp))
-               tprints("}");
-       else
-               tprintf("/* %u entries */", dents);
-       tprintf(", %lu", tcp->u_arg[2]);
-       free(buf);
-       return 0;
-}
-
-#if _LFS64_LARGEFILE
-int
-sys_getdents64(struct tcb *tcp)
-{
-       int i, len, dents = 0;
-       char *buf;
-
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               return 0;
-       }
-       if (syserror(tcp) || !verbose(tcp)) {
-               tprintf("%#lx, %lu", tcp->u_arg[1], tcp->u_arg[2]);
-               return 0;
-       }
-
-       len = tcp->u_rval;
-       /* Beware of insanely large or negative tcp->u_rval */
-       if (tcp->u_rval > 1024*1024)
-               len = 1024*1024;
-       if (tcp->u_rval < 0)
-               len = 0;
-       buf = len ? malloc(len) : NULL;
-       if (len && !buf)
-               die_out_of_memory();
-
-       if (umoven(tcp, tcp->u_arg[1], len, buf) < 0) {
-               tprintf("%#lx, %lu", tcp->u_arg[1], tcp->u_arg[2]);
-               free(buf);
-               return 0;
-       }
-       if (!abbrev(tcp))
-               tprints("{");
-       for (i = 0; i < len;) {
-               struct dirent64 *d = (struct dirent64 *) &buf[i];
-               if (!abbrev(tcp)) {
-                       tprintf("%s{d_ino=%" PRIu64 ", d_off=%" PRId64 ", ",
-                               i ? " " : "",
-                               d->d_ino,
-                               d->d_off);
-                       tprints("d_type=");
-                       printxval(direnttypes, d->d_type, "DT_???");
-                       tprints(", ");
-                       tprintf("d_reclen=%u, d_name=\"%s\"}",
-                               d->d_reclen, d->d_name);
-               }
-               if (!d->d_reclen) {
-                       tprints("/* d_reclen == 0, problem here */");
-                       break;
-               }
-               i += d->d_reclen;
-               dents++;
-       }
-       if (!abbrev(tcp))
-               tprints("}");
-       else
-               tprintf("/* %u entries */", dents);
-       tprintf(", %lu", tcp->u_arg[2]);
-       free(buf);
-       return 0;
-}
-#endif
-
-int
-sys_getcwd(struct tcb *tcp)
-{
-       if (exiting(tcp)) {
-               if (syserror(tcp))
-                       tprintf("%#lx", tcp->u_arg[0]);
-               else
-                       printpathn(tcp, tcp->u_arg[0], tcp->u_rval - 1);
-               tprintf(", %lu", tcp->u_arg[1]);
+               return;
        }
-       return 0;
+
+       do_printstat32(tcp, &statbuf);
 }
+#endif /* STAT32_PERSONALITY */
 
-#ifdef HAVE_SYS_ASYNCH_H
+#if defined(SPARC) || defined(SPARC64)
 
-int
-sys_aioread(struct tcb *tcp)
-{
-       struct aio_result_t res;
+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 */
+};
 
-       if (entering(tcp)) {
-               tprintf("%lu, ", tcp->u_arg[0]);
-       } else {
-               if (syserror(tcp))
-                       tprintf("%#lx", tcp->u_arg[1]);
-               else
-                       printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-               tprintf(", %lu, %lu, ", tcp->u_arg[2], tcp->u_arg[3]);
-               printxval(whence, tcp->u_arg[4], "L_???");
-               if (syserror(tcp) || tcp->u_arg[5] == 0
-                   || umove(tcp, tcp->u_arg[5], &res) < 0)
-                       tprintf(", %#lx", tcp->u_arg[5]);
-               else
-                       tprintf(", {aio_return %d aio_errno %d}",
-                               res.aio_return, res.aio_errno);
-       }
-       return 0;
-}
+# 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"
 
-int
-sys_aiowrite(struct tcb *tcp)
+static void
+printstatsol(struct tcb *tcp, long addr)
 {
-       struct aio_result_t res;
+       struct solstat statbuf;
 
-       if (entering(tcp)) {
-               tprintf("%lu, ", tcp->u_arg[0]);
-               printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-               tprintf(", %lu, %lu, ", tcp->u_arg[2], tcp->u_arg[3]);
-               printxval(whence, tcp->u_arg[4], "L_???");
-       }
-       else {
-               if (tcp->u_arg[5] == 0)
-                       tprints(", NULL");
-               else if (syserror(tcp)
-                   || umove(tcp, tcp->u_arg[5], &res) < 0)
-                       tprintf(", %#lx", tcp->u_arg[5]);
-               else
-                       tprintf(", {aio_return %d aio_errno %d}",
-                               res.aio_return, res.aio_errno);
+       if (umove(tcp, addr, &statbuf) < 0) {
+               tprints("{...}");
+               return;
        }
-       return 0;
-}
 
-int
-sys_aiowait(struct tcb *tcp)
-{
-       if (entering(tcp))
-               printtv(tcp, tcp->u_arg[0]);
-       return 0;
+       do_printstat_sol(tcp, &statbuf);
 }
 
-int
-sys_aiocancel(struct tcb *tcp)
+#endif /* SPARC || SPARC64 */
+
+static void
+printstat(struct tcb *tcp, long addr)
 {
-       struct aio_result_t res;
+       struct stat statbuf;
 
-       if (exiting(tcp)) {
-               if (tcp->u_arg[0] == 0)
-                       tprints("NULL");
-               else if (syserror(tcp)
-                   || umove(tcp, tcp->u_arg[0], &res) < 0)
-                       tprintf("%#lx", tcp->u_arg[0]);
-               else
-                       tprintf("{aio_return %d aio_errno %d}",
-                               res.aio_return, res.aio_errno);
+       if (!addr) {
+               tprints("NULL");
+               return;
+       }
+       if (syserror(tcp) || !verbose(tcp)) {
+               tprintf("%#lx", addr);
+               return;
        }
-       return 0;
-}
-
-#endif /* HAVE_SYS_ASYNCH_H */
 
-static const struct xlat xattrflags[] = {
-#ifdef XATTR_CREATE
-       { XATTR_CREATE,  "XATTR_CREATE" },
-       { XATTR_REPLACE, "XATTR_REPLACE" },
+#ifdef STAT32_PERSONALITY
+       if (current_personality == STAT32_PERSONALITY) {
+               printstat32(tcp, addr);
+               return;
+       }
 #endif
-       { 0,             NULL }
-};
 
-static void
-print_xattr_val(struct tcb *tcp, int failed,
-               unsigned long arg,
-               unsigned long insize,
-               unsigned long size)
-{
-       if (!failed) {
-               unsigned long capacity = 4 * size + 1;
-               unsigned char *buf = (capacity < size) ? NULL : malloc(capacity);
-               if (buf == NULL || /* probably a bogus size argument */
-                       umoven(tcp, arg, size, (char *) &buf[3 * size]) < 0) {
-                       failed = 1;
-               }
-               else {
-                       unsigned char *out = buf;
-                       unsigned char *in = &buf[3 * size];
-                       size_t i;
-                       for (i = 0; i < size; ++i) {
-                               if (isprint(in[i]))
-                                       *out++ = in[i];
-                               else {
-#define tohex(n) "0123456789abcdef"[n]
-                                       *out++ = '\\';
-                                       *out++ = 'x';
-                                       *out++ = tohex(in[i] / 16);
-                                       *out++ = tohex(in[i] % 16);
-                               }
-                       }
-                       /* Don't print terminating NUL if there is one.  */
-                       if (i > 0 && in[i - 1] == '\0')
-                               out -= 4;
-                       *out = '\0';
-                       tprintf(", \"%s\", %ld", buf, insize);
-               }
-               free(buf);
+#if defined(SPARC) || defined(SPARC64)
+       if (current_personality == 1) {
+               printstatsol(tcp, addr);
+               return;
        }
-       if (failed)
-               tprintf(", 0x%lx, %ld", arg, insize);
-}
+#endif /* SPARC || SPARC64 */
 
-int
-sys_setxattr(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printstr(tcp, tcp->u_arg[1], -1);
-               print_xattr_val(tcp, 0, tcp->u_arg[2], tcp->u_arg[3], tcp->u_arg[3]);
-               tprints(", ");
-               printflags(xattrflags, tcp->u_arg[4], "XATTR_???");
+       if (umove(tcp, addr, &statbuf) < 0) {
+               tprints("{...}");
+               return;
        }
-       return 0;
-}
 
-int
-sys_fsetxattr(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printstr(tcp, tcp->u_arg[1], -1);
-               print_xattr_val(tcp, 0, tcp->u_arg[2], tcp->u_arg[3], tcp->u_arg[3]);
-               tprints(", ");
-               printflags(xattrflags, tcp->u_arg[4], "XATTR_???");
-       }
-       return 0;
+       do_printstat(tcp, &statbuf);
 }
 
 int
-sys_getxattr(struct tcb *tcp)
+sys_stat(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printpath(tcp, tcp->u_arg[0]);
                tprints(", ");
-               printstr(tcp, tcp->u_arg[1], -1);
        } else {
-               print_xattr_val(tcp, syserror(tcp), tcp->u_arg[2], tcp->u_arg[3],
-                               tcp->u_rval);
+               printstat(tcp, tcp->u_arg[1]);
        }
        return 0;
 }
 
 int
-sys_fgetxattr(struct tcb *tcp)
+sys_fstat(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
                tprints(", ");
-               printstr(tcp, tcp->u_arg[1], -1);
        } else {
-               print_xattr_val(tcp, syserror(tcp), tcp->u_arg[2], tcp->u_arg[3],
-                               tcp->u_rval);
+               printstat(tcp, tcp->u_arg[1]);
        }
        return 0;
 }
 
+#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).
+ */
+struct stat64 {
+       unsigned long long      st_dev;
+       unsigned char   __pad0[4];
+       unsigned int    __st_ino;
+       unsigned int    st_mode;
+       unsigned int    st_nlink;
+       unsigned int    st_uid;
+       unsigned int    st_gid;
+       unsigned long long      st_rdev;
+       unsigned char   __pad3[4];
+       long long       st_size;
+       unsigned int    st_blksize;
+       unsigned long long      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 long long      st_ino;
+}
+#  if defined X86_64 || defined X32
+  __attribute__((packed))
+#   define STAT64_SIZE 96
+#  else
+#   define STAT64_SIZE 104
+#  endif
+;
+#  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_STRUCT_STAT64
+
+# define DO_PRINTSTAT do_printstat64
+# define STRUCT_STAT struct stat64
+# undef HAVE_STRUCT_STAT_ST_FLAGS
+# undef HAVE_STRUCT_STAT_ST_FSTYPE
+# undef HAVE_STRUCT_STAT_ST_GEN
+# include "printstat.h"
+
 static void
-print_xattr_list(struct tcb *tcp, unsigned long addr, unsigned long size)
+printstat64(struct tcb *tcp, long addr)
 {
-       if (syserror(tcp)) {
+       struct stat64 statbuf;
+
+# 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);
-       } else {
-               if (!addr) {
-                       tprints("NULL");
-               } else {
-                       unsigned long len =
-                               (size < tcp->u_rval) ? size : tcp->u_rval;
-                       printstr(tcp, addr, len);
-               }
+               return;
+       }
+
+# ifdef STAT32_PERSONALITY
+       if (current_personality != STAT32_PERSONALITY) {
+               printstat(tcp, addr);
+               return;
+       }
+# endif /* STAT32_PERSONALITY */
+
+       if (umove(tcp, addr, &statbuf) < 0) {
+               tprints("{...}");
+               return;
        }
-       tprintf(", %lu", size);
+
+       do_printstat64(tcp, &statbuf);
 }
 
 int
-sys_listxattr(struct tcb *tcp)
+sys_stat64(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printpath(tcp, tcp->u_arg[0]);
                tprints(", ");
        } else {
-               print_xattr_list(tcp, tcp->u_arg[1], tcp->u_arg[2]);
+               printstat64(tcp, tcp->u_arg[1]);
        }
        return 0;
 }
 
 int
-sys_flistxattr(struct tcb *tcp)
+sys_fstat64(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
                tprints(", ");
        } else {
-               print_xattr_list(tcp, tcp->u_arg[1], tcp->u_arg[2]);
+               printstat64(tcp, tcp->u_arg[1]);
        }
        return 0;
 }
 
+#else
+
 int
-sys_removexattr(struct tcb *tcp)
+sys_stat64(struct tcb *tcp)
 {
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printstr(tcp, tcp->u_arg[1], -1);
-       }
-       return 0;
+       return sys_stat(tcp);
 }
 
 int
-sys_fremovexattr(struct tcb *tcp)
+sys_fstat64(struct tcb *tcp)
 {
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printstr(tcp, tcp->u_arg[1], -1);
-       }
-       return 0;
+       return sys_fstat(tcp);
 }
 
-static const struct xlat advise[] = {
-       { POSIX_FADV_NORMAL,            "POSIX_FADV_NORMAL"     },
-       { POSIX_FADV_RANDOM,            "POSIX_FADV_RANDOM"     },
-       { POSIX_FADV_SEQUENTIAL,        "POSIX_FADV_SEQUENTIAL" },
-       { POSIX_FADV_WILLNEED,          "POSIX_FADV_WILLNEED"   },
-       { POSIX_FADV_DONTNEED,          "POSIX_FADV_DONTNEED"   },
-       { POSIX_FADV_NOREUSE,           "POSIX_FADV_NOREUSE"    },
-       { 0,                            NULL                    }
-};
+#endif /* HAVE_STRUCT_STAT64 */
 
 int
-sys_fadvise64(struct tcb *tcp)
+sys_newfstatat(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               int argn;
-               printfd(tcp, tcp->u_arg[0]);
+               print_dirfd(tcp, tcp->u_arg[0]);
+               printpath(tcp, tcp->u_arg[1]);
+               tprints(", ");
+       } else {
+#if defined STAT32_PERSONALITY
+               if (current_personality == STAT32_PERSONALITY)
+                       printstat64(tcp, tcp->u_arg[2]);
+               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 /* STAT32_PERSONALITY || HAVE_STRUCT_STAT64 */
                tprints(", ");
-               argn = printllval(tcp, "%lld", 1);
-               tprintf(", %ld, ", tcp->u_arg[argn++]);
-               printxval(advise, tcp->u_arg[argn], "POSIX_FADV_???");
+               printflags(at_flags, tcp->u_arg[3], "AT_???");
        }
        return 0;
 }
 
-int
-sys_fadvise64_64(struct tcb *tcp)
+#if defined(HAVE_STRUCT___OLD_KERNEL_STAT)
+
+static void
+convertoldstat(const struct __old_kernel_stat *oldbuf, struct stat *newbuf)
 {
-       if (entering(tcp)) {
-               int argn;
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-#if defined ARM || defined POWERPC
-               argn = printllval(tcp, "%lld, ", 2);
-#else
-               argn = printllval(tcp, "%lld, ", 1);
-#endif
-               argn = printllval(tcp, "%lld, ", argn);
-#if defined ARM || defined POWERPC
-               printxval(advise, tcp->u_arg[1], "POSIX_FADV_???");
-#else
-               printxval(advise, tcp->u_arg[argn], "POSIX_FADV_???");
-#endif
-       }
-       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;
 }
 
-static const struct xlat inotify_modes[] = {
-       { 0x00000001,   "IN_ACCESS"     },
-       { 0x00000002,   "IN_MODIFY"     },
-       { 0x00000004,   "IN_ATTRIB"     },
-       { 0x00000008,   "IN_CLOSE_WRITE"},
-       { 0x00000010,   "IN_CLOSE_NOWRITE"},
-       { 0x00000020,   "IN_OPEN"       },
-       { 0x00000040,   "IN_MOVED_FROM" },
-       { 0x00000080,   "IN_MOVED_TO"   },
-       { 0x00000100,   "IN_CREATE"     },
-       { 0x00000200,   "IN_DELETE"     },
-       { 0x00000400,   "IN_DELETE_SELF"},
-       { 0x00000800,   "IN_MOVE_SELF"  },
-       { 0x00002000,   "IN_UNMOUNT"    },
-       { 0x00004000,   "IN_Q_OVERFLOW" },
-       { 0x00008000,   "IN_IGNORED"    },
-       { 0x01000000,   "IN_ONLYDIR"    },
-       { 0x02000000,   "IN_DONT_FOLLOW"},
-       { 0x20000000,   "IN_MASK_ADD"   },
-       { 0x40000000,   "IN_ISDIR"      },
-       { 0x80000000,   "IN_ONESHOT"    },
-       { 0,            NULL            }
-};
+static void
+printoldstat(struct tcb *tcp, long addr)
+{
+       struct __old_kernel_stat statbuf;
+       struct stat newstatbuf;
 
-static const struct xlat inotify_init_flags[] = {
-       { 0x00000800,   "IN_NONBLOCK"   },
-       { 0x00080000,   "IN_CLOEXEC"    },
-       { 0,            NULL            }
-};
+       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);
+}
 
 int
-sys_inotify_add_watch(struct tcb *tcp)
+sys_oldstat(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printpath(tcp, tcp->u_arg[1]);
+               printpath(tcp, tcp->u_arg[0]);
                tprints(", ");
-               printflags(inotify_modes, tcp->u_arg[2], "IN_???");
+       } else {
+               printoldstat(tcp, tcp->u_arg[1]);
        }
        return 0;
 }
 
 int
-sys_inotify_rm_watch(struct tcb *tcp)
+sys_oldfstat(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
-               tprintf(", %d", (int) tcp->u_arg[1]);
+               tprints(", ");
+       } else {
+               printoldstat(tcp, tcp->u_arg[1]);
        }
        return 0;
 }
 
-int
-sys_inotify_init1(struct tcb *tcp)
-{
-       if (entering(tcp))
-               printflags(inotify_init_flags, tcp->u_arg[0], "IN_???");
-       return 0;
-}
+#endif /* HAVE_STRUCT___OLD_KERNEL_STAT */
+
+#if defined(SPARC) || defined(SPARC64)
 
 int
-sys_fallocate(struct tcb *tcp)
+sys_xstat(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               int argn;
-               printfd(tcp, tcp->u_arg[0]);            /* fd */
+               tprintf("%ld, ", tcp->u_arg[0]);
+               printpath(tcp, tcp->u_arg[1]);
                tprints(", ");
-               tprintf("%#lo, ", tcp->u_arg[1]);       /* mode */
-               argn = printllval(tcp, "%llu, ", 2);    /* offset */
-               printllval(tcp, "%llu", argn);          /* len */
+       } else {
+               printstat(tcp, tcp->u_arg[2]);
        }
        return 0;
 }
 
-#ifndef SWAP_FLAG_PREFER
-# define SWAP_FLAG_PREFER 0x8000
-#endif
-#ifndef SWAP_FLAG_DISCARD
-# define SWAP_FLAG_DISCARD 0x10000
-#endif
-static const struct xlat swap_flags[] = {
-       { SWAP_FLAG_PREFER,     "SWAP_FLAG_PREFER"      },
-       { SWAP_FLAG_DISCARD,    "SWAP_FLAG_DISCARD"     },
-       { 0,                    NULL                    }
-};
-
 int
-sys_swapon(struct tcb *tcp)
+sys_fxstat(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               int flags = tcp->u_arg[1];
-               printpath(tcp, tcp->u_arg[0]);
+               tprintf("%ld, ", tcp->u_arg[0]);
+               printfd(tcp, tcp->u_arg[1]);
                tprints(", ");
-               printflags(swap_flags, flags & ~SWAP_FLAG_PRIO_MASK,
-                       "SWAP_FLAG_???");
-               if (flags & SWAP_FLAG_PREFER)
-                       tprintf("|%d", flags & SWAP_FLAG_PRIO_MASK);
+       } else {
+               printstat(tcp, tcp->u_arg[2]);
        }
        return 0;
 }
+
+#endif /* SPARC || SPARC64 */