X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmapread.c;h=8319657a337a736b196bd5267fe89af209cdf1d3;hb=81be3ad6b83ecc1f9a9799d8196a79b9073b6a11;hp=8b75a72cc0c605af79b5df3db0425daef057ba0d;hpb=8dc4a07247c20f31ac8a69d73fc5117052cc4a96;p=16.git

diff --git a/src/lib/mapread.c b/src/lib/mapread.c
index 8b75a72c..8319657a 100644
--- a/src/lib/mapread.c
+++ b/src/lib/mapread.c
@@ -128,7 +128,7 @@ int loadmap(char *mn, map_t *map)
 	char huge *js = NULL;
 	size_t jslen = 0;
 	char buf[BUFSIZ];
-	char huge *buff = /*(char huge *)*/&buf;//(char huge *)(MK_FP(FP_SEG(&buf), FP_OFF(&buf)));//
+	char huge *buff = &buf;//(char huge *)(MK_FP(FP_SEG(&buf), FP_OFF(&buf)));//
 	static char js_ss[16];
 
 	jsmn_parser p;
@@ -147,8 +147,6 @@ int loadmap(char *mn, map_t *map)
 		return 3;
 	}
 
-	//buff = _fmalloc(sizeof(buf));
-
 	for (;;) {
 		/* Read another chunk */
 		r = fread(buf, 1, sizeof(buf), fh);
@@ -164,8 +162,8 @@ int loadmap(char *mn, map_t *map)
 				return 2;
 			}
 		}
-		buff = /*(char huge *)*/&buf;
-		js = _frealloc(js, jslen + r +1);
+		//buf[BUFSIZ]=(char)"\0";
+		js = _frealloc(js, jslen + r + 1);
 		if (js == NULL) {
 			fprintf(stderr, "*js=%Fp\n", *js);
 			fprintf(stderr, "realloc(): errno = %d\n", errno);
@@ -173,8 +171,12 @@ int loadmap(char *mn, map_t *map)
 		}
 		//printf("strncpy~\n");
 		//strncpy(jz + jslen, buf, r);
-		if(_fstrncpy(js + jslen, buff, r) == NULL)
-			fprintf(stderr, "_fstrncpy(): errno = %d\n", errno);
+		//if(
+		//_fstrncpy(js + jslen, &(*buff), r);
+		_fstrncpy(js + jslen, &(*buff), r);
+		//strncpy((char *)js + jslen, buf, r);
+		// == NULL)
+//			fprintf(stderr, "_fstrncpy(): errno = %d\n", errno);
 		//printf("strncpy okies~~\n");
 		jslen = jslen + r;
 
@@ -192,11 +194,13 @@ again:
 				goto again;
 			}
 		} else {
-			printf("*js=%Fp\n", (*js));
+			printf("js=%Fp\n", (js));
+			printf("*js=%Fp\n", (*(js)));
+			printf("&*js=%s\n", &(*(js)));
 			printf("&buf=[%Fp]\n", &buf);
-			printf("&buf_seg=[%x]\n", FP_SEG(&buf));
-			printf("&buf_off=[%x]\n", FP_OFF(&buf));
-			printf("&buf_fp=[%Fp]\n", MK_FP(FP_SEG(&buf), FP_OFF(&buf)));
+			//printf("&buf_seg=[%x]\n", FP_SEG(&buf));
+			//printf("&buf_off=[%x]\n", FP_OFF(&buf));
+			//printf("&buf_fp=[%Fp]\n", MK_FP(FP_SEG(&buf), FP_OFF(&buf)));
 			//printf("buf=[\n%s\n]\n", buf);
 			printf("buff=[%Fp]\n", buff);
 			printf("(*buff)=[%Fp]\n", (*buff));
@@ -206,8 +210,9 @@ again:
 		}
 	}
 
-	hfree(js);
-	hfree(tok);
+	_ffree(js);
+	_ffree(buff);
+	_ffree(tok);
 	fclose(fh);
 
 	return 0;