fte
/
quakespasm
mirror of https://github.com/Shpoike/Quakespasm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

replaced COM_FileExtension by a slightly better version from uhexen2, 

renamed it to COM_FileGetExtension, added a prototype to common.h.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@454 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
sezero 2011-05-20 20:38:11 +00:00
parent 99bbf85535
commit 5d43920b02
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Quake/common.c
View File

@ -919,23 +919,25 @@ void COM_StripExtension (const char *in, char *out)
/*
============
COM_FileExtension
COM_FileGetExtension - doesn't return NULL
============
*/
const char *COM_FileExtension (const char *in)
const char *COM_FileGetExtension (const char *in)
{
static char exten[8];
int i;
const char *src;
size_t len;
while (*in && *in != '.')
in++;
if (!*in)
len = strlen(in);
if (len < 2) /* nothing meaningful */
return "";
in++;
for (i=0 ; i<7 && *in ; i++,in++)
exten[i] = *in;
exten[i] = 0;
return exten;
src = in + len - 1;
while (src != in && src[-1] != '.')
src--;
if (src == in || strchr(src, '/') != NULL || strchr(src, '\\') != NULL)
return ""; /* no extension, or parent directory has a dot */
return src;
}
/*

1
Quake/common.h
View File

@ -178,6 +178,7 @@ const char *COM_SkipPath (const char *pathname);
void COM_StripExtension (const char *in, char *out);
void COM_FileBase (const char *in, char *out);
void COM_DefaultExtension (char *path, const char *extension);
const char *COM_FileGetExtension (const char *in);
void COM_CreatePath (char *path);
char *va (const char *format, ...) __attribute__((__format__(__printf__,1,2)));