gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 18:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

if module name is too long, error out rather than silently truncate

Browse Source
This commit is contained in:
bentley
2010-01-17 16:26:46 -07:00
parent a3eb287044
commit c6fb526a88
1 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/lib/library.c
View File

@@ -182,27 +182,14 @@ lib_Write(sLibrary * lib, char *filename)
return (0); return (0);
} }
void
TruncateFileName(char *dest, char *src)
{
SLONG l;
l = strlen(src) - 1;
while ((l >= 0) && (src[l] != '\\') && (src[l] != '/'))
l -= 1;
strcpy(dest, &src[l + 1]);
}
sLibrary * sLibrary *
lib_Find(sLibrary * lib, char *filename) lib_Find(sLibrary * lib, char *filename)
{ {
char truncname[MAXNAMELENGTH]; if (strlen(filename) >= MAXNAMELENGTH)
errx(5, "Module name too long: %s", filename);
TruncateFileName(truncname, filename);
while (lib) { while (lib) {
if (strcmp(lib->tName, truncname) == 0) if (strcmp(lib->tName, filename) == 0)
break; break;
lib = lib->pNext; lib = lib->pNext;
@@ -218,9 +205,9 @@ lib_AddReplace(sLibrary * lib, char *filename)
if ((f = fopen(filename, "rb"))) { if ((f = fopen(filename, "rb"))) {
sLibrary *module; sLibrary *module;
char truncname[MAXNAMELENGTH];
TruncateFileName(truncname, filename); if (strlen(filename) >= MAXNAMELENGTH)
errx(5, "Module name too long: %s", filename);
if ((module = lib_Find(lib, filename)) == NULL) { if ((module = lib_Find(lib, filename)) == NULL) {
module = malloc(sizeof *module); module = malloc(sizeof *module);
@@ -235,14 +222,14 @@ lib_AddReplace(sLibrary * lib, char *filename)
} }
module->nByteLength = file_Length(f); module->nByteLength = file_Length(f);
strcpy(module->tName, truncname); strcpy(module->tName, filename);
module->pData = malloc(module->nByteLength); module->pData = malloc(module->nByteLength);
if (!module->pData) if (!module->pData)
errx(5, "Out of memory"); errx(5, "Out of memory");
fread(module->pData, sizeof(UBYTE), module->nByteLength, f); fread(module->pData, sizeof(UBYTE), module->nByteLength, f);
printf("Added module '%s'\n", truncname); printf("Added module '%s'\n", filename);
fclose(f); fclose(f);
} }
@@ -252,16 +239,17 @@ lib_AddReplace(sLibrary * lib, char *filename)
sLibrary * sLibrary *
lib_DeleteModule(sLibrary * lib, char *filename) lib_DeleteModule(sLibrary * lib, char *filename)
{ {
char truncname[MAXNAMELENGTH];
sLibrary **pp, **first; sLibrary **pp, **first;
BBOOL found = 0; BBOOL found = 0;
pp = &lib; pp = &lib;
first = pp; first = pp;
TruncateFileName(truncname, filename); if (strlen(filename) >= MAXNAMELENGTH)
errx(5, "Module name too long: %s", filename);
while ((*pp) && (!found)) { while ((*pp) && (!found)) {
if (strcmp((*pp)->tName, truncname) == 0) { if (strcmp((*pp)->tName, filename) == 0) {
sLibrary *t; sLibrary *t;
t = *pp; t = *pp;
@@ -280,7 +268,7 @@ lib_DeleteModule(sLibrary * lib, char *filename)
if (!found) if (!found)
errx(5, "Module not found"); errx(5, "Module not found");
else else
printf("Module '%s' deleted from library\n", truncname); printf("Module '%s' deleted from library\n", filename);
return (*first); return (*first);
} }