Skip to contentSkip to conversation

fixup previous changes to loadunimap.c

PATCH In review Mike Frysinger 2 participants 2 messages Mar 30, 2008 – Apr 1, 2008

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fixup previous changes to loadunimap.c

iirc, a Debian patch made the change to loadunimap.c:
-static char *unidirpath[] = { "", DATADIR "/" UNIMAPDIR "/", 0 }; +static char *unidirpath[] = { "", DATADIR "/" TRANSDIR "/", 0 };

that shouldnt be an exclusive change, it should be both dirs. the attached patch fixes things.
-mike

src/loadunimap.c renamed from src/loadunimap.c.orig +2 -2
@@ -28,7 +28,7 @@
 extern char *progname;
 extern int force;
 
-static char *unidirpath[] = { "", DATADIR "/" TRANSDIR "/", 0 };
-static char *unisuffixes[] = { "", ".sfm", ".uni", 0 };
+static char *unidirpath[] = { "", DATADIR "/" UNIMAPDIR "/", DATADIR "/" TRANSDIR "/", 0 };
+static char *unisuffixes[] = { "", ".uni", ".sfm", 0 };
 
 #ifdef MAIN
#1 lore raw
Quoted 5 lines · Mike Frysinger

iirc, a Debian patch made the change to loadunimap.c:

(quoted diff) +1 -1
-static char *unidirpath[] = { "", DATADIR "/" UNIMAPDIR "/", 0 };
+static char *unidirpath[] = { "", DATADIR "/" TRANSDIR "/", 0 };

that shouldnt be an exclusive change, it should be both dirs. the attached patch fixes things.

Commit 1.12-21-g5f2bf61 was wrong. It should be fixed. Only following change is needed for compatibility with console-tools:

-static char *unisuffixes[] = { "", ".uni", 0 }; +static char *unisuffixes[] = { "", ".sfm", ".uni", 0 };

Thanks!

Signature · 1 line
Rgrds, legion