[packages/conflib.git] / conflib-cl_build_stanza_array-fix.patch

diff -urN conflib-0.4.5.orig/src/cl_alist.c conflib-0.4.5/src/cl_alist.c
--- conflib-0.4.5.orig/src/cl_alist.c	Fri Oct  9 19:03:57 1998
+++ conflib-0.4.5/src/cl_alist.c	Tue Jul 25 10:58:11 2000
@@ -65,8 +65,15 @@
 	int count;
 	char **array;
 
-	if (!st)
-		return NULL;
+        if (!st) {
+                conf->in_scanmode = 1;
+                cl_getstanza (conf, NULL, NULL, 0, NULL);
+                conf->in_scanmode = 0;
+                st=conf->stanzas;
+                if (!st)
+                    return NULL;
+        }
+
 	for (count=0,st=conf->stanzas;st!=NULL;st=st->next)
 	{
 		if (0==cl_fnmatch_casefold(pattern, st->stanzaname))
Commit	Line	Data
229d1030	1	diff -urN conflib-0.4.5.orig/src/cl_alist.c conflib-0.4.5/src/cl_alist.c
	2	--- conflib-0.4.5.orig/src/cl_alist.c Fri Oct 9 19:03:57 1998
	3	+++ conflib-0.4.5/src/cl_alist.c Tue Jul 25 10:58:11 2000
	4	@@ -65,8 +65,15 @@
	5	int count;
	6	char **array;
	7
	8	- if (!st)
	9	- return NULL;
	10	+ if (!st) {
	11	+ conf->in_scanmode = 1;
	12	+ cl_getstanza (conf, NULL, NULL, 0, NULL);
	13	+ conf->in_scanmode = 0;
	14	+ st=conf->stanzas;
	15	+ if (!st)
	16	+ return NULL;
	17	+ }
	18	+
	19	for (count=0,st=conf->stanzas;st!=NULL;st=st->next)
	20	{
	21	if (0==cl_fnmatch_casefold(pattern, st->stanzaname))