X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fclient%2Fmain.c;h=bf22fab7bd7c6f26f814e1e519c67fba6bc34eb7;hb=74b6a69bdc5a9f96d5781939167ae5af0e038375;hp=d7a8e49a0fe0ad091a0251f902703ecb49107a89;hpb=135e5ad4cc018ec05d1118e4d40be5c51db3f293;p=tpg%2Fopendispense2.git

diff --git a/src/client/main.c b/src/client/main.c
index d7a8e49..bf22fab 100644
--- a/src/client/main.c
+++ b/src/client/main.c
@@ -97,7 +97,7 @@ char	*trim(char *string);
 void	CompileRegex(regex_t *regex, const char *pattern, int flags);
 
 // === GLOBALS ===
-char	*gsDispenseServer = "heathred";
+char	*gsDispenseServer = "merlo.ucc.gu.uwa.edu.au";
  int	giDispensePort = 11020;
 
 tItem	*gaItems;
@@ -146,6 +146,11 @@ void ShowUsage(void)
 			"    dispense iteminfo <itemid>\n"
 			"        Get the name and price for an item\n"
 			);
+//	if( giTextArgc == 0 || strcmp(gsTextArgs[0], "enumitems") == 0 )
+//		printf(
+//			"    dispense enumitems\n"
+//			"        List avaliable items\n"
+//			);
 	if( giTextArgc == 0 )
 		printf("  == Coke members == \n");
 	if( giTextArgc == 0 || strcmp(gsTextArgs[0], "acct") == 0 )
@@ -161,6 +166,8 @@ void ShowUsage(void)
 		printf(
 			"    dispense refund <user> <itemid> [<price>]\n"
 			"        Refund an item to a user (with optional price override)\n"
+			"        Item IDs can be seen in the cokelog (in the brackets after the item name)\n"
+			"        e.g. coke:6 for a coke, snack:33 for slot 33 of the snack machine\n"
 			);
 	if( giTextArgc == 0 || strcmp(gsTextArgs[0], "slot") == 0 )
 		printf(
@@ -814,10 +821,10 @@ int main(int argc, char *argv[])
 		if( j > 1 ) {
 			printf("%i items dispensed\n", j);
 		}
+		Dispense_ShowUser(sock, gsUserName);
 		close(sock);
-	}
 
-	Dispense_ShowUser(sock, gsUserName);
+	}
 
 	return ret;
 }
@@ -2212,7 +2219,7 @@ char *ReadLine(int Socket)
 		}
 		else {
 			len = recv(Socket, buf+bufPos, BUFSIZ-1-bufPos, 0);
-			if( len < 0 ) {
+			if( len <= 0 ) {
 				free(ret);
 				return strdup("599 Client Connection Error\n");
 			}