Added SILC Thread Queue API

[crypto.git] / apps / irssi / src / lib-popt / popthelp.c

diff --git a/apps/irssi/src/lib-popt/popthelp.c b/apps/irssi/src/lib-popt/popthelp.c
index c1876d74ed18369db56b91e33aea6a9bc5a45c7d..15ed2d9539faf2dba1b898151e87caca1ef503e0 100644 (file)
--- a/apps/irssi/src/lib-popt/popthelp.c
+++ b/apps/irssi/src/lib-popt/popthelp.c
@@ -94,15 +94,15 @@ static void singleOptionHelp(FILE * f, int maxLeftCol,
     helpLength = strlen(help);
     while (helpLength > lineLength) {
        ch = help + lineLength - 1;
-       while (ch > help && !isspace(*ch)) ch--;
+       while (ch > help && !i_isspace(*ch)) ch--;
        if (ch == help) break;          /* give up */
-       while (ch > (help + 1) && isspace(*ch)) ch--;
+       while (ch > (help + 1) && i_isspace(*ch)) ch--;
        ch++;
 
        sprintf(format, "%%.%ds\n%%%ds", (int) (ch - help), indentLength);
        fprintf(f, format, help, " ");
        help = ch;
-       while (isspace(*help) && *help) help++;
+       while (i_isspace(*help) && *help) help++;
        helpLength = strlen(help);
     }
 
@@ -175,7 +175,7 @@ static int showHelpIntro(poptContext con, FILE * f) {
     fprintf(f, POPT_("Usage:"));
     if (!(con->flags & POPT_CONTEXT_KEEP_FIRST)) {
        fn = con->optionStack->argv[0];
-       if (strchr(fn, '/')) fn = strchr(fn, '/') + 1;
+       if (strrchr(fn, '/')) fn = strrchr(fn, '/') + 1;
        fprintf(f, " %s", fn);
        len += strlen(fn) + 1;
     }