Fixes to having multiple arguments to logging

htmlfiles/index.html

@@ -182,8 +182,15 @@
 
 		<div id="container">
 			<div id="header">
-				<h3 style="display: inline;"><span class="blue"> dan@home:~ $</span> find /google/ --name </h3>
-				<form method="get" action="https://www.google.com/search">
+				<h3 style="display: inline;"><span class="blue"> dan@home:~ $</span> set_memory_usage </h3>
+				<form method="get" action="./mem">
+					<input type="text" autofocus="autofocus" name="q" \>
+				</form>
+
+			</div>
+			<div id="header">
+				<h3 style="display: inline;"><span class="blue"> dan@home:~ $</span> set_memory_usage </h3>
+				<form method="get" action="./cpu">
 					<input type="text" autofocus="autofocus" name="q" \>
 				</form>
 
@@ -192,8 +199,8 @@ <h3 style="display: inline;"><span class="blue"> dan@home:~ $</span> find /googl
 
 				<div class="linksbox">
 					<h3><span class="blue">dan@home:~\general $</span> ls</h3>
-		        	<a class="green" target="blank" href="http://localhost/oom">Out Of Memory</a>
-		         	<a class="green" target="blank" href="http://localhost/memlimit">Memory Limit</a>
+		        	<a class="green" target="blank" href="./oom">Out Of Memory</a>
+		         	<a class="green" target="blank" href="./memlimi">Memory Limit</a>
 					<a class="green" target="blank" href="https://news.ycombinator.com">"Hacker" News</a>
 					<a class="green" target="blank" href="https://www.theregister.co.uk">The Register</a>
                     <a class="green" target="blank" href="http://rarbgunblock.xyz/torrents.php">rargb</a>

httpd.c

