Januar 2014 - ngIRCd GIT Updates

Alexander Barton : portabtest: Add checks for strdup(), strndup(), and strtok_r()
by alex＠arthur.barton.de 01 Jan '14

01 Jan '14

Module: ngircd.git Branch: master Commit: f024a4992a9a38d64d0fd63283cd0c484bdec683 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f024a499… Author: Alexander Barton <alex(a)barton.de> Date: Wed Jan 1 16:38:36 2014 +0100 portabtest: Add checks for strdup(), strndup(), and strtok_r() --- src/portab/portabtest.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/src/portab/portabtest.c b/src/portab/portabtest.c index 4f53ce7..9e6bd22 100644 --- a/src/portab/portabtest.c +++ b/src/portab/portabtest.c @@ -45,6 +45,36 @@ Check_snprintf(void) } static void +Check_strdup(void) +{ + char *ptr; + + ptr = strdup("1234567890"); + if (!ptr) + Panic("strdup"); + if (ptr[10] != '\0') + Panic("strdup NULL byte"); + if (strlen(ptr) != 10) + Panic("strdup string length"); + free(ptr); +} + +static void +Check_strndup(void) +{ + char *ptr; + + ptr = strndup("1234567890", 5); + if (!ptr) + Panic("strndup"); + if (ptr[5] != '\0') + Panic("strndup NULL byte"); + if (strlen(ptr) != 5) + Panic("strndup string length"); + free(ptr); +} + +static void Check_strlcpy(void) { char str[5]; @@ -72,6 +102,30 @@ Check_strlcat(void) Panic("strlcat string length"); } +static void +Check_strtok_r(void) +{ + char *ptr, *last; + + ptr = strdup("12,abc"); + + ptr = strtok_r(ptr, ",", &last); + if (!ptr) + Panic("strtok_r result #1"); + if (strcmp(ptr, "12") != 0) + Panic("strtok_r token #1"); + + ptr = strtok_r(NULL, ",", &last); + if (!ptr) + Panic("strtok_r result #2"); + if (strcmp(ptr, "abc") != 0) + Panic("strtok_r token #2"); + + ptr = strtok_r(NULL, ",", &last); + if (ptr) + Panic("strtok_r result #3"); +} + #ifdef PROTOTYPES static void Check_vsnprintf(const int Len, const char *Format, ...) @@ -118,8 +172,11 @@ main(void) /* check functions */ Check_snprintf(); + Check_strdup(); + Check_strndup(); Check_strlcpy(); Check_strlcat(); + Check_strtok_r(); Check_vsnprintf(2+10, "%s%s", "ab", "1234567890"); return 0;

1 0

Alexander Barton : portabtest: Actually test functions
by alex＠arthur.barton.de 01 Jan '14

01 Jan '14

