travis: add build environment information to the travis log

[strace] / uid.c

diff --git a/uid.c b/uid.c
index 7cf545fa2338dfd76b962263884405bcd8c7e542..0fb810c8b6b9cab6c11356576397b6a2859e891e 100644 (file)
--- a/uid.c
+++ b/uid.c
@@ -3,7 +3,7 @@
  * 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) 2003-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2003-2016 Dmitry V. Levin <ldv@altlinux.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,9 +34,9 @@
 #  error invalid STRACE_UID_SIZE
 # endif
 
-# define SIZEIFY(x)            SIZEIFY_(x,STRACE_UID_SIZE)
-# define SIZEIFY_(x,size)      SIZEIFY__(x,size)
-# define SIZEIFY__(x,size)     x ## size
+# define SIZEIFY(x)            SIZEIFY_(x, STRACE_UID_SIZE)
+# define SIZEIFY_(x, size)     SIZEIFY__(x, size)
+# define SIZEIFY__(x, size)    x ## size
 
 # define printuid      SIZEIFY(printuid)
 # define sys_chown     SIZEIFY(sys_chown)
@@ -75,7 +75,7 @@ SYS_FUNC(getuid)
 
 SYS_FUNC(setfsuid)
 {
-       tprintf("%u", (uid_t) tcp->u_arg[0]);
+       printuid("", tcp->u_arg[0]);
 
        return RVAL_UDECIMAL | RVAL_DECODED;
 }
@@ -88,13 +88,16 @@ SYS_FUNC(setuid)
 }
 
 static void
-get_print_uid(struct tcb *tcp, const char *prefix, const long addr)
+get_print_uid(struct tcb *const tcp, const char *const prefix,
+             const kernel_ulong_t addr)
 {
        uid_t uid;
 
        tprints(prefix);
-       if (!umove_or_printaddr(tcp, addr, &uid))
-               tprintf("[%u]", uid);
+       if (!umove_or_printaddr(tcp, addr, &uid)) {
+               printuid("[", uid);
+               tprints("]");
+       }
 }
 
 SYS_FUNC(getresuid)
@@ -153,111 +156,47 @@ printuid(const char *text, const unsigned int uid)
                tprintf("%s%u", text, (uid_t) uid);
 }
 
-SYS_FUNC(setgroups)
+static bool
+print_gid(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
 {
-       unsigned long cur, abbrev_end;
-       uid_t gid;
-       int failed = 0;
-       const unsigned long len = tcp->u_arg[0];
-       const unsigned long start = tcp->u_arg[1];
-       const unsigned long size = len * sizeof(gid);
-       const unsigned long end = start + size;
-
-       tprintf("%lu, ", len);
-       if (len == 0) {
-               tprints("[]");
-               return RVAL_DECODED;
-       }
-       if (!start || !verbose(tcp) ||
-           size / sizeof(gid) != len || end < start) {
-               printaddr(start);
-               return RVAL_DECODED;
-       }
-       if (abbrev(tcp)) {
-               abbrev_end = start + max_strlen * sizeof(gid);
-               if (abbrev_end < start)
-                       abbrev_end = end;
-       } else {
-               abbrev_end = end;
-       }
-       tprints("[");
-       for (cur = start; cur < end; cur += sizeof(gid)) {
-               if (cur > start)
-                       tprints(", ");
-               if (cur >= abbrev_end) {
-                       tprints("...");
-                       break;
-               }
-               if (umoven(tcp, cur, sizeof(gid), &gid) < 0) {
-                       tprints("?");
-                       failed = 1;
-                       break;
-               }
-               tprintf("%u", (unsigned int) gid);
-       }
-       tprints("]");
-       if (failed) {
-               tprints(" ");
-               printaddr(start);
+       printuid("", (*(uid_t *) elem_buf));
+
+       return true;
+}
+
+static void
+print_groups(struct tcb *const tcp, const unsigned int len,
+            const kernel_ulong_t addr)
+{
+       static unsigned long ngroups_max;
+       if (!ngroups_max)
+               ngroups_max = sysconf(_SC_NGROUPS_MAX);
+
+       if (len > ngroups_max) {
+               printaddr(addr);
+               return;
        }
 
+       uid_t gid;
+       print_array(tcp, addr, len, &gid, sizeof(gid),
+                   umoven_or_printaddr, print_gid, 0);
+}
+
+SYS_FUNC(setgroups)
+{
+       const int len = tcp->u_arg[0];
+
+       tprintf("%d, ", len);
+       print_groups(tcp, len, tcp->u_arg[1]);
        return RVAL_DECODED;
 }
 
 SYS_FUNC(getgroups)
 {
-       if (entering(tcp)) {
-               tprintf("%lu, ", tcp->u_arg[0]);
-       } else {
-               unsigned long cur, abbrev_end;
-               uid_t gid;
-               int failed = 0;
-               const unsigned long len = tcp->u_rval;
-               const unsigned long size = len * sizeof(gid);
-               const unsigned long start = tcp->u_arg[1];
-               const unsigned long end = start + size;
-
-               if (!start) {
-                       printaddr(start);
-                       return 0;
-               }
-               if (len == 0) {
-                       tprints("[]");
-                       return 0;
-               }
-               if (!verbose(tcp) || syserror(tcp) ||
-                   size / sizeof(gid) != len || end < start) {
-                       printaddr(start);
-                       return 0;
-               }
-               if (abbrev(tcp)) {
-                       abbrev_end = start + max_strlen * sizeof(gid);
-                       if (abbrev_end < start)
-                               abbrev_end = end;
-               } else {
-                       abbrev_end = end;
-               }
-               tprints("[");
-               for (cur = start; cur < end; cur += sizeof(gid)) {
-                       if (cur > start)
-                               tprints(", ");
-                       if (cur >= abbrev_end) {
-                               tprints("...");
-                               break;
-                       }
-                       if (umoven(tcp, cur, sizeof(gid), &gid) < 0) {
-                               tprints("?");
-                               failed = 1;
-                               break;
-                       }
-                       tprintf("%u", (unsigned int) gid);
-               }
-               tprints("]");
-               if (failed) {
-                       tprints(" ");
-                       printaddr(start);
-               }
-       }
+       if (entering(tcp))
+               tprintf("%d, ", (int) tcp->u_arg[0]);
+       else
+               print_groups(tcp, tcp->u_rval, tcp->u_arg[1]);
        return 0;
 }