Date: Wed, 4 May 2016 21:07:30 +0000 (UTC) From: Alan Somers <asomers@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r299087 - in head/usr.sbin/extattr: . tests Message-ID: <201605042107.u44L7UGY026965@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: asomers Date: Wed May 4 21:07:30 2016 New Revision: 299087 URL: https://svnweb.freebsd.org/changeset/base/299087 Log: Fix "getextattr -x" with non-ascii attribute values extattr/rmextattr.c When printing hex output, treat all attribute values as unsigned char arrays instead of sign extending them to 32 bit values. extattr/tests/extattr_test.sh Add a regression test PR: 209039 MFC after: 4 weeks Sponsored by: Spectra Logic Corp Modified: head/usr.sbin/extattr/rmextattr.c head/usr.sbin/extattr/tests/extattr_test.sh Modified: head/usr.sbin/extattr/rmextattr.c ============================================================================== --- head/usr.sbin/extattr/rmextattr.c Wed May 4 21:00:41 2016 (r299086) +++ head/usr.sbin/extattr/rmextattr.c Wed May 4 21:07:30 2016 (r299087) @@ -294,7 +294,8 @@ main(int argc, char *argv[]) printf("\"%s\"", visbuf); } else if (flag_hex) { for (i = 0; i < ret; i++) - printf("%s%02x", i ? " " : "", buf[i]); + printf("%s%02x", i ? " " : "", + (unsigned char)buf[i]); } else { fwrite(buf, ret, 1, stdout); } Modified: head/usr.sbin/extattr/tests/extattr_test.sh ============================================================================== --- head/usr.sbin/extattr/tests/extattr_test.sh Wed May 4 21:00:41 2016 (r299086) +++ head/usr.sbin/extattr/tests/extattr_test.sh Wed May 4 21:07:30 2016 (r299087) @@ -43,9 +43,22 @@ hex_head() { } hex_body() { touch foo - atf_check -s exit:0 -o empty setextattr user myattr1 XYZ foo + atf_check -s exit:0 -o empty setextattr user myattr XYZ foo atf_check -s exit:0 -o inline:"58 59 5a\n" \ - getextattr -qx user myattr1 foo + getextattr -qx user myattr foo +} + +atf_test_case hex_nonascii +hex_nonascii_head() { + atf_set "descr" "Get binary attribute values in hexadecimal" +} +hex_nonascii_body() { + touch foo + BINSTUFF=`echo $'\x20\x30\x40\x55\x66\x70\x81\xa2\xb3\xee\xff'` + atf_check -s exit:0 -o empty setextattr user myattr "$BINSTUFF" foo + getextattr user myattr foo + atf_check -s exit:0 -o inline:"20 30 40 55 66 70 81 a2 b3 ee ff\n" \ + getextattr -qx user myattr foo } atf_test_case long_name @@ -299,9 +312,9 @@ unprivileged_user_cannot_set_system_attr atf_init_test_cases() { - # TODO: add test cases for verbose output (without -q) atf_add_test_case bad_namespace atf_add_test_case hex + atf_add_test_case hex_nonascii atf_add_test_case long_name atf_add_test_case loud atf_add_test_case noattrs
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605042107.u44L7UGY026965>