Module: ngircd.git Branch: master Commit: d38747d951a8a5007e97693cade3551e11e50569 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d38747d9… Author: Alexander Barton <alex(a)barton.de> Date: Wed Jan 1 15:57:34 2014 +0100 portabtest: Actually test functions Test functions snprintf(), strlcpy(), strlcat(), vsnprintf() for correctness, not only existance (which was quite useless, because if they weren't available, the program could not have been linked at all ...). --- src/portab/portabtest.c | 102 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 81 insertions(+), 21 deletions(-) diff --git a/src/portab/portabtest.c b/src/portab/portabtest.c index 8284c1d..4f53ce7 100644 --- a/src/portab/portabtest.c +++ b/src/portab/portabtest.c @@ -24,7 +24,82 @@ #include "exp.h" -static void Panic PARAMS((char *Reason)); +static void +Panic(char *Reason) +{ + /* Oops, something failed!? */ + fprintf(stderr, "Oops, test for %s failed!?\n", Reason); + exit(1); +} /* Panic */ + +static void +Check_snprintf(void) +{ + char str[5]; + + snprintf(str, sizeof(str), "%s", "1234567890"); + if (str[4] != '\0') + Panic("snprintf NULL byte"); + if (strlen(str) != 4) + Panic("snprintf string length"); +} + +static void +Check_strlcpy(void) +{ + char str[5]; + + if (strlcpy(str, "1234567890", sizeof(str)) != 10) + Panic("strlcpy return code"); + if (str[4] != '\0') + Panic("strlcpy NULL byte"); + if (strlen(str) != 4) + Panic("strlcpy string length"); +} + +static void +Check_strlcat(void) +{ + char str[5]; + + if (strlcpy(str, "12", sizeof(str)) != 2) + Panic("strlcpy for strlcat"); + if (strlcat(str, "1234567890", sizeof(str)) != 12) + Panic("strlcat return code"); + if (str[4] != '\0') + Panic("strlcat NULL byte"); + if (strlen(str) != 4) + Panic("strlcat string length"); +} + +#ifdef PROTOTYPES +static void +Check_vsnprintf(const int Len, const char *Format, ...) +#else +static void +Check_vsnprintf(Len, Format, va_alist) +const int Len; +const char *Format; +va_dcl +#endif +{ + char str[5]; + va_list ap; + +#ifdef PROTOTYPES + va_start(ap, Format); +#else + va_start(ap); +#endif + if (vsnprintf(str, sizeof(str), Format, ap) != Len) + Panic("vsnprintf return code"); + va_end(ap); + + if (str[4] != '\0') + Panic("vsnprintf NULL byte"); + if (strlen(str) != 4) + Panic("vsnprintf string length"); +} GLOBAL int main(void) @@ -41,28 +116,13 @@ main(void) if (sizeof(UINT32) != 4) Panic("UINT32"); -#ifdef PROTOTYPES /* check functions */ - if (!snprintf) - Panic("snprintf"); - if (!vsnprintf) - Panic("vsnprintf"); - if (!strlcpy) - Panic("strlcpy"); - if (!strlcat) - Panic("strlcat"); -#endif + Check_snprintf(); + Check_strlcpy(); + Check_strlcat(); + Check_vsnprintf(2+10, "%s%s", "ab", "1234567890"); - /* ok, no error */ return 0; -} /* portab_check_types */ - -static void -Panic(char *Reason) -{ - /* Oops, something failed!? */ - fprintf(stderr, "Oops, test for %s failed!?", Reason); - exit(1); -} /* Panic */ +} /* -eof- */

1 0

Alexander Barton : portabtest: Only use one exit code to indicate errors
by alex＠arthur.barton.de 01 Jan '14

01 Jan '14

Module: ngircd.git Branch: master Commit: 18070e5381b7d66963dbe990c98b06b5c601e280 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=18070e53… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 29 17:48:25 2013 +0100 portabtest: Only use one exit code to indicate errors --- src/portab/portabtest.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/portab/portabtest.c b/src/portab/portabtest.c index 335954a..8284c1d 100644 --- a/src/portab/portabtest.c +++ b/src/portab/portabtest.c @@ -24,33 +24,33 @@ #include "exp.h" -static void Panic PARAMS (( char *Reason, int Code )); +static void Panic PARAMS((char *Reason)); GLOBAL int main(void) { /* validate datatypes */ if (false != 0) - Panic("false", 1); + Panic("false"); if (true != 1) - Panic("true", 1); + Panic("true"); if (sizeof(UINT8) != 1) - Panic("UINT8", 1); + Panic("UINT8"); if (sizeof(UINT16) != 2) - Panic("UINT16", 1); + Panic("UINT16"); if (sizeof(UINT32) != 4) - Panic("UINT32", 1); + Panic("UINT32"); #ifdef PROTOTYPES /* check functions */ if (!snprintf) - Panic("snprintf", 2); + Panic("snprintf"); if (!vsnprintf) - Panic("vsnprintf", 2); + Panic("vsnprintf"); if (!strlcpy) - Panic("strlcpy", 2); + Panic("strlcpy"); if (!strlcat) - Panic("strlcat", 2); + Panic("strlcat"); #endif /* ok, no error */ @@ -58,11 +58,11 @@ main(void) } /* portab_check_types */ static void -Panic(char *Reason, int Code) +Panic(char *Reason) { /* Oops, something failed!? */ fprintf(stderr, "Oops, test for %s failed!?", Reason); - exit(Code); + exit(1); } /* Panic */ /* -eof- */

1 0

Alexander Barton : portabtest: Code cleanup
by alex＠arthur.barton.de 01 Jan '14

01 Jan '14

Module: ngircd.git Branch: master Commit: d913323ca9a0900e836bc4f786850f303c0486ea URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d913323c… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 29 17:46:54 2013 +0100 portabtest: Code cleanup --- src/portab/portabtest.c | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/src/portab/portabtest.c b/src/portab/portabtest.c index 09afbfd..335954a 100644 --- a/src/portab/portabtest.c +++ b/src/portab/portabtest.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001,2002 by Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2013 Alexander Barton (alex(a)barton.de) and Contributors. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,40 +24,45 @@ #include "exp.h" - static void Panic PARAMS (( char *Reason, int Code )); - GLOBAL int -main( void ) +main(void) { /* validate datatypes */ - if( false != 0 ) Panic( "false", 1 ); - if( true != 1 ) Panic( "true", 1 ); - if( sizeof( UINT8 ) != 1 ) Panic( "UINT8", 1 ); - if( sizeof( UINT16 ) != 2 ) Panic( "UINT16", 1 ); - if( sizeof( UINT32 ) != 4 ) Panic( "UINT32", 1 ); + if (false != 0) + Panic("false", 1); + if (true != 1) + Panic("true", 1); + if (sizeof(UINT8) != 1) + Panic("UINT8", 1); + if (sizeof(UINT16) != 2) + Panic("UINT16", 1); + if (sizeof(UINT32) != 4) + Panic("UINT32", 1); #ifdef PROTOTYPES /* check functions */ - if( ! snprintf ) Panic( "snprintf", 2 ); - if( ! vsnprintf ) Panic( "vsnprintf", 2 ); - if( ! strlcpy ) Panic( "strlcpy", 2 ); - if( ! strlcat ) Panic( "strlcat", 2 ); + if (!snprintf) + Panic("snprintf", 2); + if (!vsnprintf) + Panic("vsnprintf", 2); + if (!strlcpy) + Panic("strlcpy", 2); + if (!strlcat) + Panic("strlcat", 2); #endif /* ok, no error */ return 0; } /* portab_check_types */ - static void -Panic( char *Reason, int Code ) +Panic(char *Reason, int Code) { /* Oops, something failed!? */ - fprintf( stderr, "Oops, test for %s failed!?", Reason ); - exit( Code ); + fprintf(stderr, "Oops, test for %s failed!?", Reason); + exit(Code); } /* Panic */ - /* -eof- */

1 0