4 files changed, 12 insertions, 7 deletions
diff --git a/Build/source/texk/makejvf/ChangeLog b/Build/source/texk/makejvf/ChangeLog
index f3e4071615f..05fc0d1bdc7 100644
--- a/Build/source/texk/makejvf/ChangeLog
+++ b/Build/source/texk/makejvf/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-01  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* tfmread.c: Use fopen() mode "rb" for TFM file.
+	* main.c, tfmread.c, write.c: Use 8-bit exit() codes.
+
 2012-04-29  Norbert Preining  <preining@logic.at>
 
 	Update for upTeX-1.10. From TANAKA Takuji <KXD02663@nifty.ne.jp>.
diff --git a/Build/source/texk/makejvf/main.c b/Build/source/texk/makejvf/main.c
index 8d15148dd9f..baa96c39798 100644
--- a/Build/source/texk/makejvf/main.c
+++ b/Build/source/texk/makejvf/main.c
@@ -55,7 +55,7 @@ int main(int argc, char ** argv)
 			}
 			if ((afp = fopen(afmname,"r"))==NULL) {
 				fprintf(stderr,"no AFM file, %s.\n",afmname);
-				exit(-1);
+				exit(100);
 			}
 			break;
 		case 'b':
@@ -119,7 +119,7 @@ int main(int argc, char ** argv)
 
 	if (kanatume>=0 && !afp) {
 		fprintf(stderr,"No AFM file for kanatume.\n");
-		exit(-1);
+		exit(100);
 	}
 
 	atfmname = malloc(strlen(*argv)+4);
diff --git a/Build/source/texk/makejvf/tfmread.c b/Build/source/texk/makejvf/tfmread.c
index 86c39aa3a18..40323a73c63 100644
--- a/Build/source/texk/makejvf/tfmread.c
+++ b/Build/source/texk/makejvf/tfmread.c
@@ -33,10 +33,10 @@ int tfmget(char *name)
 	FILE *fp;
 
 	strcpy(nbuff,name);
-	fp = fopen(nbuff,"r");
+	fp = fopen(nbuff,"rb");
 	if (fp == NULL) {
 		strcat(nbuff,".tfm");
-		fp = fopen(nbuff,"r");
+		fp = fopen(nbuff,"rb");
 		if (fp == NULL) {
 			fprintf(stderr,"%s is not found.\n",name);
 			exit(0);
@@ -110,7 +110,7 @@ int tfmidx(FILE *fp)
 	}
 	else {
 		fprintf(stderr,"This TFM is not for Japanese.\n");
-		exit(-1);
+		exit(100);
 	}
 
 	return 0;
diff --git a/Build/source/texk/makejvf/write.c b/Build/source/texk/makejvf/write.c
index fcaf6ab576d..581bf815545 100644
--- a/Build/source/texk/makejvf/write.c
+++ b/Build/source/texk/makejvf/write.c
@@ -14,7 +14,7 @@ FILE *vfopen(char *name)
 	fp = fopen(name,"wb");
 	if (fp == NULL) {
 		fprintf(stderr,"I cannot create VF file, %s.",name);
-		exit(-1);
+		exit(100);
 	}
 
 	fputc(247,fp); /* PRE */
@@ -820,7 +820,7 @@ void maketfm(char *name)
 	fp = fopen(nbuf,"wb");
 	if (fp == NULL) {
 		fprintf(stderr,"I cannot create TFM file, %s.",name);
-		exit(-1);
+		exit(100);
 	}
 
 	fputnum(jfm_id,2,fp); /* JFM ID */