--- np2/macos9/ini.cpp 2003/10/23 07:20:43 1.1 +++ np2/macos9/ini.cpp 2003/11/11 17:19:38 1.4 @@ -207,7 +207,7 @@ const INITBL *pterm; } milstr_ncpy(work, "[", sizeof(work)); milstr_ncat(work, title, sizeof(work)); - milstr_ncat(work, "]\r\n", sizeof(work)); + milstr_ncat(work, "]\r", sizeof(work)); file_write(fh, work, strlen(work)); p = tbl; @@ -230,39 +230,39 @@ const INITBL *pterm; break; case INITYPE_SINT8: - SPRINTF(work, "%d", *((char *)p->value)); + SPRINTF(work, str_d, *((char *)p->value)); break; case INITYPE_SINT16: - SPRINTF(work, "%d", *((SINT16 *)p->value)); + SPRINTF(work, str_d, *((SINT16 *)p->value)); break; case INITYPE_SINT32: - SPRINTF(work, "%d", *((SINT32 *)p->value)); + SPRINTF(work, str_d, *((SINT32 *)p->value)); break; case INITYPE_UINT8: - SPRINTF(work, "%u", *((BYTE *)p->value)); + SPRINTF(work, str_u, *((BYTE *)p->value)); break; case INITYPE_UINT16: - SPRINTF(work, "%u", *((UINT16 *)p->value)); + SPRINTF(work, str_u, *((UINT16 *)p->value)); break; case INITYPE_UINT32: - SPRINTF(work, "%u", *((UINT32 *)p->value)); + SPRINTF(work, str_u, *((UINT32 *)p->value)); break; case INITYPE_HEX8: - SPRINTF(work, "%x", *((BYTE *)p->value)); + SPRINTF(work, str_x, *((BYTE *)p->value)); break; case INITYPE_HEX16: - SPRINTF(work, "%x", *((UINT16 *)p->value)); + SPRINTF(work, str_x, *((UINT16 *)p->value)); break; case INITYPE_HEX32: - SPRINTF(work, "%x", *((UINT32 *)p->value)); + SPRINTF(work, str_x, *((UINT32 *)p->value)); break; default: @@ -273,7 +273,7 @@ const INITBL *pterm; file_write(fh, p->item, strlen(p->item)); file_write(fh, " = ", 3); file_write(fh, work, strlen(work)); - file_write(fh, "\r\n", 2); + file_write(fh, "\r", 1); } p++; } @@ -352,6 +352,7 @@ static const INITBL iniitem[] = { {"pc9861_j", INITYPE_BYTEARG, np2cfg.pc9861jmp, 6}, {"calendar", INITYPE_BOOL, &np2cfg.calendar, 0}, {"USE144FD", INITYPE_BOOL, &np2cfg.usefd144, 0}, + {"e_resume", INITYPE_BOOL, &np2oscfg.resume, 0}, {"I286SAVE", INITYPE_BOOL, &np2oscfg.I286SAVE, 0}}; #define INIITEMS (sizeof(iniitem) / sizeof(INITBL)) @@ -361,7 +362,7 @@ void initload(void) { char path[MAX_PATH]; - milstr_ncpy(path, file_getcd(inifile), sizeof(path)); + file_cpyname(path, file_getcd(inifile), sizeof(path)); ini_read(path, ini_title, iniitem, INIITEMS); } @@ -369,7 +370,7 @@ void initsave(void) { char path[MAX_PATH]; - milstr_ncpy(path, file_getcd(inifile), sizeof(path)); + file_cpyname(path, file_getcd(inifile), sizeof(path)); ini_write(path, ini_title, iniitem, INIITEMS); }