X-Git-Url: https://git.ucc.asn.au/?p=tpg%2Fopendispense2.git;a=blobdiff_plain;f=src%2Fclient%2Fmain.c;h=4d33de10af44cae6436f2b2ca55c81b7ca398dc5;hp=f0950963d93e4b6d98e2d579b5640df16d0dcda9;hb=24654ef0078320798912a273508e37f9ce921ba7;hpb=512c85b9aad68127e62244fdd8666779c053a50c

diff --git a/src/client/main.c b/src/client/main.c
index f095096..4d33de1 100644
--- a/src/client/main.c
+++ b/src/client/main.c
@@ -27,10 +27,24 @@
 
 #define	USE_NCURSES_INTERFACE	0
 #define DEBUG_TRACE_SERVER	0
+#define USE_AUTOAUTH	1
+
+#define MAX_TXT_ARGS	5	// Maximum number of textual arguments (including command)
+
+enum eUI_Modes
+{
+	UI_MODE_BASIC,	// Non-NCurses
+	UI_MODE_STANDARD,
+	UI_MODE_DRINKSONLY,
+	UI_MODE_ALL,
+	NUM_UI_MODES
+};
 
 // === TYPES ===
 typedef struct sItem {
-	char	*Ident;
+	char	*Type;
+	 int	ID;
+	 int	Status;	// 0: Availiable, 1: Sold out, -1: Error
 	char	*Desc;
 	 int	Price;
 }	tItem;
@@ -40,18 +54,24 @@ typedef struct sItem {
 void	ShowUsage(void);
 // --- GUI ---
  int	ShowNCursesUI(void);
-void	ShowItemAt(int Row, int Col, int Width, int Index);
+ int	ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted);
 void	PrintAlign(int Row, int Col, int Width, const char *Left, char Pad1, const char *Mid, char Pad2, const char *Right, ...);
 // --- Coke Server Communication ---
  int	OpenConnection(const char *Host, int Port);
  int	Authenticate(int Socket);
+ int	GetUserBalance(int Socket);
 void	PopulateItemList(int Socket);
- int	DispenseItem(int Socket, int ItemID);
+ int	Dispense_ItemInfo(int Socket, const char *Type, int ID);
+ int	DispenseItem(int Socket, const char *Type, int ID);
  int	Dispense_AlterBalance(int Socket, const char *Username, int Ammount, const char *Reason);
- int	Dispense_SetBalance(int Socket, const char *Username, int Ammount, const char *Reason);
+ int	Dispense_SetBalance(int Socket, const char *Username, int Balance, const char *Reason);
+ int	Dispense_Give(int Socket, const char *Username, int Ammount, const char *Reason);
+ int	Dispense_Donate(int Socket, int Ammount, const char *Reason);
  int	Dispense_EnumUsers(int Socket);
  int	Dispense_ShowUser(int Socket, const char *Username);
 void	_PrintUserLine(const char *Line);
+ int	Dispense_AddUser(int Socket, const char *Username);
+ int	Dispense_SetUserType(int Socket, const char *Username, const char *TypeString);
 // --- Helpers ---
 char	*ReadLine(int Socket);
  int	sendf(int Socket, const char *Format, ...);
@@ -60,35 +80,46 @@ char	*trim(char *string);
 void	CompileRegex(regex_t *regex, const char *pattern, int flags);
 
 // === GLOBALS ===
-char	*gsDispenseServer = "localhost";
+char	*gsDispenseServer = "heathred";
  int	giDispensePort = 11020;
 
 tItem	*gaItems;
  int	giNumItems;
-regex_t	gArrayRegex, gItemRegex, gSaltRegex, gUserInfoRegex;
+regex_t	gArrayRegex, gItemRegex, gSaltRegex, gUserInfoRegex, gUserItemIdentRegex;
  int	gbIsAuthenticated = 0;
 
-char	*gsOverrideUser;	//!< '-u' Dispense as another user
- int	gbUseNCurses = 0;	//!< '-G' Use the NCurses GUI?
+char	*gsItemPattern;	//!< Item pattern
+char	*gsEffectiveUser;	//!< '-u' Dispense as another user
+ int	giUIMode = UI_MODE_STANDARD;
+ int	gbDryRun = 0;	//!< '-n' Read-only
  int	giMinimumBalance = INT_MIN;	//!< '-m' Minumum balance for `dispense acct`
  int	giMaximumBalance = INT_MAX;	//!< '-M' Maximum balance for `dispense acct`
