]> granicus.if.org Git - strace/blobdiff - dirent.c
Update copyright headers
[strace] / dirent.c
index d30e0d2af7f133f1e4464fe92b2e41935d277ae6..5c0a09dd965fc527896f69ccc23d1a9e81046c69 100644 (file)
--- a/dirent.c
+++ b/dirent.c
@@ -1,93 +1,90 @@
+/*
+ * Copyright (c) 1991, 1992 Paul Kranenburg <pk@cs.few.eur.nl>
+ * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
+ * Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
+ * Copyright (c) 1996-1999 Wichert Akkerman <wichert@cistron.nl>
+ * Copyright (c) 2005-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2014-2018 The strace developers.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #include "defs.h"
-#include <dirent.h>
 
-#define D_NAME_LEN_MAX 256
+#include DEF_MPERS_TYPE(kernel_dirent)
 
-struct kernel_dirent {
-       unsigned long   d_ino;
-       unsigned long   d_off;
-       unsigned short  d_reclen;
-       char            d_name[1];
-};
+#include MPERS_DEFS
+
+#define D_NAME_LEN_MAX 256
 
 static void
-print_old_dirent(struct tcb *tcp, long addr)
+print_old_dirent(struct tcb *const tcp, const kernel_ulong_t addr)
 {
-#ifdef SH64
-       typedef struct kernel_dirent old_dirent_t;
-#else
-       typedef struct {
-               uint32_t        d_ino;
-               uint32_t        d_off;
-               unsigned short  d_reclen;
-               char            d_name[1];
-       } old_dirent_t;
-#endif
-       old_dirent_t d;
-
-       if (!verbose(tcp) || umove(tcp, addr, &d) < 0) {
-               tprintf("%#lx", addr);
+       kernel_dirent d;
+
+       if (umove_or_printaddr(tcp, addr, &d))
                return;
-       }
 
-       tprintf("{d_ino=%lu, d_off=%lu, d_reclen=%u, d_name=",
-               (unsigned long) d.d_ino, (unsigned long) d.d_off, d.d_reclen);
+       tprintf("{d_ino=%llu, d_off=%llu, d_reclen=%u, d_name=",
+               zero_extend_signed_to_ull(d.d_ino),
+               zero_extend_signed_to_ull(d.d_off), d.d_reclen);
        if (d.d_reclen > D_NAME_LEN_MAX)
                d.d_reclen = D_NAME_LEN_MAX;
-       printpathn(tcp, addr + offsetof(old_dirent_t, d_name), d.d_reclen);
+       printpathn(tcp, addr + offsetof(kernel_dirent, d_name), d.d_reclen);
        tprints("}");
 }
 
-int
-sys_readdir(struct tcb *tcp)
+SYS_FUNC(readdir)
 {
        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]);
+               if (tcp->u_rval == 0)
+                       printaddr(tcp->u_arg[1]);
                else
                        print_old_dirent(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]);
+                       tprintf(", %" PRI_klu, tcp->u_arg[2]);
        }
        return 0;
 }
 
-#include "xlat/direnttypes.h"
-
-int
-sys_getdents(struct tcb *tcp)
+SYS_FUNC(getdents)
 {
        unsigned int i, len, dents = 0;
-       char *buf;
+       unsigned char *buf;
 
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
                return 0;
        }
+
+       const unsigned int count = tcp->u_arg[2];
+
        if (syserror(tcp) || !verbose(tcp)) {
-               tprintf("%#lx, %lu", tcp->u_arg[1], tcp->u_arg[2]);
+               tprints(", ");
+               printaddr(tcp->u_arg[1]);
+               tprintf(", %u", count);
                return 0;
        }
 
        /* Beware of insanely large or too small values in tcp->u_rval */
        if (tcp->u_rval > 1024*1024)
                len = 1024*1024;
-       else if (tcp->u_rval < (int) sizeof(struct kernel_dirent))
+       else if (tcp->u_rval < (int) sizeof(kernel_dirent))
                len = 0;
        else
                len = tcp->u_rval;
 
        if (len) {
                buf = malloc(len);
-               if (!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]);
+               if (!buf || umoven(tcp, tcp->u_arg[1], len, buf) < 0) {
+                       tprints(", ");
+                       printaddr(tcp->u_arg[1]);
+                       tprintf(", %u", count);
                        free(buf);
                        return 0;
                }
@@ -95,133 +92,47 @@ sys_getdents(struct tcb *tcp)
                buf = NULL;
        }
 
+       tprints(",");
        if (!abbrev(tcp))
