snow/dockapps
1
0
Fork 0
Code Issues Releases Activity

wmail: FileNameConcat does exactly the same thing as MakePathName: get rid of it.

Browse source
This commit is contained in:
Jeremy Sowden 2019-05-27 22:52:07 +01:00 committed by Carlos R. Mafra
parent a8261ff053
commit e0f5120b9d
1 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
wmail/src/wmail.c
View file

@ -188,7 +188,6 @@ void MarkName( unsigned long checksum );
void DetermineState(); void DetermineState();
void UpdateConfiguration(); void UpdateConfiguration();
void CleanupNames(); void CleanupNames();
char *FileNameConcat( const char *path, const char *fileName );
bool HasTickerWork(); bool HasTickerWork();
@ -633,7 +632,7 @@ void CheckMaildir()
while(( dirEnt = readdir( dir )) != NULL ) while(( dirEnt = readdir( dir )) != NULL )
{ {
char *fullName = FileNameConcat( config.mailBox, dirEnt->d_name ); char *fullName = MakePathName( config.mailBox, dirEnt->d_name );
struct stat fileStat; struct stat fileStat;
if ( fullName == NULL ) if ( fullName == NULL )
@ -682,7 +681,7 @@ int TraverseDirectory( const char *name, bool isNewMail )
while(( dirEnt = readdir( dir )) != NULL ) while(( dirEnt = readdir( dir )) != NULL )
{ {
char *fullName = FileNameConcat( name, dirEnt->d_name ); char *fullName = MakePathName( name, dirEnt->d_name );
struct stat fileStat; struct stat fileStat;
unsigned long checksum = 0; unsigned long checksum = 0;
name_t *name; name_t *name;
@ -723,25 +722,6 @@ int TraverseDirectory( const char *name, bool isNewMail )
return mails; return mails;
} }
char *FileNameConcat( const char *path, const char *fileName )
{
int len1 = strlen( path );
int len2 = strlen( fileName );
char *buf;
if( path[len1-1] == '/' )
--len1;
buf = (char *)malloc( len1 + len2 + 2 );
memcpy( buf, path, len1 );
buf[len1] = '/';
memcpy( &buf[len1+1], fileName, len2 );
buf[len1+len2+1] = '\0';
return buf;
}
name_t *GetMail( unsigned long checksum ) name_t *GetMail( unsigned long checksum )
{ {
name_t *name; name_t *name;