Check HAVE_LONG_LONG_OFF_T when printing offset

[strace] / file.c

diff --git a/file.c b/file.c
index 16562436dc4cac3e1445526c415ad9e5ec8461b0..db024ef83891d3ffde0784f7e9ec13eb22fe0895 100644 (file)
--- a/file.c
+++ b/file.c
@@ -272,7 +272,6 @@ const struct xlat open_mode_flags[] = {
 #ifdef O_CLOEXEC
        { O_CLOEXEC,    "O_CLOEXEC"     },
 #endif
-
 #ifdef FNDELAY
        { FNDELAY,      "FNDELAY"       },
 #endif
@@ -334,26 +333,14 @@ static void
 print_dirfd(struct tcb *tcp, int fd)
 {
        if (fd == AT_FDCWD)
-               tprintf("AT_FDCWD, ");
-       else
-       {
+               tprints("AT_FDCWD, ");
+       else {
                printfd(tcp, fd);
-               tprintf(", ");
+               tprints(", ");
        }
 }
 #endif
 
-/*
- * Pity stpcpy() is not standardized...
- */
-static char *
-str_append(char *dst, const char *src)
-{
-       while ((*dst = *src++) != '\0')
-               dst++;
-       return dst;
-}
-
 /*
  * low bits of the open(2) flags define access mode,
  * other bits are real flags.
@@ -361,16 +348,18 @@ str_append(char *dst, const char *src)
 const char *
 sprint_open_modes(mode_t flags)
 {
-       static char outstr[1024];
+       static char outstr[(1 + ARRAY_SIZE(open_mode_flags)) * sizeof("O_LARGEFILE")];
        char *p;
-       char sep = 0;
+       char sep;
        const char *str;
        const struct xlat *x;
 
-       p = str_append(outstr, "flags ");
+       sep = ' ';
+       p = stpcpy(outstr, "flags");
        str = xlookup(open_access_modes, flags & 3);
        if (str) {
-               p = str_append(p, str);
+               *p++ = sep;
+               p = stpcpy(p, str);
                flags &= ~3;
                if (!flags)
                        return outstr;
@@ -379,9 +368,8 @@ sprint_open_modes(mode_t flags)
 
        for (x = open_mode_flags; x->str; x++) {
                if ((flags & x->val) == x->val) {
-                       if (sep)
-                               *p++ = sep;
-                       p = str_append(p, x->str);
+                       *p++ = sep;
+                       p = stpcpy(p, x->str);
                        flags &= ~x->val;
                        if (!flags)
                                return outstr;
@@ -389,8 +377,7 @@ sprint_open_modes(mode_t flags)
                }
        }
        /* flags is still nonzero */
-       if (sep)
-               *p++ = sep;
+       *p++ = sep;
        sprintf(p, "%#x", flags);
        return outstr;
 }
@@ -398,7 +385,7 @@ sprint_open_modes(mode_t flags)
 void
 tprint_open_modes(mode_t flags)
 {
-       tprintf("%s", sprint_open_modes(flags) + sizeof("flags"));
+       tprints(sprint_open_modes(flags) + sizeof("flags"));
 }
 
 static int
@@ -406,7 +393,7 @@ decode_open(struct tcb *tcp, int offset)
 {
        if (entering(tcp)) {
                printpath(tcp, tcp->u_arg[offset]);
-               tprintf(", ");
+               tprints(", ");
                /* flags */
                tprint_open_modes(tcp->u_arg[offset + 1]);
                if (tcp->u_arg[offset + 1] & O_CREAT) {
@@ -457,7 +444,7 @@ solaris_open(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printpath(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               tprints(", ");
                /* flags */
                printflags(openmodessol, tcp->u_arg[1] + 1, "O_???");
                if (tcp->u_arg[1] & 0x100) {
@@ -499,7 +486,7 @@ decode_access(struct tcb *tcp, int offset)
 {
        if (entering(tcp)) {
                printpath(tcp, tcp->u_arg[offset]);
-               tprintf(", ");
+               tprints(", ");
                printflags(access_flags, tcp->u_arg[offset + 1], "?_OK");
        }
        return 0;
@@ -547,7 +534,7 @@ sys_lseek(struct tcb *tcp)
 
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               tprints(", ");
                offset = tcp->ext_arg[1];
                _whence = tcp->u_arg[2];
                if (_whence == SEEK_SET)
@@ -567,7 +554,7 @@ sys_lseek(struct tcb *tcp)
 
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               tprints(", ");
                offset = tcp->u_arg[1];
                _whence = tcp->u_arg[2];
                if (_whence == SEEK_SET)
@@ -618,7 +605,7 @@ sys_readahead(struct tcb *tcp)
        if (entering(tcp)) {
                int argn;
                printfd(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               tprints(", ");
                argn = printllval(tcp, "%lld", 1);
                tprintf(", %ld", tcp->u_arg[argn]);
        }
@@ -633,7 +620,7 @@ sys_lseek64(struct tcb *tcp)
        if (entering(tcp)) {
                int argn;
                printfd(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               tprints(", ");
                if (tcp->u_arg[3] == SEEK_SET)
                        argn = printllval(tcp, "%llu, ", 1);
                else
@@ -686,7 +673,7 @@ sys_ftruncate64(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               tprints(", ");
                printllval(tcp, "%llu", 1);
        }
        return 0;
@@ -739,7 +726,8 @@ sprinttime(time_t t)
                strcpy(buf, "0");
                return buf;
        }
-       if ((tmp = localtime(&t)))
+       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);
@@ -782,7 +770,7 @@ printstatsol(struct tcb *tcp, long addr)
        struct solstat statbuf;
 
        if (umove(tcp, addr, &statbuf) < 0) {
-               tprintf("{...}");
+               tprints("{...}");
                return;
        }
        if (!abbrev(tcp)) {
@@ -816,7 +804,7 @@ printstatsol(struct tcb *tcp, long addr)
                tprintf("st_ctime=%s}", sprinttime(statbuf.st_ctime.tv_sec));
        }
        else
-               tprintf("...}");
+               tprints("...}");
 }
 
 #if defined (SPARC64)
@@ -826,7 +814,7 @@ printstat_sparc64(struct tcb *tcp, long addr)
        struct stat_sparc64 statbuf;
 
        if (umove(tcp, addr, &statbuf) < 0) {
-               tprintf("{...}");
+               tprints("{...}");
                return;
        }
 
@@ -861,10 +849,10 @@ printstat_sparc64(struct tcb *tcp, long addr)
                tprintf("st_atime=%s, ", sprinttime(statbuf.st_atime));
                tprintf("st_mtime=%s, ", sprinttime(statbuf.st_mtime));
                tprintf("st_ctime=%s", sprinttime(statbuf.st_ctime));
-               tprintf("}");
+               tprints("}");
        }
        else
-               tprintf("...}");
+               tprints("...}");
 }
 #endif /* SPARC64 */
 #endif /* LINUXSPARC */
@@ -897,7 +885,7 @@ printstat_powerpc32(struct tcb *tcp, long addr)
        struct stat_powerpc32 statbuf;
 
        if (umove(tcp, addr, &statbuf) < 0) {
-               tprintf("{...}");
+               tprints("{...}");
                return;
        }
 
@@ -927,10 +915,10 @@ printstat_powerpc32(struct tcb *tcp, long addr)
                tprintf("st_atime=%s, ", sprinttime(statbuf.st_atime));
                tprintf("st_mtime=%s, ", sprinttime(statbuf.st_mtime));
                tprintf("st_ctime=%s", sprinttime(statbuf.st_ctime));
-               tprintf("}");
+               tprints("}");
        }
        else
-               tprintf("...}");
+               tprints("...}");
 }
 #endif /* LINUX && POWERPC64 */
 
@@ -962,7 +950,7 @@ sys_chflags(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printpath(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               tprints(", ");
                printflags(fileflags, tcp->u_arg[1], "UF_???");
        }
        return 0;
@@ -1023,7 +1011,7 @@ realprintstat(struct tcb *tcp, struct stat *statbuf)
                tprintf("st_mtime=%s, ", sprinttime(statbuf->st_mtime));
                tprintf("st_ctime=%s", sprinttime(statbuf->st_ctime));
 #if HAVE_STRUCT_STAT_ST_FLAGS
-               tprintf(", st_flags=");
+               tprints(", st_flags=");
                printflags(fileflags, statbuf->st_flags, "UF_???");
 #endif
 #if HAVE_STRUCT_STAT_ST_ACLCNT
@@ -1039,10 +1027,10 @@ realprintstat(struct tcb *tcp, struct stat *statbuf)
 #if HAVE_STRUCT_STAT_ST_GEN
                tprintf(", st_gen=%u", statbuf->st_gen);
 #endif
-               tprintf("}");
+               tprints("}");
        }
        else
-               tprintf("...}");
+               tprints("...}");
 }
 
 
@@ -1052,7 +1040,7 @@ printstat(struct tcb *tcp, long addr)
        struct stat statbuf;
 
        if (!addr) {
-               tprintf("NULL");
+               tprints("NULL");
                return;
        }
        if (syserror(tcp) || !verbose(tcp)) {
@@ -1081,7 +1069,7 @@ printstat(struct tcb *tcp, long addr)
 #endif
 
        if (umove(tcp, addr, &statbuf) < 0) {
-               tprintf("{...}");
+               tprints("{...}");
                return;
        }
 
@@ -1132,7 +1120,7 @@ printstat64(struct tcb *tcp, long addr)
 #endif
 
        if (!addr) {
-               tprintf("NULL");
+               tprints("NULL");
                return;
        }
        if (syserror(tcp) || !verbose(tcp)) {
@@ -1161,7 +1149,7 @@ printstat64(struct tcb *tcp, long addr)
 #endif
 
        if (umove(tcp, addr, &statbuf) < 0) {
-               tprintf("{...}");
+               tprints("{...}");
                return;
        }
 
@@ -1218,7 +1206,7 @@ printstat64(struct tcb *tcp, long addr)
                tprintf("st_mtime=%s, ", sprinttime(statbuf.st_mtime));
                tprintf("st_ctime=%s", sprinttime(statbuf.st_ctime));
 #if HAVE_STRUCT_STAT_ST_FLAGS
-               tprintf(", st_flags=");
+               tprints(", st_flags=");
                printflags(fileflags, statbuf.st_flags, "UF_???");
 #endif
 #if HAVE_STRUCT_STAT_ST_ACLCNT
@@ -1234,14 +1222,15 @@ printstat64(struct tcb *tcp, long addr)
 #if HAVE_STRUCT_STAT_ST_GEN
                tprintf(", st_gen=%u", statbuf.st_gen);
 #endif
-               tprintf("}");
+               tprints("}");
        }
        else
-               tprintf("...}");
+               tprints("...}");
 }
 #endif /* HAVE_STAT64 */
 
-#if defined(LINUX) && defined(HAVE_STRUCT___OLD_KERNEL_STAT)
+#if defined(LINUX) && defined(HAVE_STRUCT___OLD_KERNEL_STAT) \
+    && !defined(HAVE_LONG_LONG_OFF_T)
 static void
 convertoldstat(const struct __old_kernel_stat *oldbuf, struct stat *newbuf)
 {
@@ -1268,7 +1257,7 @@ printoldstat(struct tcb *tcp, long addr)
        struct stat newstatbuf;
 
        if (!addr) {
-               tprintf("NULL");
+               tprints("NULL");
                return;
        }
        if (syserror(tcp) || !verbose(tcp)) {
@@ -1284,7 +1273,7 @@ printoldstat(struct tcb *tcp, long addr)
 #endif /* LINUXSPARC */
 
        if (umove(tcp, addr, &statbuf) < 0) {
-               tprintf("{...}");
+               tprints("{...}");
                return;
        }
 
@@ -1299,7 +1288,7 @@ sys_stat(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printpath(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               tprints(", ");
        } else {
                printstat(tcp, tcp->u_arg[1]);
        }
@@ -1313,7 +1302,7 @@ sys_stat64(struct tcb *tcp)
 #ifdef HAVE_STAT64
        if (entering(tcp)) {
                printpath(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               tprints(", ");
        } else {
                printstat64(tcp, tcp->u_arg[1]);
        }
@@ -1339,7 +1328,7 @@ sys_newfstatat(struct tcb *tcp)
        if (entering(tcp)) {
                print_dirfd(tcp, tcp->u_arg[0]);
                printpath(tcp, tcp->u_arg[1]);
-               tprintf(", ");
+               tprints(", ");
        } else {
 #ifdef POWERPC64
                if (current_personality == 0)
@@ -1351,20 +1340,21 @@ sys_newfstatat(struct tcb *tcp)
 #else
                printstat(tcp, tcp->u_arg[2]);
 #endif
-               tprintf(", ");
+               tprints(", ");
                printflags(fstatatflags, tcp->u_arg[3], "AT_???");
        }
        return 0;
 }
 #endif
 
-#if defined(LINUX) && defined(HAVE_STRUCT___OLD_KERNEL_STAT)
+#if defined(LINUX) && 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]);
-               tprintf(", ");
+               tprints(", ");
        } else {
                printoldstat(tcp, tcp->u_arg[1]);
        }
@@ -1378,7 +1368,7 @@ sys_fstat(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               tprints(", ");
        } else {
                printstat(tcp, tcp->u_arg[1]);
        }
@@ -1392,7 +1382,7 @@ sys_fstat64(struct tcb *tcp)
 #ifdef HAVE_STAT64
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               tprints(", ");
        } else {
                printstat64(tcp, tcp->u_arg[1]);
        }
@@ -1402,13 +1392,14 @@ sys_fstat64(struct tcb *tcp)
 #endif
 }
 
-#if defined(LINUX) && defined(HAVE_STRUCT___OLD_KERNEL_STAT)
+#if defined(LINUX) && 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]);
-               tprintf(", ");
+               tprints(", ");
        } else {
                printoldstat(tcp, tcp->u_arg[1]);
        }
@@ -1422,7 +1413,7 @@ sys_lstat(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printpath(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               tprints(", ");
        } else {
                printstat(tcp, tcp->u_arg[1]);
        }
@@ -1436,7 +1427,7 @@ sys_lstat64(struct tcb *tcp)
 #ifdef HAVE_STAT64
        if (entering(tcp)) {
                printpath(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               tprints(", ");
        } else {
                printstat64(tcp, tcp->u_arg[1]);
        }
@@ -1446,13 +1437,14 @@ sys_lstat64(struct tcb *tcp)
 #endif
 }
 
-#if defined(LINUX) && defined(HAVE_STRUCT___OLD_KERNEL_STAT)
+#if defined(LINUX) && 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]);
-               tprintf(", ");
+               tprints(", ");
        } else {
                printoldstat(tcp, tcp->u_arg[1]);
        }
@@ -1469,7 +1461,7 @@ sys_xstat(struct tcb *tcp)
        if (entering(tcp)) {
                tprintf("%ld, ", tcp->u_arg[0]);
                printpath(tcp, tcp->u_arg[1]);
-               tprintf(", ");
+               tprints(", ");
        } else {
 #ifdef _STAT64_VER
                if (tcp->u_arg[0] == _STAT64_VER)
@@ -1503,7 +1495,7 @@ sys_lxstat(struct tcb *tcp)
        if (entering(tcp)) {
                tprintf("%ld, ", tcp->u_arg[0]);
                printpath(tcp, tcp->u_arg[1]);
-               tprintf(", ");
+               tprints(", ");
        } else {
 #ifdef _STAT64_VER
                if (tcp->u_arg[0] == _STAT64_VER)
@@ -1574,7 +1566,7 @@ sys_acl(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printpath(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               tprints(", ");
                printxval(aclcmds, tcp->u_arg[1], "???ACL???");
                tprintf(", %ld", tcp->u_arg[2]);
                /*
@@ -1584,7 +1576,7 @@ sys_acl(struct tcb *tcp)
                if (tcp->u_arg[3])
                        tprintf(", %#lx", tcp->u_arg[3]);
                else
-                       tprintf(", NULL");
+                       tprints(", NULL");
        }
        return 0;
 }
@@ -1604,7 +1596,7 @@ sys_facl(struct tcb *tcp)
                if (tcp->u_arg[3])
                        tprintf(", %#lx", tcp->u_arg[3]);
                else
-                       tprintf(", NULL");
+                       tprints(", NULL");
        }
        return 0;
 }
@@ -1639,7 +1631,7 @@ sys_aclipc(struct tcb *tcp)
                if (tcp->u_arg[4])
                        tprintf(", %#lx", tcp->u_arg[4]);
                else
-                       tprintf(", NULL");
+                       tprints(", NULL");
        }
        return 0;
 }
@@ -1714,7 +1706,7 @@ printstatfs(struct tcb *tcp, long addr)
                return;
        }
        if (umove(tcp, addr, &statbuf) < 0) {
-               tprintf("{...}");
+               tprints("{...}");
                return;
        }
 #ifdef ALPHA
@@ -1744,7 +1736,7 @@ printstatfs(struct tcb *tcp, long addr)
 #ifdef _STATFS_F_FRSIZE
        tprintf(", f_frsize=%lu", (unsigned long)statbuf.f_frsize);
 #endif
-       tprintf("}");
+       tprints("}");
 }
 
 int
@@ -1752,7 +1744,7 @@ sys_statfs(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printpath(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               tprints(", ");
        } else {
                printstatfs(tcp, tcp->u_arg[1]);
        }
@@ -1764,7 +1756,7 @@ sys_fstatfs(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               tprints(", ");
        } else {
                printstatfs(tcp, tcp->u_arg[1]);
        }
@@ -1782,7 +1774,7 @@ printstatfs64(struct tcb *tcp, long addr)
                return;
        }
        if (umove(tcp, addr, &statbuf) < 0) {
-               tprintf("{...}");
+               tprints("{...}");
                return;
        }
        tprintf("{f_type=%s, f_bsize=%llu, f_blocks=%llu, f_bfree=%llu, ",
@@ -1799,7 +1791,58 @@ printstatfs64(struct tcb *tcp, long addr)
 #ifdef _STATFS_F_FRSIZE
        tprintf(", f_frsize=%llu", (unsigned long long)statbuf.f_frsize);
 #endif
-       tprintf("}");
+#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);
+       tprints("}");
 }
 
 int
@@ -1811,8 +1854,10 @@ sys_statfs64(struct tcb *tcp)
        } 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
-                       tprintf("{???}");
+                       tprints("{???}");
        }
        return 0;
 }
@@ -1826,8 +1871,10 @@ sys_fstatfs64(struct tcb *tcp)
        } 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
-                       tprintf("{???}");
+                       tprints("{???}");
        }
        return 0;
 }
@@ -1840,7 +1887,7 @@ osf_statfs(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printpath(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               tprints(", ");
        } else {
                printstatfs(tcp, tcp->u_arg[1]);
                tprintf(", %lu", tcp->u_arg[2]);
@@ -1878,7 +1925,7 @@ sys_ustat(struct tcb *tcp)
                if (syserror(tcp) || !verbose(tcp))
                        tprintf("%#lx", tcp->u_arg[1]);
                else if (umove(tcp, tcp->u_arg[1], &statbuf) < 0)
-                       tprintf("{...}");
+                       tprints("{...}");
                else {
                        tprintf("{f_tfree=%lu, f_tinode=%lu, ",
                                statbuf.f_tfree, statbuf.f_tinode);
@@ -1894,18 +1941,6 @@ sys_ustat(struct tcb *tcp)
 }
 #endif /* SUNOS4 */
 
-int
-sys_pivotroot(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprintf(", ");
-               printpath(tcp, tcp->u_arg[1]);
-       }
-       return 0;
-}
-
-
 /* directory */
 int
 sys_chdir(struct tcb *tcp)
@@ -1942,50 +1977,12 @@ sys_mkdirat(struct tcb *tcp)
 }
 #endif
 
-int
-sys_rmdir(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-       }
-       return 0;
-}
-
-int
-sys_fchdir(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-       }
-       return 0;
-}
-
-int
-sys_chroot(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-       }
-       return 0;
-}
-
-#if defined(SUNOS4) || defined(SVR4)
-int
-sys_fchroot(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-       }
-       return 0;
-}
-#endif /* SUNOS4 || SVR4 */
-
 int
 sys_link(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printpath(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               tprints(", ");
                printpath(tcp, tcp->u_arg[1]);
        }
        return 0;
@@ -1998,25 +1995,16 @@ sys_linkat(struct tcb *tcp)
        if (entering(tcp)) {
                print_dirfd(tcp, tcp->u_arg[0]);
                printpath(tcp, tcp->u_arg[1]);
-               tprintf(", ");
+               tprints(", ");
                print_dirfd(tcp, tcp->u_arg[2]);
                printpath(tcp, tcp->u_arg[3]);
-               tprintf(", ");
+               tprints(", ");
                printfd(tcp, tcp->u_arg[4]);
        }
        return 0;
 }
 #endif
 
