git.ucc.asn.au
/
tpg
/
opendispense2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Let's try this again...
[tpg/opendispense2.git]
/
src
/
server
/
main.c
diff --git
a/src/server/main.c
b/src/server/main.c
index
b23cee4
..
6105936
100644
(file)
--- a/
src/server/main.c
+++ b/
src/server/main.c
@@
-18,16
+18,17
@@
#include <fcntl.h>
#include <stdarg.h>
#include <syslog.h>
#include <fcntl.h>
#include <stdarg.h>
#include <syslog.h>
+#include "../cokebank.h"
// === IMPORTS ===
// === 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 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;
// === GLOBALS ===
int giDebugLevel = 0;
@@
-52,9
+53,11
@@
int main(int argc, char *argv[])
switch(arg[1])
{
case 'p':
switch(arg[1])
{
case 'p':
+ if( i + 1 >= argc ) return -1;
giServer_Port = atoi(argv[++i]);
break;
case 'd':
giServer_Port = atoi(argv[++i]);
break;
case 'd':
+ if( i + 1 >= argc ) return -1;
giDebugLevel = atoi(argv[++i]);
break;
default:
giDebugLevel = atoi(argv[++i]);
break;
default:
@@
-64,14
+67,21
@@
int main(int argc, char *argv[])
}
else if( arg[0] == '-' && arg[1] == '-' ) {
if( strcmp(arg, "--itemsfile") == 0 ) {
}
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 ) {
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 ) {
gsCoke_SerialPort = argv[++i];
}
else if( strcmp(arg, "--snackport") == 0 ) {
+ if( i + 1 >= argc ) return -1;
gsSnack_SerialPort = argv[++i];
}
gsSnack_SerialPort = argv[++i];
}
+ else if( strcmp(arg, "--doorpass") == 0 ) {
+ if( i + 1 >= argc ) return -1;
+ gsDoor_Password = argv[++i];
+ }
else {
// Usage error?
}
else {
// Usage error?
}
@@
-85,7
+95,8
@@
int main(int argc, char *argv[])
openlog("odispense2", 0, LOG_LOCAL4);
openlog("odispense2", 0, LOG_LOCAL4);
- Init_Cokebank(gsCokebankPath);
+ if( Bank_Initialise(gsCokebankPath) )
+ return -1;
Init_Handlers();
Init_Handlers();
@@
-102,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);
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];
if( ret ) {
size_t len = regerror(ret, regex, NULL, 0);
char errorStr[len];
UCC
git Repository :: git.ucc.asn.au