Changeset 3 in Main

Timestamp:

Sep 13, 2024, 6:06:44 PM (2 months ago)

Author:

Nishi

Message:

string op works, log works too

Location:

trunk

Files:

• Common/Makefile (modified) (1 diff)
• Common/cm_log.h (added)
• Common/cm_string.h (added)
• Common/log.c (added)
• Common/string.c (modified) (1 diff)
• Platform/generic.mk (modified) (1 diff)
• Server/Makefile (modified) (1 diff)
• Server/main.c (modified) (1 diff)
• Server/tw_version.h (added)
• Server/version.c (added)

trunk/Common/Makefile

@@ -6 +6 @@
 .SUFFIXES: .c .o
 
-OBJS = string.o
+OBJS = string.o log.o
 
 all: common.a

trunk/Common/string.c

@@ -1 +1 @@
 /* $Id$ */
+
+#include <string.h>
+#include <stdlib.h>
+
+char* cm_strcat(const char* a, const char* b) {
+        char* str = malloc(strlen(a) + strlen(b) + 1);
+        memcpy(str, a, strlen(a));
+        memcpy(str + strlen(a), b, strlen(b));
+        str[strlen(a) + strlen(b)] = 0;
+        return str;
+}
+
+char* cm_strdup(const char* str) { return cm_strcat(str, ""); }

trunk/Platform/generic.mk

@@ -3 +3 @@
 CC = cc
 AR = ar
-CFLAGS = -g -std=c99 -DPREFIX=\"$(PREFIX)\"
+CFLAGS = -g -std=c99 -DPREFIX=\"$(PREFIX)\" -I $(PWD)/Common
 LDFLAGS =
 LIBS =

trunk/Server/Makefile

@@ -6 +6 @@
 .SUFFIXES: .c .o
 
-OBJS = ../Common/common.a main.o
+OBJS = version.o main.o
 
 all: tewi$(EXEC)
 
-tewi$(EXEC): $(OBJS)
-        $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+tewi$(EXEC): $(OBJS) ../Common/common.a
+        $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) ../Common/common.a
 
 .c.o:

trunk/Server/main.c

@@ -1 +1 @@
 /* $Id$ */
 
-int main() {}
+#include <stdio.h>
+#include <stdbool.h>
+#include <string.h>
+
+#include <cm_log.h>
+
+#include "tw_version.h"
+
+extern bool cm_do_log;
+
+int main(int argc, char** argv) {
+        int i;
+        for(i = 1; i < argc; i++) {
+                if(argv[i][0] == '-') {
+                        if(strcmp(argv[i], "--verbose") == 0 || strcmp(argv[i], "-v") == 0) {
+                                if(!cm_do_log) {
+                                        cm_do_log = true;
+                                        cm_log("", "This is Tewi HTTPd, version %s", tw_get_version());
+                                } else {
+                                        cm_do_log = true;
+                                }
+                        } else {
+                                fprintf(stderr, "Unknown option: %s\n", argv[i]);
+                                return 1;
+                        }
+                }
+        }
+        cm_log("Daemon", "Ready");
+}