X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fmain.c;h=83c8e06da763aa24e5d91df6f6b4cf3801c686d1;hb=4fef498619ca05876568c6bc5114fadd7c2496ee;hp=c1b883eeca69798387b6cc16bbbfed68e008d93d;hpb=b97adce8e46e69b3250f5497156554889acbdf12;p=tpg%2Fopendispense2.git

diff --git a/src/server/main.c b/src/server/main.c
index c1b883e..83c8e06 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,19 +105,38 @@ 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;
 		}
 	}
 	
 	signal(SIGINT, sigint_handler);
+	signal(SIGTERM, sigint_handler);
 	
 	openlog("odispense2", 0, LOG_LOCAL4);