github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-26 10:43:47 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

mimedb: Add seperator between directory and filename in file_exists.

Browse Source 
get_filename tried to work around this with hardcoded strings that end with
a '/', but would fail to work properly for environment variables
XDG_DATA_HOME or XDG_DATA_DIRS that don't do the same.
This commit is contained in:
Dylan Smith 2010-11-26 11:25:30 -05:00 committed by Grissiom
parent fd4ac87382
commit cf0850edfd
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mimedb.c
View File

@ -240,7 +240,9 @@ static char * search_ini( const char *filename, const char *match )
*/
static char *file_exists( const char *dir, const char *in )
{
char *filename = my_malloc( strlen( dir ) + strlen(in) + 1 );
int dir_len = strlen( dir );
int need_sep = dir[dir_len - 1] != '/';
char *filename = my_malloc( dir_len + need_sep + strlen( in ) + 1 );
char *replaceme;
struct stat buf;
@ -251,7 +253,9 @@ static char *file_exists( const char *dir, const char *in )
return 0;
}
strcpy( filename, dir );
strcat( filename, in );
if ( need_sep )
filename[dir_len++] = '/';
strcpy( filename + dir_len, in );
if( !stat( filename, &buf ) )
return filename;
@ -309,12 +313,12 @@ static char *get_filename( char *f )
{
char *guessed_xdg_home;
guessed_xdg_home = my_malloc (strlen (home) + strlen ("/.local/share/") + 1);
guessed_xdg_home = my_malloc (strlen (home) + strlen ("/.local/share") + 1);
if( !guessed_xdg_home )
return 0;
strcpy (guessed_xdg_home, home);
strcat (guessed_xdg_home, "/.local/share/");
strcat (guessed_xdg_home, "/.local/share");
result = file_exists( guessed_xdg_home, f );
free (guessed_xdg_home);
@ -325,7 +329,7 @@ static char *get_filename( char *f )
xdg_data_dirs = getenv ("XDG_DATA_DIRS");
if (xdg_data_dirs == NULL)
xdg_data_dirs = "/usr/local/share/:/usr/share/";
xdg_data_dirs = "/usr/local/share:/usr/share";
ptr = xdg_data_dirs;