SoniEx2
/
c.sexchat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #929 from hexchat/928 

Fix scrollback_load to deal with e.g. the output of /HELP
This commit is contained in:
Richard Hitt 2014-03-30 20:09:37 -07:00
parent 1a3bfdce75 4ca9672a92
commit 5e8bc980e1
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/common/text.c
View File

@ -303,6 +303,12 @@ scrollback_load (session *sess)
buf = g_strndup (buf_tmp, n_bytes); buf = g_strndup (buf_tmp, n_bytes);
g_free (buf_tmp); g_free (buf_tmp);
/*
* Some scrollback lines have three blanks after the timestamp and a newline
* Some have only one blank and a newline
* Some don't even have a timestamp
* Some don't have any text at all
*/
if (buf[0] == 'T') if (buf[0] == 'T')
{ {
if (sizeof (time_t) == 4) if (sizeof (time_t) == 4)
@ -310,7 +316,7 @@ scrollback_load (session *sess)
else else
stamp = strtoull (buf + 2, NULL, 10); /* in case time_t is 64 bits */ stamp = strtoull (buf + 2, NULL, 10); /* in case time_t is 64 bits */
text = strchr (buf + 3, ' '); text = strchr (buf + 3, ' ');
if (text) if (text && text[1])
{ {
if (prefs.hex_text_stripcolor_replay) if (prefs.hex_text_stripcolor_replay)
{ {
@ -324,8 +330,19 @@ scrollback_load (session *sess)
g_free (text); g_free (text);
} }
} }
lines++; else
{
fe_print_text (sess, " ", stamp, TRUE);
}
} }
else
{
if (strlen (buf))
fe_print_text (sess, buf, 0, TRUE);
else
fe_print_text (sess, " ", 0, TRUE);
}
lines++;
g_free (buf); g_free (buf);
} }