+char	*gsUserName;	//!< User that dispense will happen as
+char	*gsUserFlags;	//!< User's flag set
+ int	giUserBalance=-1;	//!< User balance (set by Authenticate)
 
 // === CODE ===
 int main(int argc, char *argv[])
 {
 	 int	sock;
-	 int	i;
+	 int	i, ret = 0;
 	char	buffer[BUFSIZ];
+	char	*text_args[MAX_TXT_ARGS];	// Non-flag arguments
+	 int	text_argc = 0;
 	
+	text_args[0] = "";
+
 	// -- Create regular expressions
 	// > Code Type Count ...
 	CompileRegex(&gArrayRegex, "^([0-9]{3})\\s+([A-Za-z]+)\\s+([0-9]+)", REG_EXTENDED);	//
-	// > Code Type Ident Price Desc
-	CompileRegex(&gItemRegex, "^([0-9]{3})\\s+([A-Za-z]+)\\s+([A-Za-z0-9:]+?)\\s+([0-9]+)\\s+(.+)$", REG_EXTENDED);
+	// > Code Type Ident Status Price Desc
+	CompileRegex(&gItemRegex, "^([0-9]{3})\\s+([A-Za-z]+)\\s+([A-Za-z]+):([0-9]+)\\s+(avail|sold|error)\\s+([0-9]+)\\s+(.+)$", REG_EXTENDED);
 	// > Code 'SALT' salt
 	CompileRegex(&gSaltRegex, "^([0-9]{3})\\s+([A-Za-z]+)\\s+(.+)$", REG_EXTENDED);
 	// > Code 'User' Username Balance Flags
 	CompileRegex(&gUserInfoRegex, "^([0-9]{3})\\s+([A-Za-z]+)\\s+([^ ]+)\\s+(-?[0-9]+)\\s+(.+)$", REG_EXTENDED);
+	// > Item Ident
+	CompileRegex(&gUserItemIdentRegex, "^([A-Za-z]+):([0-9]+)$", REG_EXTENDED);
 
 	// Parse Arguments
 	for( i = 1; i < argc; i ++ )
@@ -105,93 +136,349 @@ int main(int argc, char *argv[])
 				return 0;
 			
 			case 'm':	// Minimum balance
+				if( i + 1 >= argc ) {
+					fprintf(stderr, "%s: -m takes an argument\n", argv[0]);
+					ShowUsage();
+				}
 				giMinimumBalance = atoi(argv[++i]);
 				break;
 			case 'M':	// Maximum balance
+				if( i + 1 >= argc ) {
+					fprintf(stderr, "%s: -M takes an argument\n", argv[0]);
+					ShowUsage();
+				}
 				giMaximumBalance = atoi(argv[++i]);
 				break;
 			
 			case 'u':	// Override User
-				gsOverrideUser = argv[++i];
+				if( i + 1 >= argc ) {
+					fprintf(stderr, "%s: -u takes an argument\n", argv[0]);
+					ShowUsage();
+				}
+				gsEffectiveUser = argv[++i];
 				break;
 			
-			case 'G':	// Use GUI
-				gbUseNCurses = 1;
+			case 'H':	// Override remote host
+				if( i + 1 >= argc ) {
+					fprintf(stderr, "%s: -H takes an argument\n", argv[0]);
+					ShowUsage();
+				}
+				gsDispenseServer = argv[++i];
+				break;
+			case 'P':	// Override remote port
+				if( i + 1 >= argc ) {
+					fprintf(stderr, "%s: -P takes an argument\n", argv[0]);
+					ShowUsage();
+				}
+				giDispensePort = atoi(argv[++i]);
+				break;
+			
+			case 'G':	// Don't use GUI
+				giUIMode = UI_MODE_BASIC;
+				break;
+			case 'D':	// Drinks only
+				giUIMode = UI_MODE_DRINKSONLY;
+				break;
+			case 'n':	// Dry Run / read-only
+				gbDryRun = 1;
+				break;
+			case '0':	case '1':
+			case '2':	case '3':
+			case '4':	case '5':
+			case '6':	case '7':
+			case '8':	case '9':
+				if( text_argc + 1 ==  MAX_TXT_ARGS )
+				{
+					fprintf(stderr, "ERROR: Too many arguments\n");
+					return 1;
+				}
+				text_args[text_argc++] = argv[i];
 				break;
 			}
 
 			continue;
 		}
-		
-		if( strcmp(arg, "acct") == 0 )
-		{
 
-			// Connect to server
-			sock = OpenConnection(gsDispenseServer, giDispensePort);
-			if( sock < 0 )	return -1;
+		if( text_argc + 1 == MAX_TXT_ARGS )
+		{
+			fprintf(stderr, "ERROR: Too many arguments\n");
+			return 1;
+		}
+	
+		text_args[text_argc++] = argv[i];
+	
+	}
 
