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

More minor scrollback loading improvements

This commit is contained in:
Patrick Griffis 2016-04-26 12:05:57 -04:00
parent f06a38c384
commit 5b097f560d
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/text.c
View File

@ -222,7 +222,7 @@ scrollback_load (session *sess)
GDataInputStream *istream; GDataInputStream *istream;
gchar *buf, *text; gchar *buf, *text;
gint lines = 0; gint lines = 0;
time_t stamp; time_t stamp = 0;
if (sess->text_scrollback == SET_DEFAULT) if (sess->text_scrollback == SET_DEFAULT)
{ {
@ -272,12 +272,19 @@ scrollback_load (session *sess)
* Some don't even have a timestamp * Some don't even have a timestamp
* Some don't have any text at all * Some don't have any text at all
*/ */
if (buf[0] == 'T') if (buf[0] == 'T' && buf[1] == ' ')
{ {
if (sizeof (time_t) == 4) if (sizeof (time_t) == 4)
stamp = g_ascii_strtoull (buf + 2, NULL, 10); stamp = strtoul (buf + 2, NULL, 10);
else else
stamp = g_ascii_strtoull (buf + 2, NULL, 10); /* in case time_t is 64 bits */ stamp = g_ascii_strtoull (buf + 2, NULL, 10); /* in case time_t is 64 bits */
if (G_UNLIKELY(stamp == 0))
{
g_warning ("Invalid timestamp in scrollback file");
continue;
}
text = strchr (buf + 3, ' '); text = strchr (buf + 3, ' ');
if (text && text[1]) if (text && text[1])
{ {
@ -314,7 +321,7 @@ scrollback_load (session *sess)
/* If its only an encoding error it may be specific to the line */ /* If its only an encoding error it may be specific to the line */
if (g_error_matches (err, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE)) if (g_error_matches (err, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE))
{ {
g_warning ("Invalid utf8 in scrollback file\n"); g_warning ("Invalid utf8 in scrollback file");
g_clear_error (&err); g_clear_error (&err);
continue; continue;
} }
@ -336,8 +343,7 @@ scrollback_load (session *sess)
if (lines) if (lines)
{ {
text = ctime (&stamp); text = ctime (&stamp);
text[24] = 0; /* get rid of the \n */ buf = g_strdup_printf ("\n*\t%s %s\n", _("Loaded log from"), text);
buf = g_strdup_printf ("\n*\t%s %s\n\n", _("Loaded log from"), text);
fe_print_text (sess, buf, 0, TRUE); fe_print_text (sess, buf, 0, TRUE);
g_free (buf); g_free (buf);
/*EMIT_SIGNAL (XP_TE_GENMSG, sess, "*", buf, NULL, NULL, NULL, 0);*/ /*EMIT_SIGNAL (XP_TE_GENMSG, sess, "*", buf, NULL, NULL, NULL, 0);*/