Divide itmmorgue to different modules

configure

@@ -11,9 +11,11 @@ WORKDIR='bin'
 SRC='itmmorgue.c client.c config.c splash.c locale.c menu.c stuff.c'
 SRC="$SRC windows.c area.c chat.c keyboard.c server.c protocol.c sysmsg.c"
 SRC="$SRC connection.c levels.c tiles.c player.c event.c"
+SRC="$SRC error.c time.c logger.c strutils.c ioutils.c"
 HDR='itmmorgue.h client.h config.h default_config.h stuff.h windows.h'
 HDR="$HDR area.h chat.h keyboard.h server.h protocol.h sysmsg.h"
 HDR="$HDR connection.h levels.h tiles.h player.h event.h"
+HDR="$HDR error.h time.h logger.h strutils.h ioutils.h"
 LIB='trie/trie.o'
 DEBUG=1
 ####################################################################

src/error.c

@@ -0,0 +1,15 @@
+#include "error.h"
+
+void warn(const char * const msg) {
+    if (msg) {
+        fprintf(stderr, "%s\n", msg);
+    }
+}
+
+void panic(const char * const msg) {
+    endwin();
+
+    warn(msg);
+
+    exit(EXIT_FAILURE);
+}

src/error.h

@@ -0,0 +1,31 @@
+#ifndef PANIC_H
+#define PANIC_H
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#if defined(__FreeBSD__) || defined(__linux__)
+#include <ncurses.h>
+#include <sys/uio.h>
+#else
+#include <ncurses/ncurses.h>
+#endif /* __FreeBSD__ || __linux__ */
+
+void warn(const char * const msg);
+void panic(const char * const msg);
+
+#define warnf(fmt, ...)                             \
+    do {                                            \
+        char ___buf[BUFSIZ];                        \
+        snprintf(___buf, BUFSIZ, fmt, __VA_ARGS__); \
+        warn(___buf);                               \
+    } while(0)
+
+#define panicf(fmt, ...)                            \
+    do {                                            \
+        char ___buf[BUFSIZ];                        \
+        snprintf(___buf, BUFSIZ, fmt, __VA_ARGS__); \
+        panic(___buf);                              \
+    } while(0)
+
+#endif /* PANIC_H */

src/ioutils.c

@@ -0,0 +1,42 @@
+#include "ioutils.h"
+
+
+int synchronized_readall(
+        pthread_mutex_t *mutex,
+        int fd,
+        void *buf,
+        size_t size
+) {
+    if (NULL == mutex) {
+        panic("synchronized_readall: NULL mutex provided");
+    }
+
+    pthread_mutex_lock(mutex);
+    int retval = readall(fd, buf, size);
+    pthread_mutex_unlock(mutex);
+    return retval;
+}
+
+int readall(int fd, void *buf, size_t size) {
+    int rc = -1;
+    size_t got = 0;
+
+    if (size == 0) {
+        return 0;
+    }
+
+    while (got < size) {
+        if ((rc = read(fd, (char *)buf + got, size - got)) > 0) {
+            got += rc;
+        } else {
+            break;
+        }
+    }
+
+    if (got == size) {
+        return size;
+    }
+
+    return -1;
+}
+

src/ioutils.h

@@ -0,0 +1,17 @@
+#ifndef IO_UTILS_H
+#define IO_UTILS_H
+
+#include <unistd.h>
+#include <pthread.h>
+#include "error.h"
+
+int readall(int fd, void *buf, size_t size);
+
+int synchronized_readall(
+        pthread_mutex_t *mutex,
+        int fd,
+        void *buf,
+        size_t size
+);
+
+#endif /* IO_UTILS_H */

src/itmmorgue.c

@@ -3,182 +3,6 @@
 #include "server.h"
 #include "client.h"
 
