th-libs: th_string.c annotate

annotate th_string.c @ 243:5049c220d2ae

Cosmetics.

author	Matti Hamalainen <ccr@tnsp.org>
date	Tue, 16 Feb 2016 16:30:26 +0200
parents	11f8cd7d73d3
children	59c45e295524

rev	line source
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1 /*
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2 * Miscellaneous string-handling related utility-functions
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3 * Programmed and designed by Matti 'ccr' Hamalainen
231 d480cee946de Update copyright. Matti Hamalainen <ccr@tnsp.org> parents: 230 diff changeset	4 * (C) Copyright 2002-2016 Tecnic Software productions (TNSP)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	5 *
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	6 * Please read file 'COPYING' for information on license and distribution.
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	7 */
49 598609fb49b0 Change how "config.h" is included, etc. Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	8 #include "th_util.h"
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	9 #include "th_string.h"
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	10
80 12f1af4ffc6d Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	11
12f1af4ffc6d Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	12 /* Implementation of strdup() with a NULL check
8 acc2a8035dd5 Re-add th_strdup(). Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	13 */
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	14 char th_strdup(const char src)
8 acc2a8035dd5 Re-add th_strdup(). Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	15 {
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	16 char *res;
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	17 if (src == NULL)
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	18 return NULL;
44 669d2bc97c57 More cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 43 diff changeset	19
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	20 if ((res = th_malloc(strlen(src) + 1)) == NULL)
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	21 return NULL;
44 669d2bc97c57 More cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 43 diff changeset	22
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	23 strcpy(res, src);
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	24 return res;
8 acc2a8035dd5 Re-add th_strdup(). Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	25 }
acc2a8035dd5 Re-add th_strdup(). Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	26
acc2a8035dd5 Re-add th_strdup(). Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	27
81 c9c0541bed90 Add th_strndup(). Matti Hamalainen <ccr@tnsp.org> parents: 80 diff changeset	28 /* Implementation of strndup() with NULL check
c9c0541bed90 Add th_strndup(). Matti Hamalainen <ccr@tnsp.org> parents: 80 diff changeset	29 */
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	30 char th_strndup(const char src, const size_t n)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	31 {
81 c9c0541bed90 Add th_strndup(). Matti Hamalainen <ccr@tnsp.org> parents: 80 diff changeset	32 char *res;
c9c0541bed90 Add th_strndup(). Matti Hamalainen <ccr@tnsp.org> parents: 80 diff changeset	33 size_t len;
79 909ae72c0763 Remove th_strncpy(). Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	34
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	35 if (src == NULL)
81 c9c0541bed90 Add th_strndup(). Matti Hamalainen <ccr@tnsp.org> parents: 80 diff changeset	36 return NULL;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	37
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	38 len = strlen(src);
81 c9c0541bed90 Add th_strndup(). Matti Hamalainen <ccr@tnsp.org> parents: 80 diff changeset	39 if (len > n)
c9c0541bed90 Add th_strndup(). Matti Hamalainen <ccr@tnsp.org> parents: 80 diff changeset	40 len = n;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	41
82 3e5c0615125c Oops, th_alloc() -> th_malloc(). Matti Hamalainen <ccr@tnsp.org> parents: 81 diff changeset	42 if ((res = th_malloc(len + 1)) == NULL)
81 c9c0541bed90 Add th_strndup(). Matti Hamalainen <ccr@tnsp.org> parents: 80 diff changeset	43 return NULL;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	44
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	45 memcpy(res, src, len);
81 c9c0541bed90 Add th_strndup(). Matti Hamalainen <ccr@tnsp.org> parents: 80 diff changeset	46 res[len] = 0;
c9c0541bed90 Add th_strndup(). Matti Hamalainen <ccr@tnsp.org> parents: 80 diff changeset	47
c9c0541bed90 Add th_strndup(). Matti Hamalainen <ccr@tnsp.org> parents: 80 diff changeset	48 return res;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	49 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	50
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	51
223 d58b92ef5c03 Improve documentation. Matti Hamalainen <ccr@tnsp.org> parents: 222 diff changeset	52 /* Like strdup, but trims whitespace from the string according to specified flags.
d58b92ef5c03 Improve documentation. Matti Hamalainen <ccr@tnsp.org> parents: 222 diff changeset	53 * See TH_TRIM_* in th_string.h. If the resulting string would be empty (length 0),
d58b92ef5c03 Improve documentation. Matti Hamalainen <ccr@tnsp.org> parents: 222 diff changeset	54 * NULL is returned.
90 2b1f7f1ca8e4 Add new function th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	55 */
221 81b4688f684b Oops, broken function. Fixed. Matti Hamalainen <ccr@tnsp.org> parents: 220 diff changeset	56 static inline char * th_strdup_trim_do(const char *src, size_t len, const int flags)
90 2b1f7f1ca8e4 Add new function th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	57 {
2b1f7f1ca8e4 Add new function th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	58 char *res;
220 099a1a156fd7 Implement th_strndup_trim() and factorize implementation of th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	59 size_t start, end;
099a1a156fd7 Implement th_strndup_trim() and factorize implementation of th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	60
099a1a156fd7 Implement th_strndup_trim() and factorize implementation of th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	61 if (len == 0)
90 2b1f7f1ca8e4 Add new function th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	62 return NULL;
2b1f7f1ca8e4 Add new function th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	63
174 7d5707438333 Comments, cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 169 diff changeset	64 // Trim start: find first non-whitespace character
90 2b1f7f1ca8e4 Add new function th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	65 if (flags & TH_TRIM_START)
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	66 for (start = 0; start < len && th_isspace(src[start]); start++);
90 2b1f7f1ca8e4 Add new function th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	67 else
2b1f7f1ca8e4 Add new function th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	68 start = 0;
174 7d5707438333 Comments, cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 169 diff changeset	69
7d5707438333 Comments, cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 169 diff changeset	70 // Trim end: find last non-whitespace character
90 2b1f7f1ca8e4 Add new function th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	71 if (flags & TH_TRIM_END)
224 128c8cb80205 Fix th_str(n)dup_trim() functions. :S Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	72 for (end = len - 1; end > start && th_isspace(src[end]); end--);
90 2b1f7f1ca8e4 Add new function th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	73 else
2b1f7f1ca8e4 Add new function th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	74 end = len;
2b1f7f1ca8e4 Add new function th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	75
174 7d5707438333 Comments, cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 169 diff changeset	76 // Allocate memory for result
224 128c8cb80205 Fix th_str(n)dup_trim() functions. :S Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	77 if (src[end] == 0 \|\| th_isspace(src[end]))
222 723a69185102 Fix th_str{n}dup_trim() functions. Matti Hamalainen <ccr@tnsp.org> parents: 221 diff changeset	78 return NULL;
723a69185102 Fix th_str{n}dup_trim() functions. Matti Hamalainen <ccr@tnsp.org> parents: 221 diff changeset	79
224 128c8cb80205 Fix th_str(n)dup_trim() functions. :S Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	80 len = end - start + 1;
90 2b1f7f1ca8e4 Add new function th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	81 if ((res = th_malloc(len + 1)) == NULL)
2b1f7f1ca8e4 Add new function th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	82 return NULL;
2b1f7f1ca8e4 Add new function th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	83
224 128c8cb80205 Fix th_str(n)dup_trim() functions. :S Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	84 memcpy(res, src + start, len);
90 2b1f7f1ca8e4 Add new function th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	85 res[len] = 0;
2b1f7f1ca8e4 Add new function th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	86 return res;
2b1f7f1ca8e4 Add new function th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	87 }
2b1f7f1ca8e4 Add new function th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	88
2b1f7f1ca8e4 Add new function th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	89
220 099a1a156fd7 Implement th_strndup_trim() and factorize implementation of th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	90 char th_strdup_trim(const char src, const int flags)
099a1a156fd7 Implement th_strndup_trim() and factorize implementation of th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	91 {
099a1a156fd7 Implement th_strndup_trim() and factorize implementation of th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	92 if (src == NULL)
099a1a156fd7 Implement th_strndup_trim() and factorize implementation of th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	93 return NULL;
099a1a156fd7 Implement th_strndup_trim() and factorize implementation of th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	94
099a1a156fd7 Implement th_strndup_trim() and factorize implementation of th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	95 return th_strdup_trim_do(src, strlen(src), flags);
099a1a156fd7 Implement th_strndup_trim() and factorize implementation of th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	96 }
099a1a156fd7 Implement th_strndup_trim() and factorize implementation of th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	97
099a1a156fd7 Implement th_strndup_trim() and factorize implementation of th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	98
099a1a156fd7 Implement th_strndup_trim() and factorize implementation of th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	99 char th_strndup_trim(const char src, const size_t n, const int flags)
099a1a156fd7 Implement th_strndup_trim() and factorize implementation of th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	100 {
099a1a156fd7 Implement th_strndup_trim() and factorize implementation of th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	101 size_t len;
099a1a156fd7 Implement th_strndup_trim() and factorize implementation of th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	102 if (src == NULL \|\| n == 0)
099a1a156fd7 Implement th_strndup_trim() and factorize implementation of th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	103 return NULL;
099a1a156fd7 Implement th_strndup_trim() and factorize implementation of th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	104
099a1a156fd7 Implement th_strndup_trim() and factorize implementation of th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	105 for (len = 0; len < n && src[len]; len++);
099a1a156fd7 Implement th_strndup_trim() and factorize implementation of th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	106
099a1a156fd7 Implement th_strndup_trim() and factorize implementation of th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	107 return th_strdup_trim_do(src, len, flags);
099a1a156fd7 Implement th_strndup_trim() and factorize implementation of th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	108 }
099a1a156fd7 Implement th_strndup_trim() and factorize implementation of th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	109
099a1a156fd7 Implement th_strndup_trim() and factorize implementation of th_strdup_trim(). Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	110
236 334adfa3f646 Function argument list split & indentation cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 235 diff changeset	111 //
334adfa3f646 Function argument list split & indentation cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 235 diff changeset	112 // Simple implementations of printf() type functions
334adfa3f646 Function argument list split & indentation cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 235 diff changeset	113 //
334adfa3f646 Function argument list split & indentation cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 235 diff changeset	114 static int th_vput_itoa(void ctx, int (vputch)(void *ctx, const char ch),
334adfa3f646 Function argument list split & indentation cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 235 diff changeset	115 int val, const int radix, const char padMode, const int width,
334adfa3f646 Function argument list split & indentation cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 235 diff changeset	116 const BOOL unsig, const BOOL upcase, const BOOL sign)
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	117 {
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	118 char buf[64];
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	119 size_t pos = 0;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	120 BOOL neg = FALSE;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	121 int ret = 0;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	122
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	123 if (radix > 16)
242 11f8cd7d73d3 Fix return values of some helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	124 return EOF;
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	125
229 38a0719359ef Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	126 // Check for negative value
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	127 if (val < 0)
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	128 {
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	129 neg = TRUE;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	130 val = -val;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	131 }
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	132
229 38a0719359ef Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	133 // Render the value to a string in buf (reversed)
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	134 do
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	135 {
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	136 int digit = val % radix;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	137 if (digit < 10)
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	138 buf[pos] = '0' + digit;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	139 else
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	140 buf[pos] = (upcase ? 'A' : 'a') + digit - 10;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	141 val /= radix;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	142 pos++;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	143 }
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	144 while (val > 0 && pos < sizeof(buf) - 1);
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	145 buf[pos] = 0;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	146
233 1be1a9bab1d3 Add some error checking to th_vprintf_do(). Matti Hamalainen <ccr@tnsp.org> parents: 231 diff changeset	147 // Oops, the value did not fit in the buffer!
1be1a9bab1d3 Add some error checking to th_vprintf_do(). Matti Hamalainen <ccr@tnsp.org> parents: 231 diff changeset	148 if (val > 0)
242 11f8cd7d73d3 Fix return values of some helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 241 diff changeset	149 return EOF;
233 1be1a9bab1d3 Add some error checking to th_vprintf_do(). Matti Hamalainen <ccr@tnsp.org> parents: 231 diff changeset	150
229 38a0719359ef Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	151 // Do we want a sign prefix? Not for unsigned values
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	152 if (!unsig)
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	153 {
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	154 char ch = sign ? (neg ? '-' : '+') : (neg ? '-' : 0);
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	155 if (ch && (ret = vputch(ctx, ch)) == EOF)
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	156 goto out;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	157 }
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	158
229 38a0719359ef Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	159 // Calculate necessary padding, if any
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	160 int nwidth = width - pos;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	161
241 d0bf513f2118 Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 240 diff changeset	162 // Prefix padding?
235 507defb0cb61 Reverse order of certain checks (micro-optimize). Matti Hamalainen <ccr@tnsp.org> parents: 234 diff changeset	163 if (padMode != '-' && nwidth > 0)
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	164 {
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	165 while (nwidth--)
234 82acddddb6b1 Add blocks to clarify some code. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	166 {
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	167 if ((ret = vputch(ctx, padMode)) == EOF)
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	168 goto out;
234 82acddddb6b1 Add blocks to clarify some code. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	169 }
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	170 }
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	171
229 38a0719359ef Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	172 // Output the value
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	173 while (pos--)
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	174 {
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	175 if ((ret = vputch(ctx, buf[pos])) == EOF)
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	176 goto out;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	177 }
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	178
229 38a0719359ef Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	179 // Postfix padding?
235 507defb0cb61 Reverse order of certain checks (micro-optimize). Matti Hamalainen <ccr@tnsp.org> parents: 234 diff changeset	180 if (padMode == '-' && nwidth > 0)
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	181 {
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	182 while (nwidth--)
234 82acddddb6b1 Add blocks to clarify some code. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	183 {
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	184 if ((ret = vputch(ctx, ' ')) == EOF)
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	185 goto out;
234 82acddddb6b1 Add blocks to clarify some code. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	186 }
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	187 }
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	188
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	189 out:
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	190 return ret;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	191 }
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	192
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	193
236 334adfa3f646 Function argument list split & indentation cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 235 diff changeset	194 static int th_vput_str(void ctx, int (vputch)(void *ctx, const char ch),
334adfa3f646 Function argument list split & indentation cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 235 diff changeset	195 const char *str, const char padMode, const int width)
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	196 {
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	197 int nwidth = width - strlen(str);
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	198 int ret = 0;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	199
241 d0bf513f2118 Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 240 diff changeset	200 // Prefix padding?
235 507defb0cb61 Reverse order of certain checks (micro-optimize). Matti Hamalainen <ccr@tnsp.org> parents: 234 diff changeset	201 if (padMode != '-' && nwidth > 0)
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	202 {
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	203 while (nwidth--)
234 82acddddb6b1 Add blocks to clarify some code. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	204 {
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	205 if ((ret = vputch(ctx, padMode)) == EOF)
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	206 goto out;
234 82acddddb6b1 Add blocks to clarify some code. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	207 }
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	208 }
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	209
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	210 while (*str)
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	211 {
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	212 if ((ret = vputch(ctx, *str++)) == EOF)
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	213 goto out;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	214 }
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	215
241 d0bf513f2118 Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 240 diff changeset	216 // Postfix padding?
235 507defb0cb61 Reverse order of certain checks (micro-optimize). Matti Hamalainen <ccr@tnsp.org> parents: 234 diff changeset	217 if (padMode == '-' && nwidth > 0)
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	218 {
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	219 while (nwidth--)
234 82acddddb6b1 Add blocks to clarify some code. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	220 {
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	221 if ((ret = vputch(ctx, ' ')) == EOF)
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	222 goto out;
234 82acddddb6b1 Add blocks to clarify some code. Matti Hamalainen <ccr@tnsp.org> parents: 233 diff changeset	223 }
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	224 }
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	225
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	226 out:
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	227 return ret;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	228 }
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	229
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	230
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	231 int th_vprintf_do(void ctx, int (vputch)(void ctx, const char ch), const char fmt, va_list ap)
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	232 {
238 d3ab9d263409 Initialize return value variable. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	233 int ret = 0;
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	234
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	235 while (*fmt)
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	236 {
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	237 if (*fmt != '%')
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	238 {
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	239 if ((ret = vputch(ctx, *fmt)) == EOF)
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	240 return ret;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	241 }
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	242 else
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	243 {
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	244 char padMode = ' ', padChar = 0;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	245 BOOL sign = FALSE;
240 5e781dba6136 Some preparation for %f support .. if it ever happens. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	246 int width = 0, prec = 0;
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	247
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	248 fmt++;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	249
241 d0bf513f2118 Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 240 diff changeset	250 // Check sign
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	251 if (*fmt == '+')
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	252 {
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	253 sign = TRUE;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	254 fmt++;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	255 }
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	256
241 d0bf513f2118 Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 240 diff changeset	257 // Check for padding
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	258 if (fmt == '0' \|\| fmt == '-' \|\| *fmt == '\'')
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	259 {
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	260 padMode = *fmt++;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	261 if (padMode == '\'')
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	262 {
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	263 padChar = *fmt++;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	264 if (*fmt != '\'')
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	265 goto out;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	266 fmt++;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	267 }
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	268
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	269 if (*fmt == 0)
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	270 goto out;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	271 }
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	272
241 d0bf513f2118 Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 240 diff changeset	273 // Get width
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	274 while (th_isdigit(*fmt))
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	275 width = width * 10 + (*fmt++ - '0');
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	276
241 d0bf513f2118 Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 240 diff changeset	277 // Check for precision
240 5e781dba6136 Some preparation for %f support .. if it ever happens. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	278 if (*fmt == '.')
5e781dba6136 Some preparation for %f support .. if it ever happens. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	279 {
5e781dba6136 Some preparation for %f support .. if it ever happens. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	280 fmt++;
5e781dba6136 Some preparation for %f support .. if it ever happens. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	281 if (!th_isdigit(*fmt))
5e781dba6136 Some preparation for %f support .. if it ever happens. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	282 goto out;
5e781dba6136 Some preparation for %f support .. if it ever happens. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	283
5e781dba6136 Some preparation for %f support .. if it ever happens. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	284 while (th_isdigit(*fmt))
5e781dba6136 Some preparation for %f support .. if it ever happens. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	285 prec = prec * 10 + (*fmt++ - '0');
5e781dba6136 Some preparation for %f support .. if it ever happens. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	286 }
5e781dba6136 Some preparation for %f support .. if it ever happens. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	287
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	288 switch (*fmt)
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	289 {
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	290 case '%':
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	291 vputch(ctx, *fmt);
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	292 break;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	293
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	294 case 0:
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	295 goto out;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	296
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	297 case 'u':
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	298 case 'd':
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	299 if (padMode != '0' && padMode != '-' && padMode != ' ')
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	300 goto out;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	301
243 5049c220d2ae Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 242 diff changeset	302 if ((ret = th_vput_itoa(ctx, vputch, va_arg(ap, unsigned int),
5049c220d2ae Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 242 diff changeset	303 10, padMode, width, *fmt == 'u', FALSE, sign)) == EOF)
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	304 goto out;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	305 break;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	306
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	307 case 'x':
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	308 case 'X':
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	309 if (padMode != '0' && padMode != '-' && padMode != ' ')
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	310 goto out;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	311
243 5049c220d2ae Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 242 diff changeset	312 if ((ret = th_vput_itoa(ctx, vputch, va_arg(ap, unsigned int),
5049c220d2ae Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 242 diff changeset	313 16, padMode, width, TRUE, *fmt == 'X', FALSE)) == EOF)
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	314 goto out;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	315 break;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	316
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	317 case 'f':
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	318 goto out;
240 5e781dba6136 Some preparation for %f support .. if it ever happens. Matti Hamalainen <ccr@tnsp.org> parents: 239 diff changeset	319 break;
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	320
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	321 case 's':
230 0b243bc5ffd6 Stray nbsp. Matti Hamalainen <ccr@tnsp.org> parents: 229 diff changeset	322 if ((padMode != '-' && padMode != ' ') \|\| sign)
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	323 goto out;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	324
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	325 if ((ret = th_vput_str(ctx, vputch, va_arg(ap, char *), padMode, width)) == EOF)
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	326 goto out;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	327 break;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	328
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	329 default:
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	330 vputch(ctx, *fmt);
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	331 break;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	332 }
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	333 }
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	334 fmt++;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	335 }
243 5049c220d2ae Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 242 diff changeset	336
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	337 out:
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	338 return ret;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	339 }
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	340
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	341
239 10f596441e75 Silence unused function warning when not using internal implementations. Matti Hamalainen <ccr@tnsp.org> parents: 238 diff changeset	342 #ifdef TH_USE_INTERNAL_SPRINTF
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	343 typedef struct
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	344 {
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	345 char *buf;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	346 size_t size, pos;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	347 } th_pbuf_ctx;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	348
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	349
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	350 static int th_pbuf_vputch(void *pctx, const char ch)
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	351 {
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	352 th_pbuf_ctx ctx = (th_pbuf_ctx ) pctx;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	353 if (ctx->pos < ctx->size)
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	354 ctx->buf[ctx->pos] = ch;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	355 ctx->pos++;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	356 return ch;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	357 }
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	358
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	359
239 10f596441e75 Silence unused function warning when not using internal implementations. Matti Hamalainen <ccr@tnsp.org> parents: 238 diff changeset	360 static int th_stdio_vputch(void *ctx, const char ch)
10f596441e75 Silence unused function warning when not using internal implementations. Matti Hamalainen <ccr@tnsp.org> parents: 238 diff changeset	361 {
10f596441e75 Silence unused function warning when not using internal implementations. Matti Hamalainen <ccr@tnsp.org> parents: 238 diff changeset	362 return fputc(ch, (FILE *) ctx);
10f596441e75 Silence unused function warning when not using internal implementations. Matti Hamalainen <ccr@tnsp.org> parents: 238 diff changeset	363 }
10f596441e75 Silence unused function warning when not using internal implementations. Matti Hamalainen <ccr@tnsp.org> parents: 238 diff changeset	364 #endif
10f596441e75 Silence unused function warning when not using internal implementations. Matti Hamalainen <ccr@tnsp.org> parents: 238 diff changeset	365
10f596441e75 Silence unused function warning when not using internal implementations. Matti Hamalainen <ccr@tnsp.org> parents: 238 diff changeset	366
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	367 int th_vsnprintf(char buf, size_t size, const char fmt, va_list ap)
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	368 {
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	369 #ifdef TH_USE_INTERNAL_SPRINTF
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	370 th_pbuf_ctx ctx;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	371 ctx.buf = buf;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	372 ctx.size = size;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	373 ctx.pos = 0;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	374
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	375 return th_vprintf_do((void *) &ctx, th_pbuf_vputch, fmt, ap);
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	376 #else
237 c55ebc438243 Oops, s/vsnpintf/vsnprintf/. Matti Hamalainen <ccr@tnsp.org> parents: 236 diff changeset	377 return vsnprintf(buf, size, fmt, ap);
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	378 #endif
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	379 }
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	380
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	381
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	382 int th_snprintf(char buf, size_t size, const char fmt, ...)
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	383 {
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	384 int n;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	385 va_list ap;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	386 va_start(ap, fmt);
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	387 #ifdef TH_USE_INTERNAL_SPRINTF
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	388 n = th_vsnprintf(buf, size, fmt, ap);
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	389 #else
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	390 n = vsnprintf(buf, size, fmt, ap);
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	391 #endif
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	392 va_end(ap);
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	393 return n;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	394 }
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	395
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	396
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	397 int th_vfprintf(FILE fh, const char fmt, va_list ap)
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	398 {
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	399 #ifdef TH_USE_INTERNAL_SPRINTF
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	400 return th_vprintf_do((void *) fh, th_stdio_vputch, fmt, ap);
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	401 #else
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	402 return vfprintf(fh, fmt, ap);
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	403 #endif
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	404 }
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	405
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	406
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	407 int th_fprintf(FILE fh, const char fmt, ...)
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	408 {
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	409 int ret;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	410 va_list ap;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	411 va_start(ap, fmt);
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	412 #ifdef TH_USE_INTERNAL_SPRINTF
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	413 ret = th_vprintf_do((void *) fh, th_stdio_vputch, fmt, ap);
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	414 #else
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	415 ret = fprintf(fh, fmt, ap);
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	416 #endif
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	417 va_end(ap);
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	418 return ret;
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	419 }
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	420
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	421
14 e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	422 /* Simulate a sprintf() that allocates memory
e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	423 */
43 8c015ac0c556 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	424 char th_strdup_vprintf(const char fmt, va_list args)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	425 {
133 84182dab4fca Fix reallocation. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	426 int size = 64;
84182dab4fca Fix reallocation. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	427 char buf, tmp;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	428
14 e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	429 if ((buf = th_malloc(size)) == NULL)
e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	430 return NULL;
44 669d2bc97c57 More cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 43 diff changeset	431
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	432 while (1)
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	433 {
37 3986b139bbbd Fix th_strdup_vprintf(), another misuse of va_list without making a copy of it... :( Matti Hamalainen <ccr@tnsp.org> parents: 36 diff changeset	434 int n;
3986b139bbbd Fix th_strdup_vprintf(), another misuse of va_list without making a copy of it... :( Matti Hamalainen <ccr@tnsp.org> parents: 36 diff changeset	435 va_list ap;
3986b139bbbd Fix th_strdup_vprintf(), another misuse of va_list without making a copy of it... :( Matti Hamalainen <ccr@tnsp.org> parents: 36 diff changeset	436 va_copy(ap, args);
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	437 #ifdef TH_USE_INTERNAL_SPRINTF
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	438 n = th_vsnprintf(buf, size, fmt, ap);
ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	439 #else
37 3986b139bbbd Fix th_strdup_vprintf(), another misuse of va_list without making a copy of it... :( Matti Hamalainen <ccr@tnsp.org> parents: 36 diff changeset	440 n = vsnprintf(buf, size, fmt, ap);
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	441 #endif
37 3986b139bbbd Fix th_strdup_vprintf(), another misuse of va_list without making a copy of it... :( Matti Hamalainen <ccr@tnsp.org> parents: 36 diff changeset	442 va_end(ap);
3986b139bbbd Fix th_strdup_vprintf(), another misuse of va_list without making a copy of it... :( Matti Hamalainen <ccr@tnsp.org> parents: 36 diff changeset	443
14 e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	444 if (n > -1 && n < size)
e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	445 return buf;
e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	446 if (n > -1)
e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	447 size = n + 1;
e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	448 else
e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	449 size *= 2;
37 3986b139bbbd Fix th_strdup_vprintf(), another misuse of va_list without making a copy of it... :( Matti Hamalainen <ccr@tnsp.org> parents: 36 diff changeset	450
133 84182dab4fca Fix reallocation. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	451 if ((tmp = th_realloc(buf, size)) == NULL)
84182dab4fca Fix reallocation. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	452 {
84182dab4fca Fix reallocation. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	453 th_free(buf);
14 e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	454 return NULL;
133 84182dab4fca Fix reallocation. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	455 }
84182dab4fca Fix reallocation. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	456 else
84182dab4fca Fix reallocation. Matti Hamalainen <ccr@tnsp.org> parents: 129 diff changeset	457 buf = tmp;
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	458 }
14 e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	459 }
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	460
14 e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	461
43 8c015ac0c556 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	462 char th_strdup_printf(const char fmt, ...)
14 e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	463 {
e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	464 char *res;
e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	465 va_list ap;
e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	466
e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	467 va_start(ap, fmt);
e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	468 res = th_strdup_vprintf(fmt, ap);
e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	469 va_end(ap);
e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	470
e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	471 return res;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	472 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	473
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	474
30 10d2dc143e4b Add helper functions th_pstr_vprintf() and th_pstr_printf(). Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	475 void th_pstr_vprintf(char *buf, const char fmt, va_list ap)
10d2dc143e4b Add helper functions th_pstr_vprintf() and th_pstr_printf(). Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	476 {
10d2dc143e4b Add helper functions th_pstr_vprintf() and th_pstr_printf(). Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	477 char *tmp = th_strdup_vprintf(fmt, ap);
10d2dc143e4b Add helper functions th_pstr_vprintf() and th_pstr_printf(). Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	478 th_free(*buf);
10d2dc143e4b Add helper functions th_pstr_vprintf() and th_pstr_printf(). Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	479 *buf = tmp;
10d2dc143e4b Add helper functions th_pstr_vprintf() and th_pstr_printf(). Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	480 }
10d2dc143e4b Add helper functions th_pstr_vprintf() and th_pstr_printf(). Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	481
10d2dc143e4b Add helper functions th_pstr_vprintf() and th_pstr_printf(). Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	482
10d2dc143e4b Add helper functions th_pstr_vprintf() and th_pstr_printf(). Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	483 void th_pstr_printf(char *buf, const char fmt, ...)
10d2dc143e4b Add helper functions th_pstr_vprintf() and th_pstr_printf(). Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	484 {
10d2dc143e4b Add helper functions th_pstr_vprintf() and th_pstr_printf(). Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	485 char *tmp;
10d2dc143e4b Add helper functions th_pstr_vprintf() and th_pstr_printf(). Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	486 va_list ap;
10d2dc143e4b Add helper functions th_pstr_vprintf() and th_pstr_printf(). Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	487
10d2dc143e4b Add helper functions th_pstr_vprintf() and th_pstr_printf(). Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	488 va_start(ap, fmt);
10d2dc143e4b Add helper functions th_pstr_vprintf() and th_pstr_printf(). Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	489 tmp = th_strdup_vprintf(fmt, ap);
10d2dc143e4b Add helper functions th_pstr_vprintf() and th_pstr_printf(). Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	490 va_end(ap);
10d2dc143e4b Add helper functions th_pstr_vprintf() and th_pstr_printf(). Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	491
10d2dc143e4b Add helper functions th_pstr_vprintf() and th_pstr_printf(). Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	492 th_free(*buf);
10d2dc143e4b Add helper functions th_pstr_vprintf() and th_pstr_printf(). Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	493 *buf = tmp;
10d2dc143e4b Add helper functions th_pstr_vprintf() and th_pstr_printf(). Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	494 }
10d2dc143e4b Add helper functions th_pstr_vprintf() and th_pstr_printf(). Matti Hamalainen <ccr@tnsp.org> parents: 29 diff changeset	495
88 d3d3cd41a95a Slight adjustments. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	496
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	497 /* Compare two strings ignoring case [strcasecmp, strncasecmp]
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	498 */
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	499 int th_strcasecmp(const char haystack, const char needle)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	500 {
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	501 const char s1 = haystack, s2 = needle;
1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	502 assert(haystack != NULL);
1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	503 assert(needle != NULL);
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	504
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	505 if (haystack == needle)
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	506 return 0;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	507
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	508 while (s1 && s2 && th_tolower(s1) == th_tolower(s2))
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	509 {
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	510 s1++;
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	511 s2++;
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	512 }
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	513
88 d3d3cd41a95a Slight adjustments. Matti Hamalainen <ccr@tnsp.org> parents: 87 diff changeset	514 return th_tolower(s1) - th_tolower(s2);
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	515 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	516
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	517
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	518 int th_strncasecmp(const char haystack, const char needle, size_t n)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	519 {
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	520 const char s1 = haystack, s2 = needle;
1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	521 assert(haystack != NULL);
1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	522 assert(needle != NULL);
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	523
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	524 if (haystack == needle)
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	525 return 0;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	526
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	527 while (n > 0 && s1 && s2 && th_tolower(s1) == th_tolower(s2))
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	528 {
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	529 s1++;
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	530 s2++;
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	531 n--;
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	532 }
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	533
14 e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	534 return n > 0 ? (th_tolower(s1) - th_tolower(s2)) : 0;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	535 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	536
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	537
89 30690f5c4cae Add new function th_strrcasecmp(). Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	538 /* Check if end of the given string str matches needle
30690f5c4cae Add new function th_strrcasecmp(). Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	539 * case-insensitively, return pointer to start of the match,
30690f5c4cae Add new function th_strrcasecmp(). Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	540 * if found, NULL otherwise.
30690f5c4cae Add new function th_strrcasecmp(). Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	541 */
30690f5c4cae Add new function th_strrcasecmp(). Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	542 char th_strrcasecmp(char str, const char *needle)
30690f5c4cae Add new function th_strrcasecmp(). Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	543 {
30690f5c4cae Add new function th_strrcasecmp(). Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	544 if (str == NULL \|\| needle == NULL)
30690f5c4cae Add new function th_strrcasecmp(). Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	545 return NULL;
30690f5c4cae Add new function th_strrcasecmp(). Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	546
30690f5c4cae Add new function th_strrcasecmp(). Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	547 const size_t
30690f5c4cae Add new function th_strrcasecmp(). Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	548 slen = strlen(str),
30690f5c4cae Add new function th_strrcasecmp(). Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	549 nlen = strlen(needle);
228 ca9cd98dbcff Initial work on printf() style function family implementation. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	550
89 30690f5c4cae Add new function th_strrcasecmp(). Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	551 if (slen < nlen)
30690f5c4cae Add new function th_strrcasecmp(). Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	552 return NULL;
30690f5c4cae Add new function th_strrcasecmp(). Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	553
30690f5c4cae Add new function th_strrcasecmp(). Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	554 if (th_strcasecmp(str - nlen - 1, needle) == 0)
30690f5c4cae Add new function th_strrcasecmp(). Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	555 return str - nlen - 1;
30690f5c4cae Add new function th_strrcasecmp(). Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	556 else
30690f5c4cae Add new function th_strrcasecmp(). Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	557 return NULL;
30690f5c4cae Add new function th_strrcasecmp(). Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	558 }
30690f5c4cae Add new function th_strrcasecmp(). Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	559
30690f5c4cae Add new function th_strrcasecmp(). Matti Hamalainen <ccr@tnsp.org> parents: 88 diff changeset	560
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	561 /* Remove all occurences of control characters, in-place.
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	562 * Resulting string is always shorter or same length than original.
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	563 */
43 8c015ac0c556 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	564 void th_strip_ctrlchars(char *str)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	565 {
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	566 char i, j;
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	567 assert(str != NULL);
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	568
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	569 i = str;
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	570 j = str;
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	571 while (*i)
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	572 {
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	573 if (!th_iscntrl(*i))
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	574 (j++) = i;
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	575 i++;
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	576 }
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	577
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	578 *j = 0;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	579 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	580
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	581
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	582 /* Copy a given string over in *pdst.
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	583 */
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	584 int th_pstrcpy(char *pdst, const char src)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	585 {
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	586 assert(pdst != NULL);
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	587
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	588 if (src == NULL)
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	589 return -1;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	590
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	591 th_free(*pdst);
1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	592 if ((*pdst = th_malloc(strlen(src) + 1)) == NULL)
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	593 return -2;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	594
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	595 strcpy(*pdst, src);
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	596 return 0;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	597 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	598
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	599
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	600 /* Concatenates a given string into string pointed by *pdst.
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	601 */
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	602 int th_pstrcat(char *pdst, const char src)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	603 {
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	604 assert(pdst != NULL);
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	605
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	606 if (src == NULL)
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	607 return -1;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	608
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	609 if (*pdst != NULL)
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	610 {
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	611 pdst = th_realloc(pdst, strlen(*pdst) + strlen(src) + 1);
1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	612 if (*pdst == NULL)
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	613 return -1;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	614
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	615 strcat(*pdst, src);
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	616 }
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	617 else
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	618 {
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	619 *pdst = th_malloc(strlen(src) + 1);
1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	620 if (*pdst == NULL)
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	621 return -1;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	622
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	623 strcpy(*pdst, src);
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	624 }
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	625
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	626 return 0;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	627 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	628
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	629
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	630 /* Find next non-whitespace character in string.
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	631 * Updates iPos into the position of such character and
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	632 * returns pointer to the string.
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	633 */
43 8c015ac0c556 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	634 const char th_findnext(const char str, size_t *pos)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	635 {
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	636 assert(str != NULL);
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	637
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	638 // Terminating NULL-character is not whitespace!
14 e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	639 while (th_isspace(str[*pos]))
e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	640 (*pos)++;
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	641
14 e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	642 return &str[*pos];
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	643 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	644
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	645
14 e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	646 /* Find next sep-character from string
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	647 */
43 8c015ac0c556 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	648 const char th_findsep(const char str, size_t *pos, char sep)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	649 {
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	650 assert(str != NULL);
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	651
14 e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	652 while (str[pos] && str[pos] != sep)
e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	653 (*pos)++;
e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	654
e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	655 return &str[*pos];
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	656 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	657
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	658
14 e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	659 /* Find next sep- or whitespace from string
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	660 */
43 8c015ac0c556 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 39 diff changeset	661 const char th_findseporspace(const char str, size_t *pos, char sep)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	662 {
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	663 assert(str != NULL);
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	664
14 e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	665 while (!th_isspace(str[pos]) && str[pos] != sep)
e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	666 (*pos)++;
e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	667
e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	668 return &str[*pos];
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	669 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	670
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	671
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	672 /* Compare a string to a pattern. Case-SENSITIVE version.
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	673 * The matching pattern can consist of any normal characters plus
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	674 * wildcards ? and . "?" matches any character and "" matches
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	675 * any number of characters.
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	676 */
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	677 BOOL th_strmatch(const char haystack, const char pattern)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	678 {
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	679 BOOL matched = TRUE, any = FALSE, end = FALSE;
3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	680 const char *tmp = NULL;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	681
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	682 // Check given pattern and string
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	683 if (haystack == NULL \|\| pattern == NULL)
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	684 return FALSE;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	685
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	686 // Start comparision
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	687 do {
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	688 matched = FALSE;
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	689 switch (*pattern)
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	690 {
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	691 case '?':
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	692 // Any single character matches
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	693 if (*haystack)
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	694 {
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	695 matched = TRUE;
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	696 pattern++;
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	697 haystack++;
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	698 }
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	699 break;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	700
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	701 case '*':
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	702 matched = TRUE;
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	703 pattern++;
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	704 if (!*pattern)
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	705 end = TRUE;
3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	706 any = TRUE;
3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	707 tmp = pattern;
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	708 break;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	709
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	710 case 0:
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	711 if (any)
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	712 {
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	713 if (*haystack)
1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	714 haystack++;
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	715 else
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	716 end = TRUE;
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	717 }
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	718 else
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	719 {
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	720 if (*haystack)
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	721 {
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	722 if (tmp)
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	723 {
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	724 any = TRUE;
3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	725 pattern = tmp;
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	726 }
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	727 else
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	728 matched = FALSE;
44 669d2bc97c57 More cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 43 diff changeset	729 }
669d2bc97c57 More cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 43 diff changeset	730 else
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	731 end = TRUE;
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	732 }
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	733 break;
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	734
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	735 default:
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	736 if (any)
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	737 {
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	738 if (pattern == haystack)
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	739 {
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	740 any = FALSE;
3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	741 matched = TRUE;
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	742 }
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	743 else
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	744 {
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	745 if (*haystack)
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	746 {
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	747 matched = TRUE;
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	748 haystack++;
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	749 }
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	750 }
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	751 }
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	752 else
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	753 {
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	754 if (pattern == haystack)
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	755 {
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	756 matched = TRUE;
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	757 if (*pattern)
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	758 pattern++;
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	759 if (*haystack)
1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	760 haystack++;
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	761 }
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	762 else
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	763 {
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	764 if (tmp)
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	765 {
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	766 matched = TRUE;
3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	767 any = TRUE;
3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	768 pattern = tmp;
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	769 }
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	770 }
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	771 }
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	772
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	773 if (!haystack && !pattern)
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	774 end = TRUE;
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	775 break;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	776
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	777 } // switch
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	778 } while (matched && !end);
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	779
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	780 return matched;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	781 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	782
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	783
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	784 /* Compare a string to a pattern. Case-INSENSITIVE version.
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	785 */
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	786 BOOL th_strcasematch(const char haystack, const char pattern)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	787 {
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	788 BOOL matched = TRUE, any = FALSE, end = FALSE;
3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	789 const char *tmp = NULL;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	790
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	791 // Check given pattern and string
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	792 if (haystack == NULL \|\| pattern == NULL)
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	793 return FALSE;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	794
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	795 // Start comparision
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	796 do {
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	797 switch (*pattern) {
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	798 case '?':
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	799 // Any single character matches
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	800 if (*haystack)
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	801 {
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	802 pattern++;
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	803 haystack++;
44 669d2bc97c57 More cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 43 diff changeset	804 }
669d2bc97c57 More cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 43 diff changeset	805 else
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	806 matched = FALSE;
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	807 break;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	808
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	809 case '*':
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	810 pattern++;
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	811 if (!pattern \|\| pattern == '?')
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	812 end = TRUE;
3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	813 any = TRUE;
3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	814 tmp = pattern;
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	815 break;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	816
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	817 case 0:
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	818 if (any)
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	819 {
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	820 if (*haystack)
1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	821 haystack++;
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	822 else
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	823 end = TRUE;
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	824 }
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	825 else
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	826 {
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	827 if (*haystack)
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	828 {
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	829 if (tmp)
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	830 {
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	831 any = TRUE;
3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	832 pattern = tmp;
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	833 }
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	834 else
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	835 matched = FALSE;
44 669d2bc97c57 More cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 43 diff changeset	836 }
669d2bc97c57 More cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 43 diff changeset	837 else
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	838 end = TRUE;
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	839 }
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	840 break;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	841
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	842 default:
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	843 if (any)
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	844 {
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	845 if (th_tolower(pattern) == th_tolower(haystack))
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	846 {
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	847 any = FALSE;
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	848 }
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	849 else
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	850 {
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	851 if (*haystack)
1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	852 haystack++;
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	853 else
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	854 matched = FALSE;
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	855 }
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	856 }
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	857 else
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	858 {
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	859 if (th_tolower(pattern) == th_tolower(haystack))
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	860 {
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	861 if (*pattern)
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	862 pattern++;
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	863 if (*haystack)
1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	864 haystack++;
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	865 }
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	866 else
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	867 {
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	868 if (tmp)
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	869 {
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	870 any = TRUE;
3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	871 pattern = tmp;
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	872 }
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	873 else
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	874 matched = FALSE;
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	875 }
a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	876 }
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	877
186 1ee46a95aa8c Clean up the code, add argument identifiers to function prototypes and Matti Hamalainen <ccr@tnsp.org> parents: 175 diff changeset	878 if (!haystack && !pattern)
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	879 end = TRUE;
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	880
10 a25f5d22483e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 8 diff changeset	881 break;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	882
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 107 diff changeset	883 } // switch
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	884 } while (matched && !end);
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	885
175 3d0a1f87e393 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	886 return matched;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	887 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	888
14 e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	889
e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	890 int th_get_hex_triplet(const char *str)
e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	891 {
e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	892 const char *p = str;
e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	893 int len, val = 0;
44 669d2bc97c57 More cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 43 diff changeset	894
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	895 for (len = 0; *p && len < 6; p++, len++)
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	896 {
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	897 if (p >= '0' && p <= '9')
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	898 {
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	899 val *= 16;
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	900 val += (*p - '0');
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	901 }
174 7d5707438333 Comments, cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 169 diff changeset	902 else
7d5707438333 Comments, cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 169 diff changeset	903 if (p >= 'A' && p <= 'F')
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	904 {
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	905 val *= 16;
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	906 val += (*p - 'A') + 10;
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	907 }
174 7d5707438333 Comments, cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 169 diff changeset	908 else
7d5707438333 Comments, cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 169 diff changeset	909 if (p >= 'a' && p <= 'f')
39 0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	910 {
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	911 val *= 16;
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	912 val += (*p - 'a') + 10;
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	913 }
0d55592e0e01 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 38 diff changeset	914 else
14 e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	915 return -1;
e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	916 }
44 669d2bc97c57 More cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 43 diff changeset	917
14 e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	918 return (len == 6) ? val : -1;
e5e6370217ef Various cleanups, additions and removals. Matti Hamalainen <ccr@tnsp.org> parents: 10 diff changeset	919 }
162 578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	920
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	921
167 7638fa9d191f Add th_get_boolean() function. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	922 BOOL th_get_boolean(const char str, BOOL value)
7638fa9d191f Add th_get_boolean() function. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	923 {
7638fa9d191f Add th_get_boolean() function. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	924 if (!th_strcasecmp(str, "yes") \|\|
169 a06a87b771ce Add on/off to valid boolean values. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	925 !th_strcasecmp(str, "on") \|\|
167 7638fa9d191f Add th_get_boolean() function. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	926 !th_strcasecmp(str, "true") \|\|
7638fa9d191f Add th_get_boolean() function. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	927 !th_strcasecmp(str, "1"))
7638fa9d191f Add th_get_boolean() function. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	928 {
7638fa9d191f Add th_get_boolean() function. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	929 *value = TRUE;
7638fa9d191f Add th_get_boolean() function. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	930 return TRUE;
7638fa9d191f Add th_get_boolean() function. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	931 }
7638fa9d191f Add th_get_boolean() function. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	932 else
7638fa9d191f Add th_get_boolean() function. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	933 if (!th_strcasecmp(str, "no") \|\|
169 a06a87b771ce Add on/off to valid boolean values. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	934 !th_strcasecmp(str, "off") \|\|
167 7638fa9d191f Add th_get_boolean() function. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	935 !th_strcasecmp(str, "false") \|\|
7638fa9d191f Add th_get_boolean() function. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	936 !th_strcasecmp(str, "0"))
7638fa9d191f Add th_get_boolean() function. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	937 {
7638fa9d191f Add th_get_boolean() function. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	938 *value = FALSE;
7638fa9d191f Add th_get_boolean() function. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	939 return TRUE;
7638fa9d191f Add th_get_boolean() function. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	940 }
7638fa9d191f Add th_get_boolean() function. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	941 else
7638fa9d191f Add th_get_boolean() function. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	942 return FALSE;
7638fa9d191f Add th_get_boolean() function. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	943 }
7638fa9d191f Add th_get_boolean() function. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	944
7638fa9d191f Add th_get_boolean() function. Matti Hamalainen <ccr@tnsp.org> parents: 162 diff changeset	945
162 578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	946 static void th_pad(FILE *outFile, int count)
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	947 {
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	948 while (count--)
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	949 fputc(' ', outFile);
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	950 }
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	951
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	952
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	953 void th_print_wrap(FILE fh, const char str, int spad, int rpad, int width)
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	954 {
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	955 size_t pos = 0;
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	956 BOOL first = TRUE;
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	957
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	958 while (str[pos])
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	959 {
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	960 // Pre-pad line
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	961 int linelen = first ? spad : rpad;
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	962 th_pad(fh, first ? 0 : rpad);
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	963 first = FALSE;
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	964
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	965 // Skip whitespace at line start
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	966 while (th_isspace(str[pos]) \|\| str[pos] == '\n') pos++;
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	967
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	968 // Handle each word
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	969 while (str[pos] && str[pos] != '\n')
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	970 {
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	971 size_t next;
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	972 int wlen;
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	973
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	974 // Find word length and next break
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	975 for (wlen = 0, next = pos; str[next] && !th_isspace(str[next]) && str[next] != '\n'; next++, wlen++);
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	976
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	977 // Check if we have too much of text?
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	978 if (linelen + wlen >= width)
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	979 break;
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	980
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	981 // Print what we have
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	982 for (;pos < next; pos++, linelen++)
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	983 fputc(str[pos], fh);
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	984
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	985 // Check if we are at end of input or hard linefeed
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	986 if (str[next] == '\n' \|\| str[next] == 0)
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	987 break;
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	988 else
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	989 {
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	990 fputc(str[pos], fh);
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	991 pos++;
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	992 linelen++;
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	993 }
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	994 }
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	995 fprintf(fh, "\n");
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	996 }
578d9298cc1e Actually, move th_print_wrap() to th_string module. Matti Hamalainen <ccr@tnsp.org> parents: 144 diff changeset	997 }

Mercurial > hg > th-libs

annotate th_string.c @ 243:5049c220d2ae