Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 12:53:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Minor edits in parse_util.c

Browse source 
darcs-hash:20060217125205-ac50b-f3cd1572eec966581730ee1983d06b64caac566f.gz
This commit is contained in:
axel 2006-02-17 22:52:05 +10:00
parent 5dfa28059e
commit e1d0b9370e
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
parse_util.c
View file

@ -496,12 +496,13 @@ int parse_util_load( const wchar_t *cmd,
if( !all_loaded )
{
all_loaded = malloc( sizeof( hash_table_t ) );
halloc_register_function_void( global_context, &parse_util_destroy );
if( !all_loaded )
{
die_mem();
}
hash_init( all_loaded, &hash_wcs_func, &hash_wcs_cmp );
}
}
loaded = (hash_table_t *)hash_get( all_loaded, path_var );
@ -514,7 +515,6 @@ int parse_util_load( const wchar_t *cmd,
}
hash_init( loaded, &hash_wcs_func, &hash_wcs_cmp );
hash_put( all_loaded, wcsdup(path_var), loaded );
halloc_register_function_void( global_context, &parse_util_destroy );
}
/*
@ -526,8 +526,12 @@ int parse_util_load( const wchar_t *cmd,
Did we just check this?
*/
if( tm )
{
if(time(0)-tm[1]<=1)
{
return 0;
}
}
/*
Return if already loaded and we are skipping reloading
@ -558,7 +562,7 @@ int parse_util_load( const wchar_t *cmd,
if( (wstat( (wchar_t *)path->buff, &buf )== 0) &&
(waccess( (wchar_t *)path->buff, R_OK ) == 0) )
{
if( !tm || (*tm != buf.st_mtime ) )
if( !tm || (tm[0] != buf.st_mtime ) )
{
wchar_t *esc = escape( (wchar_t *)path->buff, 1 );
wchar_t *src_cmd = wcsdupcat( L". ", esc );