-int
-sys_unlink(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-       }
-       return 0;
-}
-
 #ifdef LINUX
 static const struct xlat unlinkatflags[] = {
 #ifndef AT_REMOVEDIR
@@ -2032,31 +2020,20 @@ sys_unlinkat(struct tcb *tcp)
        if (entering(tcp)) {
                print_dirfd(tcp, tcp->u_arg[0]);
                printpath(tcp, tcp->u_arg[1]);
-               tprintf(", ");
+               tprints(", ");
                printflags(unlinkatflags, tcp->u_arg[2], "AT_???");
        }
        return 0;
 }
 #endif
 
-int
-sys_symlink(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprintf(", ");
-               printpath(tcp, tcp->u_arg[1]);
-       }
-       return 0;
-}
-
 #ifdef LINUX
 int
 sys_symlinkat(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printpath(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               tprints(", ");
                print_dirfd(tcp, tcp->u_arg[1]);
                printpath(tcp, tcp->u_arg[2]);
        }
@@ -2069,12 +2046,19 @@ decode_readlink(struct tcb *tcp, int offset)
 {
        if (entering(tcp)) {
                printpath(tcp, tcp->u_arg[offset]);
-               tprintf(", ");
+               tprints(", ");
        } else {
                if (syserror(tcp))
                        tprintf("%#lx", tcp->u_arg[offset + 1]);
                else
-                       printpathn(tcp, tcp->u_arg[offset + 1], tcp->u_rval);
+                       /* 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;
@@ -2096,17 +2080,6 @@ sys_readlinkat(struct tcb *tcp)
 }
 #endif
 
-int
-sys_rename(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprintf(", ");
-               printpath(tcp, tcp->u_arg[1]);
-       }
-       return 0;
-}
-
 #ifdef LINUX
 int
 sys_renameat(struct tcb *tcp)
@@ -2114,7 +2087,7 @@ sys_renameat(struct tcb *tcp)
        if (entering(tcp)) {
                print_dirfd(tcp, tcp->u_arg[0]);
                printpath(tcp, tcp->u_arg[1]);
-               tprintf(", ");
+               tprints(", ");
                print_dirfd(tcp, tcp->u_arg[2]);
                printpath(tcp, tcp->u_arg[3]);
        }
@@ -2142,7 +2115,7 @@ sys_fchownat(struct tcb *tcp)
                printpath(tcp, tcp->u_arg[1]);
                printuid(", ", tcp->u_arg[2]);
                printuid(", ", tcp->u_arg[3]);
-               tprintf(", ");
+               tprints(", ");
                printflags(fstatatflags, tcp->u_arg[4], "AT_???");
        }
        return 0;
@@ -2202,7 +2175,7 @@ sys_osf_utimes(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printpath(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               tprints(", ");
                printtv_bitness(tcp, tcp->u_arg[1], BITNESS_32,  0);
        }
        return 0;
@@ -2214,18 +2187,18 @@ decode_utimes(struct tcb *tcp, int offset, int special)
 {
        if (entering(tcp)) {
                printpath(tcp, tcp->u_arg[offset]);
-               tprintf(", ");
+               tprints(", ");
                if (tcp->u_arg[offset + 1] == 0)
-                       tprintf("NULL");
+                       tprints("NULL");
                else {
-                       tprintf("{");
+                       tprints("{");
                        printtv_bitness(tcp, tcp->u_arg[offset + 1],
                                        BITNESS_CURRENT, special);
-                       tprintf(", ");
+                       tprints(", ");
                        printtv_bitness(tcp, tcp->u_arg[offset + 1]
                                        + sizeof(struct timeval),
                                        BITNESS_CURRENT, special);
-                       tprintf("}");
+                       tprints("}");
                }
        }
        return 0;
@@ -2252,7 +2225,7 @@ sys_utimensat(struct tcb *tcp)
        if (entering(tcp)) {
                print_dirfd(tcp, tcp->u_arg[0]);
                decode_utimes(tcp, 1, 1);
-               tprintf(", ");
+               tprints(", ");
                printflags(utimensatflags, tcp->u_arg[3], "AT_???");
        }
        return 0;
@@ -2269,15 +2242,15 @@ sys_utime(struct tcb *tcp)
 
        if (entering(tcp)) {
                printpath(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               tprints(", ");
                if (!tcp->u_arg[1])
-                       tprintf("NULL");
+                       tprints("NULL");
                else if (!verbose(tcp))
                        tprintf("%#lx", tcp->u_arg[1]);
                else if (umoven(tcp, tcp->u_arg[1],
                                2 * personality_wordsize[current_personality],
                                (char *) &u) < 0)
-                       tprintf("[?, ?]");
+                       tprints("[?, ?]");
                else if (personality_wordsize[current_personality]
                         == sizeof u.utl[0]) {
                        tprintf("[%s,", sprinttime(u.utl[0]));
@@ -2371,13 +2344,13 @@ printdir(struct tcb *tcp, long addr)
                return;
        }
        if (umove(tcp, addr, &d) < 0) {
-               tprintf("{...}");
+               tprints("{...}");
                return;
        }
        tprintf("{d_ino=%ld, ", (unsigned long) d.d_ino);
-       tprintf("d_name=");
+       tprints("d_name=");
        printpathn(tcp, (long) ((struct dirent *) addr)->d_name, d.d_reclen);
-       tprintf("}");
+       tprints("}");
 }
 
 int
@@ -2385,7 +2358,7 @@ sys_readdir(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               tprints(", ");
        } else {
                if (syserror(tcp) || tcp->u_rval == 0 || !verbose(tcp))
                        tprintf("%#lx", tcp->u_arg[1]);
@@ -2424,7 +2397,7 @@ sys_getdents(struct tcb *tcp)
 
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               tprints(", ");
                return 0;
        }
        if (syserror(tcp) || !verbose(tcp)) {
@@ -2432,19 +2405,21 @@ sys_getdents(struct tcb *tcp)
                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) {
-               tprintf("%#lx, %lu", tcp->u_arg[1], tcp->u_arg[2]);
-               fprintf(stderr, "out of memory\n");
-               return 0;
-       }
+       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))
-               tprintf("{");
+               tprints("{");
        for (i = 0; i < len;) {
                struct kernel_dirent *d = (struct kernel_dirent *) &buf[i];
 #ifdef LINUX
@@ -2484,14 +2459,14 @@ sys_getdents(struct tcb *tcp)
                }
 #endif /* FREEBSD */
                if (!d->d_reclen) {
-                       tprintf("/* d_reclen == 0, problem here */");
+                       tprints("/* d_reclen == 0, problem here */");
                        break;
                }
                i += d->d_reclen;
                dents++;
        }
        if (!abbrev(tcp))
-               tprintf("}");
+               tprints("}");
        else
                tprintf("/* %u entries */", dents);
        tprintf(", %lu", tcp->u_arg[2]);
@@ -2509,27 +2484,31 @@ sys_getdents64(struct tcb *tcp)
 
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               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) {
-               tprintf("%#lx, %lu", tcp->u_arg[1], tcp->u_arg[2]);
-               fprintf(stderr, "out of memory\n");
-               return 0;
-       }
+       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))
-               tprintf("{");
+               tprints("{");
        for (i = 0; i < len;) {
                struct dirent64 *d = (struct dirent64 *) &buf[i];
 #if defined(LINUX) || defined(SVR4)
@@ -2539,9 +2518,9 @@ sys_getdents64(struct tcb *tcp)
                                d->d_ino,
                                d->d_off);
 #ifdef LINUX
