Index: fontconfig/fc-lang/fc-lang.c
===================================================================
RCS file: /cvs/fontconfig/fontconfig/fc-lang/fc-lang.c,v
retrieving revision 1.11
diff -u -r1.11 fc-lang.c
--- fontconfig/fc-lang/fc-lang.c	7 Dec 2004 01:14:46 -0000	1.11
+++ fontconfig/fc-lang/fc-lang.c	2 Jun 2005 14:51:31 -0000
@@ -121,8 +121,9 @@
 	    while (*file == ' ')
 		file++;
 	    end = strlen (file);
-	    if (file[end-1] == '\n')
-		file[end-1] = '\0';
+	    while (end!=0 && (file[end-1] == '\n' || file[end-1]=='\r')) {
+		file[--end] = '\0';
+	    }
 	    f = scanopen (file);
 	    if (!f)
 		fatal (file, 0, "can't open");