--- np2/win9x/dosio.cpp	2005/02/12 12:13:59	1.9
+++ np2/win9x/dosio.cpp	2005/03/20 08:58:19	1.11
@@ -152,37 +152,37 @@ void DOSIOCALL file_setcd(const OEMCHAR 
 
 OEMCHAR * DOSIOCALL file_getcd(const OEMCHAR *path) {
 
-	file_cpyname(curfilep, path, sizeof(curpath) - (curfilep - curpath));
+	file_cpyname(curfilep, path, NELEMENTS(curpath) - (curfilep - curpath));
 	return(curpath);
 }
 
 FILEH DOSIOCALL file_open_c(const OEMCHAR *path) {
 
-	file_cpyname(curfilep, path, sizeof(curpath) - (curfilep - curpath));
+	file_cpyname(curfilep, path, NELEMENTS(curpath) - (curfilep - curpath));
 	return(file_open(curpath));
 }
 
 FILEH DOSIOCALL file_open_rb_c(const OEMCHAR *path) {
 
-	file_cpyname(curfilep, path, sizeof(curpath) - (curfilep - curpath));
+	file_cpyname(curfilep, path, NELEMENTS(curpath) - (curfilep - curpath));
 	return(file_open_rb(curpath));
 }
 
 FILEH DOSIOCALL file_create_c(const OEMCHAR *path) {
 
-	file_cpyname(curfilep, path, sizeof(curpath) - (curfilep - curpath));
+	file_cpyname(curfilep, path, NELEMENTS(curpath) - (curfilep - curpath));
 	return(file_create(curpath));
 }
 
 short DOSIOCALL file_delete_c(const OEMCHAR *path) {
 
-	file_cpyname(curfilep, path, sizeof(curpath) - (curfilep - curpath));
+	file_cpyname(curfilep, path, NELEMENTS(curpath) - (curfilep - curpath));
 	return(file_delete(curpath));
 }
 
 short DOSIOCALL file_attr_c(const OEMCHAR *path) {
 
-	file_cpyname(curfilep, path, sizeof(curpath) - (curfilep - curpath));
+	file_cpyname(curfilep, path, NELEMENTS(curpath) - (curfilep - curpath));
 	return(file_attr(curpath));
 }
 
@@ -278,7 +278,7 @@ const OEMCHAR	*q;
 	p = file_getname(path);
 	q = NULL;
 	while((csize = milstr_charsize(p)) != 0) {
-		if ((csize == 1) && (*path == '.')) {
+		if ((csize == 1) && (*p == '.')) {
 			q = p + 1;
 		}
 		p += csize;
@@ -298,7 +298,7 @@ void DOSIOCALL file_cutext(OEMCHAR *path
 	p = file_getname(path);
 	q = NULL;
 	while((csize = milstr_charsize(p)) != 0) {
-		if ((csize == 1) && (*path == '.')) {
+		if ((csize == 1) && (*p == '.')) {
 			q = p;
 		}
 		p += csize;