Add globbing to INCLUDE statements. Helps when $HOME keeps being different

across and within organizations (you can use a leading ~ now).

2 files changed, 45 insertions, 1 deletions

diff --git a/misc/remind/files/patch-sum b/misc/remind/files/patch-sum
index 3038ae1b6a0..be1e792fcb1 100644
--- a/misc/remind/files/patch-sum
+++ b/misc/remind/files/patch-sum
@@ -1,4 +1,5 @@
-$NetBSD: patch-sum,v 1.2 2000/03/02 00:09:51 kim Exp $
+$NetBSD: patch-sum,v 1.3 2000/03/02 00:56:44 kim Exp $
 
 MD5 (patch-aa) = 80e1d0f1d5681b5c1c2d35cbb4ee0106
 MD5 (patch-ab) = e158ffaddff04a20d0452f32f2b62cd3
+MD5 (patch-ac) = 5e27d2f4831041bea2886f8dfac8a60a
diff --git a/misc/remind/patches/patch-ac b/misc/remind/patches/patch-ac
new file mode 100644
index 00000000000..37b3136a609
--- /dev/null
+++ b/misc/remind/patches/patch-ac
@@ -0,0 +1,43 @@
+$NetBSD: patch-ac,v 1.1 2000/03/02 00:56:45 kim Exp $
+
+--- src/files.c.orig	Mon Apr  5 13:34:48 1999
++++ src/files.c	Wed Mar  1 19:48:52 2000
+@@ -19,6 +19,7 @@
+ 
+ #include <string.h>
+ #include <ctype.h>
++#include <glob.h>
+ #include <sys/stat.h>
+ 
+ #ifdef TM_IN_SYS_TIME
+@@ -421,16 +422,26 @@
+ {     
+     DynamicBuffer buf;
+     int r, e;
++    glob_t g;
+ 
+     DBufInit(&buf);
++    memset(&g, 0, sizeof(g));
++
+     if ( (r=ParseToken(p, &buf)) ) return r;
+     e = VerifyEoln(p); 
+     if (e) Eprint("%s", ErrMsg[e]);
+-    if ( (r=IncludeFile(DBufValue(&buf))) ) {
+-	DBufFree(&buf);
+-	return r;
+-    }
++
++    glob(DBufValue(&buf), GLOB_NOCHECK|GLOB_BRACE|GLOB_TILDE, NULL, &g);
+     DBufFree(&buf);
++
++    do {
++	if ( (r=IncludeFile(*g.gl_pathv)) ) {
++	    globfree(&g);
++	    return r;
++	}
++    } while (*++g.gl_pathv != NULL);
++
++    globfree(&g);
+     NumIfs = 0;
+     IfFlags = 0;
+     return OK;