comparison src/log.c @ 7461:c1ddc403fda4

[gaim-migrate @ 8074] windows is really getting on my nerves, luckily SimGuy is very patient /nick ZenGuy committer: Tailor Script <tailor@pidgin.im>
author Nathan Walp <nwalp@pidgin.im>
date Sat, 08 Nov 2003 08:21:48 +0000
parents 8bc33ec515a1
children 5fb4cbf1ac54
comparison
equal deleted inserted replaced
7460:3973a09525b3 7461:c1ddc403fda4
613 g_free(logfile); 613 g_free(logfile);
614 614
615 GaimLog *log = NULL; 615 GaimLog *log = NULL;
616 GList *list = NULL; 616 GList *list = NULL;
617 617
618 if (!(file = fopen(path, "r"))) { 618 if (!(file = fopen(path, "rb"))) {
619 g_free(path); 619 g_free(path);
620 return NULL; 620 return NULL;
621 } 621 }
622 622
623 while (fgets(buf, BUF_LONG, file)) { 623 while (fgets(buf, BUF_LONG, file)) {
646 } else { 646 } else {
647 data->length -= 647 data->length -=
648 strlen("---- New Conversation @ ") + strlen("----"); 648 strlen("---- New Conversation @ ") + strlen("----");
649 } 649 }
650 650
651 if(strchr(buf, '\r'))
652 data->length--;
653
651 if (data->length != 0) 654 if (data->length != 0)
652 list = g_list_append(list, log); 655 list = g_list_append(list, log);
653 else 656 else
654 gaim_log_free(log); 657 gaim_log_free(log);
655 } 658 }
680 } 683 }
681 684
682 char * old_logger_read (GaimLog *log, GaimLogReadFlags *flags) 685 char * old_logger_read (GaimLog *log, GaimLogReadFlags *flags)
683 { 686 {
684 struct old_logger_data *data = log->logger_data; 687 struct old_logger_data *data = log->logger_data;
685 FILE *file = fopen(data->path, "r"); 688 FILE *file = fopen(data->path, "rb");
686 char *read = g_malloc(data->length + 1); 689 char *read = g_malloc(data->length + 1);
687 fseek(file, data->offset, SEEK_SET); 690 fseek(file, data->offset, SEEK_SET);
688 fread(read, data->length, 1, file); 691 fread(read, data->length, 1, file);
689 read[data->length] = '\0'; 692 read[data->length] = '\0';
690 *flags = 0; 693 *flags = 0;
691 if(strstr(read, "<BR>")) 694 if(strstr(read, "<BR>"))
692 *flags |= GAIM_LOG_READ_NO_NEWLINE; 695 *flags |= GAIM_LOG_READ_NO_NEWLINE;
696 gaim_str_strip_linefeed(read);
693 return read; 697 return read;
694 } 698 }
695 699
696 static GaimLogLogger old_logger = { 700 static GaimLogLogger old_logger = {
697 "old logger", "old", 701 "old logger", "old",