From 94a66383f886eaecb7ff641785117247784900c8 Mon Sep 17 00:00:00 2001
From: John Hodge <tpg@mutabah.net>
Date: Wed, 5 Jan 2011 15:09:56 +0845
Subject: [PATCH] Added check for second WaitForColon
---
src/server/handler_coke.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/server/handler_coke.c b/src/server/handler_coke.c
index ad5387f..cd02fa7 100644
--- a/src/server/handler_coke.c
+++ b/src/server/handler_coke.c
@@ -71,7 +71,10 @@ int Coke_CanDispense(int User, int Item)
sprintf(tmp, "s%i\r\n", Item);
write(giCoke_SerialFD, tmp, 4);
- WaitForColon();
+ if( WaitForColon() ) {
+ fprintf(stderr, "Coke machine timed out (after initial)\n");
+ return -2; // -EMYBAD
+ }
ret = ReadLine(sizeof(tmp)-1, tmp);
printf("ret = %i, tmp = '%s'\n", ret, tmp);
--
GitLab