From max at tyndur.org Mon Jan 2 16:57:25 2012 From: max at tyndur.org (Max Reitz) Date: Mon, 2 Jan 2012 16:57:25 +0100 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH=5D_tests=3A_sprintf=3A_signed_i?= =?utf-8?q?st_nicht_immer_unsigned?= Message-ID: <1325519845-11855-1-git-send-email-max@tyndur.org> * %[uoxX] erwarten einen unsigned int, keinen signed int. Signed-off-by: Max Reitz --- tests/libc/sprintf.c | 306 +++++++++++++++++++++++++------------------------- 1 files changed, 153 insertions(+), 153 deletions(-) diff --git a/tests/libc/sprintf.c b/tests/libc/sprintf.c index 17b5a95..1c3e6ab 100644 --- a/tests/libc/sprintf.c +++ b/tests/libc/sprintf.c @@ -57,14 +57,14 @@ int test_sprintf(void) TEST("-1024", 5, "%d", -1024) TEST("1024", 4, "%i", 1024) TEST("-1024", 5, "%i", -1024) - TEST("1024", 4, "%u", 1024) - TEST("4294966272", 10, "%u", -1024) - TEST("777", 3, "%o", 0777) - TEST("37777777001", 11, "%o", -0777) - TEST("1234abcd", 8, "%x", 0x1234abcd) - TEST("edcb5433", 8, "%x", -0x1234abcd) - TEST("1234ABCD", 8, "%X", 0x1234abcd) - TEST("EDCB5433", 8, "%X", -0x1234abcd) + TEST("1024", 4, "%u", 1024u) + TEST("4294966272", 10, "%u", -1024u) + TEST("777", 3, "%o", 0777u) + TEST("37777777001", 11, "%o", -0777u) + TEST("1234abcd", 8, "%x", 0x1234abcdu) + TEST("edcb5433", 8, "%x", -0x1234abcdu) + TEST("1234ABCD", 8, "%X", 0x1234abcdu) + TEST("EDCB5433", 8, "%X", -0x1234abcdu) TEST("x", 1, "%c", 'x') TEST("%", 1, "%%") @@ -74,14 +74,14 @@ int test_sprintf(void) TEST("-1024", 5, "%+d", -1024) TEST("+1024", 5, "%+i", 1024) TEST("-1024", 5, "%+i", -1024) - TEST("1024", 4, "%+u", 1024) - TEST("4294966272", 10, "%+u", -1024) - TEST("777", 3, "%+o", 0777) - TEST("37777777001", 11, "%+o", -0777) - TEST("1234abcd", 8, "%+x", 0x1234abcd) - TEST("edcb5433", 8, "%+x", -0x1234abcd) - TEST("1234ABCD", 8, "%+X", 0x1234abcd) - TEST("EDCB5433", 8, "%+X", -0x1234abcd) + TEST("1024", 4, "%+u", 1024u) + TEST("4294966272", 10, "%+u", -1024u) + TEST("777", 3, "%+o", 0777u) + TEST("37777777001", 11, "%+o", -0777u) + TEST("1234abcd", 8, "%+x", 0x1234abcdu) + TEST("edcb5433", 8, "%+x", -0x1234abcdu) + TEST("1234ABCD", 8, "%+X", 0x1234abcdu) + TEST("EDCB5433", 8, "%+X", -0x1234abcdu) TEST("x", 1, "%+c", 'x') /* Vorzeichenplatzhalter erzwingen (Flag ) */ @@ -90,14 +90,14 @@ int test_sprintf(void) TEST("-1024", 5, "% d", -1024) TEST(" 1024", 5, "% i", 1024) TEST("-1024", 5, "% i", -1024) - TEST("1024", 4, "% u", 1024) - TEST("4294966272", 10, "% u", -1024) - TEST("777", 3, "% o", 0777) - TEST("37777777001", 11, "% o", -0777) - TEST("1234abcd", 8, "% x", 0x1234abcd) - TEST("edcb5433", 8, "% x", -0x1234abcd) - TEST("1234ABCD", 8, "% X", 0x1234abcd) - TEST("EDCB5433", 8, "% X", -0x1234abcd) + TEST("1024", 4, "% u", 1024u) + TEST("4294966272", 10, "% u", -1024u) + TEST("777", 3, "% o", 0777u) + TEST("37777777001", 11, "% o", -0777u) + TEST("1234abcd", 8, "% x", 0x1234abcdu) + TEST("edcb5433", 8, "% x", -0x1234abcdu) + TEST("1234ABCD", 8, "% X", 0x1234abcdu) + TEST("EDCB5433", 8, "% X", -0x1234abcdu) TEST("x", 1, "% c", 'x') /* Flag + hat Vorrang über */ @@ -106,26 +106,26 @@ int test_sprintf(void) TEST("-1024", 5, "%+ d", -1024) TEST("+1024", 5, "%+ i", 1024) TEST("-1024", 5, "%+ i", -1024) - TEST("1024", 4, "%+ u", 1024) - TEST("4294966272", 10, "%+ u", -1024) - TEST("777", 3, "%+ o", 0777) - TEST("37777777001", 11, "%+ o", -0777) - TEST("1234abcd", 8, "%+ x", 0x1234abcd) - TEST("edcb5433", 8, "%+ x", -0x1234abcd) - TEST("1234ABCD", 8, "%+ X", 0x1234abcd) - TEST("EDCB5433", 8, "%+ X", -0x1234abcd) + TEST("1024", 4, "%+ u", 1024u) + TEST("4294966272", 10, "%+ u", -1024u) + TEST("777", 3, "%+ o", 0777u) + TEST("37777777001", 11, "%+ o", -0777u) + TEST("1234abcd", 8, "%+ x", 0x1234abcdu) + TEST("edcb5433", 8, "%+ x", -0x1234abcdu) + TEST("1234ABCD", 8, "%+ X", 0x1234abcdu) + TEST("EDCB5433", 8, "%+ X", -0x1234abcdu) TEST("x", 1, "%+ c", 'x') /* Alternative Form */ - TEST("0777", 4, "%#o", 0777) - TEST("037777777001", 12, "%#o", -0777) - TEST("0x1234abcd", 10, "%#x", 0x1234abcd) - TEST("0xedcb5433", 10, "%#x", -0x1234abcd) - TEST("0X1234ABCD", 10, "%#X", 0x1234abcd) - TEST("0XEDCB5433", 10, "%#X", -0x1234abcd) - TEST("0", 1, "%#o", 0) - TEST("0", 1, "%#x", 0) - TEST("0", 1, "%#X", 0) + TEST("0777", 4, "%#o", 0777u) + TEST("037777777001", 12, "%#o", -0777u) + TEST("0x1234abcd", 10, "%#x", 0x1234abcdu) + TEST("0xedcb5433", 10, "%#x", -0x1234abcdu) + TEST("0X1234ABCD", 10, "%#X", 0x1234abcdu) + TEST("0XEDCB5433", 10, "%#X", -0x1234abcdu) + TEST("0", 1, "%#o", 0u) + TEST("0", 1, "%#x", 0u) + TEST("0", 1, "%#X", 0u) /* Feldbreite: Kleiner als Ausgabe */ TEST("Hallo heimur", 12, "%1s", "Hallo heimur") @@ -133,14 +133,14 @@ int test_sprintf(void) TEST("-1024", 5, "%1d", -1024) TEST("1024", 4, "%1i", 1024) TEST("-1024", 5, "%1i", -1024) - TEST("1024", 4, "%1u", 1024) - TEST("4294966272", 10, "%1u", -1024) - TEST("777", 3, "%1o", 0777) - TEST("37777777001", 11, "%1o", -0777) - TEST("1234abcd", 8, "%1x", 0x1234abcd) - TEST("edcb5433", 8, "%1x", -0x1234abcd) - TEST("1234ABCD", 8, "%1X", 0x1234abcd) - TEST("EDCB5433", 8, "%1X", -0x1234abcd) + TEST("1024", 4, "%1u", 1024u) + TEST("4294966272", 10, "%1u", -1024u) + TEST("777", 3, "%1o", 0777u) + TEST("37777777001", 11, "%1o", -0777u) + TEST("1234abcd", 8, "%1x", 0x1234abcdu) + TEST("edcb5433", 8, "%1x", -0x1234abcdu) + TEST("1234ABCD", 8, "%1X", 0x1234abcdu) + TEST("EDCB5433", 8, "%1X", -0x1234abcdu) TEST("x", 1, "%1c", 'x') /* Feldbreite: Größer als Ausgabe */ @@ -149,14 +149,14 @@ int test_sprintf(void) TEST(" -1024", 20, "%20d", -1024) TEST(" 1024", 20, "%20i", 1024) TEST(" -1024", 20, "%20i", -1024) - TEST(" 1024", 20, "%20u", 1024) - TEST(" 4294966272", 20, "%20u", -1024) - TEST(" 777", 20, "%20o", 0777) - TEST(" 37777777001", 20, "%20o", -0777) - TEST(" 1234abcd", 20, "%20x", 0x1234abcd) - TEST(" edcb5433", 20, "%20x", -0x1234abcd) - TEST(" 1234ABCD", 20, "%20X", 0x1234abcd) - TEST(" EDCB5433", 20, "%20X", -0x1234abcd) + TEST(" 1024", 20, "%20u", 1024u) + TEST(" 4294966272", 20, "%20u", -1024u) + TEST(" 777", 20, "%20o", 0777u) + TEST(" 37777777001", 20, "%20o", -0777u) + TEST(" 1234abcd", 20, "%20x", 0x1234abcdu) + TEST(" edcb5433", 20, "%20x", -0x1234abcdu) + TEST(" 1234ABCD", 20, "%20X", 0x1234abcdu) + TEST(" EDCB5433", 20, "%20X", -0x1234abcdu) TEST(" x", 20, "%20c", 'x') /* Feldbreite: Linksbündig */ @@ -165,14 +165,14 @@ int test_sprintf(void) TEST("-1024 ", 20, "%-20d", -1024) TEST("1024 ", 20, "%-20i", 1024) TEST("-1024 ", 20, "%-20i", -1024) - TEST("1024 ", 20, "%-20u", 1024) - TEST("4294966272 ", 20, "%-20u", -1024) - TEST("777 ", 20, "%-20o", 0777) - TEST("37777777001 ", 20, "%-20o", -0777) - TEST("1234abcd ", 20, "%-20x", 0x1234abcd) - TEST("edcb5433 ", 20, "%-20x", -0x1234abcd) - TEST("1234ABCD ", 20, "%-20X", 0x1234abcd) - TEST("EDCB5433 ", 20, "%-20X", -0x1234abcd) + TEST("1024 ", 20, "%-20u", 1024u) + TEST("4294966272 ", 20, "%-20u", -1024u) + TEST("777 ", 20, "%-20o", 0777u) + TEST("37777777001 ", 20, "%-20o", -0777u) + TEST("1234abcd ", 20, "%-20x", 0x1234abcdu) + TEST("edcb5433 ", 20, "%-20x", -0x1234abcdu) + TEST("1234ABCD ", 20, "%-20X", 0x1234abcdu) + TEST("EDCB5433 ", 20, "%-20X", -0x1234abcdu) TEST("x ", 20, "%-20c", 'x') /* Feldbreite: Padding mit 0 */ @@ -180,29 +180,29 @@ int test_sprintf(void) TEST("-0000000000000001024", 20, "%020d", -1024) TEST("00000000000000001024", 20, "%020i", 1024) TEST("-0000000000000001024", 20, "%020i", -1024) - TEST("00000000000000001024", 20, "%020u", 1024) - TEST("00000000004294966272", 20, "%020u", -1024) - TEST("00000000000000000777", 20, "%020o", 0777) - TEST("00000000037777777001", 20, "%020o", -0777) - TEST("0000000000001234abcd", 20, "%020x", 0x1234abcd) - TEST("000000000000edcb5433", 20, "%020x", -0x1234abcd) - TEST("0000000000001234ABCD", 20, "%020X", 0x1234abcd) - TEST("000000000000EDCB5433", 20, "%020X", -0x1234abcd) + TEST("00000000000000001024", 20, "%020u", 1024u) + TEST("00000000004294966272", 20, "%020u", -1024u) + TEST("00000000000000000777", 20, "%020o", 0777u) + TEST("00000000037777777001", 20, "%020o", -0777u) + TEST("0000000000001234abcd", 20, "%020x", 0x1234abcdu) + TEST("000000000000edcb5433", 20, "%020x", -0x1234abcdu) + TEST("0000000000001234ABCD", 20, "%020X", 0x1234abcdu) + TEST("000000000000EDCB5433", 20, "%020X", -0x1234abcdu) /* Feldbreite: Padding und alternative Form */ - TEST(" 0777", 20, "%#20o", 0777) - TEST(" 037777777001", 20, "%#20o", -0777) - TEST(" 0x1234abcd", 20, "%#20x", 0x1234abcd) - TEST(" 0xedcb5433", 20, "%#20x", -0x1234abcd) - TEST(" 0X1234ABCD", 20, "%#20X", 0x1234abcd) - TEST(" 0XEDCB5433", 20, "%#20X", -0x1234abcd) + TEST(" 0777", 20, "%#20o", 0777u) + TEST(" 037777777001", 20, "%#20o", -0777u) + TEST(" 0x1234abcd", 20, "%#20x", 0x1234abcdu) + TEST(" 0xedcb5433", 20, "%#20x", -0x1234abcdu) + TEST(" 0X1234ABCD", 20, "%#20X", 0x1234abcdu) + TEST(" 0XEDCB5433", 20, "%#20X", -0x1234abcdu) - TEST("00000000000000000777", 20, "%#020o", 0777) - TEST("00000000037777777001", 20, "%#020o", -0777) - TEST("0x00000000001234abcd", 20, "%#020x", 0x1234abcd) - TEST("0x0000000000edcb5433", 20, "%#020x", -0x1234abcd) - TEST("0X00000000001234ABCD", 20, "%#020X", 0x1234abcd) - TEST("0X0000000000EDCB5433", 20, "%#020X", -0x1234abcd) + TEST("00000000000000000777", 20, "%#020o", 0777u) + TEST("00000000037777777001", 20, "%#020o", -0777u) + TEST("0x00000000001234abcd", 20, "%#020x", 0x1234abcdu) + TEST("0x0000000000edcb5433", 20, "%#020x", -0x1234abcdu) + TEST("0X00000000001234ABCD", 20, "%#020X", 0x1234abcdu) + TEST("0X0000000000EDCB5433", 20, "%#020X", -0x1234abcdu) /* Feldbreite: - hat Vorrang vor 0 */ TEST("Hallo ", 20, "%0-20s", "Hallo") @@ -210,14 +210,14 @@ int test_sprintf(void) TEST("-1024 ", 20, "%0-20d", -1024) TEST("1024 ", 20, "%0-20i", 1024) TEST("-1024 ", 20, "%0-20i", -1024) - TEST("1024 ", 20, "%0-20u", 1024) - TEST("4294966272 ", 20, "%0-20u", -1024) - TEST("777 ", 20, "%-020o", 0777) - TEST("37777777001 ", 20, "%-020o", -0777) - TEST("1234abcd ", 20, "%-020x", 0x1234abcd) - TEST("edcb5433 ", 20, "%-020x", -0x1234abcd) - TEST("1234ABCD ", 20, "%-020X", 0x1234abcd) - TEST("EDCB5433 ", 20, "%-020X", -0x1234abcd) + TEST("1024 ", 20, "%0-20u", 1024u) + TEST("4294966272 ", 20, "%0-20u", -1024u) + TEST("777 ", 20, "%-020o", 0777u) + TEST("37777777001 ", 20, "%-020o", -0777u) + TEST("1234abcd ", 20, "%-020x", 0x1234abcdu) + TEST("edcb5433 ", 20, "%-020x", -0x1234abcdu) + TEST("1234ABCD ", 20, "%-020X", 0x1234abcdu) + TEST("EDCB5433 ", 20, "%-020X", -0x1234abcdu) TEST("x ", 20, "%-020c", 'x') /* Feldbreite: Aus Parameter */ @@ -226,14 +226,14 @@ int test_sprintf(void) TEST(" -1024", 20, "%*d", 20, -1024) TEST(" 1024", 20, "%*i", 20, 1024) TEST(" -1024", 20, "%*i", 20, -1024) - TEST(" 1024", 20, "%*u", 20, 1024) - TEST(" 4294966272", 20, "%*u", 20, -1024) - TEST(" 777", 20, "%*o", 20, 0777) - TEST(" 37777777001", 20, "%*o", 20, -0777) - TEST(" 1234abcd", 20, "%*x", 20, 0x1234abcd) - TEST(" edcb5433", 20, "%*x", 20, -0x1234abcd) - TEST(" 1234ABCD", 20, "%*X", 20, 0x1234abcd) - TEST(" EDCB5433", 20, "%*X", 20, -0x1234abcd) + TEST(" 1024", 20, "%*u", 20, 1024u) + TEST(" 4294966272", 20, "%*u", 20, -1024u) + TEST(" 777", 20, "%*o", 20, 0777u) + TEST(" 37777777001", 20, "%*o", 20, -0777u) + TEST(" 1234abcd", 20, "%*x", 20, 0x1234abcdu) + TEST(" edcb5433", 20, "%*x", 20, -0x1234abcdu) + TEST(" 1234ABCD", 20, "%*X", 20, 0x1234abcdu) + TEST(" EDCB5433", 20, "%*X", 20, -0x1234abcdu) TEST(" x", 20, "%*c", 20, 'x') /* Präzision / Mindestanzahl von Ziffern */ @@ -242,14 +242,14 @@ int test_sprintf(void) TEST("-00000000000000001024", 21, "%.20d", -1024) TEST("00000000000000001024", 20, "%.20i", 1024) TEST("-00000000000000001024", 21, "%.20i", -1024) - TEST("00000000000000001024", 20, "%.20u", 1024) - TEST("00000000004294966272", 20, "%.20u", -1024) - TEST("00000000000000000777", 20, "%.20o", 0777) - TEST("00000000037777777001", 20, "%.20o", -0777) - TEST("0000000000001234abcd", 20, "%.20x", 0x1234abcd) - TEST("000000000000edcb5433", 20, "%.20x", -0x1234abcd) - TEST("0000000000001234ABCD", 20, "%.20X", 0x1234abcd) - TEST("000000000000EDCB5433", 20, "%.20X", -0x1234abcd) + TEST("00000000000000001024", 20, "%.20u", 1024u) + TEST("00000000004294966272", 20, "%.20u", -1024u) + TEST("00000000000000000777", 20, "%.20o", 0777u) + TEST("00000000037777777001", 20, "%.20o", -0777u) + TEST("0000000000001234abcd", 20, "%.20x", 0x1234abcdu) + TEST("000000000000edcb5433", 20, "%.20x", -0x1234abcdu) + TEST("0000000000001234ABCD", 20, "%.20X", 0x1234abcdu) + TEST("000000000000EDCB5433", 20, "%.20X", -0x1234abcdu) /* Feldbreite und Präzision */ TEST(" Hallo", 20, "%20.5s", "Hallo heimur") @@ -257,14 +257,14 @@ int test_sprintf(void) TEST(" -01024", 20, "%20.5d", -1024) TEST(" 01024", 20, "%20.5i", 1024) TEST(" -01024", 20, "%20.5i", -1024) - TEST(" 01024", 20, "%20.5u", 1024) - TEST(" 4294966272", 20, "%20.5u", -1024) - TEST(" 00777", 20, "%20.5o", 0777) - TEST(" 37777777001", 20, "%20.5o", -0777) - TEST(" 1234abcd", 20, "%20.5x", 0x1234abcd) - TEST(" 00edcb5433", 20, "%20.10x", -0x1234abcd) - TEST(" 1234ABCD", 20, "%20.5X", 0x1234abcd) - TEST(" 00EDCB5433", 20, "%20.10X", -0x1234abcd) + TEST(" 01024", 20, "%20.5u", 1024u) + TEST(" 4294966272", 20, "%20.5u", -1024u) + TEST(" 00777", 20, "%20.5o", 0777u) + TEST(" 37777777001", 20, "%20.5o", -0777u) + TEST(" 1234abcd", 20, "%20.5x", 0x1234abcdu) + TEST(" 00edcb5433", 20, "%20.10x", -0x1234abcdu) + TEST(" 1234ABCD", 20, "%20.5X", 0x1234abcdu) + TEST(" 00EDCB5433", 20, "%20.10X", -0x1234abcdu) /* Präzision: 0 wird ignoriert */ TEST(" Hallo", 20, "%020.5s", "Hallo heimur") @@ -272,14 +272,14 @@ int test_sprintf(void) TEST(" -01024", 20, "%020.5d", -1024) TEST(" 01024", 20, "%020.5i", 1024) TEST(" -01024", 20, "%020.5i", -1024) - TEST(" 01024", 20, "%020.5u", 1024) - TEST(" 4294966272", 20, "%020.5u", -1024) - TEST(" 00777", 20, "%020.5o", 0777) - TEST(" 37777777001", 20, "%020.5o", -0777) - TEST(" 1234abcd", 20, "%020.5x", 0x1234abcd) - TEST(" 00edcb5433", 20, "%020.10x", -0x1234abcd) - TEST(" 1234ABCD", 20, "%020.5X", 0x1234abcd) - TEST(" 00EDCB5433", 20, "%020.10X", -0x1234abcd) + TEST(" 01024", 20, "%020.5u", 1024u) + TEST(" 4294966272", 20, "%020.5u", -1024u) + TEST(" 00777", 20, "%020.5o", 0777u) + TEST(" 37777777001", 20, "%020.5o", -0777u) + TEST(" 1234abcd", 20, "%020.5x", 0x1234abcdu) + TEST(" 00edcb5433", 20, "%020.10x", -0x1234abcdu) + TEST(" 1234ABCD", 20, "%020.5X", 0x1234abcdu) + TEST(" 00EDCB5433", 20, "%020.10X", -0x1234abcdu) /* Präzision 0 */ TEST("", 0, "%.0s", "Hallo heimur") @@ -292,18 +292,18 @@ int test_sprintf(void) TEST(" 1024", 20, "%20.0i", 1024) TEST(" -1024", 20, "%20.i", -1024) TEST(" ", 20, "%20.i", 0) - TEST(" 1024", 20, "%20.u", 1024) - TEST(" 4294966272", 20, "%20.0u", -1024) - TEST(" ", 20, "%20.u", 0) - TEST(" 777", 20, "%20.o", 0777) - TEST(" 37777777001", 20, "%20.0o", -0777) - TEST(" ", 20, "%20.o", 0) - TEST(" 1234abcd", 20, "%20.x", 0x1234abcd) - TEST(" edcb5433", 20, "%20.0x", -0x1234abcd) - TEST(" ", 20, "%20.x", 0) - TEST(" 1234ABCD", 20, "%20.X", 0x1234abcd) - TEST(" EDCB5433", 20, "%20.0X", -0x1234abcd) - TEST(" ", 20, "%20.X", 0) + TEST(" 1024", 20, "%20.u", 1024u) + TEST(" 4294966272", 20, "%20.0u", -1024u) + TEST(" ", 20, "%20.u", 0u) + TEST(" 777", 20, "%20.o", 0777u) + TEST(" 37777777001", 20, "%20.0o", -0777u) + TEST(" ", 20, "%20.o", 0u) + TEST(" 1234abcd", 20, "%20.x", 0x1234abcdu) + TEST(" edcb5433", 20, "%20.0x", -0x1234abcdu) + TEST(" ", 20, "%20.x", 0u) + TEST(" 1234ABCD", 20, "%20.X", 0x1234abcdu) + TEST(" EDCB5433", 20, "%20.0X", -0x1234abcdu) + TEST(" ", 20, "%20.X", 0u) /* Negative Präzision wird ignoriert */ /* XXX glibc tut nicht, was ich erwartet habe, vorerst deaktiviert... */ @@ -313,14 +313,14 @@ int test_sprintf(void) TEST("-1024", 5, "%.-42d", -1024) TEST("1024", 4, "%.-42i", 1024) TEST("-1024", 5, "%.-42i", -1024) - TEST("1024", 4, "%.-42u", 1024) - TEST("4294966272", 10, "%.-42u", -1024) - TEST("777", 3, "%.-42o", 0777) - TEST("37777777001", 11, "%.-42o", -0777) - TEST("1234abcd", 8, "%.-42x", 0x1234abcd) - TEST("edcb5433", 8, "%.-42x", -0x1234abcd) - TEST("1234ABCD", 8, "%.-42X", 0x1234abcd) - TEST("EDCB5433", 8, "%.-42X", -0x1234abcd) + TEST("1024", 4, "%.-42u", 1024u) + TEST("4294966272", 10, "%.-42u", -1024u) + TEST("777", 3, "%.-42o", 0777u) + TEST("37777777001", 11, "%.-42o", -0777u) + TEST("1234abcd", 8, "%.-42x", 0x1234abcdu) + TEST("edcb5433", 8, "%.-42x", -0x1234abcdu) + TEST("1234ABCD", 8, "%.-42X", 0x1234abcdu) + TEST("EDCB5433", 8, "%.-42X", -0x1234abcdu) #endif /* @@ -333,14 +333,14 @@ int test_sprintf(void) TEST("-01024 ", 20, "% -0+*.*d", 20, 5, -1024) TEST("+01024 ", 20, "% -0+*.*i", 20, 5, 1024) TEST("-01024 ", 20, "% 0-+*.*i", 20, 5, -1024) - TEST("01024 ", 20, "% 0-+*.*u", 20, 5, 1024) - TEST("4294966272 ", 20, "% 0-+*.*u", 20, 5, -1024) - TEST("00777 ", 20, "%+ -0*.*o", 20, 5, 0777) - TEST("37777777001 ", 20, "%+ -0*.*o", 20, 5, -0777) - TEST("1234abcd ", 20, "%+ -0*.*x", 20, 5, 0x1234abcd) - TEST("00edcb5433 ", 20, "%+ -0*.*x", 20, 10, -0x1234abcd) - TEST("1234ABCD ", 20, "% -+0*.*X", 20, 5, 0x1234abcd) - TEST("00EDCB5433 ", 20, "% -+0*.*X", 20, 10, -0x1234abcd) + TEST("01024 ", 20, "% 0-+*.*u", 20, 5, 1024u) + TEST("4294966272 ", 20, "% 0-+*.*u", 20, 5, -1024u) + TEST("00777 ", 20, "%+ -0*.*o", 20, 5, 0777u) + TEST("37777777001 ", 20, "%+ -0*.*o", 20, 5, -0777u) + TEST("1234abcd ", 20, "%+ -0*.*x", 20, 5, 0x1234abcdu) + TEST("00edcb5433 ", 20, "%+ -0*.*x", 20, 10, -0x1234abcdu) + TEST("1234ABCD ", 20, "% -+0*.*X", 20, 5, 0x1234abcdu) + TEST("00EDCB5433 ", 20, "% -+0*.*X", 20, 10, -0x1234abcdu) if (failed == 0) { printf("* PASS sprintf\n"); -- 1.7.8.1 From hartmut at tyndur.org Fri Jan 13 22:24:59 2012 From: hartmut at tyndur.org (Alexander Kluth) Date: Fri, 13 Jan 2012 22:24:59 +0100 Subject: [tyndur-devel] =?utf-8?q?=5BPATCH=5D_*_losh=3A_String_ge=C3=A4nde?= =?utf-8?q?rt?= Message-ID: <1326489899-8659-1-git-send-email-hartmut@tyndur.org> * commands.c: Es sollte "Datei nicht gefunden!" heißen, es handelt sic ja nicht direkt um einen Befehl Signed-off-by: Alexander Kluth --- src/modules/c/shell/commmands.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/modules/c/shell/commmands.c b/src/modules/c/shell/commmands.c index 4e47ab7..6dc4c30 100644 --- a/src/modules/c/shell/commmands.c +++ b/src/modules/c/shell/commmands.c @@ -140,7 +140,7 @@ int shell_command_start(int argc, char* argv[], const char* cmd) return 0; } - puts(TMS(start_not_found, "Befehl wurde nicht gefunden!")); + puts(TMS(start_not_found, "Datei wurde nicht gefunden!")); return -1; } -- 1.7.7 From hartmut at tyndur.org Sat Jan 14 19:36:37 2012 From: hartmut at tyndur.org (Alexander Kluth) Date: Sat, 14 Jan 2012 19:36:37 +0100 Subject: [tyndur-devel] [PATCH] losh: Erneut KRITIKEL gefixt Message-ID: <1326566197-15649-1-git-send-email-hartmut@tyndur.org> * commmands.c: Nun heißt die Datei commands.c und der Text wurde verfeinert Signed-off-by: Alexander Kluth --- src/modules/c/shell/commands.c | 356 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 356 insertions(+), 0 deletions(-) create mode 100644 src/modules/c/shell/commands.c diff --git a/src/modules/c/shell/commands.c b/src/modules/c/shell/commands.c new file mode 100644 index 0000000..6310735 --- /dev/null +++ b/src/modules/c/shell/commands.c @@ -0,0 +1,356 @@ +/* + * Copyright (c) 2007 The tyndur Project. All rights reserved. + * + * This code is derived from software contributed to the tyndur Project + * by Antoine Kaufmann. + * + * 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. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the tyndur Project + * and its contributors. + * 4. Neither the name of the tyndur Project nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``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 COPYRIGHT HOLDERS OR + * CONTRIBUTORS 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 +#include +#include +#include +#include +#include +#include +#include +#include "shell.h" +#include +#include +#include +#include +#include + +#define TMS_MODULE cmd +#include + +#include + + +//Hier koennen die Debug-Nachrichten aktiviert werden +#define DEBUG 0 + +#if DEBUG == 1 + #define DEBUG_MSG(s) printf("[ SHELL ] debug: %s() '%s'\n",__FUNCTION__,s) + #define DEBUG_MSG1(x, y) \ + printf("[ SHELL ] debug: %s() '", __FUNCTION__); \ + printf(x, y); \ + printf("'\n"); + #define DEBUG_MSG2(x, y, z) \ + printf("[ SHELL ] debug: %s() '", __FUNCTION__); \ + printf(x, y, z); \ + printf("'\n"); +#else + #define DEBUG_MSG(s) + #define DEBUG_MSG1(s,x) + #define DEBUG_MSG2(s,x,y) +#endif + + +int shell_start_path_app(const char* cmd, bool wait) +{ + DEBUG_MSG1("Starte das Programm %s", cmd); + pid_t pid; + + // Fuehrende Leerzeichen im Befehl grosszuegig ueberspringen + while (*cmd == ' ') { + cmd++; + } + + pid = init_execute(cmd); + + // Fehler ist aufgetreten + if (pid == 0) { + return -1; + } + + // Wenn es gewuenscht wurde, wird jetzt gewartet, bis der Prozess beendet + // wird. + if (wait == true) { + int status; + while (waitpid(pid, &status, 0) != pid); + } + return 0; +} + +/** + * Wird aufgerufen, wenn keiner der internen Befehle passt. + */ +int shell_command_default(int argc, char* argv[], const char* cmd) +{ + // Leere Kommandozeilen sollen keine Fehlermeldungen bringen + if (strlen(cmd) == 0) { + return 0; + } + + if (shell_start_path_app(cmd, true) == 0) { + return 0; + } + + puts(TMS(exec_not_found, "Befehl wurde nicht gefunden!")); + return -1; +} + +/** + * Eine ausfuerbare Datei im aktuellen Verzeichnis oder in PATH starten. + */ +int shell_command_start(int argc, char* argv[], const char* cmd) +{ + const char* program; + DEBUG_MSG("start"); + + if (argc < 2) { + printf(TMS(start_usage, "\nAufruf: start [Argumente ...]\n")); + return -1; + } + + program = strchr(cmd, ' ') + 1; + if (program == NULL) { + return -1; + } + + if (shell_start_path_app(program, false) == 0) { + return 0; + } + + puts(TMS(start_not_found, "Datei nicht gefunden!")); + return -1; +} + + +/** + * + */ +int shell_command_help(int argc, char* argv[], const char* args) +{ + char* help_args = strchr(args, ' '); + char* cmd; + int ret; + + // Erstmal versuchen, ob thelp installiert ist + if (help_args == NULL) { + cmd = strdup("thelp tyndur"); + } else { + asprintf(&cmd, "thelp %s", help_args + 1); + } + + ret = shell_start_path_app(cmd, true); + free(cmd); + if (ret == 0) { + return 0; + } + + // Wenn nicht, gibt es eben die klassische Hilfe + puts(TMS(help_text, + "Verfügbare Befehle:\n" + + " Startet das Programm an im Vordergrund\n" + " start Startet das Programm an im Hintergrund\n" + " echo Zeigt an\n" + "\n" + " pwd Zeigt den aktuellen Verzeichnisnamen an\n" + " ls Zeigt den Verzeichnisinhalt an\n" + " stat Zeigt Informationen zur einer Datei an\n" + " cd Wechselt das Verzeichnis\n" + " mkdir Erstellt das Verzeichnis\n" + "\n" + " cp Kopiert die Datei nach \n" + " ln Erstellt einen auf verweisenden Link \n" + " symlink Erstellt einen symbolischen Link auf \n" + " readlink Liest das Ziel des Symlinks aus\n" + " rm Löscht eine Datei\n" + "\n" + " cat Zeigt den Inhalt der Datei an\n" + " bincat Zeigt den Inhalt der Datei als einzelne Bytes an\n" + " pipe Ein-/Ausgabe auf einer Datei (z.B. TCP-Verbindung)\n" + " sync Alle veränderten Blöcke im Cache zurückschreiben\n" + "\n" + " date Zeigt das Datum und die Uhrzeit an\n" + " free Zeigt den Speicherverbrauch des Systems an\n" + " ps Zeigt eine Liste mit allen Prozessen an\n" + " pstree Zeigt die Prozesshierarchie als Baum an\n" + " kill Beendet den Prozess \n" + " dbg_st Zeigt einen Stack Backtrace des Prozesses an\n" + + " set Setzt Umgebungsvariablen oder zeigt sie an\n" + " read Liest einen Wert für die Umgebungsvariable ein\n" + " source Führt das Skript in der aktuellen Shell aus\n" + " sleep Wartet Sekunden\n" + + " exit Beendet die Shell\n" + "\n" + "Diese Hilfe wird in den meisten Fällen nicht auf den Bildschirm" + " passen. Um\n" + "weiter oben stehende Befehle anzuzeigen, bitte Shift-BildAuf" + " drücken.\n" + "Shift-BildAb blättert wieder nach unten. Andere Tasten springen" + " zurück an die\n" + "aktuelle Position.\n" + "\n" + )); + + return 0; +} + +/** + * + */ +int shell_command_version(int argc, char* argv[], const char* args) +{ + puts("tyndur Shell " TYNDUR_VERSION); + return 0; +} + +/** + * + */ +int shell_command_exit(int argc, char* argv[], const char* args) +{ + exit(0); + return 0; +} + +int shell_command_cd(int argc, char* argv[], const char* args) +{ + char* cd_args = strchr(args, ' '); + char* path; + DIR* dir; + + if (cd_args == NULL) { + goto usage; + } + + cd_args++; + path = io_get_absolute_path(cd_args); + if (path == NULL) { + goto usage; + } + + dir = opendir(path); + if (dir == NULL) { + printf(TMS(cd_error, "Wechseln in das Verzeichnis '%s' " + "nicht möglich!\n"), path); + } else { + chdir(path); + closedir(dir); + } + free(path); + + return 0; + +usage: + puts(TMS(cd_usage, "\nAufruf: cd ")); + return -1; +} + +int shell_command_source(int argc, char* argv[], const char* args) +{ + const char* path; + if (argc != 2) { + printf(TMS(source_usage, "\nAufruf: source \n")); + return -1; + } + + path = argv[1]; + if (shell_script(path)) { + return 0; + } else { + printf(TMS(source_error, "Ausführen des Skripts '%s' " + "fehlgeschlagen.\n"), path); + return -1; + } +} + +int shell_command_clear(int argc, char* argv[], const char* args) +{ + printf("\033[1;1H\033[2J"); + + return 0; +} + +void set_display_usage(void); +void set_list_vars(void); + +int shell_command_set(int argc, char* argv[], const char* args) +{ + int overwrite = 1; + + while (argc > 1) { + if (!strcmp(argv[1], "-d")) { + overwrite = 0; + } else if (!strcmp(argv[1], "-h")) { + set_display_usage(); + return EXIT_SUCCESS; + } else { + break; + } + argc--; + argv++; + } + + switch (argc) { + case 1: + set_list_vars(); + break; + + case 2: + unsetenv(argv[1]); + break; + + case 3: + setenv(argv[1], argv[2], overwrite); + break; + + default: + set_display_usage(); + return EXIT_FAILURE; + } + + return EXIT_SUCCESS; +} + +void set_list_vars() +{ + int i, cnt; + + cnt = getenv_count(); + for (i = 0; i < cnt; i++) { + printf("%s = %s\n", getenv_name_by_index(i), getenv_index(i)); + } +} + +void set_display_usage() +{ + puts(TMS(set_usage, "\nAufruf: set [-d] [ []]\n\n" + "Optionen:\n" + " -d: Defaultwert setzen. Wenn die Variable schon gesetzt ist, wird " + "ihr Wert\n nicht geändert.\n")); +} + -- 1.7.7