Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rewrite set_file() to be smaller and better readable, and a comment describing what it does.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27567 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2010-07-25 22:45:57 +00:00
parent 6325ef978b
commit a3e6a865df
2 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
apps/settings.c
View file

@ -1188,33 +1188,36 @@ bool set_option(const char* string, const void* variable, enum optiontype type,
return true;
}
void set_file(const char* filename, char* setting, int maxlen)
/*
* Takes filename, removes the directory (assumed to be ROCKBOX_DIR) its in
* and the extension, and then copies the basename into setting
**/
void set_file(const char* filename, char* setting, const int maxlen)
{
const char* fptr = strrchr(filename,'/');
const char* extptr;
int len;
int extlen = 0;
const char* ptr;
if (!fptr)
return;
fptr++;
len = strlen(fptr);
ptr = fptr + len;
while ((*ptr != '.') && (ptr != fptr)) {
extlen++;
ptr--;
}
if(ptr == fptr) extlen = 0;
extptr = strrchr(fptr, '.');
if (strncasecmp(ROCKBOX_DIR, filename, strlen(ROCKBOX_DIR)) ||
(len-extlen > maxlen))
if (!extptr || extptr < fptr)
extlen = 0;
else
extlen = strlen(extptr);
len = strlen(fptr) - extlen;
/* error if filename isn't in ROCKBOX_DIR */
if (strncasecmp(ROCKBOX_DIR, filename, ROCKBOX_DIR_LEN) || (len > maxlen))
return;
strlcpy(setting, fptr, len-extlen+1);
strlcpy(setting, fptr, len+1);
settings_save();
}

4
apps/settings.h
View file

@ -55,7 +55,7 @@ struct opt_items {
#ifndef ROCKBOX_DIR
#error ROCKBOX_DIR not defined (should be in autoconf.h)
#endif
#define ROCKBOX_DIR_LEN sizeof(ROCKBOX_DIR)
#define ROCKBOX_DIR_LEN (sizeof(ROCKBOX_DIR)-1)
#endif /* def __PCTOOL__ */
@ -288,7 +288,7 @@ bool set_int_ex(const unsigned char* string, const char* unit, int voice_unit,
const char* (*formatter)(char*, size_t, int, const char*),
int32_t (*get_talk_id)(int, int));
void set_file(const char* filename, char* setting, int maxlen);
void set_file(const char* filename, char* setting, const int maxlen);
bool set_option(const char* string, const void* variable, enum optiontype type,
const struct opt_items* options, int numoptions, void (*function)(int));