X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fmain.c;h=61059364aad03e0bc0757e8fa92cc4e1b0e3fa60;hb=4de4de3c3a18dd790e9ccefadc2b7c8bb25ce9e0;hp=8abb9847cc1c89a3863afab9ab11e6df6f4821e2;hpb=41582cb84bded83614e11b1c115deea13e1914cc;p=tpg%2Fopendispense2.git

diff --git a/src/server/main.c b/src/server/main.c
index 8abb984..6105936 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -17,16 +17,18 @@
 #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;
+extern char	*gsDoor_Password;
 
 // === GLOBALS ===
  int	giDebugLevel = 0;
@@ -51,9 +53,11 @@ int main(int argc, char *argv[])
 			switch(arg[1])
 			{
 			case 'p':
+				if( i + 1 >= argc )	return -1;
 				giServer_Port = atoi(argv[++i]);
 				break;
 			case 'd':
+				if( i + 1 >= argc )	return -1;
 				giDebugLevel = atoi(argv[++i]);
 				break;
 			default:
@@ -63,14 +67,21 @@ int main(int argc, char *argv[])
 		}
 		else if( arg[0] == '-' && arg[1] == '-' ) {
 			if( strcmp(arg, "--itemsfile") == 0 ) {
+				if( i + 1 >= argc )	return -1;
 				gsItemListFile = argv[++i];
 			}
 			else if( strcmp(arg, "--cokeport") == 0 ) {
+				if( i + 1 >= argc )	return -1;
 				gsCoke_SerialPort = argv[++i];
 			}
 			else if( strcmp(arg, "--snackport") == 0 ) {
+				if( i + 1 >= argc )	return -1;
 				gsSnack_SerialPort = argv[++i];
 			}
+			else if( strcmp(arg, "--doorpass") == 0 ) {
+				if( i + 1 >= argc )	return -1;
+				gsDoor_Password = argv[++i];
+			}
 			else {
 				// Usage error?
 			}
@@ -82,7 +93,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();
 
@@ -99,6 +113,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];