Skip to content
Snippets Groups Projects
Verified Commit 3f60f568 authored by Jeremy Soller's avatar Jeremy Soller
Browse files

Fix multiple fnmatch

parent 010649b7
No related branches found
No related tags found
No related merge requests found
diff -ru make-4.2/config/config.sub make-4.2-new/config/config.sub diff -ru make-4.2/config/config.sub make-4.2-new/config/config.sub
--- make-4.2/config/config.sub 2018-11-16 20:15:41.363343886 -0700 --- make-4.2/config/config.sub 2018-11-16 21:11:15.392794814 -0700
+++ make-4.2-new/config/config.sub 2018-11-16 20:15:58.095419089 -0700 +++ make-4.2-new/config/config.sub 2018-11-16 21:11:37.922637742 -0700
@@ -1376,7 +1376,7 @@ @@ -1376,7 +1376,7 @@
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
...@@ -11,8 +11,8 @@ diff -ru make-4.2/config/config.sub make-4.2-new/config/config.sub ...@@ -11,8 +11,8 @@ diff -ru make-4.2/config/config.sub make-4.2-new/config/config.sub
| -aos* | -aros* | -cloudabi* | -sortix* \ | -aos* | -aros* | -cloudabi* | -sortix* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
diff -ru make-4.2/getopt1.c make-4.2-new/getopt1.c diff -ru make-4.2/getopt1.c make-4.2-new/getopt1.c
--- make-4.2/getopt1.c 2018-11-16 20:15:41.379343966 -0700 --- make-4.2/getopt1.c 2018-11-16 21:11:15.408796156 -0700
+++ make-4.2-new/getopt1.c 2018-11-16 20:28:25.520961828 -0700 +++ make-4.2-new/getopt1.c 2018-11-16 21:11:37.922637742 -0700
@@ -48,6 +48,8 @@ @@ -48,6 +48,8 @@
#endif #endif
#endif #endif
...@@ -23,8 +23,8 @@ diff -ru make-4.2/getopt1.c make-4.2-new/getopt1.c ...@@ -23,8 +23,8 @@ diff -ru make-4.2/getopt1.c make-4.2-new/getopt1.c
diff -ru make-4.2/getopt.c make-4.2-new/getopt.c diff -ru make-4.2/getopt.c make-4.2-new/getopt.c
--- make-4.2/getopt.c 2018-11-16 20:15:41.359343867 -0700 --- make-4.2/getopt.c 2018-11-16 21:11:15.384794143 -0700
+++ make-4.2-new/getopt.c 2018-11-16 20:28:07.653254603 -0700 +++ make-4.2-new/getopt.c 2018-11-16 21:11:37.922637742 -0700
@@ -56,6 +56,8 @@ @@ -56,6 +56,8 @@
# endif # endif
#endif #endif
...@@ -34,9 +34,27 @@ diff -ru make-4.2/getopt.c make-4.2-new/getopt.c ...@@ -34,9 +34,27 @@ diff -ru make-4.2/getopt.c make-4.2-new/getopt.c
#ifndef ELIDE_CODE #ifndef ELIDE_CODE
diff -ru make-4.2/glob/fnmatch.c make-4.2-new/glob/fnmatch.c
--- make-4.2/glob/fnmatch.c 2018-11-16 21:11:15.384794143 -0700
+++ make-4.2-new/glob/fnmatch.c 2018-11-16 21:11:53.311846128 -0700
@@ -477,6 +477,7 @@
}
+/*
int
fnmatch (pattern, string, flags)
const char *pattern;
@@ -485,5 +486,6 @@
{
return internal_fnmatch (pattern, string, flags & FNM_PERIOD, flags);
}
+*/
#endif /* _LIBC or not __GNU_LIBRARY__. */
diff -ru make-4.2/glob/glob.c make-4.2-new/glob/glob.c diff -ru make-4.2/glob/glob.c make-4.2-new/glob/glob.c
--- make-4.2/glob/glob.c 2018-11-16 20:15:41.359343867 -0700 --- make-4.2/glob/glob.c 2018-11-16 21:11:15.384794143 -0700
+++ make-4.2-new/glob/glob.c 2018-11-16 20:15:58.095419089 -0700 +++ make-4.2-new/glob/glob.c 2018-11-16 21:11:37.926638062 -0700
@@ -625,9 +625,9 @@ @@ -625,9 +625,9 @@
#else #else
const char *home_dir = getenv ("HOME"); const char *home_dir = getenv ("HOME");
...@@ -59,8 +77,8 @@ diff -ru make-4.2/glob/glob.c make-4.2-new/glob/glob.c ...@@ -59,8 +77,8 @@ diff -ru make-4.2/glob/glob.c make-4.2-new/glob/glob.c
{ {
char *end_name = strchr (dirname, '/'); char *end_name = strchr (dirname, '/');
diff -ru make-4.2/job.c make-4.2-new/job.c diff -ru make-4.2/job.c make-4.2-new/job.c
--- make-4.2/job.c 2018-11-16 20:15:41.351343827 -0700 --- make-4.2/job.c 2018-11-16 21:11:15.380793809 -0700
+++ make-4.2-new/job.c 2018-11-16 20:15:58.099419106 -0700 +++ make-4.2-new/job.c 2018-11-16 21:11:37.926638062 -0700
@@ -1038,7 +1038,7 @@ @@ -1038,7 +1038,7 @@
void void
block_sigs (void) block_sigs (void)
...@@ -83,8 +101,8 @@ diff -ru make-4.2/job.c make-4.2-new/job.c ...@@ -83,8 +101,8 @@ diff -ru make-4.2/job.c make-4.2-new/job.c
#endif #endif
diff -ru make-4.2/read.c make-4.2-new/read.c diff -ru make-4.2/read.c make-4.2-new/read.c
--- make-4.2/read.c 2018-11-16 20:15:41.359343867 -0700 --- make-4.2/read.c 2018-11-16 21:11:15.384794143 -0700
+++ make-4.2-new/read.c 2018-11-16 20:15:58.099419106 -0700 +++ make-4.2-new/read.c 2018-11-16 21:11:37.926638062 -0700
@@ -2937,7 +2937,7 @@ @@ -2937,7 +2937,7 @@
free (home_dir); free (home_dir);
home_dir = getenv ("HOME"); home_dir = getenv ("HOME");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment