th-libs: th_string.c annotate

annotate th_string.c @ 335:11d97063d6dd

Mostly cosmetics.

author	Matti Hamalainen <ccr@tnsp.org>
date	Tue, 23 Feb 2016 14:59:07 +0200
parents	b2c4b0b4d44f
children	cda5a2aebbb6

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

Mercurial > hg > th-libs

annotate th_string.c @ 335:11d97063d6dd