-                       tprintf("d_type=");
+                       tprints("d_type=");
                        printxval(direnttypes, d->d_type, "DT_???");
-                       tprintf(", ");
+                       tprints(", ");
 #endif
                        tprintf("d_reclen=%u, d_name=\"%s\"}",
                                d->d_reclen, d->d_name);
@@ -2557,14 +2536,14 @@ sys_getdents64(struct tcb *tcp)
                }
 #endif /* SUNOS4 */
                if (!d->d_reclen) {
-                       tprintf("/* d_reclen == 0, problem here */");
+                       tprints("/* d_reclen == 0, problem here */");
                        break;
                }
                i += d->d_reclen;
                dents++;
        }
        if (!abbrev(tcp))
-               tprintf("}");
+               tprints("}");
        else
                tprintf("/* %u entries */", dents);
        tprintf(", %lu", tcp->u_arg[2]);
@@ -2583,26 +2562,31 @@ sys_getdirentries(struct tcb *tcp)
 
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               tprints(", ");
                return 0;
        }
        if (syserror(tcp) || !verbose(tcp)) {
                tprintf("%#lx, %lu, %#lx", tcp->u_arg[1], tcp->u_arg[2], tcp->u_arg[3]);
                return 0;
        }
+
        len = tcp->u_rval;
