Added printtext_string() which works like printtext(), except it prints

text from a string, so that %s, %d, etc. don't work. Changed perl's
Irssi::print() use this instead as well as /HELP printer.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1072 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-01-05 08:30:01 +00:00 committed by cras
commit 86aa2d514d
6 changed files with 24 additions and 51 deletions

View file

@ -30,23 +30,15 @@ void
print(str, level=MSGLEVEL_CLIENTNOTICE)
char *str
int level;
PREINIT:
char *fixed;
CODE:
fixed = perl_fix_formats(str);
printtext(NULL, NULL, level, fixed);
g_free(fixed);
printtext_string(NULL, NULL, level, str);
void
print_window(str, level=MSGLEVEL_CLIENTNOTICE)
char *str
int level;
PREINIT:
char *fixed;
CODE:
fixed = perl_fix_formats(str);
printtext_window(active_win, level, fixed);
g_free(fixed);
printtext_window(active_win, level, str);
void
command(cmd, server=active_win->active_server, item=active_win->active)

View file

@ -426,41 +426,6 @@ void printformat_perl(TEXT_DEST_REC *dest, char *format, char **arglist)
g_free(module);
}
/* change all %s strings to %%s */
char *perl_fix_formats(char *str)
{
char *ret, *out;
out = ret = g_malloc(strlen(str)*2+1);
while (*str != '\0') {
if (*str == '%') {
str++;
switch (*str) {
case 's':
case 'd':
case 'f':
case 'u':
case 'l':
case '%':
*out++ = '%';
*out++ = '%';
if (*str == '%')
str += 2;
break;
default:
*out++ = '%';
break;
}
continue;
}
*out++ = *str++;
}
*out = '\0';
return ret;
}
void perl_command(const char *cmd, SERVER_REC *server, WI_ITEM_REC *item)
{
const char *cmdchars;

View file

@ -42,9 +42,6 @@ void irssi_add_plains(PLAIN_OBJECT_INIT_REC *objects);
char *perl_get_use_list(void);
/* change all %s strings to %%s */
char *perl_fix_formats(char *str);
void perl_common_init(void);
void perl_common_deinit(void);