util: return pointer to string literal directly in sprinttime

[strace] / sysctl.c

diff --git a/sysctl.c b/sysctl.c
index 70cc5d9a5250b7334a6069324813e076ec79c95a..38436931c7ce944fbd73158ede1d3812a269f4b5 100644 (file)
--- a/sysctl.c
+++ b/sysctl.c
@@ -1,3 +1,32 @@
+/*
+ * 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>
+ * 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 <linux/sysctl.h>
@@ -14,26 +43,25 @@
 #include "xlat/sysctl_net_ipv6.h"
 #include "xlat/sysctl_net_ipv6_route.h"
 
-int
-sys_sysctl(struct tcb *tcp)
+SYS_FUNC(sysctl)
 {
        struct __sysctl_args info;
        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);
        if (name == NULL ||
-           umoven(tcp, (unsigned long) info.name, size, (char *) name) < 0) {
+           umoven(tcp, (unsigned long) info.name, size, name) < 0) {
                free(name);
                if (entering(tcp))
                        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)) {
@@ -139,19 +167,13 @@ sys_sysctl(struct tcb *tcp)
                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);
                }
@@ -161,7 +183,7 @@ sys_sysctl(struct tcb *tcp)
                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);
        }