-       if ((buf = malloc(len)) == NULL) {
-               tprintf("%#lx, %lu, %#lx", tcp->u_arg[1], tcp->u_arg[2], tcp->u_arg[3]);
-               fprintf(stderr, "out of memory\n");
-               return 0;
-       }
+       /* 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 = malloc(len);
+       if (!buf)
+               die_out_of_memory();
+
        if (umoven(tcp, tcp->u_arg[1], len, buf) < 0) {
                tprintf("%#lx, %lu, %#lx", tcp->u_arg[1], tcp->u_arg[2], tcp->u_arg[3]);
                free(buf);
                return 0;
        }
        if (!abbrev(tcp))
-               tprintf("{");
+               tprints("{");
        for (i = 0; i < len;) {
                struct kernel_dirent *d = (struct kernel_dirent *) &buf[i];
                if (!abbrev(tcp)) {
@@ -2613,14 +2597,14 @@ sys_getdirentries(struct tcb *tcp)
                                d->d_namlen, d->d_namlen, d->d_name);
                }
                if (!d->d_reclen) {
-                       tprintf("/* d_reclen == 0, problem here */");
+                       tprints("/* d_reclen == 0, problem here */");
                        break;
                }
                i += d->d_reclen;
                dents++;
        }
        if (!abbrev(tcp))
