1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
|
--- wcsmbs/wcpncpy.c 1 Jun 2003 07:06:26 -0000 1.4
+++ wcsmbs/wcpncpy.c 22 Jul 2003 19:19:55 -0000 1.5
@@ -31,8 +31,6 @@
wint_t c;
wchar_t *const s = dest;
- --dest;
-
if (n >= 4)
{
size_t n4 = n >> 2;
@@ -40,19 +38,19 @@
for (;;)
{
c = *src++;
- *++dest = c;
+ *dest++ = c;
if (c == L'\0')
break;
c = *src++;
- *++dest = c;
+ *dest++ = c;
if (c == L'\0')
break;
c = *src++;
- *++dest = c;
+ *dest++ = c;
if (c == L'\0')
break;
c = *src++;
- *++dest = c;
+ *dest++ = c;
if (c == L'\0')
break;
if (--n4 == 0)
--- /dev/null 2003-01-13 18:16:28.000000000 +0900
+++ wcsmbs/tst-wcpncpy.c 2003-07-23 04:23:43.000000000 +0900
@@ -0,0 +1,31 @@
+/* Copyright (C) 2003 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@cygnus.com>, 2003.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <wchar.h>
+
+
+int
+main (void)
+{
+ const wchar_t src[] = L"0";
+ wchar_t dest[10];
+ wmemset (dest, L'\0', 10);
+ wcpncpy (dest, src, 2);
+ return wcscmp (dest, src) != 0;
+}
--- wcsmbs/Makefile 29 Aug 2002 06:37:43 -0000 1.20
+++ wcsmbs/Makefile 22 Jul 2003 19:23:54 -0000 1.21
@@ -1,4 +1,4 @@
-# Copyright (C) 1995-2000, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1995-2000, 2002, 2003 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -40,7 +40,7 @@
wcsmbsload mbsrtowcs_l
tests := tst-wcstof wcsmbs-tst1 tst-wcsnlen tst-btowc tst-mbrtowc \
- tst-wcrtomb
+ tst-wcrtomb tst-wcpncpy
include ../Rules
|