-int server_only = 0;
-
-void warn(char *msg) {
-    if (msg) {
-        fprintf(stderr, "%s\n", msg);
-    }
-}
-
-void panic(char *msg) {
-    endwin();
-
-    warn(msg);
-
-    exit(EXIT_FAILURE);
-}
-
-int strtoi(const char *nptr, char **endptr, int base) {
-    long lval = strtol(nptr, endptr, base);
-    if (lval < INT_MIN) {
-        errno = ERANGE;
-        return INT_MIN;
-    }
-    if (lval > INT_MAX) {
-        errno = ERANGE;
-        return INT_MAX;
-    }
-    return (int) lval;
-}
-
-size_t anystrunplen(char *str, size_t maxlen, char ** endp) {
-    int len = 0;
-
-    char *last_sym = str;
-
-    while (maxlen-- && *str) {
-        if ((*str++ & 0xC0) != 0x80) {
-            len++;
-            last_sym = str - 1;
-        } else {
-            maxlen++;
-        }
-    }
-
-    if (++maxlen == 0 && endp != NULL && *endp != NULL && *str) {
-        *endp = last_sym;
-    }
-
-    return len;
-}
-
-size_t anystrnplen(char *str, size_t maxlen, char ** endp) {
-    int len = 0;
-
-    while (maxlen-- && *str) {
-        if ((*str++ & 0xC0) != 0x80) {
-            len++;
-        }
-    }
-
-    if (++maxlen == 0 && endp != NULL && *endp != NULL && *str) {
-        *endp = str;
-    }
-
-    return len;
-}
-
-size_t anystrnlen(char *str, size_t maxlen) {
-    return anystrnplen(str, maxlen, NULL);
-}
-
-size_t anystrlen(char *str) {
-    return anystrnlen(str, UINT_MAX);
-}
-
-#ifdef __sun
-size_t strnlen(const char *str, size_t maxlen) {
-    size_t rc = 0;
-
-    while (maxlen-- && *str++) {
-        rc++;
-    }
-
-    return rc;
-}
-#endif /* __sun */
-
-int synchronized_readall(pthread_mutex_t *mutex, int fd, void *buf,
-        size_t size) {
-    if (NULL == mutex) {
-        panic("synchronized_readall: NULL mutex provided");
-    }
-
-    pthread_mutex_lock(mutex);
-    int retval = readall(fd, buf, size);
-    pthread_mutex_unlock(mutex);
-    return retval;
-}
-
-int readall(int fd, void *buf, size_t size) {
-    int rc = -1;
-    size_t got = 0;
-
-    if (size == 0) {
-        return 0;
-    }
-    while (got < size) {
-        if ((rc = read(fd, (char *)buf + got, size - got)) > 0) {
-            got += rc;
-        } else {
-            break;
-        }
-    }
-
-    if (got == size) {
-        return size;
-    }
-
-    return -1;
-}
-
-void log_init() {
-    char *log_file = CONF_SVAL("file_server_log");
-    if (! *log_file) {
-        return;
-    }
-
-    if ((log_fd = open(log_file, O_WRONLY | O_APPEND | O_CREAT, 0666)) < 0) {
-        panicf("Unable to open %s!", log_file);
-    }
-
-    logger(" ======= GAME STARTED ======= ");
-}
-
-void logger(char *str) {
-    if (log_fd < 0) {
-        return;
-    }
-
-    char buf[8192];
-    struct timeval tv;
-    if (gettimeofday(&tv, NULL) < 0) {
-        panic("Unable to get system time!");
-    }
-
-    int len = snprintf(buf, sizeof(buf), "%lu: %s\n", tv.tv_sec, str);
-    if (write(log_fd, buf, len) < 0) {
-        panic("Unable to write log output!");
-    }
-
-    if (server_only == 1) {
-        if (write(2, buf, len) < 0) {
-            panic("Unable to write log to stderr!");
-        }
-    }
-}
-
-unsigned long long systime() {
-    struct timeval tv;
-
-    if (gettimeofday(&tv, NULL) < 0) {
-        panic("Unable to get system time!");
-    }
-
-    return tv.tv_sec;
-}
-
-unsigned long long sysutime() {
-    struct timeval tv;
-
-    if (gettimeofday(&tv, NULL) < 0) {
-        panic("Unable to get system time!");
-    }
-
-    return tv.tv_sec * 1000000 + tv.tv_usec;
-}
-
 int main(int argc, char *argv[]) {
     // TODO parse argv and run server / client
 
@@ -196,7 +20,7 @@ int main(int argc, char *argv[]) {
     }
 
     log_fd = -1;
-    log_init();
+    logger_init();
 
     if (server_only == 0) {
         client();

src/itmmorgue.h

@@ -49,51 +49,14 @@ enum colors {
 #include "stuff.h"
 #include "tiles.h"
 #include "levels.h"
+#include "config.h"
+#include "error.h"
+#include "ioutils.h"
+#include "strutils.h"
+#include "logger.h"
 
-int client(void);
-
-int log_fd;
-int client(void);
-void logger(char *str);
-int synchronized_readall(pthread_mutex_t *mutex, int fd, void *buf,
-        size_t size);
-int readall(int fd, void *buf, size_t size);
-
-// Panic related definitions
-void warn(char *msg);
-void panic(char *msg);
-#define warnf(fmt, ...)                             \
-    do {                                            \
-        char ___buf[BUFSIZ];                        \
-        snprintf(___buf, BUFSIZ, fmt, __VA_ARGS__); \
-        warn(___buf);                               \
-    } while(0)
-#define panicf(fmt, ...)                            \
-    do {                                            \
-        char ___buf[BUFSIZ];                        \
-        snprintf(___buf, BUFSIZ, fmt, __VA_ARGS__); \
-        panic(___buf);                              \
-    } while(0)
-#define loggerf(fmt, ...)                           \
-    do {                                            \
-        char ___buf[BUFSIZ];                        \
-        snprintf(___buf, BUFSIZ, fmt, __VA_ARGS__); \
-        logger(___buf);                             \
-    } while(0)
-
-// Wrapper for strtol(3) for int numbers
-int strtoi(const char *nptr, char **endptr, int base);
-
-// strlen() alternatives for UTF-8 strings
-size_t anystrlen(char *str);
-size_t anystrnlen(char *str, size_t maxlen);
-size_t anystrnplen(char *str, size_t maxlen, char ** endp);
-size_t anystrunplen(char *str, size_t maxlen, char ** endp);
-unsigned long long systime();
-unsigned long long sysutime();
+int server_only;
 void player_move(player_move_t *move);
-#ifdef __sun
-size_t strnlen(const char *str, size_t maxlen);
-#endif /* __sun */
+
 
 #endif /* ITMMORGUE_H */