--- np2/x11/dosio.c 2003/10/16 17:59:41 1.1.1.1 +++ np2/x11/dosio.c 2005/03/09 16:13:24 1.14 @@ -1,217 +1,329 @@ -#include "compiler.h" -#include -#include -#include "codecnv.h" -#include "dosio.h" -#if defined(WIN32) -#include -#endif -#if 0 -#include -#include -#endif +/* $Id: dosio.c,v 1.14 2005/03/09 16:13:24 monaka Exp $ */ -static char curpath[MAX_PATH]; -static char *curfilep = curpath; +#include "compiler.h" + +#include +#include + +#include "codecnv.h" +#include "dosio.h" + + +static OEMCHAR curpath[MAX_PATH]; +static OEMCHAR *curfilep = curpath; #define ISKANJI(c) ((((c) - 0xa1) & 0xff) < 0x5c) -void dosio_init(void) { +void +dosio_init(void) +{ + + /* nothing to do */ } -void dosio_term(void) { +void +dosio_term(void) +{ + + /* nothing to do */ } -/* ¥Õ¥¡¥¤¥ëÁàºî */ -FILEH file_open(const char *path) { +/* ¡¦¥æ¡¦¡£¡¦¡¢¡¦öÃà¼*/ +FILEH +file_open(const OEMCHAR *path) +{ + FILEH fh; - return(fopen(path, "rb+")); + fh = fopen(path, "rb+"); + if (fh) + return fh; + return fopen(path, "rb"); } -FILEH file_open_rb(const char *path) { +FILEH +file_open_rb(const OEMCHAR *path) +{ - return(fopen(path, "rb+")); + return fopen(path, "rb"); } -FILEH file_create(const char *path) { +FILEH +file_create(const OEMCHAR *path) +{ - return(fopen(path, "wb+")); + return fopen(path, "wb+"); } -long file_seek(FILEH handle, long pointer, int method) { +long +file_seek(FILEH handle, long pointer, int method) +{ fseek(handle, pointer, method); - return(ftell(handle)); + return ftell(handle); } -UINT file_read(FILEH handle, void *data, UINT length) { +UINT +file_read(FILEH handle, void *data, UINT length) +{ - return((UINT)fread(data, 1, length, handle)); + return (UINT)fread(data, 1, length, handle); } -UINT file_write(FILEH handle, const void *data, UINT length) { +UINT +file_write(FILEH handle, const void *data, UINT length) +{ - return((UINT)fwrite(data, 1, length, handle)); + return (UINT)fwrite(data, 1, length, handle); } -short file_close(FILEH handle) { +short +file_close(FILEH handle) +{ fclose(handle); - return(0); + return 0; } -UINT file_getsize(FILEH handle) { - +UINT +file_getsize(FILEH handle) +{ struct stat sb; - if (fstat(fileno(handle), &sb) == 0) { - return(sb.st_size); - } - return(0); + if (fstat(fileno(handle), &sb) == 0) + return sb.st_size; + return 0; } -short file_attr(const char *path) { - -struct stat sb; - short attr; +short +file_attr(const OEMCHAR *path) +{ + struct stat sb; + short attr; if (stat(path, &sb) == 0) { -#ifndef WIN32 if (S_ISDIR(sb.st_mode)) { - return(FILEATTR_DIRECTORY); + return FILEATTR_DIRECTORY; } attr = 0; if (!(sb.st_mode & S_IWUSR)) { attr |= FILEATTR_READONLY; } -#else - if (sb.st_mode & _S_IFDIR) { - attr = FILEATTR_DIRECTORY; - } - else { - attr = 0; - } - if (!(sb.st_mode & S_IWRITE)) { - attr |= FILEATTR_READONLY; - } -#endif - return(attr); + return attr; } - return(-1); + return -1; } -short file_getdatetime(FILEH handle, DOSDATE *dosdate, DOSTIME *dostime) { +static BOOL +cnvdatetime(struct stat *sb, DOSDATE *dosdate, DOSTIME *dostime) +{ + struct tm *ftime; -struct stat sb; -struct tm *ftime; - - if (fstat(fileno(handle), &sb) == 0) { - ftime = localtime(&sb.st_mtime); - if (ftime) { - if (dosdate) { - dosdate->year = ftime->tm_year + 1900; - dosdate->month = ftime->tm_mon + 1; - dosdate->day = ftime->tm_mday; - } - if (dostime) { - dostime->hour = ftime->tm_hour; - dostime->minute = ftime->tm_min; - dostime->second = ftime->tm_sec; - } - return(0); + ftime = localtime(&sb->st_mtime); + if (ftime) { + if (dosdate) { + dosdate->year = ftime->tm_year + 1900; + dosdate->month = ftime->tm_mon + 1; + dosdate->day = ftime->tm_mday; + } + if (dostime) { + dostime->hour = ftime->tm_hour; + dostime->minute = ftime->tm_min; + dostime->second = ftime->tm_sec; } + return SUCCESS; } - return(-1); + return FAILURE; +} + +short +file_getdatetime(FILEH handle, DOSDATE *dosdate, DOSTIME *dostime) +{ + struct stat sb; + + if ((fstat(fileno(handle), &sb) == 0) + && (cnvdatetime(&sb, dosdate, dostime))) + return 0; + return -1; } -short file_delete(const char *path) { +short +file_delete(const OEMCHAR *path) +{ - return(unlink(path)); + return (short)unlink(path); } -short file_dircreate(const char *path) { +short +file_dircreate(const OEMCHAR *path) +{ -#ifndef WIN32 - return((short)mkdir(path, 0777)); -#else - return((short)mkdir(path)); -#endif + return (short)mkdir(path, 0777); } -/* ¥«¥ì¥ó¥È¥Õ¥¡¥¤¥ëÁàºî */ -void file_setcd(const char *exepath) { +/* ¡¦¥©¡¦ø§ó¥È¥Õ¥¡¥¤¥ëÁàº*/ +void +file_setcd(const OEMCHAR *exepath) +{ milstr_ncpy(curpath, exepath, sizeof(curpath)); curfilep = file_getname(curpath); *curfilep = '\0'; } -char *file_getcd(const char *sjis) { +char * +file_getcd(const OEMCHAR *filename) +{ *curfilep = '\0'; - file_catname(curpath, sjis, sizeof(curpath)); - return(curpath); + file_catname(curpath, filename, sizeof(curpath)); + return curpath; } -FILEH file_open_c(const char *sjis) { +FILEH +file_open_c(const OEMCHAR *filename) +{ *curfilep = '\0'; - file_catname(curpath, sjis, sizeof(curpath)); - return(file_open(curpath)); + file_catname(curpath, filename, sizeof(curpath)); + return file_open(curpath); } -FILEH file_open_rb_c(const char *sjis) { +FILEH +file_open_rb_c(const OEMCHAR *filename) +{ *curfilep = '\0'; - file_catname(curpath, sjis, sizeof(curpath)); - return(file_open_rb(curpath)); + file_catname(curpath, filename, sizeof(curpath)); + return file_open_rb(curpath); } -FILEH file_create_c(const char *sjis) { +FILEH +file_create_c(const OEMCHAR *filename) +{ *curfilep = '\0'; - file_catname(curpath, sjis, sizeof(curpath)); - return(file_create(curpath)); + file_catname(curpath, filename, sizeof(curpath)); + return file_create(curpath); } -short file_delete_c(const char *sjis) { +short +file_delete_c(const OEMCHAR *filename) +{ *curfilep = '\0'; - file_catname(curpath, sjis, sizeof(curpath)); - return(file_delete(curpath)); + file_catname(curpath, filename, sizeof(curpath)); + return file_delete(curpath); } -short file_attr_c(const char *sjis) { +short +file_attr_c(const OEMCHAR *filename) +{ *curfilep = '\0'; - file_catname(curpath, sjis, sizeof(curpath)); - return(file_attr_c(curpath)); + file_catname(curpath, filename, sizeof(curpath)); + return file_attr_c(curpath); } +FLISTH +file_list1st(const OEMCHAR *dir, FLINFO *fli) +{ + FLISTH ret; + + ret = (FLISTH)_MALLOC(sizeof(_FLISTH), "FLISTH"); + if (ret == NULL) { + VERBOSE(("file_list1st: couldn't alloc memory (size = %d)", sizeof(_FLISTH))); + return FLISTH_INVALID; + } + + milstr_ncpy(ret->path, dir, sizeof(ret->path)); + file_setseparator(ret->path, sizeof(ret->path)); + ret->hdl = opendir(ret->path); + VERBOSE(("file_list1st: opendir(%s)", ret->path)); + if (ret->hdl == NULL) { + VERBOSE(("file_list1st: opendir failure")); + _MFREE(ret); + return FLISTH_INVALID; + } + if (file_listnext((FLISTH)ret, fli) == SUCCESS) { + return (FLISTH)ret; + } + VERBOSE(("file_list1st: file_listnext failure")); + closedir(ret->hdl); + _MFREE(ret); + return FLISTH_INVALID; +} + +BOOL +file_listnext(FLISTH hdl, FLINFO *fli) +{ + OEMCHAR buf[MAX_PATH]; + struct dirent *de; + struct stat sb; + + de = readdir(hdl->hdl); + if (de == NULL) { + VERBOSE(("file_listnext: readdir failure")); + return FAILURE; + } -static int euckanji1st(const char *str, int pos) { + milstr_ncpy(buf, hdl->path, sizeof(buf)); + milstr_ncat(buf, de->d_name, sizeof(buf)); + if (stat(buf, &sb) != 0) { + VERBOSE(("file_listnext: stat failure. (path = %s)", buf)); + return FAILURE; + } + + fli->caps = FLICAPS_SIZE | FLICAPS_ATTR | FLICAPS_DATE | FLICAPS_TIME; + fli->size = sb.st_size; + fli->attr = 0; + if (S_ISDIR(sb.st_mode)) { + fli->attr |= FILEATTR_DIRECTORY; + } + if (!(sb.st_mode & S_IWUSR)) { + fli->attr |= FILEATTR_READONLY; + } + cnvdatetime(&sb, &fli->date, &fli->time); + milstr_ncpy(fli->path, de->d_name, sizeof(fli->path)); + VERBOSE(("file_listnext: success")); + return SUCCESS; +} - int ret; +void +file_listclose(FLISTH hdl) +{ - ret = 0; - while((pos >= 0) && - (((str[pos--] - 0xa1) & 0xff) < 0x5d)) { - ret ^= 1; + if (hdl) { + closedir(hdl->hdl); + _MFREE(hdl); } - return(ret); } -void file_cpyname(char *dst, const char *src, int maxlen) { +static int +euckanji1st(const OEMCHAR *str, int pos) +{ + int ret; + int c; - int i; + for (ret = 0; pos >= 0; ret ^= 1) { + c = (UINT8)str[pos--]; + if (!ISKANJI(c)) + break; + } + return ret; +} + +void +file_cpyname(OEMCHAR *dst, const OEMCHAR *src, int maxlen) +{ + int i; - if (maxlen--) { - for (i=0; i 0) { + for (i = 0; i < maxlen && src[i] != '\0'; i++) { dst[i] = src[i]; } - if (i) { + if (i > 0) { if (euckanji1st(src, i-1)) { i--; } @@ -220,117 +332,101 @@ void file_cpyname(char *dst, const char } } -void file_catname(char *path, const char *sjis, int maxlen) { +void +file_catname(OEMCHAR *path, const OEMCHAR *filename, int maxlen) +{ - while(maxlen) { + for (; maxlen > 0; path++, maxlen--) { if (*path == '\0') { break; } - path++; - maxlen--; } - if (maxlen) { - codecnv_sjis2euc(path, maxlen, sjis, (UINT)-1); - while(1) { + if (maxlen > 0) { + milstr_ncpy(path, filename, maxlen); + for (; *path != '\0'; path++) { if (!ISKANJI(*path)) { - if (*(path+1) == '\0') { + path++; + if (*path == '\0') { break; } - path++; - } - else if ((((*path) - 0x41) & 0xff) < 26) { + } else if (((*path - 0x41) & 0xff) < 26) { *path |= 0x20; - } - else if (*path == '\\') { + } else if (*path == '\\') { *path = '/'; } - else if (*path == '\0') { - break; - } - path++; } } } -BOOL file_cmpname(char *path, const char *sjis) { - - char euc[MAX_PATH]; +BOOL +file_cmpname(const OEMCHAR *path, const OEMCHAR *path2) +{ - codecnv_sjis2euc(euc, sizeof(euc), sjis, (UINT)-1); - return(strcmp(path, euc)); + return strcmp(path, path2); } -char *file_getname(char *path) { +OEMCHAR * +file_getname(const OEMCHAR *path) +{ + const OEMCHAR *ret; - char *ret; - - ret = path; - while(1) { + for (ret = path; *path != '\0'; path++) { if (ISKANJI(*path)) { - if (*(path+1) == '\0') { + path++; + if (*path == '\0') { break; } - path++; - } - else if (*path == '/') { + } else if (*path == '/') { ret = path + 1; } - else if (*path == '\0') { - break; - } - path++; } - return(ret); + return (OEMCHAR *)ret; } -void file_cutname(char *path) { - - char *p; +void +file_cutname(OEMCHAR *path) +{ + OEMCHAR *p; p = file_getname(path); *p = '\0'; } -char *file_getext(char *path) { +OEMCHAR * +file_getext(const OEMCHAR *path) +{ + const OEMCHAR *p, *q; - char *p; - char *q; - - p = file_getname(path); - q = NULL; - while(*p != '\0') { + for (p = file_getname(path), q = NULL; *p != '\0'; p++) { if (*p == '.') { q = p + 1; } - p++; } if (q == NULL) { q = p; } - return(q); + return (char *)q; } -void file_cutext(char *path) { +void +file_cutext(OEMCHAR *path) +{ + OEMCHAR *p, *q; - char *p; - char *q; - - p = file_getname(path); - q = NULL; - while(*p != '\0') { + for (p = file_getname(path), q = NULL; *p != '\0'; p++) { if (*p == '.') { q = p; } - p++; } if (q != NULL) { *q = '\0'; } } -void file_cutseparator(char *path) { - - int pos; +void +file_cutseparator(OEMCHAR *path) +{ + int pos; pos = strlen(path) - 1; if ((pos > 0) && (path[pos] == '/')) { @@ -338,9 +434,10 @@ void file_cutseparator(char *path) { } } -void file_setseparator(char *path, int maxlen) { - - int pos; +void +file_setseparator(OEMCHAR *path, int maxlen) +{ + int pos; pos = strlen(path); if ((pos) && (path[pos-1] != '/') && ((pos + 2) < maxlen)) { @@ -348,4 +445,3 @@ void file_setseparator(char *path, int m path[pos] = '\0'; } } -