RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-04 23:07:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

mcd: unbreak cue search

Browse source
This commit is contained in:
notaz 2024-07-09 22:30:17 +03:00 • committed by kub
parent 977e5db898
commit 538982b062
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
pico/cd/cd_parse.c
View file

@ -71,23 +71,23 @@ static int get_token(const char *buff, char *dest, int len)
static int get_ext(const char *fname, char ext[4], static int get_ext(const char *fname, char ext[4],
char *base, size_t base_size) char *base, size_t base_size)
{ {
int len, pos = 0; size_t pos = 0;
char *p;
len = strrchr(fname, '.') - fname; ext[0] = 0;
if (len > 0) if (!(p = strrchr(fname, '.')))
pos = len; return -1;
pos = p - fname;
strncpy(ext, fname + pos + 1, 4/*sizeof(ext)*/-1); strncpy(ext, fname + pos + 1, 4/*sizeof(ext)*/-1);
ext[4/*sizeof(ext)*/-1] = '\0'; ext[4/*sizeof(ext)*/-1] = '\0';
if (base != NULL && base_size > 0) { if (base != NULL && base_size > 0) {
if (pos + 1 < base_size) if (pos >= base_size)
pos = base_size - 1; pos = base_size - 1;
len = (pos < len) ? pos : len; memcpy(base, fname, pos);
base[pos] = 0;
memcpy(base, fname, len);
base[len] = 0;
} }
return pos; return pos;
} }
@ -219,17 +219,17 @@ cd_data_t *cue_parse(const char *fname)
if (fname == NULL || (fname_len = strlen(fname)) == 0) if (fname == NULL || (fname_len = strlen(fname)) == 0)
return NULL; return NULL;
ret = get_ext(fname, ext, cue_base, sizeof(cue_base)); ret = get_ext(fname, ext, cue_base, sizeof(cue_base) - 4);
if (strcasecmp(ext, "cue") == 0) { if (strcasecmp(ext, "cue") == 0) {
f = fopen(fname, "r"); f = fopen(fname, "r");
} }
else { else if (strcasecmp(ext, "chd") != 0) {
// not a .cue, try one with the same base name // not a .cue, try one with the same base name
if (ret + 3 < sizeof(cue_base)) { if (0 < ret && ret < sizeof(cue_base)) {
strcpy(cue_base + ret, "cue"); strcpy(cue_base + ret, ".cue");
f = fopen(cue_base, "r"); f = fopen(cue_base, "r");
if (f == NULL) { if (f == NULL) {
strcpy(cue_base + ret, "CUE"); strcpy(cue_base + ret, ".CUE");
f = fopen(cue_base, "r"); f = fopen(cue_base, "r");
} }
} }