-               tprints("{");
-       for (i = 0; len && i <= len - sizeof(struct kernel_dirent); ) {
-               struct kernel_dirent *d = (struct kernel_dirent *) &buf[i];
+               tprints(" [");
+       for (i = 0; len && i <= len - sizeof(kernel_dirent); ) {
+               kernel_dirent *d = (kernel_dirent *) &buf[i];
 
                if (!abbrev(tcp)) {
-                       int oob = d->d_reclen < sizeof(struct kernel_dirent) ||
+                       int oob = d->d_reclen < sizeof(kernel_dirent) ||
                                  i + d->d_reclen - 1 >= len;
                        int d_name_len = oob ? len - i : d->d_reclen;
-                       d_name_len -= offsetof(struct kernel_dirent, d_name) + 1;
+                       d_name_len -= offsetof(kernel_dirent, d_name) + 1;
                        if (d_name_len > D_NAME_LEN_MAX)
                                d_name_len = D_NAME_LEN_MAX;
 
-                       tprintf("%s{d_ino=%lu, d_off=%lu, d_reclen=%u, d_name=",
-                               i ? " " : "", d->d_ino, d->d_off, d->d_reclen);
+                       tprintf("%s{d_ino=%llu, d_off=%llu, d_reclen=%u"
+                               ", d_name=", i ? ", " : "",
+                               zero_extend_signed_to_ull(d->d_ino),
+                               zero_extend_signed_to_ull(d->d_off),
+                               d->d_reclen);
 
-                       if (print_quoted_string(d->d_name, d_name_len,
-                                               QUOTE_0_TERMINATED) > 0) {
-                               tprints("...");
-                       }
+                       print_quoted_cstring(d->d_name, d_name_len);
 
                        tprints(", d_type=");
                        if (oob)
                                tprints("?");
                        else
-                               printxval(direnttypes, buf[i + d->d_reclen - 1], "DT_???");
+                               printxval(dirent_types, buf[i + d->d_reclen - 1], "DT_???");
                        tprints("}");
                }
                dents++;
-               if (d->d_reclen < sizeof(struct kernel_dirent)) {
-                       tprints("/* d_reclen < sizeof(struct kernel_dirent) */");
+               if (d->d_reclen < sizeof(kernel_dirent)) {
+                       tprints_comment("d_reclen < sizeof(struct dirent)");
                        break;
                }
                i += d->d_reclen;
        }
        if (!abbrev(tcp))
-               tprints("}");
-       else
-               tprintf("/* %u entries */", dents);
-       tprintf(", %lu", tcp->u_arg[2]);
-       free(buf);
-       return 0;
-}
-
-int
-sys_getdents64(struct tcb *tcp)
-{
-       /* the minimum size of a valid dirent64 structure */
-       const unsigned int d_name_offset = offsetof(struct dirent64, d_name);
-
-       unsigned 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;
-       }
-
-       /* Beware of insanely large or too small tcp->u_rval */
-       if (tcp->u_rval > 1024*1024)
-               len = 1024*1024;
-       else if (tcp->u_rval < (int) d_name_offset)
-               len = 0;
-       else
-               len = tcp->u_rval;
-
-       if (len) {
-               buf = malloc(len);
-               if (!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;
-               }
-       } else {
-               buf = NULL;
-       }
-
-       if (!abbrev(tcp))
-               tprints("{");
-       for (i = 0; len && i <= len - d_name_offset; ) {
-               struct dirent64 *d = (struct dirent64 *) &buf[i];
-               if (!abbrev(tcp)) {
-                       int d_name_len;
-                       if (d->d_reclen >= d_name_offset
-                           && i + d->d_reclen <= len) {
-                               d_name_len = d->d_reclen - d_name_offset;
-                       } else {
-                               d_name_len = len - i - d_name_offset;
-                       }
-                       if (d_name_len > D_NAME_LEN_MAX)
-                               d_name_len = D_NAME_LEN_MAX;
-
-                       tprintf("%s{d_ino=%" PRIu64 ", d_off=%" PRId64
-                               ", d_reclen=%u, d_type=",
-                               i ? " " : "",
-                               d->d_ino,
-                               d->d_off,
-                               d->d_reclen);
-                       printxval(direnttypes, d->d_type, "DT_???");
-
-                       tprints(", d_name=");
-                       if (print_quoted_string(d->d_name, d_name_len,
-                                               QUOTE_0_TERMINATED) > 0) {
-                               tprints("...");
-                       }
-
-                       tprints("}");
-               }
-               if (d->d_reclen < d_name_offset) {
-                       tprints("/* d_reclen < offsetof(struct dirent64, d_name) */");
-                       break;
-               }
-               i += d->d_reclen;
-               dents++;
-       }
-       if (!abbrev(tcp))
-               tprints("}");
+               tprints("]");
        else
-               tprintf("/* %u entries */", dents);
-       tprintf(", %lu", tcp->u_arg[2]);
+               tprintf_comment("%u entries", dents);
+       tprintf(", %u", count);
        free(buf);
        return 0;
 }