r8468 - packages/trunk/xlife/debian/patches

[Peter De Wachter]

Author: pdewacht-guest
Date: 2008-12-01 22:00:44 +0000 (Mon, 01 Dec 2008)
New Revision: 8468

Added:
   packages/trunk/xlife/debian/patches/50_loading_rules.diff
Modified:
   packages/trunk/xlife/debian/patches/series
Log:
fix the loading of patterns that use non-standard rules


Added: packages/trunk/xlife/debian/patches/50_loading_rules.diff
===================================================================
--- packages/trunk/xlife/debian/patches/50_loading_rules.diff	                        (rev 0)
+++ packages/trunk/xlife/debian/patches/50_loading_rules.diff	2008-12-01 22:00:44 UTC (rev 8468)
@@ -0,0 +1,22 @@
+--- a/xlife/file.c
++++ b/xlife/file.c
+@@ -924,12 +924,15 @@
+     char	*errmsg, *fullpath, patfile[PATNAMESIZ+80];
+ 
+     strcpy(patfile, rulefile);
+-    strcat(patfile, ".r");
+     if ((fullpath = findfile(patfile)) == (char *)NULL)
+     {
+-	sprintf(patfile, "Can't find rule file %s\n", rulefile);
+-	error(patfile);
+-	return(-1);
++        strcat(patfile, ".r");
++        if ((fullpath = findfile(patfile)) == (char *)NULL)
++        {
++            sprintf(patfile, "Can't find rule file %s\n", rulefile);
++            error(patfile);
++            return(-1);
++        }
+     }
+     else if ((errmsg = readrules(fullpath, context)) != (char *)NULL)
+     {

Modified: packages/trunk/xlife/debian/patches/series
===================================================================
--- packages/trunk/xlife/debian/patches/series	2008-11-30 22:25:33 UTC (rev 8467)
+++ packages/trunk/xlife/debian/patches/series	2008-12-01 22:00:44 UTC (rev 8468)
@@ -2,3 +2,4 @@
 20_xlife_manpage.diff
 30_wireworld.diff
 40_lifesrc_manpage.diff
+50_loading_rules.diff