Remove linux/ptp_clock.h

[strace] / uname.c

diff --git a/uname.c b/uname.c
index 0f699d863fdc1ccb142c9713c16bfbf71096719c..02f21178612fe62cfbea503e9fd1551fb223fb3a 100644 (file)
--- a/uname.c
+++ b/uname.c
@@ -1,5 +1,37 @@
-#include "defs.h"
+/*
+ * 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) 2012-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 "print_fields.h"
 #include <sys/utsname.h>
 
 SYS_FUNC(uname)
@@ -9,27 +41,18 @@ SYS_FUNC(uname)
        if (entering(tcp))
                return 0;
 
-       if (syserror(tcp) || !verbose(tcp))
-               tprintf("%#lx", tcp->u_arg[0]);
-       else if (umove(tcp, tcp->u_arg[0], &uname) < 0)
-               tprints("{...}");
-       else {
-#define PRINT_UTS_MEMBER(prefix, member) \
-               tprints(prefix #member "="); \
-               print_quoted_string(uname.member, sizeof(uname.member), \
-                                   QUOTE_0_TERMINATED)
-
-               PRINT_UTS_MEMBER("{", sysname);
-               PRINT_UTS_MEMBER(", ", nodename);
+       if (!umove_or_printaddr(tcp, tcp->u_arg[0], &uname)) {
+               PRINT_FIELD_CSTRING("{", uname, sysname);
+               PRINT_FIELD_CSTRING(", ", uname, nodename);
                if (abbrev(tcp)) {
                        tprints(", ...}");
                        return 0;
                }
-               PRINT_UTS_MEMBER(", ", release);
-               PRINT_UTS_MEMBER(", ", version);
-               PRINT_UTS_MEMBER(", ", machine);
+               PRINT_FIELD_CSTRING(", ", uname, release);
+               PRINT_FIELD_CSTRING(", ", uname, version);
+               PRINT_FIELD_CSTRING(", ", uname, machine);
 #ifdef HAVE_STRUCT_UTSNAME_DOMAINNAME
-               PRINT_UTS_MEMBER(", ", domainname);
+               PRINT_FIELD_CSTRING(", ", uname, domainname);
 #endif
                tprints("}");
        }