Changeset 4 in Main

Timestamp:

Sep 13, 2024, 6:39:33 PM (2 months ago)

Author:

Nishi

Message:

can trim line

Location:

trunk

Files:

• Common/cm_string.h (modified) (1 diff)
• Common/string.c (modified) (1 diff)
• Makefile (modified) (1 diff)
• Server/Makefile (modified) (1 diff)
• Server/config.c (added)
• Server/main.c (modified) (4 diffs)
• Server/tw_config.h (added)

trunk/Common/cm_string.h

@@ -6 +6 @@
 char* cm_strcat(const char* a, const char* b);
 char* cm_strdup(const char* str);
+char* cm_trimstart(const char* str);
+char* cm_trimend(const char* str);
+char* cm_trim(const char* str);
 
 #endif

trunk/Common/string.c

@@ -13 +13 @@
 
 char* cm_strdup(const char* str) { return cm_strcat(str, ""); }
+
+char* cm_trimstart(const char* str){
+        int i;
+        for(i = 0; str[i] != 0; i++){
+                if(str[i] != ' ' && str[i] != '\t'){
+                        return cm_strdup(str + i);
+                }
+        }
+        return cm_strdup("");
+}
+
+char* cm_trimend(const char* str){
+        char* s = cm_strdup(str);
+        int i;
+        for(i = strlen(s) - 1; i >= 0; i--){
+                if(s[i] != '\t' && s[i] != ' '){
+                        s[i + 1] = 0;
+                        break;
+                }
+        }
+        return s;
+}
+
+char* cm_trim(const char* str){
+        char* tmp = cm_trimstart(str);
+        char* s = cm_trimend(tmp);
+        free(tmp);
+        return s;
+}

trunk/Makefile

@@ -3 +3 @@
 PWD = `pwd`
 PLATFORM = generic
-PREFIX = /usr
+PREFIX = /usr/local
 
 FLAGS = PWD=$(PWD) PLATFORM=$(PLATFORM) PREFIX=$(PREFIX)

trunk/Server/Makefile

@@ -6 +6 @@
 .SUFFIXES: .c .o
 
-OBJS = version.o main.o
+OBJS = version.o main.o config.o
 
 all: tewi$(EXEC)

trunk/Server/main.c

@@ -7 +7 @@
 #include <cm_log.h>
 
+#include "tw_config.h"
 #include "tw_version.h"
 
@@ -13 +14 @@
 int main(int argc, char** argv) {
         int i;
+        const char* config = PREFIX "/etc/tewi.conf";
         for(i = 1; i < argc; i++) {
                 if(argv[i][0] == '-') {
@@ -22 +24 @@
                                         cm_do_log = true;
                                 }
+                        } else if(strcmp(argv[i], "--config") == 0 || strcmp(argv[i], "-C") == 0){
+                                i++;
+                                if(argv[i] == NULL){
+                                        fprintf(stderr, "Missing argument\n");
+                                        return 1;
+                                }
+                                config = argv[i];
                         } else {
                                 fprintf(stderr, "Unknown option: %s\n", argv[i]);
@@ -28 +37 @@
                 }
         }
+        if(tw_config_read(config) != 0){
+                fprintf(stderr, "Could not read the config\n");
+                return 1;
+        }
         cm_log("Daemon", "Ready");
 }