github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-23 06:05:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move parts of the command description lookup code to a shellscript function

Browse Source 
darcs-hash:20060203172736-ac50b-95430eb4ca0d7ee2859237e8543a4e0883349fdb.gz
This commit is contained in:
axel 2006-02-04 03:27:36 +10:00
parent f71cd494de
commit f13262d87e
3 changed files with 23 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
complete.c
View File

@ -1053,10 +1053,9 @@ static void complete_cmd_desc( const wchar_t *cmd, array_list_t *comp )
int i;
const wchar_t *cmd_start;
int cmd_len;
wchar_t *apropos_cmd=0;
wchar_t *lookup_cmd=0;
array_list_t list;
hash_table_t lookup;
wchar_t *whatis_path = env_get( L"__fish_whatis_path" );
wchar_t *esc;
if( !cmd )
@ -1076,7 +1075,7 @@ static void complete_cmd_desc( const wchar_t *cmd, array_list_t *comp )
to many results - require at least two characters if we don't
know the location of the whatis-database.
*/
if( (cmd_len < 2) && (!whatis_path) )
if(cmd_len < 2 )
return;
if( wildcard_has( cmd_start, 0 ) )
@ -1086,14 +1085,7 @@ static void complete_cmd_desc( const wchar_t *cmd, array_list_t *comp )
esc = expand_escape( cmd_start, 1 );
if( whatis_path )
{
apropos_cmd =wcsdupcat2( L"grep ^/dev/null -F <", whatis_path, L" ", esc, 0 );
}
else
{
apropos_cmd = wcsdupcat( L"apropos ^/dev/null ", esc );
}
lookup_cmd = wcsdupcat( L"__fish_describe_command ", esc );
free(esc);
al_init( &list );
@ -1106,7 +1098,7 @@ static void complete_cmd_desc( const wchar_t *cmd, array_list_t *comp )
systems with a large set of manuals, but it should be ok
since apropos is only called once.
*/
exec_subshell( apropos_cmd, &list );
exec_subshell( lookup_cmd, &list );
/*
Then discard anything that is not a possible completion and put
the result into a hashtable with the completion as key and the
@ -1118,53 +1110,18 @@ static void complete_cmd_desc( const wchar_t *cmd, array_list_t *comp )
{
wchar_t *el = (wchar_t *)al_get( &list, i );
wchar_t *key, *key_end, *val_begin;
key = el+wcslen(cmd);
if( !el )
continue;
//fwprintf( stderr, L"%ls\n", el );
if( wcsncmp( el, cmd_start, cmd_len ) != 0 )
continue;
//fwprintf( stderr, L"%ls\n", el );
key = el + cmd_len;
key_end = wcschr( el, L' ' );
key_end = wcschr( el, L'\t' );
if( !key_end )
{
key_end = wcschr( el, L'\t' );
if( !key_end )
{
continue;
}
}
continue;
*key_end = 0;
val_begin=key_end+1;
//fwprintf( stderr, L"Key %ls\n", el );
while( *val_begin != L'-' && *val_begin)
{
val_begin++;
}
if( !*val_begin )
{
continue;
}
val_begin++;
while( *val_begin == L' ' || *val_begin == L'\t' )
{
val_begin++;
}
if( !*val_begin )
{
continue;
}
val_begin = key_end+1;
/*
And once again I make sure the first character is uppercased
because I like it that way, and I get to decide these
@ -1214,7 +1171,7 @@ static void complete_cmd_desc( const wchar_t *cmd, array_list_t *comp )
al_foreach( &list,
(void(*)(const void *))&free );
al_destroy( &list );
free( apropos_cmd );
free( lookup_cmd );
}
static const wchar_t *complete_function_desc( const wchar_t *fn )

8
exec.c
View File

@ -392,20 +392,20 @@ static int handle_child_io( io_data_t *io, int exit_on_error )
static int setup_child_process( job_t *j, process_t *p )
{
int res;
if( j->job_control )
{
pid_t pid;
/*
Put the process into the process group and give the process
group the terminal, if appropriate. This has to be done
group the terminal, if appropriate. This has to be done
both by the shell and in the individual child processes
because of potential race conditions.
*/
pid = getpid ();
if (j->pgid == 0)
j->pgid = pid;
/* Wait till shell puts us in our own group */
while( getpgrp() != j->pgid )
sleep(0);
@ -419,7 +419,7 @@ static int setup_child_process( job_t *j, process_t *p )
}
res = handle_child_io( j->io, (p==0) );
/* Set the handling for job control signals back to the default. */
if( res )
{

7
init/fish_function.fish
View File

@ -247,6 +247,13 @@ function vared -d "Edit variable value"
end
end
#
# This function is used internally by the fish command completion code
#
function __fish_describe_command -d "Command used to find descriptions for commands"
apropos $argv | sed -ne "s/^$argv\([^ ]*\) *(1) *- \(.*\)\$/$argv\1"\t"\2/p"
end
#
# This function is bound to Alt-L, it is used to list the contents of