Petite modif de autbasename

This commit is contained in:
Ludovic Jacomme 2002-07-30 10:06:14 +00:00
parent e96402cefc
commit e6b6914dd6
3 changed files with 13 additions and 9 deletions

View File

@ -113,7 +113,7 @@ extern "C" {
# define autbegin() do { \
\
if ( AUT_DEBUG_ON ) addautdebug(__LINE__,basename(__FILE__)); } while (0)
if ( AUT_DEBUG_ON ) addautdebug(__LINE__,autbasename(__FILE__,NULL)); } while (0)
# define autend() do { \
\

View File

@ -119,16 +119,20 @@ char *autbasename( Name, Extension )
int Index;
char *NewName;
NewName = mbkstrdup( Name );
Index = strlen( NewName ) - (strlen( Extension ) + 1);
NewName = basename( mbkstrdup( Name ) );
if ( Index >= 0 )
if ( Extension != (char *)0 )
{
if ( ! strcmp( NewName + Index + 1, Extension ) )
Index = strlen( NewName ) - (strlen( Extension ) + 1);
if ( Index >= 0 )
{
if ( NewName[ Index ] == '.' )
if ( ! strcmp( NewName + Index + 1, Extension ) )
{
NewName[ Index ] = '\0';
if ( NewName[ Index ] == '.' )
{
NewName[ Index ] = '\0';
}
}
}
}

View File

@ -82,9 +82,9 @@
\------------------------------------------------------------*/
# define auterror( E, V ) \
(aut_error( (int)(E), (char *)(V), basename(__FILE__), __LINE__ ))
(aut_error( (int)(E), (char *)(V), autbasename(__FILE__,NULL), __LINE__ ))
# define autwarning( W, V ) \
(aut_warning( (int)(W), (char *)(V), basename(__FILE__), __LINE__ ))
(aut_warning( (int)(W), (char *)(V), autbasename(__FILE__,NULL), __LINE__ ))
/*------------------------------------------------------------\
| |