new upstream release (3.3.0); modify package compatibility for Stretch

[ossec-hids.git] / src / logcollector / read_multiline.c

diff --git a/src/logcollector/read_multiline.c b/src/logcollector/read_multiline.c
old mode 100755 (executable)
new mode 100644 (file)
index 02d357e..0d353d3
--- a/src/logcollector/read_multiline.c
+++ b/src/logcollector/read_multiline.c
@@ -1,6 +1,3 @@
-/* @(#) $Id: ./src/logcollector/read_multiline.c, 2011/09/08 dcid Exp $
- */
-
 /* Copyright (C) 2010 Trend Micro Inc.
  * All right reserved.
  *
@@ -10,99 +7,80 @@
  * Foundation
  */
 
-/* Read the syslog */
-
-
 #include "shared.h"
 #include "logcollector.h"
 
 
-
-/* Read multiline logs. */
+/* Read multiline logs */
 void *read_multiline(int pos, int *rc, int drop_it)
 {
     int __ms = 0;
     int linecount;
     int linesgot = 0;
-    int buffer_size = 0;
+    size_t buffer_size = 0;
     char *p;
     char str[OS_MAXSTR + 1];
-    char buffer[OS_MAXSTR +1];
-
+    char buffer[OS_MAXSTR + 1];
     fpos_t fp_pos;
 
     buffer[0] = '\0';
     buffer[OS_MAXSTR] = '\0';
-    str[OS_MAXSTR]= '\0';
+    str[OS_MAXSTR] = '\0';
     *rc = 0;
 
     linecount = atoi(logff[pos].logformat);
 
-    /* Getting initial file location */
+    /* Get initial file location */
     fgetpos(logff[pos].fp, &fp_pos);
 
-    while(fgets(str, OS_MAXSTR - OS_LOG_HEADER, logff[pos].fp) != NULL)
-    {
+    while (fgets(str, OS_MAXSTR - OS_LOG_HEADER, logff[pos].fp) != NULL) {
         linesgot++;
 
-        /* Getting the last occurence of \n */
-        if ((p = strrchr(str, '\n')) != NULL)
-        {
+        /* Get the last occurrence of \n */
+        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.
          */
-        else if(strlen(str) >= (OS_MAXSTR - OS_LOG_HEADER - 2))
-        {
+        else if (strlen(str) >= (OS_MAXSTR - OS_LOG_HEADER - 2)) {
             /* Message size > maximum allowed */
             __ms = 1;
-        }
-        else
-        {
+        } else {
             /* Message not complete. Return. */
-            debug1("%s: Message not complete. Trying again: '%s'", ARGV0,str);
+            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)
-        {
+#ifdef WIN32
+        if ((p = strrchr(str, '\r')) != NULL) {
             *p = '\0';
         }
-        #endif
+#endif
 
         debug2("%s: DEBUG: Reading message: '%s'", ARGV0, str);
 
-
-        /* Adding to buffer. */
+        /* Add to buffer */
         buffer_size = strlen(buffer);
-        if(buffer[0] != '\0')
-        {
+        if (buffer[0] != '\0') {
             buffer[buffer_size] = ' ';
             buffer_size++;
         }
 
-        strncpy(buffer + buffer_size, str, OS_MAXSTR - buffer_size -2);
+        strncpy(buffer + buffer_size, str, OS_MAXSTR - buffer_size - 2);
 
-
-        if(linesgot < linecount)
-        {
+        if (linesgot < linecount) {
             continue;
         }
 
-
-        /* Sending message to queue */
-        if(drop_it == 0)
-        {
-            if(SendMSG(logr_queue, buffer, logff[pos].file,
-                        LOCALFILE_MQ) < 0)
-            {
+        /* Send message to queue */
+        if (drop_it == 0) {
+            if (SendMSG(logr_queue, buffer, logff[pos].file,
+                        LOCALFILE_MQ) < 0) {
                 merror(QUEUE_SEND, ARGV0);
-                if((logr_queue = StartMQ(DEFAULTQPATH,WRITE)) < 0)
-                {
+                if ((logr_queue = StartMQ(DEFAULTQPATH, WRITE)) < 0) {
                     ErrorExit(QUEUE_FATAL, ARGV0, DEFAULTQPATH);
                 }
             }
@@ -111,15 +89,12 @@ void *read_multiline(int pos, int *rc, int drop_it)
         buffer[0] = '\0';
 
 
-        /* Incorrectly message size */
-        if(__ms)
-        {
+        /* Incorrect message size */
+        if (__ms) {
             merror("%s: Large message size: '%s'", ARGV0, str);
-            while(fgets(str, OS_MAXSTR - 2, logff[pos].fp) != NULL)
-            {
-                /* Getting the last occurence of \n */
-                if ((p = strrchr(str, '\n')) != NULL)
-                {
+            while (fgets(str, OS_MAXSTR - 2, logff[pos].fp) != NULL) {
+                /* Get the last occurrence of \n */
+                if ((p = strrchr(str, '\n')) != NULL) {
                     break;
                 }
             }
@@ -130,7 +105,6 @@ void *read_multiline(int pos, int *rc, int drop_it)
         continue;
     }
 
-    return(NULL);
+    return (NULL);
 }
 
-/* EOF */