From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 19 May 2004 16:52:55 +0000 (+0000)
Subject: Update.
X-Git-Tag: upstream/2.30~17932
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d4b6038332afd43414b7ff0eb0ae3dec377b10bf;p=external%2Fglibc.git

Update.

	* misc/regexp.h: Say the functions have been withdrawn.
---

diff --git a/ChangeLog b/ChangeLog
index c5d542d..02615c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-05-19  Ulrich Drepper  <drepper@redhat.com>
 
+	* misc/regexp.h: Say the functions have been withdrawn.
+
 	* wcsmbs/tst-wcpncpy.c: Add more tests.
 
 2004-05-18  Roland McGrath  <roland@frob.com>
diff --git a/misc/regexp.h b/misc/regexp.h
index bb1c401..b7b50b7 100644
--- a/misc/regexp.h
+++ b/misc/regexp.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -22,7 +22,8 @@
 
 /* The contents of this header file was first standardized in X/Open
    System Interface and Headers Issue 2, originally coming from SysV.
-   In issue 4, version 2, it is marked as TO BE WITDRAWN.
+   In issue 4, version 2, it is marked as TO BE WITDRAWN, and it has
+   been withdrawn in SUSv3.
 
    This code shouldn't be used in any newly written code.  It is
    included only for compatibility reasons.  Use the POSIX definition
diff --git a/wcsmbs/tst-wcpncpy.c b/wcsmbs/tst-wcpncpy.c
index 26eeff9..76d5fd3 100644
--- a/wcsmbs/tst-wcpncpy.c
+++ b/wcsmbs/tst-wcpncpy.c
@@ -27,7 +27,7 @@ main (void)
   int result = 0;
 
   const wchar_t src[] = L"0";
-  wchar_t dest[10];
+  wchar_t dest[21];
   wmemset (dest, L'\0', 10);
   wchar_t *endp = wcpncpy (dest, src, 2);
   if (wcscmp (dest, src) != 0)
@@ -65,5 +65,13 @@ main (void)
       puts ("return value of long string call incorrect");
     }
 
+  const wchar_t src5[] = L"ab";
+  endp = wcpncpy (dest, src5, 20);
+  if (endp != dest + 2)
+    {
+      result = 1;
+      puts ("return value of large limit call incorrect");
+    }
+
   return result;
 }