+	//
+	// `dispense acct`
+	// - 
+	if( strcmp(text_args[0], "acct") == 0 )
+	{
+		// Connect to server
+		sock = OpenConnection(gsDispenseServer, giDispensePort);
+		if( sock < 0 )	return -1;
 			// List accounts?
-			if( i + 1 == argc ) {
-				Dispense_EnumUsers(sock);
-				return 0;
-			}
+		if( text_argc == 1 ) {
+			Dispense_EnumUsers(sock);
+			return 0;
+		}
+			
+		// text_args[1]: Username
+		
+		// Alter account?
+		if( text_argc == 4 )
+		{
+			// Authentication required
+			if( Authenticate(sock) )
+				return -1;
 			
-			// argv[i+1]: Username
+			// text_args[1]: Username
+			// text_args[2]: Ammount
+			// text_args[3]: Reason
 			
-			// Alter account?
-			if( i + 2 < argc )
-			{	
-				if( i + 3 >= argc ) {
-					fprintf(stderr, "Error: `dispense acct' needs a reason\n");
+			if( text_args[2][0] == '=' ) {
+				// Set balance
+				if( text_args[2][1] != '0' && atoi(text_args[2]+1) == 0 ) {
+					fprintf(stderr, "Error: Invalid balance to be set\n");
 					exit(1);
 				}
 				
-				// Authentication required
-				Authenticate(sock);
-				
-				// argv[i+1]: Username
-				// argv[i+2]: Ammount
-				// argv[i+3]: Reason
-				
-				if( argv[i+2][0] == '=' ) {
-					// Set balance
-					Dispense_SetBalance(sock, argv[i+1], atoi(argv[i+2] + 1), argv[i+3]);
-				}
-				else {
-					// Alter balance
-					Dispense_AlterBalance(sock, argv[i+1], atoi(argv[i+2]), argv[i+3]);
-				}
+				Dispense_SetBalance(sock, text_args[1], atoi(text_args[2]+1), text_args[3]);
+			}
+			else {
+				// Alter balance
+				Dispense_AlterBalance(sock, text_args[1], atoi(text_args[2]), text_args[3]);
+			}
+		}
+		
+		// Show user information
+		Dispense_ShowUser(sock, text_args[1]);
+		
+		close(sock);
+		return 0;
+	}
+	//
+	// `dispense give`
+	// - "Here, have some money."
+	if( strcmp(text_args[0], "give") == 0 )
+	{
+		if( text_argc != 3 ) {
+			fprintf(stderr, "`dispense give` takes three arguments\n");
+			ShowUsage();
+			return -1;
+		}
+		
+		// text_args[1]: Destination
+		// text_args[2]: Ammount
+		// text_args[3]: Reason
+		
+		// Connect to server
+		sock = OpenConnection(gsDispenseServer, giDispensePort);
+		if( sock < 0 )	return -1;
+		
+		// Authenticate
+		if( Authenticate(sock) )
+			return -1;
+		
+		Dispense_Give(sock, text_args[1], atoi(text_args[2]), text_args[3]);
+		return 0;
+	}
+	// 
+	// `dispense user`
+	// - User administration (Admin Only)
+	if( strcmp(text_args[0], "user") == 0 )
+	{
+		// Check argument count
+		if( text_argc == 1 ) {
+			fprintf(stderr, "Error: `dispense user` requires arguments\n");
+			ShowUsage();
+			exit(1);
+		}
+		
+		// Connect to server
+		sock = OpenConnection(gsDispenseServer, giDispensePort);
+		if( sock < 0 )	return -1;
+		
+		// Attempt authentication
+		if( Authenticate(sock) )
+			return -1;
+		
+		// Add new user?
+		if( strcmp(text_args[1], "add") == 0 )
+		{
+			if( text_argc != 3 ) {
+				fprintf(stderr, "Error: `dispense user add` requires an argument\n");
+				ShowUsage();
+				exit(1);
 			}
 			
-			Dispense_ShowUser(sock, argv[i+1]);
+			Dispense_AddUser(sock, text_args[2]);
+		}
+		// Update a user
+		else if( strcmp(text_args[1], "type") == 0 )
+		{
+			if( text_argc != 4 ) {
+				fprintf(stderr, "Error: `dispense user type` requires two arguments\n");
+				ShowUsage();
+				exit(1);
+			}
 			
-			close(sock);
-			return 0;
+			Dispense_SetUserType(sock, text_args[2], text_args[3]);
 		}
-		else {
-			// Item name / pattern
-			break;
+		else
+		{
+			fprintf(stderr, "Error: Unknown sub-command for `dispense user`\n");
+			ShowUsage();
+			exit(1);
 		}
+		return 0;
+	}
+	
+	// Donation!
+	if( strcmp(text_args[0], "donate") == 0 )
+	{
+		// Check argument count
+		if( text_argc != 3 ) {
+			fprintf(stderr, "Error: `dispense donate` requires two arguments\n");
+			ShowUsage();
+			exit(1);
+		}
+		
+		// Connect to server
+		sock = OpenConnection(gsDispenseServer, giDispensePort);
+		if( sock < 0 )	return -1;
+		
+		// Attempt authentication
+		if( Authenticate(sock) )
+			return -1;
+		
+		// Do donation
+		Dispense_Donate(sock, atoi(text_args[1]), text_args[2]);
+		
+		return 0;
+	}
+	else {
+		// Item name / pattern
+		gsItemPattern = text_args[0];
 	}
 	
 	// Connect to server
 	sock = OpenConnection(gsDispenseServer, giDispensePort);
 	if( sock < 0 )	return -1;
-	
-	// Authenticate
-	Authenticate(sock);
+
+	// Get the user's balance
+	GetUserBalance(sock);
 
 	// Get items
 	PopulateItemList(sock);
 	
-	if( gbUseNCurses )
+	// Disconnect from server
+	close(sock);
+	
+	if( gsItemPattern && gsItemPattern[0] )
+	{
+		regmatch_t matches[3];
+		// Door (hard coded)
+		if( strcmp(gsItemPattern, "door") == 0 )
+		{
+			// Connect, Authenticate, dispense and close
+			sock = OpenConnection(gsDispenseServer, giDispensePort);
+			if( sock < 0 )	return -1;
+			Authenticate(sock);
+			DispenseItem(sock, "door", 0);
+			close(sock);
+			return 0;
+		}
+		// Item id (<type>:<num>)
+		else if( RunRegex(&gUserItemIdentRegex, gsItemPattern, 3, matches, NULL) == 0 )
+		{
+			char	*ident;
+			 int	id;
+			
+			// Get and finish ident
+			ident = gsItemPattern + matches[1].rm_so;
+			gsItemPattern[matches[1].rm_eo] = '\0';
+			// Get ID
+			id = atoi( gsItemPattern + matches[2].rm_so );
+			
+			// Connect, Authenticate, dispense and close
+			sock = OpenConnection(gsDispenseServer, giDispensePort);
+			if( sock < 0 )	return -1;
+			
+			Dispense_ItemInfo(sock, ident, id);
+			
+			Authenticate(sock);
+			DispenseItem(sock, ident, id);
+			close(sock);
+			return 0;
+		}
+		// Item number (6 = coke)
+		else if( strcmp(gsItemPattern, "0") == 0 || atoi(gsItemPattern) > 0 )
+		{
+			i = atoi(gsItemPattern);
+		}
+		// Item prefix
+		else
+		{
+			 int	j;
+			 int	best = -1;
+			for( i = 0; i < giNumItems; i ++ )
+			{
+				// Prefix match (with case-insensitive match)
+				for( j = 0; gsItemPattern[j]; j ++ )
+				{
+					if( gaItems[i].Desc[j] == gsItemPattern[j] )
+						continue;
+					if( tolower(gaItems[i].Desc[j]) == tolower(gsItemPattern[j]) )
+						continue;
+					break;
+				}
+				// Check if the prefix matched
+				if( gsItemPattern[j] != '\0' )
+					continue;
+				
+				// Prefect match
+				if( gaItems[i].Desc[j] == '\0' ) {
+					best = i;
+					break;
+				}
+				
+				// Only one match allowed
+				if( best == -1 ) {
+					best = i;
+				}
+				else {
+					// TODO: Allow ambiguous matches?
+					// or just print a wanrning
+					printf("Warning - Ambiguous pattern, stopping\n");
+					return 1;
+				}
+			}
+			
+			// Was a match found?
+			if( best == -1 )
+			{
+				fprintf(stderr, "No item matches the passed string\n");
+				return 1;
+			}
+			
+			i = best;
+		}
+	}
+	else if( giUIMode != UI_MODE_BASIC )
 	{
 		i = ShowNCursesUI();
 	}
 	else
 	{
-		for( i = 0; i < giNumItems; i ++ ) {		
-			printf("%2i %s\t%3i %s\n", i, gaItems[i].Ident, gaItems[i].Price, gaItems[i].Desc);
+		// Very basic dispense interface
+		for( i = 0; i < giNumItems; i ++ ) {
+			// Add a separator
+			if( i && strcmp(gaItems[i].Type, gaItems[i-1].Type) != 0 )
+				printf("   ---\n");
+			
+			printf("%2i %s:%i\t%3i %s\n", i, gaItems[i].Type, gaItems[i].ID,
+				gaItems[i].Price, gaItems[i].Desc);
 		}
 		printf(" q Quit\n");
 		for(;;)
@@ -219,40 +506,62 @@ int main(int argc, char *argv[])
 		}
 	}
 	
+	
 	// Check for a valid item ID
 	if( i >= 0 )
-		DispenseItem(sock, i);
-
-	close(sock);
+	{
+		// Connect, Authenticate, dispense and close
+		sock = OpenConnection(gsDispenseServer, giDispensePort);
+		if( sock < 0 )	return -1;
+			
+		Dispense_ItemInfo(sock, gaItems[i].Type, gaItems[i].ID);
+		
+		Authenticate(sock);
+		ret = DispenseItem(sock, gaItems[i].Type, gaItems[i].ID);
+		close(sock);
+	}
 
-	return 0;
+	return ret;
 }
 
 void ShowUsage(void)
 {
 	printf(
 		"Usage:\n"
-		"\tdispense\n"
-		"\t\tShow interactive list\n"
-		"\tdispense <item>\n"
-		"\t\tDispense named item\n"
-		"\tdispense give <user> <ammount> \"<reason>\"\n"
-		"\t\tGive some of your money away\n"
-		"\tdispense acct [<user>]\n"
-		"\t\tShow user balances\n"
-		"\tdispense acct <user> [+-=]<ammount> \"<reason>\"\n"
-		"\t\tAlter a account value (Coke members only)\n"
+		"  == Everyone ==\n"
+		"    dispense\n"
+		"        Show interactive list\n"
+		"    dispense <item>\n"
+		"        Dispense named item\n"
+		"    dispense give <user> <ammount> \"<reason>\"\n"
+		"        Give money to another user\n"
+		"    dispense donate <ammount> \"<reason>\"\n"
+		"        Donate to the club\n"
+		"  == Coke members == \n"
+		"    dispense acct [<user>]\n"
+		"        Show user balances\n"
+		"    dispense acct <user> [+-]<ammount> \"<reason>\"\n"
+		"        Alter a account value\n"
+		"  == Dispense administrators ==\n"
+		"    dispense acct <user> =<ammount> \"<reason>\"\n"
+		"        Set an account balance\n"
+		"    dispense user add <user>\n"
+		"        Create new coke account (Admins only)\n"
+		"    dispense user type <user> <flags>\n"
+		"        Alter a user's flags\n"
+		"        <flags> is a comma-separated list of user, coke, admin or disabled\n"
+		"        Flags are removed by preceding the name with '-' or '!'\n"
 		"\n"
 		"General Options:\n"
-		"\t-u <username>\n"
-		"\t\tSet a different user (Coke members only)\n"
-		"\t-h / -?\n"
-		"\t\tShow help text\n"
-		"\t-G\n"
-		"\t\tUse alternate GUI\n"
-		"\t-m <min balance>\n"
-		"\t-M <max balance>\n"
-		"\t\tSet the Maximum/Minimum balances shown in `dispense acct`\n"
+		"    -u <username>\n"
+		"        Set a different user (Coke members only)\n"
+		"    -h / -?\n"
+		"        Show help text\n"
+		"    -G\n"
+		"        Use alternate GUI\n"
+		"    -m <min balance>\n"
+		"    -M <max balance>\n"
+		"        Set the Maximum/Minimum balances shown in `dispense acct`\n"
 		);
 }
 
@@ -271,24 +580,45 @@ int ShowNCursesUI(void)
 	 int	i, times;
 	 int	xBase, yBase;
 	const int	displayMinWidth = 40;
-	const int	displayMinItems = 8;
 	char	*titleString = "Dispense";
-	 int	itemCount = displayMinItems;
+	 int	itemCount;
+	 int	maxItemIndex;
 	 int	itemBase = 0;
-	 int	currentItem = 0;
+	 int	currentItem;
 	 int	ret = -2;	// -2: Used for marking "no return yet"
+	
+	char	balance_str[5+1+2+1];	// If $9999.99 is too little, something's wrong
+	char	*username;
+	struct passwd *pwd;
 	 
 	 int	height, width;
 	 
+	// Get Username
+	if( gsEffectiveUser )
+		username = gsEffectiveUser;
+	else {
+		pwd = getpwuid( getuid() );
+		username = pwd->pw_name;
+	}
+	// Get balance
+	snprintf(balance_str, sizeof balance_str, "$%i.%02i", giUserBalance/100, giUserBalance%100);
+	
 	// Enter curses mode
 	initscr();
 	raw(); noecho();
 	
-	// Get item count
+	// Get max index
+	maxItemIndex = ShowItemAt(0, 0, 0, -1, 0);
+	// Get item count per screen
 	// - 6: randomly chosen (Need at least 3)
 	itemCount = LINES - 6;
-	if( itemCount > giNumItems )
-		itemCount = giNumItems;
+	if( itemCount > maxItemIndex )
+		itemCount = maxItemIndex;
+	// Get first index
+	currentItem = 0;
+	while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 )
+		currentItem ++;
+	
 	
 	// Get dimensions
 	height = itemCount + 3;
@@ -306,35 +636,35 @@ int ShowNCursesUI(void)
 		// Items
 		for( i = 0; i < itemCount; i ++ )
 		{
+			 int	pos = 0;
+			
 			move( yBase + 1 + i, xBase );
+			printw("| ");
 			
-			if( currentItem == itemBase + i ) {
-				printw("| -> ");
-			}
-			else {
-				printw("|    ");
-			}
+			pos += 2;
 			
-			// Check for ... row
+			// Check for the '...' row
 			// - Oh god, magic numbers!
-			if( i == 0 && itemBase > 0 ) {
-				printw("   ...");
-				times = width-1 - 8 - 3;
-				while(times--)	addch(' ');
-			}
-			else if( i == itemCount - 1 && itemBase < giNumItems - itemCount ) {
-				printw("   ...");
-				times = width-1 - 8 - 3;
+			if( (i == 0 && itemBase > 0)
+			 || (i == itemCount - 1 && itemBase < maxItemIndex - itemCount) )
+			{
+				printw("     ...");	pos += 8;
+				times = (width - pos) - 1;
 				while(times--)	addch(' ');
 			}
 			// Show an item
 			else {
-				ShowItemAt( yBase + 1 + i, xBase + 5, width - 7, itemBase + i);
-				addch(' ');
+				ShowItemAt(
+					yBase + 1 + i, xBase + pos,	// Position
+					(width - pos) - 3,	// Width
+					itemBase + i,	// Index
+					!!(currentItem == itemBase + i)	// Hilighted
+					);
+				printw("  ");
 			}
 			
 			// Scrollbar (if needed)
-			if( giNumItems > itemCount ) {
+			if( maxItemIndex > itemCount ) {
 				if( i == 0 ) {
 					addch('A');
 				}
@@ -342,7 +672,7 @@ int ShowNCursesUI(void)
 					addch('V');
 				}
 				else {
-					 int	percentage = itemBase * 100 / (giNumItems-itemCount);
+					 int	percentage = itemBase * 100 / (maxItemIndex-itemCount);
 					if( i-1 == percentage*(itemCount-3)/100 ) {
 						addch('#');
 					}
@@ -359,6 +689,12 @@ int ShowNCursesUI(void)
 		// Footer
 		PrintAlign(yBase+height-2, xBase, width, "\\", '-', "", '-', "/");
 		
+		// User line
+		// - Username, balance, flags
+		PrintAlign(yBase+height-1, xBase+1, width-2,
+			username, ' ', balance_str, ' ', gsUserFlags);
+		
+		
 		// Get input
 		ch = getch();
 		
@@ -370,32 +706,47 @@ int ShowNCursesUI(void)
 				switch(ch)
 				{
 				case 'B':
-					//if( itemBase < giNumItems - (itemCount) )
-					//	itemBase ++;
-					if( currentItem < giNumItems - 1 )
+					currentItem ++;
+					// Skip over spacers
+					while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 )
 						currentItem ++;
-					if( itemBase + itemCount - 1 <= currentItem && itemBase + itemCount < giNumItems )
-						itemBase ++;
+					
+					if( currentItem >= maxItemIndex ) {
+						currentItem = 0;
+						// Skip over spacers
+						while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 )
+							currentItem ++;
+					}
 					break;
 				case 'A':
-					//if( itemBase > 0 )
-					//	itemBase --;
-					if( currentItem > 0 )
+					currentItem --;
+					// Skip over spacers
+					while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 )
 						currentItem --;
-					if( itemBase + 1 > currentItem && itemBase > 0 )
-						itemBase --;
+					
+					if( currentItem < 0 ) {
+						currentItem = maxItemIndex - 1;
+						// Skip over spacers
+						while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 )
+							currentItem --;
+					}
 					break;
 				}
 			}
 			else {
 				
 			}
