th-libs: th_string.c annotate

annotate th_string.c @ 358:a224327ad94e

More work.

author	Matti Hamalainen <ccr@tnsp.org>
date	Thu, 25 Feb 2016 10:58:48 +0200
parents	77201824790c
children	b1984383aaac

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

Mercurial > hg > th-libs

annotate th_string.c @ 358:a224327ad94e