@@ -374,7 +374,8 @@ int receive(int socket)
     if ( stringMatch("GET", request->method) )				// GET
     {
 
-        printf("GET request for %s\n", request->URI);
+        logInfof("GET request for %s\n", request->URI);
+
         sendHeader("200 OK", contentType, htmlfiles_index_html_len, connecting_socket);
         sendString((char *)htmlfiles_index_html,connecting_socket);
         if (postData) {

log.c

@@ -8,13 +8,17 @@
  */
 
 #include <sys/time.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <time.h>
+#include <unistd.h>
 #include "log.h"
 
 int loglevel;
 long seedTime;
+#define STDOUT 1
 
 void setLogLevel(int log)
 {
@@ -29,32 +33,117 @@ void logInit(void)
     setLogLevel(4);
 }
 
+char *convert(unsigned int num, int base)
+{
+    static char Representation[]= "0123456789ABCDEF";
+    static char buffer[50];
+    char *ptr;
+
+    ptr = &buffer[49];
+    *ptr = '\0';
+
+    do
+    {
+        *--ptr = Representation[num%base];
+        num /= base;
+    }while(num != 0);
+
+    return(ptr);
+}
+
 void logDebug(char *text)
 {
     if (loglevel < 4) 
         return;
     struct timeval tv;
     gettimeofday(&tv, NULL);
     long newTimeCount = time(NULL);
-    printf("\x1B[37mDEBG\x1B[0m[%04ld] %s\n", (newTimeCount - seedTime), text);
+    printf("\x1B[37mDEBG\x1B[0m[%04ld] %s", (newTimeCount - seedTime), text);
 }
 
 void logInfo(char *text)
 {
     if (loglevel < 3) 
         return;
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
     long newTimeCount = time(NULL);
-    printf("\x1B[34mINFO\x1B[0m[%04ld] %s\n", (newTimeCount - seedTime), text);
+    printf("\x1B[34mINFO\x1B[0m[%04ld] %s", (newTimeCount - seedTime), text);
+}
+
+void logInfof(char* format,...)
+{
+    if (loglevel < 3)
+        return;
+    char *traverse;
+    unsigned int i;
+    char *s;
+    long newTimeCount = time(NULL);
+    printf("\x1B[34mINFO\x1B[0m[%04ld] ", (newTimeCount - seedTime));
+
+    va_list arg;
+    va_start(arg, format);
+    unsigned long stringLength = strlen(format);
+    for(traverse = format; *traverse != '\0'; traverse++)
+    {
+        if (stringLength == 0)
+            break;
+        while( *traverse != '%')
+        {
+            if (*traverse == '\0') // Check for end of format
+                break;
+            putchar(*traverse);
+            traverse++;
+            stringLength--;
+            if (stringLength == 0)
+                break;
+        }
+
+        if (*traverse == '\0') // If end of format end 
+            break;
+        traverse++;
+
+
+        switch(*traverse)
+        {
+            case 'c' : i = va_arg(arg,int);     //Fetch char argument
+                putchar(i);
+                break;
+
+            case 'd' : i = va_arg(arg,int);         //Fetch Decimal/Integer argument
+                if((signed int)i<0)
+                {
+                    i = -i;
+                    putchar('-');
+                }
+                puts(convert(i,10));
+                break;
+
+            case 'o': i = va_arg(arg,unsigned int); //Fetch Octal representation
+                puts(convert(i,8));
+                break;
+
+            case 's': s = va_arg(arg,char *);       //Fetch string
+                if (s != NULL) {
+                    fputs(s, stdout);
+                }
+                break;
+
+            case 'x': i = va_arg(arg,unsigned int); //Fetch Hexadecimal representation
+                puts(convert(i,16));
+                break;
+        }
+        stringLength--;
+    }
+
+    va_end(arg);
 }
 
+
 void logWarn(char *text)
 {
     if (loglevel < 2) 
         return;
     long newTimeCount = time(NULL);
-    printf("\x1B[33mWARN\x1B[0m[%04ld] %s\n", (newTimeCount - seedTime), text);
+    printf("\x1B[33mWARN\x1B[0m[%04ld] %s", (newTimeCount - seedTime), text);
 }
 
 void logError(char *text)
@@ -64,7 +153,7 @@ void logError(char *text)
     struct timeval tv;
     gettimeofday(&tv, NULL);
     long newTimeCount = time(NULL);
-    printf("\x1B[31mERRO\x1B[0m[%04ld] %s\n", (newTimeCount - seedTime), text);
+    printf("\x1B[31mERRO\x1B[0m[%04ld] %s", (newTimeCount - seedTime), text);
 }
 
 void logFatal(char *text)
@@ -74,6 +163,6 @@ void logFatal(char *text)
     struct timeval tv;
     gettimeofday(&tv, NULL);
     long newTimeCount = time(NULL);
-    printf("\x1B[36mERRO\x1B[0m[%04ld] %s\n", (newTimeCount - seedTime), text);
+    printf("\x1B[36mERRO\x1B[0m[%04ld] %s", (newTimeCount - seedTime), text);
     exit(1);
 }

log.h

@@ -14,6 +14,7 @@ void logInit(void); //Needed to enable logging
 
 void logDebug(char *text); //5
 void logInfo(char *text);  //4
+void logInfof(char* format,...); // 4
 void logWarn(char *text);  //3
 void logError(char *text); //2
 void logFatal(char *text); //1

main.c

@@ -93,7 +93,7 @@ int main(int argc, char**argv)
                 break;
            case 'w':
                 // Set a port to bind to
-                printf("Starting WebServer\n");
+                logInfo("Starting WebServer\n");
                 argument = optarg;
                 int port = atoi(argument);
                 setPort(port);
@@ -120,7 +120,6 @@ int main(int argc, char**argv)
                 break;
         }
     }
-
     printf("%s\n", getMemoryConfiguration());
     //setSignalHander();
     while(1) {

mem.c

@@ -12,6 +12,7 @@
 #include <string.h>
 
 #include "utils.h"
+#include "log.h"
 
 int urchinMemorySize;
 char *urchinMemory;
@@ -49,6 +50,7 @@ char* getMemoryConfiguration() {
     char *oom;
     oom = readFile("/proc/sys/vm/overcommit_memory");
     if (oom == 0) {
+        logWarn("Unable to read OOM settings\n");
         return "Couldn't Read file [/proc/sys/vm/overcommit_memory]";
     }
     if (oom[0] == '0' ) {

mem.h

@@ -9,4 +9,4 @@
 
 void setMem(int mem);
 char* getMemoryConfiguration(void);
-int allocateMemory();
+int allocateMemory(void);