+			
+			if( itemCount > maxItemIndex && currentItem < itemBase + 2 && itemBase > 0 )
+				itemBase = currentItem - 2;
+			if( itemCount > maxItemIndex && currentItem > itemBase + itemCount - 2 && itemBase < maxItemIndex-1 )
+				itemBase = currentItem - itemCount + 2;
 		}
 		else {
 			switch(ch)
 			{
 			case '\n':
-				ret = currentItem;
+				ret = ShowItemAt(0, 0, 0, currentItem, 0);
 				break;
 			case 'q':
 				ret = -1;	// -1: Return with no dispense
@@ -416,32 +767,111 @@ int ShowNCursesUI(void)
 
 /**
  * \brief Show item \a Index at (\a Col, \a Row)
+ * \return Dispense index of item
  * \note Part of the NCurses UI
  */
-void ShowItemAt(int Row, int Col, int Width, int Index)
+int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted)
 {
 	 int	_x, _y, times;
-	char	*name;
-	 int	price;
+	char	*name = NULL;
+	 int	price = 0;
+	 int	status = -1;
 	
-	move( Row, Col );
-	
-	if( Index < 0 || Index >= giNumItems ) {
-		name = "OOR";
-		price = 0;
-	}
-	else {
+	switch(giUIMode)
+	{
+	// Standard UI
+	// - This assumes that 
+	case UI_MODE_STANDARD:
+		// Bounds check
+		// Index = -1, request limit
+		if( Index < 0 || Index >= giNumItems+2 )
+			return giNumItems+2;
+		// Drink label
+		if( Index == 0 )
+		{
+			price = 0;
+			name = "Coke Machine";
+			Index = -1;	// -1 indicates a label
+			break;
+		}
+		Index --;
+		// Drinks 0 - 6
+		if( Index <= 6 )
+		{
+			name = gaItems[Index].Desc;
+			price = gaItems[Index].Price;
+			status = gaItems[Index].Status;
+			break;
+		}
+		Index -= 7;
+		// EPS label
+		if( Index == 0 )
+		{
+			price = 0;
+			name = "Electronic Payment System";
+			Index = -1;	// -1 indicates a label
+			break;
+		}
+		Index --;
+		Index += 7;
 		name = gaItems[Index].Desc;
 		price = gaItems[Index].Price;
+		status = gaItems[Index].Status;
+		break;
+	default:
+		return -1;
 	}
-
-	printw("%02i %s", Index, name);
 	
-	getyx(stdscr, _y, _x);
-	// Assumes max 4 digit prices
-	times = Width - 4 - (_x - Col);	// TODO: Better handling for large prices
-	while(times--)	addch(' ');
-	printw("%4i", price);
+	// Width = 0, don't print
+	if( Width > 0 )
+	{
+		move( Row, Col );
+		
+		if( Index >= 0 )
+		{
+			// Show hilight and status
+			switch( status )
+			{
+			case 0:
+				if( bHilighted )
+					printw("-> ");
+				else
+					printw("   ");
+				break;
+			case 1:
+				printw("SLD");
+				break;
+			
+			default:
+			case -1:
+				printw("ERR");
+				break;
+			}
+			
+			printw(" %s", name);
+		
+			getyx(stdscr, _y, _x);
+			// Assumes max 4 digit prices
+			times = Width - 5 - (_x - Col);	// TODO: Better handling for large prices
+			while(times--)	addch(' ');
+			
+			printw(" %4i", price);
+		}
+		else
+		{
+			printw("-- %s", name);
+			getyx(stdscr, _y, _x);
+			times = Width - 4 - (_x - Col);
+			while(times--)	addch(' ');
+			printw("    ");
+		}
+	}
+	
+	// If the item isn't availiable for sale, return -1 (so it's skipped)
+	if( status )
+		Index = -1;
+	
+	return Index;
 }
 
 /**
@@ -486,7 +916,7 @@ void PrintAlign(int Row, int Col, int Width, const char *Left, char Pad1,
 		addstr(tmp);
 	}
 	// - Left padding
-	times = Width/2 - mLen/2 - lLen;
+	times = (Width - mLen)/2 - lLen;
 	while(times--)	addch(Pad1);
 	// - Middle
 	{
@@ -495,7 +925,8 @@ void PrintAlign(int Row, int Col, int Width, const char *Left, char Pad1,
 		addstr(tmp);
 	}
 	// - Right Padding
-	times = Width/2 - mLen/2 - rLen;
+	times = (Width - mLen)/2 - rLen;
+	if( (Width - mLen) % 2 )	times ++;
 	while(times--)	addch(Pad2);
 	// - Right
 	{
@@ -532,17 +963,29 @@ int OpenConnection(const char *Host, int Port)
 		fprintf(stderr, "Failed to create socket\n");
 		return -1;
 	}
+
+//	printf("geteuid() = %i, getuid() = %i\n", geteuid(), getuid());
 	
-	#if USE_AUTOAUTH
+	if( geteuid() == 0 || getuid() == 0 )
 	{
+		 int	i;
 		struct sockaddr_in	localAddr;
 		memset(&localAddr, 0, sizeof(localAddr));
 		localAddr.sin_family = AF_INET;	// IPv4
-		localAddr.sin_port = 1023;	// IPv4
-		// Attempt to bind to low port for autoauth
-		bind(sock, &localAddr, sizeof(localAddr));
+		
+		// Loop through all the top ports until one is avaliable
+		for( i = 512; i < 1024; i ++)
+		{
+			localAddr.sin_port = htons(i);	// IPv4
+			// Attempt to bind to low port for autoauth
+			if( bind(sock, (struct sockaddr*)&localAddr, sizeof(localAddr)) == 0 )
+				break;
+		}
+		if( i == 1024 )
+			printf("Warning: AUTOAUTH unavaliable\n");
+//		else
+//			printf("Bound to 0.0.0.0:%i\n", i);
 	}
-	#endif
 	
 	if( connect(sock, (struct sockaddr *) &serverAddr, sizeof(serverAddr)) < 0 ) {
 		fprintf(stderr, "Failed to connect to server\n");
@@ -579,11 +1022,9 @@ int Authenticate(int Socket)
 	responseCode = atoi(buf);
 	switch( responseCode )
 	{
-	
-	case 200:	// Authenticated, return :)
-		gbIsAuthenticated = 1;
+	case 200:	// Autoauth succeeded, return
 		free(buf);
-		return 0;
+		break;
 	
 	case 401:	// Untrusted, attempt password authentication
 		free(buf);
@@ -650,12 +1091,9 @@ int Authenticate(int Socket)
 			return -1;
 		}
 		free(buf);
-		if( i < 3 ) {
-			gbIsAuthenticated = 1;
-			return 0;
-		}
-		else
+		if( i == 3 )
 			return 2;	// 2 = Bad Password
+		break;
 	
 	case 404:	// Bad Username
 		fprintf(stderr, "Bad Username '%s'\n", pwd->pw_name);
@@ -668,8 +1106,158 @@ int Authenticate(int Socket)
 		free(buf);
 		return -1;
 	}
+	
+	// Set effective user
+	if( gsEffectiveUser ) {
+		sendf(Socket, "SETEUSER %s\n", gsEffectiveUser);
+		
+		buf = ReadLine(Socket);
+		responseCode = atoi(buf);
+		
+		switch(responseCode)
+		{
+		case 200:
+			printf("Running as '%s' by '%s'\n", gsEffectiveUser, pwd->pw_name);
+			break;
+		
+		case 403:
+			printf("Only coke members can use `dispense -u`\n");
+			free(buf);
+			return -1;
+		
+		case 404:
+			printf("Invalid user selected\n");
+			free(buf);
+			return -1;
+		
+		default:
+			fprintf(stderr, "Unkown response code %i from server\n", responseCode);
+			printf("%s\n", buf);
+			free(buf);
+			exit(-1);
+		}
+		
+		free(buf);
+	}
+	
+	gbIsAuthenticated = 1;
+	
+	return 0;
 }
 
+int GetUserBalance(int Socket)
+{
+	regmatch_t	matches[6];
+	struct passwd	*pwd;
+	char	*buf;
+	 int	responseCode;
+	
+	if( !gsUserName )
+	{
+		if( gsEffectiveUser ) {
+			gsUserName = gsEffectiveUser;
+		}
+		else {
+			pwd = getpwuid( getuid() );
+			gsUserName = strdup(pwd->pw_name);
+		}
+	}
+	
+	sendf(Socket, "USER_INFO %s\n", gsUserName);
+	buf = ReadLine(Socket);
+	responseCode = atoi(buf);
+	switch(responseCode)
+	{
+	case 202:	break;	// Ok
+	
+	case 404:
+		printf("Invalid user? (USER_INFO failed)\n");
+		free(buf);
+		return -1;
+	
+	default:
+		fprintf(stderr, "Unkown response code %i from server\n", responseCode);
+		printf("%s\n", buf);
+		free(buf);
+		exit(-1);
+	}
+
+	RunRegex(&gUserInfoRegex, buf, 6, matches, "Malformed server response");
+	
+	giUserBalance = atoi( buf + matches[4].rm_so );
+	gsUserFlags = strdup( buf + matches[5].rm_so );
+	
+	free(buf);
+	
+	return 0;
+}
+
+/**
+ * \brief Read an item info response from the server
+ * \param Dest	Destination for the read item (strings will be on the heap)
+ */
+int ReadItemInfo(int Socket, tItem *Dest)
+{
+	char	*buf;
+	 int	responseCode;
+	
+	regmatch_t	matches[8];
+	char	*statusStr;
+	
+	// Get item info
+	buf = ReadLine(Socket);
+	responseCode = atoi(buf);
+	
+	switch(responseCode)
+	{
+	case 202:	break;
+	
+	case 406:
+		printf("Bad item name\n");
+		free(buf);
+		return 1;
+	
+	default:
+		fprintf(stderr, "Unknown response from dispense server (Response Code %i)\n%s", responseCode, buf);
+		exit(-1);
+	}
+	
+	RunRegex(&gItemRegex, buf, 8, matches, "Malformed server response");
+	
+	buf[ matches[3].rm_eo ] = '\0';
+	buf[ matches[5].rm_eo ] = '\0';
+	buf[ matches[7].rm_eo ] = '\0';
+	
+	statusStr = &buf[ matches[5].rm_so ];
+	
+	Dest->ID = atoi( buf + matches[4].rm_so );
+	
+	if( strcmp(statusStr, "avail") == 0 )
+		Dest->Status = 0;
+	else if( strcmp(statusStr, "sold") == 0 )
+		Dest->Status = 1;
+	else if( strcmp(statusStr, "error") == 0 )
+		Dest->Status = -1;
+	else {
+		fprintf(stderr, "Unknown response from dispense server (status '%s')\n",
+			statusStr);
+		return 1;
+	}
+	Dest->Price = atoi( buf + matches[6].rm_so );
+	
+	// Hack a little to reduce heap fragmentation
+	{
+		char	tmpType[strlen(buf + matches[3].rm_so) + 1];
+		char	tmpDesc[strlen(buf + matches[7].rm_so) + 1];
+		strcpy(tmpType, buf + matches[3].rm_so);
+		strcpy(tmpDesc, buf + matches[7].rm_so);
+		free(buf);
+		Dest->Type = strdup( tmpType );
+		Dest->Desc = strdup( tmpDesc );
+	}
+	
+	return 0;
+}
 
 /**
  * \brief Fill the item information structure
@@ -724,26 +1312,7 @@ void PopulateItemList(int Socket)
 	// Fetch item information
 	for( i = 0; i < giNumItems; i ++ )
 	{
-		regmatch_t	matches[6];
-		
-		// Get item info
-		buf = ReadLine(Socket);
-		responseCode = atoi(buf);
-		
-		if( responseCode != 202 ) {
-			fprintf(stderr, "Unknown response from dispense server (Response Code %i)\n", responseCode);
-			exit(-1);
-		}
-		
-		RunRegex(&gItemRegex, buf, 6, matches, "Malformed server response");
-		
-		buf[ matches[3].rm_eo ] = '\0';
-		
-		gaItems[i].Ident = strdup( buf + matches[3].rm_so );
-		gaItems[i].Price = atoi( buf + matches[4].rm_so );
-		gaItems[i].Desc = strdup( buf + matches[5].rm_so );
-		
-		free(buf);
+		ReadItemInfo( Socket, &gaItems[i] );
 	}
 	
 	// Read end of list
@@ -760,19 +1329,51 @@ void PopulateItemList(int Socket)
 	free(buf);
 }
 
+
+/**
+ * \brief Get information on an item
+ * \return Boolean Failure
+ */
+int Dispense_ItemInfo(int Socket, const char *Type, int ID)
+{
+	tItem	item;
+	
+	// Query
+	sendf(Socket, "ITEM_INFO %s:%i\n", Type, ID);
+	
+	if( ReadItemInfo(Socket, &item) )
+	{
+		return -1;
+	}
+	
+	printf("%8s:%-2i %2i.%02i %s\n",
+		item.Type, item.ID,
+		item.Price/100, item.Price%100,
+		item.Desc);
+	
+	free(item.Type);
+	free(item.Desc);
+	
+	return 0;
+}
+
 /**
  * \brief Dispense an item
  * \return Boolean Failure
  */
-int DispenseItem(int Socket, int ItemID)
+int DispenseItem(int Socket, const char *Type, int ID)
 {
 	 int	ret, responseCode;
 	char	*buf;
 	
-	if( ItemID < 0 || ItemID > giNumItems )	return -1;
+	// Check for a dry run
+	if( gbDryRun ) {
+		printf("Dry Run - No action\n");
+		return 0;
+	}
 	
 	// Dispense!
-	sendf(Socket, "DISPENSE %s\n", gaItems[ItemID].Ident);
+	sendf(Socket, "DISPENSE %s:%i\n", Type, ID);
 	buf = ReadLine(Socket);
 	
 	responseCode = atoi(buf);
@@ -791,7 +1392,7 @@ int DispenseItem(int Socket, int ItemID)
 		ret = 1;
 		break;
 	case 406:
-		printf("Bad item name, bug report\n");
+		printf("Bad item name\n");
 		ret = 1;
 		break;
 	case 500:
@@ -820,6 +1421,12 @@ int Dispense_AlterBalance(int Socket, const char *Username, int Ammount, const c
 	char	*buf;
 	 int	responseCode;
 	
+	// Check for a dry run
+	if( gbDryRun ) {
+		printf("Dry Run - No action\n");
+		return 0;
+	}
+	
 	sendf(Socket, "ADD %s %i %s\n", Username, Ammount, Reason);
 	buf = ReadLine(Socket);
 	
@@ -829,6 +1436,9 @@ int Dispense_AlterBalance(int Socket, const char *Username, int Ammount, const c
 	switch(responseCode)
 	{
 	case 200:	return 0;	// OK
+	case 402:
+		fprintf(stderr, "Insufficient balance\n");
+		return 1;
 	case 403:	// Not in coke
 		fprintf(stderr, "You are not in coke (sucker)\n");
 		return 1;
@@ -844,14 +1454,21 @@ int Dispense_AlterBalance(int Socket, const char *Username, int Ammount, const c
 }
 
 /**
- * \brief Alter a user's balance
+ * \brief Set a user's balance
+ * \note Only avaliable to dispense admins
  */
-int Dispense_SetBalance(int Socket, const char *Username, int Ammount, const char *Reason)
+int Dispense_SetBalance(int Socket, const char *Username, int Balance, const char *Reason)
 {
 	char	*buf;
 	 int	responseCode;
 	
-	sendf(Socket, "SET %s %i %s\n", Username, Ammount, Reason);
+	// Check for a dry run
+	if( gbDryRun ) {
+		printf("Dry Run - No action\n");
+		return 0;
+	}
+	
+	sendf(Socket, "SET %s %i %s\n", Username, Balance, Reason);
 	buf = ReadLine(Socket);
 	
 	responseCode = atoi(buf);
@@ -861,7 +1478,7 @@ int Dispense_SetBalance(int Socket, const char *Username, int Ammount, const cha
 	{
 	case 200:	return 0;	// OK
 	case 403:	// Not in coke
-		fprintf(stderr, "You are not in coke (sucker)\n");
+		fprintf(stderr, "You are not an admin\n");
 		return 1;
 	case 404:	// Unknown user
 		fprintf(stderr, "Unknown user '%s'\n", Username);
@@ -874,6 +1491,108 @@ int Dispense_SetBalance(int Socket, const char *Username, int Ammount, const cha
 	return -1;
 }
 
+/**
+ * \brief Give money to another user
+ */
+int Dispense_Give(int Socket, const char *Username, int Ammount, const char *Reason)
+{
+	char	*buf;
+	 int	responseCode;
+	
+	if( Ammount < 0 ) {
+		printf("Sorry, you can only give, you can't take.\n");
+		return -1;
+	}
+	
+	// Fast return on zero
+	if( Ammount == 0 ) {
+		printf("Are you actually going to give any?\n");
+		return 0;
+	}
+	
+	// Check for a dry run
+	if( gbDryRun ) {
+		printf("Dry Run - No action\n");
+		return 0;
+	}
+	
+	sendf(Socket, "GIVE %s %i %s\n", Username, Ammount, Reason);
+	buf = ReadLine(Socket);
+	
+	responseCode = atoi(buf);
+	free(buf);
+	
+	switch(responseCode)
+	{
+	case 200:	return 0;	// OK
+	
+	case 402:	
+		fprintf(stderr, "Insufficient balance\n");
+		return 1;
+	
+	case 404:	// Unknown user
+		fprintf(stderr, "Unknown user '%s'\n", Username);
+		return 2;
+	
+	default:
+		fprintf(stderr, "Unknown response code %i\n", responseCode);
+		return -1;
+	}
+	
+	return -1;
+}
+
+
+/**
+ * \brief Donate money to the club
+ */
+int Dispense_Donate(int Socket, int Ammount, const char *Reason)
+{
+	char	*buf;
+	 int	responseCode;
+	
+	if( Ammount < 0 ) {
+		printf("Sorry, you can only give, you can't take.\n");
+		return -1;
+	}
+	
+	// Fast return on zero
+	if( Ammount == 0 ) {
+		printf("Are you actually going to give any?\n");
+		return 0;
+	}
+	
+	// Check for a dry run
+	if( gbDryRun ) {
+		printf("Dry Run - No action\n");
+		return 0;
+	}
+	
+	sendf(Socket, "DONATE %i %s\n", Ammount, Reason);
+	buf = ReadLine(Socket);
+	
+	responseCode = atoi(buf);
+	free(buf);
+	
+	switch(responseCode)
+	{
+	case 200:	return 0;	// OK
+	
+	case 402:	
+		fprintf(stderr, "Insufficient balance\n");
+		return 1;
+	
+	default:
+		fprintf(stderr, "Unknown response code %i\n", responseCode);
+		return -1;
+	}
+	
+	return -1;
+}
+
+/**
+ * \brief Enumerate users
+ */
 int Dispense_EnumUsers(int Socket)
 {
 	char	*buf;
@@ -883,15 +1602,15 @@ int Dispense_EnumUsers(int Socket)
 	
 	if( giMinimumBalance != INT_MIN ) {
 		if( giMaximumBalance != INT_MAX ) {
-			sendf(Socket, "ENUM_USERS %i %i\n", giMinimumBalance, giMaximumBalance);
+			sendf(Socket, "ENUM_USERS min_balance:%i max_balance:%i\n", giMinimumBalance, giMaximumBalance);
 		}
 		else {
-			sendf(Socket, "ENUM_USERS %i\n", giMinimumBalance);
+			sendf(Socket, "ENUM_USERS min_balance:%i\n", giMinimumBalance);
 		}
 	}
 	else {
 		if( giMaximumBalance != INT_MAX ) {
-			sendf(Socket, "ENUM_USERS - %i\n", giMaximumBalance);
+			sendf(Socket, "ENUM_USERS max_balance:%i\n", giMaximumBalance);
 		}
 		else {
 			sendf(Socket, "ENUM_USERS\n");
@@ -995,8 +1714,103 @@ void _PrintUserLine(const char *Line)
 		flags[flagsLen] = '\0';
 		
 		bal = atoi(Line + matches[4].rm_so);
-		printf("%-15s: $%4i.%02i (%s)\n", username, bal/100, bal%100, flags);
+		printf("%-15s: $%4i.%02i (%s)\n", username, bal/100, abs(bal)%100, flags);
+	}
+}
+
+int Dispense_AddUser(int Socket, const char *Username)
+{
+	char	*buf;
+	 int	responseCode, ret;
+	
+	// Check for a dry run
+	if( gbDryRun ) {
+		printf("Dry Run - No action\n");
+		return 0;
+	}
+	
+	sendf(Socket, "USER_ADD %s\n", Username);
+	
+	buf = ReadLine(Socket);
+	responseCode = atoi(buf);
+	
+	switch(responseCode)
+	{
+	case 200:
+		printf("User '%s' added\n", Username);
+		ret = 0;
+		break;
+		
+	case 403:
+		printf("Only wheel can add users\n");
+		ret = 1;
+		break;
+		
+	case 404:
+		printf("User '%s' already exists\n", Username);
+		ret = 0;
+		break;
+	
+	default:
+		fprintf(stderr, "Unknown response code %i '%s'\n", responseCode, buf);
+		ret = -1;
+		break;
 	}
+	
+	free(buf);
+	
+	return ret;
+}
+
+int Dispense_SetUserType(int Socket, const char *Username, const char *TypeString)
+{
+	char	*buf;
+	 int	responseCode, ret;
+	
+	// Check for a dry run
+	if( gbDryRun ) {
+		printf("Dry Run - No action\n");
+		return 0;
+	}
+	
+	// TODO: Pre-validate the string
+	
+	sendf(Socket, "USER_FLAGS %s %s\n", Username, TypeString);
+	
+	buf = ReadLine(Socket);
+	responseCode = atoi(buf);
+	
+	switch(responseCode)
+	{
+	case 200:
+		printf("User '%s' updated\n", Username);
+		ret = 0;
+		break;
+		
+	case 403:
+		printf("Only wheel can modify users\n");
+		ret = 1;
+		break;
+	
+	case 404:
+		printf("User '%s' does not exist\n", Username);
+		ret = 0;
+		break;
+	
+	case 407:
+		printf("Flag string is invalid\n");
+		ret = 0;
+		break;
+	
+	default:
+		fprintf(stderr, "Unknown response code %i '%s'\n", responseCode, buf);
+		ret = -1;
+		break;
+	}
+	
+	free(buf);
+	
+	return ret;
 }
 
 // ---------------
@@ -1099,7 +1913,7 @@ int RunRegex(regex_t *regex, const char *string, int nMatches, regmatch_t *match
 	 int	ret;
 	
 	ret = regexec(regex, string, nMatches, matches, 0);
-	if( ret ) {
+	if( ret && errorMessage ) {
 		size_t  len = regerror(ret, regex, NULL, 0);
 		char    errorStr[len];
 		regerror(ret, regex, errorStr, len);