Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-12 21:18:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Lazily load history file

Browse source 
darcs-hash:20060206150810-ac50b-f4e5fe9312aa898fa025d2874444c4fc5724c309.gz
This commit is contained in:
axel 2006-02-07 01:08:10 +10:00
parent 585191310b
commit cf3d30d4e4
2 changed files with 43 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
history.c
View file

@ -45,6 +45,8 @@ typedef struct
The last item loaded from file The last item loaded from file
*/ */
ll_node_t *last_loaded; ll_node_t *last_loaded;
int is_loaded;
} }
history_data; history_data;
@ -82,25 +84,31 @@ static wchar_t *mode_name;
*/ */
static hash_table_t history_table; static hash_table_t history_table;
/**
Flag, set to 1 once the history file has been loaded
*/
static int is_loaded;
/** /**
Load history from ~/.fish_history Load history from file
*/ */
static void history_load( wchar_t *name ) static void history_load()
{ {
wchar_t *fn; wchar_t *fn;
wchar_t *buff=0; wchar_t *buff=0;
int buff_len=0; int buff_len=0;
FILE *in_stream; FILE *in_stream;
hash_table_t used; hash_table_t used;
is_loaded = 1;
block(); block();
hash_init2( &used, hash_init2( &used,
&hash_wcs_func, &hash_wcs_func,
&hash_wcs_cmp, &hash_wcs_cmp,
4096 ); 4096 );
fn = wcsdupcat2( env_get(L"HOME"), L"/.", name, L"_history", 0 ); fn = wcsdupcat2( env_get(L"HOME"), L"/.", mode_name, L"_history", 0 );
in_stream = wfopen( fn, "r" ); in_stream = wfopen( fn, "r" );
@ -111,7 +119,7 @@ static void history_load( wchar_t *name )
int buff_read = fgetws2( &buff, &buff_len, in_stream ); int buff_read = fgetws2( &buff, &buff_len, in_stream );
if( buff_read == -1 ) if( buff_read == -1 )
{ {
debug( 1, L"The following non-fatal error occurred while reading command history from \'%ls\':", name ); debug( 1, L"The following non-fatal error occurred while reading command history from \'%ls\':", mode_name );
wperror( L"fgetws2" ); wperror( L"fgetws2" );
fclose( in_stream ); fclose( in_stream );
free( fn ); free( fn );
@ -161,7 +169,7 @@ static void history_load( wchar_t *name )
{ {
if( errno != ENOENT ) if( errno != ENOENT )
{ {
debug( 1, L"The following non-fatal error occurred while reading command history from \'%ls\':", name ); debug( 1, L"The following non-fatal error occurred while reading command history from \'%ls\':", mode_name );
wperror( L"fopen" ); wperror( L"fopen" );
} }
@ -198,6 +206,7 @@ static void history_to_hash()
d->last=history_last; d->last=history_last;
d->last_loaded=last_loaded; d->last_loaded=last_loaded;
d->count=history_count; d->count=history_count;
d->is_loaded = is_loaded;
hash_put( &history_table, hash_put( &history_table,
mode_name, mode_name,
@ -223,13 +232,14 @@ void history_set_mode( wchar_t *name )
history_current = history_last = curr->last; history_current = history_last = curr->last;
last_loaded = curr->last_loaded; last_loaded = curr->last_loaded;
history_count = curr->count; history_count = curr->count;
is_loaded = curr->is_loaded;
} }
else else
{ {
history_count=0; history_count=0;
history_last = history_current = last_loaded=0; history_last = history_current = last_loaded=0;
mode_name = wcsdup( name ); mode_name = wcsdup( name );
history_load( name ); is_loaded = 0;
} }
past_end=1; past_end=1;
@ -259,6 +269,9 @@ static void history_save()
/* First we save this sessions history in local variables */ /* First we save this sessions history in local variables */
ll_node_t *real_pos = history_last, *real_first = last_loaded; ll_node_t *real_pos = history_last, *real_first = last_loaded;
if( !is_loaded )
return;
if( !real_first ) if( !real_first )
{ {
real_first = history_current; real_first = history_current;
@ -390,6 +403,9 @@ void history_destroy()
*/ */
static ll_node_t *history_find( ll_node_t *n, const wchar_t *s ) static ll_node_t *history_find( ll_node_t *n, const wchar_t *s )
{ {
if( !is_loaded )
history_load();
if( n == 0 ) if( n == 0 )
return 0; return 0;
@ -406,6 +422,9 @@ void history_add( const wchar_t *str )
{ {
ll_node_t *old_node; ll_node_t *old_node;
if( !is_loaded )
history_load();
if( wcslen( str ) == 0 ) if( wcslen( str ) == 0 )
return; return;
@ -460,6 +479,9 @@ static int history_test( const wchar_t *needle, const wchar_t *haystack )
const wchar_t *history_prev_match( const wchar_t *str ) const wchar_t *history_prev_match( const wchar_t *str )
{ {
if( !is_loaded )
history_load();
if( history_current == 0 ) if( history_current == 0 )
return str; return str;
@ -481,6 +503,9 @@ const wchar_t *history_prev_match( const wchar_t *str )
const wchar_t *history_next_match( const wchar_t *str) const wchar_t *history_next_match( const wchar_t *str)
{ {
if( !is_loaded )
history_load();
if( history_current == 0 ) if( history_current == 0 )
return str; return str;
@ -507,15 +532,21 @@ void history_reset()
*/ */
void history_first() void history_first()
{ {
while( history_current->prev ) if( is_loaded )
history_current = history_current->prev; while( history_current->prev )
history_current = history_current->prev;
} }
wchar_t *history_get( int idx ) wchar_t *history_get( int idx )
{ {
ll_node_t *n=history_last; ll_node_t *n;
int i; int i;
if( !is_loaded )
history_load();
n = history_last;
if( idx<0) if( idx<0)
{ {
debug( 1, L"Tried to access negative history index %d", idx ); debug( 1, L"Tried to access negative history index %d", idx );

3
history.h
View file

@ -8,7 +8,8 @@
#include <wchar.h> #include <wchar.h>
/** /**
Load history from file. Init history library. The history file won't actually be loaded
until the first time a history search is performed.
*/ */
void history_init(); void history_init();