X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fmain.c;h=eedafc3c50c80cf21fbe768b2676638d350c3869;hb=af75d76fa94d5ff7fe1ff5e0b7c2a0a17740e93b;hp=5ca472362c3a5bc9da93e94882b1baa518d1d0f3;hpb=76d7ff31e2bb0ace116d9c995c007d857c41cdff;p=tpg%2Fopendispense2.git

diff --git a/src/server/main.c b/src/server/main.c
index 5ca4723..eedafc3 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -49,6 +49,21 @@ void sigint_handler()
 	exit(0);
 }
 
+void PrintUsage(const char *progname)
+{
+	fprintf(stderr, "Usage: %s\n", progname);
+	fprintf(stderr, "  -p    Set server port (default 11020)\n");
+	fprintf(stderr, "  -d    Set debug level (0 - 2, default 0)\n");
+	fprintf(stderr, "  --itemsfile\n");
+	fprintf(stderr, "        Set debug level (0 - 2, default 0)\n");
+	fprintf(stderr, "  --cokeport\n");
+	fprintf(stderr, "        Coke machine serial port (Default \"/dev/ttyS0\")\n");
+	fprintf(stderr, "  --doorpass\n");
+	fprintf(stderr, "        Door LAT password file (Default empty password)\n");
+	fprintf(stderr, "  --cokebank\n");
+	fprintf(stderr, "        Coke bank database file (Default \"cokebank.db\")\n");
+}
+
 int main(int argc, char *argv[])
 {
 	 int	i;
@@ -72,7 +87,8 @@ int main(int argc, char *argv[])
 				break;
 			default:
 				// Usage Error?
-				break;
+				PrintUsage(argv[0]);
+				return -1;
 			}
 		}
 		else if( arg[0] == '-' && arg[1] == '-' ) {
@@ -89,15 +105,33 @@ int main(int argc, char *argv[])
 				gsSnack_SerialPort = argv[++i];
 			}
 			else if( strcmp(arg, "--doorpass") == 0 ) {
+				FILE	*fp;
+				char	buf[30];
+				if( i + 1 >= argc )	return -1;
+				fp = fopen(argv[++i], "r");
+				if( !fp ) {
+					fprintf(stderr, "ERROR: Unable to read password file\n");
+					perror("reading LAT password");
+					return -1;
+				}
+				fgets(buf, sizeof buf, fp);
+				fclose(fp);
+				gsDoor_Password = strdup(buf);;
+			}
+			else if( strcmp(arg, "--cokebank") == 0 ) {
 				if( i + 1 >= argc )	return -1;
-				gsDoor_Password = argv[++i];
+				gsCokebankPath = argv[++i];
 			}
 			else {
 				// Usage error?
+				PrintUsage(argv[0]);
+				return -1;
 			}
 		}
 		else {
 			// Usage Error?
+			PrintUsage(argv[0]);
+			return -1;
 		}
 	}
 	
@@ -129,7 +163,7 @@ void *Periodic_Thread(void *Unused)
 	for( ;; )
 	{
 		sleep(10);	// Sleep for a while
-		printf("Periodic firing\n");
+//		printf("Periodic firing\n");
 		for( i = 0; i < ciMaxPeriodics; i ++ )
 		{
 			if( gaPeriodicCalls[i].Function )