Update copyright headers

[strace] / sysctl.c

diff --git a/sysctl.c b/sysctl.c
index 03d7b1c89906138dbbd54d26e3fe0722fab53fcf..5b6fac139157e4fb9becb1025b42fbc21fcf6932 100644 (file)
--- a/sysctl.c
+++ b/sysctl.c
@@ -1,3 +1,13 @@
+/*
+ * Copyright (c) 1999 Ulrich Drepper <drepper@cygnus.com>
+ * Copyright (c) 2005 Roland McGrath <roland@redhat.com>
+ * 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 <linux/sysctl.h>
@@ -20,8 +30,8 @@ SYS_FUNC(sysctl)
        int *name;
        unsigned long size;
 
-       if (umove(tcp, tcp->u_arg[0], &info) < 0)
-               return printargs(tcp);
+       if (umove_or_printaddr(tcp, tcp->u_arg[0], &info))
+               return RVAL_DECODED;
 
        size = sizeof(int) * (unsigned long) info.nlen;
        name = (size / sizeof(int) != (unsigned long) info.nlen) ? NULL : malloc(size);
@@ -32,7 +42,7 @@ SYS_FUNC(sysctl)
                        tprintf("{%p, %d, %p, %p, %p, %lu}",
                                info.name, info.nlen, info.oldval,
                                info.oldlenp, info.newval, (unsigned long)info.newlen);
-               return 0;
+               return RVAL_DECODED;
        }
 
        if (entering(tcp)) {
@@ -125,7 +135,7 @@ SYS_FUNC(sysctl)
                default:
                        goto out;
                }
-       out:
+out:
                max_cnt = info.nlen;
                if (abbrev(tcp) && max_cnt > max_strlen)
                        max_cnt = max_strlen;
@@ -138,19 +148,13 @@ SYS_FUNC(sysctl)
                size_t oldlen = 0;
                if (info.oldval == NULL) {
                        tprints("NULL");
-               } else if (umove(tcp, (long)info.oldlenp, &oldlen) >= 0
+               } else if (umove(tcp, ptr_to_kulong(info.oldlenp), &oldlen) >= 0
                           && info.nlen >= 2
                           && ((name[0] == CTL_KERN
                                && (name[1] == KERN_OSRELEASE
                                    || name[1] == KERN_OSTYPE
-#ifdef KERN_JAVA_INTERPRETER
-                                   || name[1] == KERN_JAVA_INTERPRETER
-#endif
-#ifdef KERN_JAVA_APPLETVIEWER
-                                   || name[1] == KERN_JAVA_APPLETVIEWER
-#endif
                                        )))) {
-                       printpath(tcp, (size_t)info.oldval);
+                       printpath(tcp, ptr_to_kulong(info.oldval));
                } else {
                        tprintf("%p", info.oldval);
                }
@@ -160,7 +164,7 @@ SYS_FUNC(sysctl)
                else if (syserror(tcp))
                        tprintf("%p", info.newval);
                else
-                       printpath(tcp, (size_t)info.newval);
+                       printpath(tcp, ptr_to_kulong(info.newval));
                tprintf(", %lu", (unsigned long)info.newlen);
        }