-               tprintf("}");
+               tprints("}");
        else
                tprintf("/* %u entries */", dents);
        free(buf);
@@ -2702,7 +2686,7 @@ sys_aiowrite(struct tcb *tcp)
        }
        else {
                if (tcp->u_arg[5] == 0)
-                       tprintf(", NULL");
+                       tprints(", NULL");
                else if (syserror(tcp)
                    || umove(tcp, tcp->u_arg[5], &res) < 0)
                        tprintf(", %#lx", tcp->u_arg[5]);
@@ -2728,7 +2712,7 @@ sys_aiocancel(struct tcb *tcp)
 
        if (exiting(tcp)) {
                if (tcp->u_arg[0] == 0)
-                       tprintf("NULL");
+                       tprints("NULL");
                else if (syserror(tcp)
                    || umove(tcp, tcp->u_arg[0], &res) < 0)
                        tprintf("%#lx", tcp->u_arg[0]);
@@ -2794,10 +2778,10 @@ sys_setxattr(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printpath(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               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]);
-               tprintf(", ");
+               tprints(", ");
                printflags(xattrflags, tcp->u_arg[4], "XATTR_???");
        }
        return 0;
@@ -2808,10 +2792,10 @@ sys_fsetxattr(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               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]);
-               tprintf(", ");
+               tprints(", ");
                printflags(xattrflags, tcp->u_arg[4], "XATTR_???");
        }
        return 0;
