Add .cantunwind to _dl_start_user

[platform/upstream/glibc.git] / posix / bug-regex6.c

diff --git a/posix/bug-regex6.c b/posix/bug-regex6.c
index 9a06898..efcc890 100644 (file)
--- a/posix/bug-regex6.c
+++ b/posix/bug-regex6.c
@@ -1,5 +1,5 @@
 /* Test for regexec.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002-2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@redhat.com>, 2002.
 
@@ -14,14 +14,15 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
-#include <sys/types.h>
-#include <regex.h>
 #include <locale.h>
 #include <stdio.h>
+#include <string.h>
+#include <sys/types.h>
+#include <regex.h>
+
 
 int
 main (int argc, char *argv[])
@@ -29,8 +30,8 @@ main (int argc, char *argv[])
   regex_t re;
   regmatch_t mat[10];
   int i, j, ret = 0;
-  char *locales[] = { "C", "de_DE.UTF-8" };
-  char *string = "http://www.regex.com/pattern/matching.html#intro";
+  const char *locales[] = { "C", "de_DE.UTF-8" };
+  const char *string = "http://www.regex.com/pattern/matching.html#intro";
   regmatch_t expect[10] = {
     { 0, 48 }, { 0, 5 }, { 0, 4 }, { 5, 20 }, { 7, 20 }, { 20, 42 },
     { -1, -1 }, { -1, -1 }, { 42, 48 }, { 43, 48 } };
@@ -46,7 +47,7 @@ main (int argc, char *argv[])
                        "^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?",
                        REG_EXTENDED) != REG_NOERROR)
        {
-         puts ("cannot compile expression \"[a-f]*\"");
+         puts ("cannot compile the regular expression");
          ret = 1;
        }
       else if (regexec (&re, string, 10, mat, 0) == REG_NOMATCH)