th-libs: th_string.c annotate

annotate th_string.c @ 431:d41cb5983772

#ifdef out WIP floating point support from printf() implementation.

author	Matti Hamalainen <ccr@tnsp.org>
date	Mon, 07 Nov 2016 02:57:23 +0200
parents	77fd4f0327dc
children	1b3472ba7b23

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

Mercurial > hg > th-libs

annotate th_string.c @ 431:d41cb5983772