Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-12-25 17:29:19 +00:00
Code Issues Projects Releases Wiki Activity

Host OS name representation must be large enough to handle any kind of native

Browse Source 
encoding (e.g. UTF-8 on MacOS X).
This commit is contained in:
gbeauche 2007-11-03 09:59:39 +00:00
parent 9000d4f54c
commit d83c11faa2
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
BasiliskII/src/extfs.cpp
View File

@ -158,8 +158,8 @@ struct FSItem {
uint32 id; // CNID of this file/dir uint32 id; // CNID of this file/dir
uint32 parent_id; // CNID of parent file/dir uint32 parent_id; // CNID of parent file/dir
FSItem *parent; // Pointer to parent FSItem *parent; // Pointer to parent
char name[32]; // Object name (C string) - Host OS char *name; // Object name (C string) - Host OS
char guest_name[32]; // Object name (C string) - Guest OS char guest_name[32]; // Object name (C string) - Guest OS
time_t mtime; // Modification time for get_cat_info caching time_t mtime; // Modification time for get_cat_info caching
int cache_dircount; // Cached number of files in directory int cache_dircount; // Cached number of files in directory
}; };
@ -235,8 +235,8 @@ static FSItem *create_fsitem(const char *name, const char *guest_name, FSItem *p
p->id = next_cnid++; p->id = next_cnid++;
p->parent_id = parent->id; p->parent_id = parent->id;
p->parent = parent; p->parent = parent;
strncpy(p->name, name, 31); p->name = new char[strlen(name) + 1];
p->name[31] = 0; strcpy(p->name, name);
strncpy(p->guest_name, guest_name, 31); strncpy(p->guest_name, guest_name, 31);
p->guest_name[31] = 0; p->guest_name[31] = 0;
p->mtime = 0; p->mtime = 0;
@ -416,6 +416,7 @@ void ExtFSInit(void)
p->id = ROOT_PARENT_ID; p->id = ROOT_PARENT_ID;
p->parent_id = 0; p->parent_id = 0;
p->parent = NULL; p->parent = NULL;
p->name = new char[1];
p->name[0] = 0; p->name[0] = 0;
p->guest_name[0] = 0; p->guest_name[0] = 0;
@ -427,8 +428,9 @@ void ExtFSInit(void)
p->id = ROOT_ID; p->id = ROOT_ID;
p->parent_id = ROOT_PARENT_ID; p->parent_id = ROOT_PARENT_ID;
p->parent = first_fs_item; p->parent = first_fs_item;
strncpy(p->name, GetString(STR_EXTFS_VOLUME_NAME), 32); const char *volume_name = GetString(STR_EXTFS_VOLUME_NAME);
p->name[31] = 0; p->name = new char[strlen(volume_name) + 1];
strcpy(p->name, volume_name);
strncpy(p->guest_name, host_encoding_to_macroman(p->name), 32); strncpy(p->guest_name, host_encoding_to_macroman(p->name), 32);
p->guest_name[31] = 0; p->guest_name[31] = 0;
@ -453,6 +455,7 @@ void ExtFSExit(void)
FSItem *p = first_fs_item, *next; FSItem *p = first_fs_item, *next;
while (p) { while (p) {
next = p->next; next = p->next;
delete[] p->name;
delete p; delete p;
p = next; p = next;
} }