X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=backend%2Fdvi%2Fmdvi-lib%2Ffontmap.c;h=c3c3a8d3e65530559b03cc9a6aa49fef68585b34;hb=11eb3f2a9d6062b2d38a549c1f9547d7985c7be5;hp=cc610643633556ee8c8300d0d00a1da73ccf42cc;hpb=13a06349251874bd35d2f03c3fc93217cee749a2;p=evince.git

diff --git a/backend/dvi/mdvi-lib/fontmap.c b/backend/dvi/mdvi-lib/fontmap.c
index cc610643..c3c3a8d3 100644
--- a/backend/dvi/mdvi-lib/fontmap.c
+++ b/backend/dvi/mdvi-lib/fontmap.c
@@ -14,9 +14,10 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+#include <config.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -118,7 +119,7 @@ static int read_encoding(DviEncoding *enc)
 	
 	ASSERT(enc->private == NULL);
 
-	in = fopen(enc->filename, "r");
+	in = fopen(enc->filename, "rb");
 	if(in == NULL) {
 		DEBUG((DBG_FMAP, "%s: could not read `%s' (%s)\n",
 			enc->name, enc->filename, strerror(errno)));
@@ -266,7 +267,7 @@ static DviEncoding *register_encoding(const char *basefile, int replace)
 	if(filename == NULL)
 		filename = mdvi_strdup(basefile);
 
-	in = fopen(filename, "r");
+	in = fopen(filename, "rb");
 	if(in == NULL) {
 		mdvi_free(filename);
 		return NULL;
@@ -477,9 +478,9 @@ DviFontMapEnt	*mdvi_load_fontmap(const char *file)
 	if(ptr == NULL)
 		ptr = kpse_find_file(file, kpse_dvips_config_format, 0);
 	if(ptr == NULL)
-		in = fopen(file, "r");			
+		in = fopen(file, "rb");
 	else {
-		in = fopen(ptr, "r");
+		in = fopen(ptr, "rb");
 		mdvi_free(ptr);
 	}
 	if(in == NULL)
@@ -585,9 +586,10 @@ DviFontMapEnt	*mdvi_load_fontmap(const char *file)
 		}
 		if(ent->encfile && enc){ 		
 			if(ent->encoding && !STREQ(ent->encoding, enc->name)) {
-				warning(
+				mdvi_warning(
 	_("%s: %d: [%s] requested encoding `%s' does not match vector `%s'\n"),
-					file, lineno);
+					file, lineno, ent->encfile,
+					ent->encoding, enc->name);
 			} else if(!ent->encoding)
 				ent->encoding = mdvi_strdup(enc->name);
 		}
@@ -726,9 +728,9 @@ static int	mdvi_init_fontmaps(void)
 	/* let's ask kpathsea for the file first */
 	file = kpse_find_file(config, kpse_program_text_format, 0);
 	if(file == NULL)
-		in = fopen(config, "r");
+		in = fopen(config, "rb");
 	else {
-		in = fopen(file, "r");
+		in = fopen(file, "rb");
 		mdvi_free(file);
 	}
 	if(in == NULL)
@@ -747,7 +749,7 @@ static int	mdvi_init_fontmaps(void)
 			DEBUG((DBG_FMAP, "%s: loading fontmap\n", arg));
 			ent = mdvi_load_fontmap(arg);
 			if(ent == NULL)
-				warning(_("%s: could not load fontmap\n"), arg);
+				mdvi_warning(_("%s: could not load fontmap\n"), arg);
 			else {
 				DEBUG((DBG_FMAP, 
 					"%s: installing fontmap\n", arg));
@@ -761,8 +763,8 @@ static int	mdvi_init_fontmaps(void)
 		} else if(STRNEQ(line, "default-encoding", 16)) {
 			arg = getstring(line + 16, " \t", &line); *line = 0;
 			if(mdvi_set_default_encoding(arg) < 0)
-				warning(_("%s: could not set as default encoding\n"),
-					arg);
+				mdvi_warning(_("%s: could not set as default encoding\n"),
+					     arg);
 		} else if(STRNEQ(line, "psfontpath", 10)) {
 			arg = getstring(line + 11, " \t", &line); *line = 0;
 			if(!psinitialized)
@@ -780,8 +782,8 @@ static int	mdvi_init_fontmaps(void)
 		} else if(STRNEQ(line, "psfontmap", 9)) {
 			arg = getstring(line + 9, " \t", &line); *line = 0;
 			if(mdvi_ps_read_fontmap(arg) < 0)
-				warning("%s: %s: could not read PS fontmap\n",
-					config, arg);
+				mdvi_warning("%s: %s: could not read PS fontmap\n",
+					     config, arg);
 		}
 	}
 	fclose(in);
@@ -840,8 +842,8 @@ void	mdvi_flush_encodings(void)
 	for(; (enc = (DviEncoding *)encodings.head); ) {
 		encodings.head = LIST(enc->next);
 		if((enc != tex_text_encoding && enc->links) || enc->links > 1) {
-			warning(_("encoding vector `%s' is in use\n"),
-				enc->name);
+			mdvi_warning(_("encoding vector `%s' is in use\n"),
+				     enc->name);
 		}
 		destroy_encoding(enc);
 	}
@@ -904,7 +906,7 @@ int	mdvi_ps_read_fontmap(const char *name)
 		fullname = kpse_path_search(pslibdir, name, 1);
 	else
 		fullname = (char *)name;
-	in = fopen(fullname, "r");
+	in = fopen(fullname, "rb");
 	if(in == NULL) {
 		if(fullname != name)
 			mdvi_free(fullname);