--- np2/macos9/dosio.cpp 2004/01/23 06:03:40 1.3 +++ np2/macos9/dosio.cpp 2005/02/14 06:25:31 1.5 @@ -274,7 +274,7 @@ short file_attr(const char *path) { else { ret = FILEATTR_ARCHIVE; } - if (pb.hFileInfo.ioFlAttrib & kioFlAttribLockedMask) { + if (pb.hFileInfo.ioFlAttrib & 0x01) { ret |= FILEATTR_READONLY; } return(ret); @@ -561,7 +561,7 @@ BOOL file_listnext(FLISTH hdl, FLINFO *f fli->size = flhdl->pb.hFileInfo.ioFlLgLen; dt = flhdl->pb.hFileInfo.ioFlMdDat; } - if (flhdl->pb.hFileInfo.ioFlAttrib & kioFlAttribLockedMask) { + if (flhdl->pb.hFileInfo.ioFlAttrib & 0x01) { fli->attr |= FILEATTR_READONLY; } cnvdatetime(dt, &fli->date, &fli->time); @@ -612,9 +612,9 @@ void file_catname(char *path, const char } } -char *file_getname(char *path) { +char *file_getname(const char *path) { - char *ret; +const char *ret; ret = path; while(*path != '\0') { @@ -622,7 +622,7 @@ char *file_getname(char *path) { ret = path; } } - return(ret); + return((char *)ret); } void file_cutname(char *path) { @@ -633,10 +633,10 @@ void file_cutname(char *path) { p[0] = '\0'; } -char *file_getext(char *path) { +char *file_getext(const char *path) { - char *p; - char *q; +const char *p; +const char *q; p = file_getname(path); q = NULL; @@ -649,7 +649,7 @@ char *file_getext(char *path) { if (!q) { q = p; } - return(q); + return((char *)q); } void file_cutext(char *path) {