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
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
8abb984
..
0692d6a
100644
(file)
--- a/
src/server/main.c
+++ b/
src/server/main.c
@@
-17,16
+17,17
@@
#include <sys/stat.h>
#include <fcntl.h>
#include <stdarg.h>
#include <sys/stat.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;
// === GLOBALS ===
int giDebugLevel = 0;
// === GLOBALS ===
int giDebugLevel = 0;
@@
-82,7
+83,10
@@
int main(int argc, char *argv[])
signal(SIGINT, sigint_handler);
signal(SIGINT, sigint_handler);
- Init_Cokebank(gsCokebankPath);
+ openlog("odispense2", 0, LOG_LOCAL4);
+
+ if( Bank_Initialise(gsCokebankPath) )
+ return -1;
Init_Handlers();
Init_Handlers();
@@
-99,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);
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