@@ -2822,7 +2806,7 @@ sys_getxattr(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printpath(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               tprints(", ");
                printstr(tcp, tcp->u_arg[1], -1);
        } else {
                print_xattr_val(tcp, syserror(tcp), tcp->u_arg[2], tcp->u_arg[3],
@@ -2836,7 +2820,7 @@ sys_fgetxattr(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               tprints(", ");
                printstr(tcp, tcp->u_arg[1], -1);
        } else {
                print_xattr_val(tcp, syserror(tcp), tcp->u_arg[2], tcp->u_arg[3],
@@ -2874,7 +2858,7 @@ sys_removexattr(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printpath(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               tprints(", ");
                printstr(tcp, tcp->u_arg[1], -1);
        }
        return 0;
@@ -2885,7 +2869,7 @@ sys_fremovexattr(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               tprints(", ");
                printstr(tcp, tcp->u_arg[1], -1);
        }
        return 0;
@@ -2910,7 +2894,7 @@ sys_fadvise64(struct tcb *tcp)
        if (entering(tcp)) {
                int argn;
                printfd(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               tprints(", ");
                argn = printllval(tcp, "%lld", 1);
                tprintf(", %ld, ", tcp->u_arg[argn++]);
                printxval(advise, tcp->u_arg[argn], "POSIX_FADV_???");
@@ -2926,7 +2910,7 @@ sys_fadvise64_64(struct tcb *tcp)
        if (entering(tcp)) {
                int argn;
                printfd(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               tprints(", ");
 #if defined ARM || defined POWERPC
                argn = printllval(tcp, "%lld, ", 2);
 #else
@@ -2978,9 +2962,9 @@ sys_inotify_add_watch(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
-               tprintf(", ");
+               tprints(", ");
                printpath(tcp, tcp->u_arg[1]);
-               tprintf(", ");
+               tprints(", ");
                printflags(inotify_modes, tcp->u_arg[2], "IN_???");
        }
        return 0;
@@ -3010,7 +2994,7 @@ sys_fallocate(struct tcb *tcp)
        if (entering(tcp)) {
                int argn;
                printfd(tcp, tcp->u_arg[0]);            /* fd */
-               tprintf(", ");
+               tprints(", ");
                tprintf("%#lo, ", tcp->u_arg[1]);       /* mode */
                argn = printllval(tcp, "%llu, ", 2);    /* offset */
                printllval(tcp, "%llu", argn);          /* len */