]> granicus.if.org Git - strace/commitdiff
utime: fix omission of field names in utimbuf structure printing
authorEugene Syromyatnikov <evgsyr@gmail.com>
Mon, 28 Nov 2016 09:26:13 +0000 (12:26 +0300)
committerDmitry V. Levin <ldv@altlinux.org>
Tue, 29 Nov 2016 00:26:20 +0000 (00:26 +0000)
* utime.c (SYS_FUNC(utime)): Print struct utimbuf as a structure,
not as an array (use curly brackets instead of square ones).
Add field names to the output.
* tests/utime.c (main): Update expected output.

tests/utime.c
utime.c

index ef40d1bd03b7901f4b6187f4fb582db1aaa52c58..910447055126a5f13308888fbc7ee7f16bc9dbf3 100644 (file)
@@ -54,11 +54,11 @@ main(void)
 
        rc = utime("utime\nfilename", tail_u);
        const char *errstr = sprintrc(rc);
-       printf("utime(\"utime\\nfilename\", [");
+       printf("utime(\"utime\\nfilename\", {actime=");
        print_tm(p);
-       printf(", ");
+       printf(", modtime=");
        print_tm(p);
-       printf("]) = %s\n", errstr);
+       printf("}) = %s\n", errstr);
 
        puts("+++ exited with 0 +++");
        return 0;
diff --git a/utime.c b/utime.c
index 4f8f40a1e6cc07d4ab1be2af1e34cb332406d069..8126b350f25abcfb6a0d93b012c40a2e2dbe4626 100644 (file)
--- a/utime.c
+++ b/utime.c
@@ -15,8 +15,8 @@ SYS_FUNC(utime)
        printpath(tcp, tcp->u_arg[0]);
        tprints(", ");
        if (!umove_or_printaddr(tcp, tcp->u_arg[1], &u)) {
-               tprintf("[%s,", sprinttime(u.actime));
-               tprintf(" %s]", sprinttime(u.modtime));
+               tprintf("{actime=%s,", sprinttime(u.actime));
+               tprintf(" modtime=%s}", sprinttime(u.modtime));
        }
 
        return RVAL_DECODED;