Rev 3351 | Only display areas with differences | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 3351 | Rev 4482 | ||
---|---|---|---|
1 | /* |
1 | /* |
2 | * Copyright (c) 2006 Josef Cejka |
2 | * Copyright (c) 2006 Josef Cejka |
3 | * Copyright (c) 2008 Jakub Jermar |
3 | * Copyright (c) 2008 Jakub Jermar |
4 | * All rights reserved. |
4 | * All rights reserved. |
5 | * |
5 | * |
6 | * Redistribution and use in source and binary forms, with or without |
6 | * Redistribution and use in source and binary forms, with or without |
7 | * modification, are permitted provided that the following conditions |
7 | * modification, are permitted provided that the following conditions |
8 | * are met: |
8 | * are met: |
9 | * |
9 | * |
10 | * - Redistributions of source code must retain the above copyright |
10 | * - Redistributions of source code must retain the above copyright |
11 | * notice, this list of conditions and the following disclaimer. |
11 | * notice, this list of conditions and the following disclaimer. |
12 | * - Redistributions in binary form must reproduce the above copyright |
12 | * - Redistributions in binary form must reproduce the above copyright |
13 | * notice, this list of conditions and the following disclaimer in the |
13 | * notice, this list of conditions and the following disclaimer in the |
14 | * documentation and/or other materials provided with the distribution. |
14 | * documentation and/or other materials provided with the distribution. |
15 | * - The name of the author may not be used to endorse or promote products |
15 | * - The name of the author may not be used to endorse or promote products |
16 | * derived from this software without specific prior written permission. |
16 | * derived from this software without specific prior written permission. |
17 | * |
17 | * |
18 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
18 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
19 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
19 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
20 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
20 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
21 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
21 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
22 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
22 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
23 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
23 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
24 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
24 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
25 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
25 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
26 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
26 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
27 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
27 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
28 | */ |
28 | */ |
29 | 29 | ||
30 | /** @addtogroup libc |
30 | /** @addtogroup libc |
31 | * @{ |
31 | * @{ |
32 | */ |
32 | */ |
33 | /** @file |
33 | /** @file |
34 | */ |
34 | */ |
35 | 35 | ||
36 | #include <stdarg.h> |
36 | #include <stdarg.h> |
37 | #include <stdio.h> |
37 | #include <stdio.h> |
38 | #include <stdlib.h> |
38 | #include <stdlib.h> |
- | 39 | #include <string.h> |
|
39 | #include <io/printf_core.h> |
40 | #include <io/printf_core.h> |
40 | 41 | ||
41 | static int asprintf_prewrite(const char *str, size_t count, void *unused) |
42 | static int asprintf_str_write(const char *str, size_t count, void *unused) |
42 | { |
43 | { |
43 | return count; |
44 | return str_nlength(str, count); |
- | 45 | } |
|
- | 46 | ||
- | 47 | static int asprintf_wstr_write(const wchar_t *str, size_t count, void *unused) |
|
- | 48 | { |
|
- | 49 | return wstr_nlength(str, count); |
|
44 | } |
50 | } |
45 | 51 | ||
46 | /** Allocate and print to string. |
52 | /** Allocate and print to string. |
47 | * |
53 | * |
48 | * @param strp Address of the pointer where to store the address of |
54 | * @param strp Address of the pointer where to store the address of |
49 | * the newly allocated string. |
55 | * the newly allocated string. |
50 | * @fmt Format strin. |
56 | * @fmt Format string. |
51 | * |
57 | * |
52 | * @return Number of characters printed or a negative error code. |
58 | * @return Number of characters printed or a negative error code. |
- | 59 | * |
|
53 | */ |
60 | */ |
54 | int asprintf(char **strp, const char *fmt, ...) |
61 | int asprintf(char **strp, const char *fmt, ...) |
55 | { |
62 | { |
56 | struct printf_spec ps = { |
63 | struct printf_spec ps = { |
57 | asprintf_prewrite, |
64 | asprintf_str_write, |
- | 65 | asprintf_wstr_write, |
|
58 | NULL |
66 | NULL |
59 | }; |
67 | }; |
60 | int ret; |
- | |
61 | va_list args; |
- | |
62 | 68 | ||
- | 69 | va_list args; |
|
63 | va_start(args, fmt); |
70 | va_start(args, fmt); |
- | 71 | ||
64 | ret = printf_core(fmt, &ps, args); |
72 | int ret = printf_core(fmt, &ps, args); |
65 | va_end(args); |
73 | va_end(args); |
- | 74 | ||
66 | if (ret > 0) { |
75 | if (ret > 0) { |
67 | *strp = malloc(ret + 20); |
76 | *strp = malloc(STR_BOUNDS(ret) + 1); |
68 | if (!*strp) |
77 | if (*strp == NULL) |
69 | return -1; |
78 | return -1; |
- | 79 | ||
70 | va_start(args, fmt); |
80 | va_start(args, fmt); |
71 | vsprintf(*strp, fmt, args); |
81 | vsnprintf(*strp, STR_BOUNDS(ret) + 1, fmt, args); |
72 | va_end(args); |
82 | va_end(args); |
73 | } |
83 | } |
74 | 84 | ||
75 | return ret; |
85 | return ret; |
76 | } |
86 | } |
77 | 87 | ||
78 | /** @} |
88 | /** @} |
79 | */ |
89 | */ |
80 | 90 |