Dmitry V. Levin
de484eced5
In many places where kernel expects a NUL-terminated string of length up to a known fixed limit, e.g. when a NUL-terminated string is a fixed-size field of a structure, strace does not print the last byte assuming it is NUL, which is not always the case. Change output format for such strings to distinguish NUL-terminated strings from non-NUL-terminated ones: append ellipsis to the output when the string is not NUL-terminated. * defs.h (print_quoted_cstring): New prototype. * util.c (print_quoted_cstring): New function. (printpathn): Use it instead of print_quoted_string with QUOTE_0_TERMINATED argument. * print_fields.h (PRINT_FIELD_CSTRING): Likewise. * btrfs.c (btrfs_ioctl): Likewise. * dirent.c (SYS_FUNC(getdents)): Likewise. * dirent64.c (SYS_FUNC(getdents64)): Likewise. * print_ifindex.c (print_ifindex): Likewise. * sysmips.c (SYS_FUNC(sysmips)): Likewise. * ubi.c (ubi_ioctl): Likewise. * tests/tests.h (print_quoted_cstring): New prototype. * tests/print_quoted_string.c (print_quoted_cstring): New function. * tests/ioctl_block.c (main): Update expected output. * tests/ioctl_dm.c (main): Likewise. * tests/ioctl_loop.c (print_loop_info, print_loop_info64): Likewise. * tests/netlink_crypto.c (test_crypto_msg_newalg): Likewise.
47 lines
1.8 KiB
C
47 lines
1.8 KiB
C
/*
|
|
* Copyright (c) 2001-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 <net/if.h>
|
|
|
|
void
|
|
print_ifindex(const unsigned int ifindex)
|
|
{
|
|
#ifdef HAVE_IF_INDEXTONAME
|
|
char buf[IFNAMSIZ + 1];
|
|
|
|
if (if_indextoname(ifindex, buf)) {
|
|
tprints("if_nametoindex(");
|
|
print_quoted_cstring(buf, sizeof(buf));
|
|
tprints(")");
|
|
return;
|
|
}
|
|
#endif
|
|
|
|
tprintf("%u", ifindex);
|
|
}
|