netlink_sock_diag: print inet_diag_sockid.idiag_if as an interface index

[strace] / mknod.c

diff --git a/mknod.c b/mknod.c
index 07e9a4596ab331aadaa4ff856e1d68b6fe7abfae..0a4e342e7c4b35910da0371b0bd05560d6b34f46 100644 (file)
--- a/mknod.c
+++ b/mknod.c
@@ -1,79 +1,72 @@
+/*
+ * Copyright (c) 1991, 1992 Paul Kranenburg <pk@cs.few.eur.nl>
+ * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
+ * Copyright (c) 1993-1996 Rick Sladkey <jrs@world.std.com>
+ * Copyright (c) 1996-1999 Wichert Akkerman <wichert@cistron.nl>
+ * Copyright (c) 2006 Ulrich Drepper <drepper@redhat.com>
+ * Copyright (c) 2006 Bernhard Kaindl <bk@suse.de>
+ * Copyright (c) 2006-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2014-2017 The strace developers.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #include "defs.h"
 
 #include <fcntl.h>
+#include <sys/stat.h>
 
-#ifdef MAJOR_IN_SYSMACROS
-# include <sys/sysmacros.h>
-#endif
-
-#ifdef MAJOR_IN_MKDEV
-# include <sys/mkdev.h>
-#endif
-
-static int
+static void
 decode_mknod(struct tcb *tcp, int offset)
 {
-       int mode = tcp->u_arg[offset + 1];
+       unsigned short mode = tcp->u_arg[offset + 1];
+       unsigned int dev;
 
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[offset]);
-               tprintf(", %s", sprintmode(mode));
-               switch (mode & S_IFMT) {
-               case S_IFCHR:
-               case S_IFBLK:
-#if defined(SPARC) || defined(SPARC64)
-                       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 /* SPARC || SPARC64 */
-                               tprintf(", makedev(%lu, %lu)",
-                               (unsigned long) major(tcp->u_arg[offset + 2]),
-                               (unsigned long) minor(tcp->u_arg[offset + 2]));
-                       break;
-               default:
-                       break;
-               }
+       printpath(tcp, tcp->u_arg[offset]);
+       tprints(", ");
+       print_symbolic_mode_t(mode);
+       switch (mode & S_IFMT) {
+       case S_IFCHR:
+       case S_IFBLK:
+               dev = tcp->u_arg[offset + 2];
+               tprints(", ");
+               print_dev_t(dev);
+               break;
        }
-       return 0;
 }
 
-int
-sys_mknod(struct tcb *tcp)
+SYS_FUNC(mknod)
 {
-       return decode_mknod(tcp, 0);
-}
+       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);
+       return RVAL_DECODED;
 }
 
-#if defined(SPARC) || defined(SPARC64)
-int
-sys_xmknod(struct tcb *tcp)
+SYS_FUNC(mknodat)
 {
-       int mode = tcp->u_arg[2];
+       print_dirfd(tcp, tcp->u_arg[0]);
+       decode_mknod(tcp, 1);
 
-       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;
+       return RVAL_DECODED;
 }
-#endif /* SPARC || SPARC64 */