X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=ossec-hids.git;a=blobdiff_plain;f=src%2Flogcollector%2Fread_multiline.c;h=02d357e30f68e9faf9d5bfda1437372f4d1019c3;hp=29a565d736305bf1cead0539b277c788a2b60cb2;hb=6ef2f786c6c8ead94841b5f93baf9f43421f08c8;hpb=301048b51990573e58a30dc4a5bb4ec285cad554 diff --git a/src/logcollector/read_multiline.c b/src/logcollector/read_multiline.c index 29a565d..02d357e 100755 --- a/src/logcollector/read_multiline.c +++ b/src/logcollector/read_multiline.c @@ -1,4 +1,5 @@ -/* @(#) $Id$ */ +/* @(#) $Id: ./src/logcollector/read_multiline.c, 2011/09/08 dcid Exp $ + */ /* Copyright (C) 2010 Trend Micro Inc. * All right reserved. @@ -45,11 +46,11 @@ void *read_multiline(int pos, int *rc, int drop_it) linesgot++; /* Getting the last occurence of \n */ - if ((p = strrchr(str, '\n')) != NULL) + if ((p = strrchr(str, '\n')) != NULL) { *p = '\0'; } - + /* If we didn't get the new line, because the * size is large, send what we got so far. */ @@ -64,17 +65,17 @@ void *read_multiline(int pos, int *rc, int drop_it) debug1("%s: Message not complete. Trying again: '%s'", ARGV0,str); fsetpos(logff[pos].fp, &fp_pos); break; - } - + } + #ifdef WIN32 if ((p = strrchr(str, '\r')) != NULL) { *p = '\0'; } #endif - + debug2("%s: DEBUG: Reading message: '%s'", ARGV0, str); - + /* Adding to buffer. */ buffer_size = strlen(buffer); @@ -86,12 +87,12 @@ void *read_multiline(int pos, int *rc, int drop_it) strncpy(buffer + buffer_size, str, OS_MAXSTR - buffer_size -2); - + if(linesgot < linecount) { continue; } - + /* Sending message to queue */ if(drop_it == 0) @@ -124,12 +125,12 @@ void *read_multiline(int pos, int *rc, int drop_it) } __ms = 0; } - + fgetpos(logff[pos].fp, &fp_pos); continue; } - return(NULL); + return(NULL); } /* EOF */