Fixing crappy code in coke handler, debug in others

[tpg/opendispense2.git] / src / server / main.c

diff --git a/src/server/main.c b/src/server/main.c
index 17397c1..0692d6a 100644 (file)
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -16,16 +16,18 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <stdarg.h>
+#include <syslog.h>
+#include "../cokebank.h"
 
 // === IMPORTS ===
-extern void    Init_Cokebank(const char *Argument);    // cokebank.c
 extern void    Init_Handlers(void);
 extern void    Load_Itemlist(void);
 extern void    Server_Start(void);
 extern int     giServer_Port;
-extern char*   gsItemListFile;
-extern char*   gsCoke_SerialPort;
-extern char*   gsSnack_SerialPort;
+extern char    *gsItemListFile;
+extern char    *gsCoke_SerialPort;
+extern char    *gsSnack_SerialPort;
 
 // === GLOBALS ===
  int   giDebugLevel = 0;
@@ -81,7 +83,10 @@ int main(int argc, char *argv[])
        
        signal(SIGINT, sigint_handler);
        
-       Init_Cokebank(gsCokebankPath);
+       openlog("odispense2", 0, LOG_LOCAL4);
+       
+       if( Bank_Initialise(gsCokebankPath) )
+               return -1;
 
        Init_Handlers();
 
@@ -98,6 +103,9 @@ int RunRegex(regex_t *regex, const char *string, int nMatches, regmatch_t *match
         int    ret;
        
        ret = regexec(regex, string, nMatches, matches, 0);
+       if( ret == REG_NOMATCH ) {
+               return -1;
+       }
        if( ret ) {
                size_t  len = regerror(ret, regex, NULL, 0);
                char    errorStr[len];
@@ -129,22 +137,48 @@ int InitSerial(const char *File, int BaudRate)
         int    baud;
         int    fd;
        
-       
-       fd = open(File, O_RDWR | O_NOCTTY);
+       fd = open(File, O_RDWR | O_NOCTTY | O_NONBLOCK);
        if( fd == -1 )  return -1;
        
        switch(BaudRate)
        {
        case 9600:      baud = B9600;   break;
-       default:        return ;
+       default:        close(fd);      return -1;
        }
        
-       cfmakeraw(&info);       // Sets 8N1
+       info.c_lflag = 0;       // Non-Canoical, No Echo
+       info.c_cflag = baud | CS8 | CLOCAL | CREAD;     // baud, 8N1
        cfsetspeed(&info, baud);
+       info.c_cc[VTIME] = 0;   // No time limit
+       info.c_cc[VMIN] = 1;    // Block until 1 char
        
+       tcflush(fd, TCIFLUSH);
        tcsetattr(fd, TCSANOW, &info);
        
        return fd;
 }
 
 
+/**
+ * \brief Create a formatted heap string
+ */
+char *mkstr(const char *Format, ...)
+{
+       va_list args;
+        int    len;
+       char    *ret;
+
+       va_start(args, Format);
+       len = vsnprintf(NULL, 0, Format, args);
+       va_end(args);
+
+       ret = malloc( len + 1 );
+       if(!ret)        return NULL;
+
+       va_start(args, Format);
+       vsprintf(ret, Format, args);
+       va_end(args);
+       
+       return ret;
+}
+