#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 char *gsItemListFile;
extern char *gsCoke_SerialPort;
extern char *gsSnack_SerialPort;
+extern char *gsDoor_Password;
// === GLOBALS ===
int giDebugLevel = 0;
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:
}
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?
}
openlog("odispense2", 0, LOG_LOCAL4);
- Init_Cokebank(gsCokebankPath);
+ if( Bank_Initialise(gsCokebankPath) )
+ return -1;
Init_Handlers();
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];