jrd/irssi
1
0
Fork 0
forked from PsychoticNinja/irssi
Code Issues Pull Requests Projects Releases Wiki Activity

/HELP can now display help of non-commands if the file just exists in

Browse Source 
help directory


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1289 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-02-22 20:51:26 +00:00 committed by cras
parent 68652116e8
commit acf0dd879e
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/fe-common/core/fe-help.c
View File

@ -107,7 +107,7 @@ static void help_category(GSList *cmdlist, int items)
g_free(linebuf); g_free(linebuf);
} }
static int show_help_rec(COMMAND_REC *cmd) static int show_help_file(const char *file)
{ {
const char *helppath; const char *helppath;
char tmpbuf[1024], *str, *path; char tmpbuf[1024], *str, *path;
@ -117,9 +117,7 @@ static int show_help_rec(COMMAND_REC *cmd)
helppath = settings_get_str("help_path"); helppath = settings_get_str("help_path");
/* helpdir/command or helpdir/category/command */ /* helpdir/command or helpdir/category/command */
path = cmd->category == NULL ? path = g_strdup_printf("%s/%s", helppath, file);
g_strdup_printf("%s/%s", helppath, cmd->cmd) :
g_strdup_printf("%s/%s/%s", helppath, cmd->category, cmd->cmd);
f = open(path, O_RDONLY); f = open(path, O_RDONLY);
g_free(path); g_free(path);
@ -146,10 +144,10 @@ static int show_help_rec(COMMAND_REC *cmd)
static void show_help(const char *data) static void show_help(const char *data)
{ {
COMMAND_REC *rec, *last, *helpitem; COMMAND_REC *rec, *last;
GSList *tmp, *cmdlist; GSList *tmp, *cmdlist;
int items, findlen; int items, findlen;
int header, found; int header, found, fullmatch;
g_return_if_fail(data != NULL); g_return_if_fail(data != NULL);
@ -157,7 +155,7 @@ static void show_help(const char *data)
commands = g_slist_sort(commands, (GCompareFunc) commands_equal); commands = g_slist_sort(commands, (GCompareFunc) commands_equal);
/* print command, sort by category */ /* print command, sort by category */
cmdlist = NULL; last = NULL; header = FALSE; helpitem = NULL; cmdlist = NULL; last = NULL; header = FALSE; fullmatch = FALSE;
items = 0; findlen = strlen(data); found = FALSE; items = 0; findlen = strlen(data); found = FALSE;
for (tmp = commands; tmp != NULL; last = rec, tmp = tmp->next) { for (tmp = commands; tmp != NULL; last = rec, tmp = tmp->next) {
rec = tmp->data; rec = tmp->data;
@ -188,7 +186,7 @@ static void show_help(const char *data)
if ((int)strlen(rec->cmd) >= findlen && if ((int)strlen(rec->cmd) >= findlen &&
g_strncasecmp(rec->cmd, data, findlen) == 0) { g_strncasecmp(rec->cmd, data, findlen) == 0) {
if (rec->cmd[findlen] == '\0') { if (rec->cmd[findlen] == '\0') {
helpitem = rec; fullmatch = TRUE;
found = TRUE; found = TRUE;
break; break;
} }
@ -201,7 +199,7 @@ static void show_help(const char *data)
} }
} }
if (!found || (helpitem != NULL && !show_help_rec(helpitem))) { if ((!found || fullmatch) && !show_help_file(data)) {
printtext(NULL, NULL, MSGLEVEL_CLIENTCRAP, printtext(NULL, NULL, MSGLEVEL_CLIENTCRAP,
"No help for %s", data); "No help for %s", data);
} }