pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-07 18:23:13 +02:00
Code Activity

Fix backlog in logger plugin (empty line incorrectly displayed at the end of backlog)

Browse Source
This commit is contained in:
Sebastien Helleu
2008-10-31 10:32:53 +01:00
parent a0d233bd4e
commit 72c0321b54
1 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/logger/logger-tail.c
+30 -28
View File
@@ -30,7 +30,6 @@
#include <fcntl.h>
#include <string.h>
#include "../weechat-plugin.h"
#include "logger.h"
#include "logger-tail.h"
@@ -123,38 +122,41 @@ logger_tail_file (const char *filename, int n_lines)
pos_eol[0] = '\0';
pos_eol++;
}
new_line = malloc (sizeof (*new_line));
if (!new_line)
if (part_of_line || pos_eol[0])
{
logger_tail_free (ptr_line);
ptr_line = NULL;
break;
}
if (part_of_line)
{
new_line->data = malloc ((strlen (pos_eol) +
strlen (part_of_line) + 1));
if (!new_line->data)
new_line = malloc (sizeof (*new_line));
if (!new_line)
{
free (part_of_line);
logger_tail_free (ptr_line);
close (fd);
return NULL;
ptr_line = NULL;
break;
}
strcpy (new_line->data, pos_eol);
strcat (new_line->data, part_of_line);
free (part_of_line);
part_of_line = NULL;
if (part_of_line)
{
new_line->data = malloc ((strlen (pos_eol) +
strlen (part_of_line) + 1));
if (!new_line->data)
{
free (part_of_line);
logger_tail_free (ptr_line);
close (fd);
return NULL;
}
strcpy (new_line->data, pos_eol);
strcat (new_line->data, part_of_line);
free (part_of_line);
part_of_line = NULL;
}
else
{
new_line->data = strdup (pos_eol);
}
new_line->next_line = ptr_line;
ptr_line = new_line;
n_lines--;
if (n_lines <= 0)
break;
}
else
{
new_line->data = strdup (pos_eol);
}
new_line->next_line = ptr_line;
ptr_line = new_line;
n_lines--;
if (n_lines <= 0)
break;
}
else if (!pos_eol)
{