th-libs: th_string.c annotate

annotate th_string.c @ 280:454f0d37d94b

Implement th_printf_vput_pad() helper and use it where needed.

author	Matti Hamalainen <ccr@tnsp.org>
date	Mon, 22 Feb 2016 11:53:47 +0200
parents	15e2ee6c7bfc
children	0c70dcfb6796

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

Mercurial > hg > th-libs

annotate th_string.c @ 280:454f0d37d94b