Deleted Added
sdiff udiff text old ( 122105 ) new ( 128002 )
full compact
vswprintf.c (122105) vswprintf.c (128002)
1/* $OpenBSD: vasprintf.c,v 1.4 1998/06/21 22:13:47 millert Exp $ */
2
3/*
4 * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

--- 17 unchanged lines hidden (view full) ---

26 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
27 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */
29
30#include <sys/cdefs.h>
31#if 0
32__FBSDID("FreeBSD: src/lib/libc/stdio/vasprintf.c,v 1.16 2002/08/21 16:19:57 mike Exp ");
33#endif
1/* $OpenBSD: vasprintf.c,v 1.4 1998/06/21 22:13:47 millert Exp $ */
2
3/*
4 * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

--- 17 unchanged lines hidden (view full) ---

26 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
27 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */
29
30#include <sys/cdefs.h>
31#if 0
32__FBSDID("FreeBSD: src/lib/libc/stdio/vasprintf.c,v 1.16 2002/08/21 16:19:57 mike Exp ");
33#endif
34__FBSDID("$FreeBSD: head/lib/libc/stdio/vswprintf.c 122105 2003-11-05 08:20:45Z tjr $");
34__FBSDID("$FreeBSD: head/lib/libc/stdio/vswprintf.c 128002 2004-04-07 09:55:05Z tjr $");
35
36#include <errno.h>
37#include <stdio.h>
38#include <stdlib.h>
39#include <wchar.h>
40#include "local.h"
41
42int
43vswprintf(wchar_t * __restrict s, size_t n, const wchar_t * __restrict fmt,
44 __va_list ap)
45{
35
36#include <errno.h>
37#include <stdio.h>
38#include <stdlib.h>
39#include <wchar.h>
40#include "local.h"
41
42int
43vswprintf(wchar_t * __restrict s, size_t n, const wchar_t * __restrict fmt,
44 __va_list ap)
45{
46 static const mbstate_t initial;
47 mbstate_t mbs;
46 FILE f;
47 struct __sFILEX ext;
48 char *mbp;
49 int ret, sverrno;
50
51 if (n == 0) {
52 errno = EINVAL;
53 return (-1);

--- 17 unchanged lines hidden (view full) ---

71 return (-1);
72 }
73 *f._p = '\0';
74 mbp = f._bf._base;
75 /*
76 * XXX Undo the conversion from wide characters to multibyte that
77 * fputwc() did in __vfwprintf().
78 */
48 FILE f;
49 struct __sFILEX ext;
50 char *mbp;
51 int ret, sverrno;
52
53 if (n == 0) {
54 errno = EINVAL;
55 return (-1);

--- 17 unchanged lines hidden (view full) ---

73 return (-1);
74 }
75 *f._p = '\0';
76 mbp = f._bf._base;
77 /*
78 * XXX Undo the conversion from wide characters to multibyte that
79 * fputwc() did in __vfwprintf().
80 */
79 if (mbsrtowcs(s, (const char **)&mbp, n, NULL) == (size_t)-1) {
81 mbs = initial;
82 if (mbsrtowcs(s, (const char **)&mbp, n, &mbs) == (size_t)-1) {
80 free(f._bf._base);
81 errno = EILSEQ;
82 return (-1);
83 }
84 free(f._bf._base);
85 if (s[n - 1] != L'\0') {
86 s[n - 1] = L'\0';
87 errno = EOVERFLOW;
88 return (-1);
89 }
90
91 return (ret);
92}
83 free(f._bf._base);
84 errno = EILSEQ;
85 return (-1);
86 }
87 free(f._bf._base);
88 if (s[n - 1] != L'\0') {
89 s[n - 1] = L'\0';
90 errno = EOVERFLOW;
91 return (-1);
92 }
93
94 return (ret);
95}