Merge pull request #1 from opennars/master

pull latest

src/Globals.c

@@ -35,3 +35,15 @@ void assert(bool b, char* message)
         exit(1);
     }
 }
+
+void strtrim(char *line)
+{
+    for(int i=strlen(line)-1; i>=0; i--)
+    {
+        if(!isspace(line[i]))
+        {
+            break;
+        }
+        line[i] = 0;
+    }
+}

src/Globals.h

@@ -26,6 +26,8 @@
 #define GLOBALS_H
 
 #include <stdbool.h>
+#include <string.h>
+#include <ctype.h> 
 
 /*-------*/
 /* Flags */
@@ -49,7 +51,10 @@
 #define PRINTD(format, args...) ((void)0)
 #endif
 #define IN_DEBUG(x) {if(DEBUG){ x } }
+//assert, printing message and exiting if b=false
 void assert(bool b, char* message);
+//trim a string, standard library "extension"
+void strtrim(char *line);
 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
 #define MAX(a, b) (((a) > (b)) ? (a) : (b))
 

src/NetworkNAR/UDPNAR.c

@@ -63,6 +63,7 @@ void* Receive_Thread_Run(void *sockfd_address)
         {
             break;
         }
+        strtrim(buffer);
         pthread_mutex_lock(&nar_mutex);
         NAR_AddInputNarsese(buffer);
         pthread_mutex_unlock(&nar_mutex);

src/Shell.c

@@ -90,14 +90,7 @@ void Shell_Start()
             exit(0);
         }
         //trim string, for IRC etc. convenience
-        for(int i=strlen(line)-1; i>=0; i--)
-        {
-            if(!isspace(line[i]))
-            {
-                break;
-            }
-            line[i] = 0;
-        }
+        strtrim(line);
         int size = strlen(line);
         if(size==0)
         {

src/Shell.h

@@ -33,7 +33,6 @@
 //References//
 //----------//
 #include "NAR.h"
-#include <ctype.h> 
 #include "Stats.h"
 
 //Methods//