X-Git-Url: https://git.ucc.asn.au/?p=tpg%2Fopendispense2.git;a=blobdiff_plain;f=src%2Fserver%2Fserver.c;h=a536121988f039e8a175ec43de3c1f531befecdb;hp=46cb4c6d4bde1384bc5f3dd465b235ce9a0ec9de;hb=3e1c2bf267dea8c592f41636c3d0fb1c7253ee26;hpb=90744b9f8d74ec10843c6b7fe8ca035184d13b94

diff --git a/src/server/server.c b/src/server/server.c
index 46cb4c6..a536121 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -23,6 +23,7 @@
 // Statistics
 #define MAX_CONNECTION_QUEUE	5
 #define INPUT_BUFFER_SIZE	256
+#define CLIENT_TIMEOUT	10	// Seconds
 
 #define HASH_TYPE	SHA1
 #define HASH_LENGTH	20
@@ -69,8 +70,9 @@ void	Server_Cmd_USERADD(tClient *Client, char *Args);
 void	Server_Cmd_USERFLAGS(tClient *Client, char *Args);
 // --- Helpers ---
 void	Debug(tClient *Client, const char *Format, ...);
- int	Server_int_ParseFlags(tClient *Client, const char *Str, int *Mask, int *Value);
  int	sendf(int Socket, const char *Format, ...);
+ int	Server_int_ParseArgs(int bUseLongArg, char *ArgStr, ...);
+ int	Server_int_ParseFlags(tClient *Client, const char *Str, int *Mask, int *Value);
 
 // === CONSTANTS ===
 // - Commands
@@ -153,6 +155,18 @@ void Server_Start(void)
 			return ;
 		}
 		
+		// Set a timeout on the user conneciton
+		{
+			struct timeval tv;
+			tv.tv_sec = CLIENT_TIMEOUT;
+			tv.tv_usec = 0;
+			if( setsockopt(client_socket, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)) )
+			{
+				perror("setsockopt");
+				return ;
+			}
+		}
+		
 		// Debug: Print the connection string
 		if(giDebugLevel >= 2) {
 			char	ipstr[INET_ADDRSTRLEN];
@@ -172,8 +186,9 @@ void Server_Start(void)
 			switch( ntohl( client_addr.sin_addr.s_addr ) )
 			{
 			case 0x7F000001:	// 127.0.0.1	localhost
-			//case 0x825E0D00:	// 130.95.13.0
+		//	case 0x825E0D00:	// 130.95.13.0
 			case 0x825E0D07:	// 130.95.13.7	motsugo
+			case 0x825E0D11:	// 130.95.13.17	mermaid
 			case 0x825E0D12:	// 130.95.13.18	mussel
 			case 0x825E0D17:	// 130.95.13.23	martello
 				bTrusted = 1;
@@ -225,6 +240,7 @@ void Server_HandleClient(int Socket, int bTrusted)
 	 *   it is saved to the beginning of `inbuf` and `buf` is updated to
 	 *   the end of it.
 	 */
+	// TODO: Use select() instead (to give a timeout)
 	while( (bytes = recv(Socket, buf, remspace, 0)) > 0 )
 	{
 		char	*eol, *start;
@@ -278,47 +294,25 @@ void Server_HandleClient(int Socket, int bTrusted)
  */
 void Server_ParseClientCommand(tClient *Client, char *CommandString)
 {
-	char	*space, *args;
+	char	*command, *args;
 	 int	i;
-	#if 0
-	char	**argList;
-	 int	numArgs = 0;
-	#endif
 	
-	// Split at first space
-	space = strchr(CommandString, ' ');
-	if(space == NULL) {
-		args = NULL;
-	}
-	else {
-		*space = '\0';
-		args = space + 1;
-		while( *space == ' ' )	space ++;
-		
-		#if 0
-		// Count arguments
-		numArgs = 1;
-		for( i = 0; args[i]; )
-		{
-			while( CommandString[i] != ' ' ) {
-				if( CommandString[i] == '"' ) {
-					while( !(CommandString[i] != '\\' CommandString[i+1] == '"' ) )
-						i ++;
-					i ++;
-				}
-				i ++;
-			}
-			numArgs ++;
-			while( CommandString[i] == ' ' )	i ++;
-		}
-		#endif
+	if( giDebugLevel >= 2 )
+		Debug(Client, "Server_ParseClientCommand: (CommandString = '%s')", CommandString);
+	
+	if( Server_int_ParseArgs(1, CommandString, &command, &args, NULL) )
+	{
+		// Is this an error? (just ignore for now)
+		//args = "";
 	}
 	
 	
 	// Find command
 	for( i = 0; i < NUM_COMMANDS; i++ )
 	{
-		if(strcmp(CommandString, gaServer_Commands[i].Name) == 0) {
+		if(strcmp(command, gaServer_Commands[i].Name) == 0) {
+			if( giDebugLevel >= 2 )
+				Debug(Client, "CMD %s - \"%s\"", command, args);
 			gaServer_Commands[i].Function(Client, args);
 			return ;
 		}
@@ -337,17 +331,18 @@ void Server_ParseClientCommand(tClient *Client, char *CommandString)
  */
 void Server_Cmd_USER(tClient *Client, char *Args)
 {
-	char	*space = strchr(Args, ' ');
-	if(space)	*space = '\0';	// Remove characters after the ' '
+	char	*username;
+	
+	Server_int_ParseArgs(0, Args, &username, NULL);
 	
 	// Debug!
 	if( giDebugLevel )
-		Debug(Client, "Authenticating as '%s'", Args);
+		Debug(Client, "Authenticating as '%s'", username);
 	
 	// Save username
 	if(Client->Username)
 		free(Client->Username);
-	Client->Username = strdup(Args);
+	Client->Username = strdup(username);
 	
 	#if USE_SALT
 	// Create a salt (that changes if the username is changed)
@@ -375,11 +370,12 @@ void Server_Cmd_USER(tClient *Client, char *Args)
  */
 void Server_Cmd_PASS(tClient *Client, char *Args)
 {
-	char	*space = strchr(Args, ' ');
-	if(space)	*space = '\0';	// Remove characters after the ' '
+	char	*passhash;
+	
+	Server_int_ParseArgs(0, Args, &passhash, NULL);
 	
 	// Pass on to cokebank
-	Client->UID = Bank_GetUserAuth(Client->Salt, Client->Username, Args);
+	Client->UID = Bank_GetUserAuth(Client->Salt, Client->Username, passhash);
 
 	if( Client->UID != -1 ) {
 		Client->bIsAuthed = 1;
@@ -397,8 +393,13 @@ void Server_Cmd_PASS(tClient *Client, char *Args)
  */
 void Server_Cmd_AUTOAUTH(tClient *Client, char *Args)
 {
-	char	*space = strchr(Args, ' ');
-	if(space)	*space = '\0';	// Remove characters after the ' '
+	char	*username;
+	
+	if( Server_int_ParseArgs(0, Args, &username, NULL) )
+	{
+		sendf(Client->Socket, "407 AUTOAUTH takes 1 argument\n");
+		return ;
+	}
 	
 	// Check if trusted
 	if( !Client->bIsTrusted ) {
@@ -409,16 +410,18 @@ void Server_Cmd_AUTOAUTH(tClient *Client, char *Args)
 	}
 	
 	// Get UID
-	Client->UID = Bank_GetAcctByName( Args );	
+	Client->UID = Bank_GetAcctByName( username );	
 	if( Client->UID < 0 ) {
 		if(giDebugLevel)
-			Debug(Client, "Unknown user '%s'", Args);
+			Debug(Client, "Unknown user '%s'", username);
 		sendf(Client->Socket, "401 Auth Failure\n");
 		return ;
 	}
 	
 	// You can't be an internal account
 	if( Bank_GetFlags(Client->UID) & USER_FLAG_INTERNAL ) {
+		if(giDebugLevel)
+			Debug(Client, "Autoauth as '%s', not allowed", username);
 		Client->UID = -1;
 		sendf(Client->Socket, "401 Auth Failure\n");
 		return ;
@@ -427,7 +430,7 @@ void Server_Cmd_AUTOAUTH(tClient *Client, char *Args)
 	Client->bIsAuthed = 1;
 	
 	if(giDebugLevel)
-		Debug(Client, "Auto authenticated as '%s' (%i)", Args, Client->UID);
+		Debug(Client, "Auto authenticated as '%s' (%i)", username, Client->UID);
 	
 	sendf(Client->Socket, "200 Auth OK\n");
 }
@@ -437,11 +440,9 @@ void Server_Cmd_AUTOAUTH(tClient *Client, char *Args)
  */
 void Server_Cmd_SETEUSER(tClient *Client, char *Args)
 {
-	char	*space;
-	
-	space = strchr(Args, ' ');
+	char	*username;
 	
-	if(space)	*space = '\0';
+	Server_int_ParseArgs(0, Args, &username, NULL);
 	
 	if( !strlen(Args) ) {
 		sendf(Client->Socket, "407 SETEUSER expects an argument\n");
@@ -455,7 +456,7 @@ void Server_Cmd_SETEUSER(tClient *Client, char *Args)
 	}
 	
 	// Set id
-	Client->EffectiveUID = Bank_GetAcctByName(Args);
+	Client->EffectiveUID = Bank_GetAcctByName(username);
 	if( Client->EffectiveUID == -1 ) {
 		sendf(Client->Socket, "404 User not found\n");
 		return ;
@@ -471,25 +472,56 @@ void Server_Cmd_SETEUSER(tClient *Client, char *Args)
 	sendf(Client->Socket, "200 User set\n");
 }
 
+/**
+ * \brief Send an item status to the client
+ * \param Client	Who to?
+ * \param Item	Item to send
+ */
+void Server_int_SendItem(tClient *Client, tItem *Item)
+{
+	char	*status = "avail";
+	
+	if( Item->Handler->CanDispense )
+	{
+		switch(Item->Handler->CanDispense(Item->ID, Client->UID))
+		{
+		case  0:	status = "avail";	break;
+		case  1:	status = "sold";	break;
+		default:
+		case -1:	status = "error";	break;
+		}
+	}
+	
+	sendf(Client->Socket,
+		"202 Item %s:%i %s %i %s\n",
+		Item->Handler->Name, Item->ID, status, Item->Price, Item->Name
+		);
+}
+
 /**
  * \brief Enumerate the items that the server knows about
  */
 void Server_Cmd_ENUMITEMS(tClient *Client, char *Args)
 {
-	 int	i;
+	 int	i, count;
 
 	if( Args != NULL && strlen(Args) ) {
 		sendf(Client->Socket, "407 ENUM_ITEMS takes no arguments\n");
 		return ;
 	}
+	
+	// Count shown items
+	count = 0;
+	for( i = 0; i < giNumItems; i ++ ) {
+		if( gaItems[i].bHidden )	continue;
+		count ++;
+	}
 
-	sendf(Client->Socket, "201 Items %i\n", giNumItems);
+	sendf(Client->Socket, "201 Items %i\n", count);
 
 	for( i = 0; i < giNumItems; i ++ ) {
-		sendf(Client->Socket,
-			"202 Item %s:%i %i %s\n",
-			 gaItems[i].Handler->Name, gaItems[i].ID, gaItems[i].Price, gaItems[i].Name
-			 );
+		if( gaItems[i].bHidden )	continue;
+		Server_int_SendItem( Client, &gaItems[i] );
 	}
 
 	sendf(Client->Socket, "200 List end\n");
@@ -537,17 +569,21 @@ tItem *_GetItemFromString(char *String)
  */
 void Server_Cmd_ITEMINFO(tClient *Client, char *Args)
 {
-	tItem	*item = _GetItemFromString(Args);
+	tItem	*item;
+	char	*itemname;
+	
+	if( Server_int_ParseArgs(0, Args, &itemname, NULL) ) {
+		sendf(Client->Socket, "407 ITEMINFO takes 1 argument\n");
+		return ;
+	}
+	item = _GetItemFromString(Args);
 	
 	if( !item ) {
 		sendf(Client->Socket, "406 Bad Item ID\n");
 		return ;
 	}
 	
-	sendf(Client->Socket,
-		"202 Item %s:%i %i %s\n",
-		 item->Handler->Name, item->ID, item->Price, item->Name
-		 );
+	Server_int_SendItem( Client, item );
 }
 
 void Server_Cmd_DISPENSE(tClient *Client, char *Args)
@@ -555,13 +591,19 @@ void Server_Cmd_DISPENSE(tClient *Client, char *Args)
 	tItem	*item;
 	 int	ret;
 	 int	uid;
+	char	*itemname;
+	
+	if( Server_int_ParseArgs(0, Args, &itemname, NULL) ) {
+		sendf(Client->Socket, "407 DISPENSE takes only 1 argument\n");
+		return ;
+	}
 	 
 	if( !Client->bIsAuthed ) {
 		sendf(Client->Socket, "401 Not Authenticated\n");
 		return ;
 	}
 
-	item = _GetItemFromString(Args);
+	item = _GetItemFromString(itemname);
 	if( !item ) {
 		sendf(Client->Socket, "406 Bad Item ID\n");
 		return ;
@@ -591,28 +633,16 @@ void Server_Cmd_GIVE(tClient *Client, char *Args)
 	 int	uid, iAmmount;
 	 int	thisUid;
 	
-	if( !Client->bIsAuthed ) {
-		sendf(Client->Socket, "401 Not Authenticated\n");
-		return ;
-	}
-
-	recipient = Args;
-
-	ammount = strchr(Args, ' ');
-	if( !ammount ) {
-		sendf(Client->Socket, "407 Invalid Argument, expected 3 parameters, 1 encountered\n");
+	// Parse arguments
+	if( Server_int_ParseArgs(1, Args, &recipient, &ammount, &reason, NULL) ) {
+		sendf(Client->Socket, "407 GIVE takes only 3 arguments\n");
 		return ;
 	}
-	*ammount = '\0';
-	ammount ++;
-
-	reason = strchr(ammount, ' ');
-	if( !reason ) {
-		sendf(Client->Socket, "407 Invalid Argument, expected 3 parameters, 2 encountered\n");
+	// Check for authed
+	if( !Client->bIsAuthed ) {
+		sendf(Client->Socket, "401 Not Authenticated\n");
 		return ;
 	}
-	*reason = '\0';
-	reason ++;
 
 	// Get recipient
 	uid = Bank_GetAcctByName(recipient);
@@ -662,25 +692,14 @@ void Server_Cmd_DONATE(tClient *Client, char *Args)
 	 int	iAmmount;
 	 int	thisUid;
 	
-	if( !Client->bIsAuthed ) {
-		sendf(Client->Socket, "401 Not Authenticated\n");
-		return ;
-	}
-
-	ammount = Args;
-
-	// Get the start of the reason
-	reason = strchr(Args, ' ');
-	if( !ammount ) {
-		sendf(Client->Socket, "407 Invalid Argument, expected 2 parameters, 1 encountered\n");
+	// Parse arguments
+	if( Server_int_ParseArgs(1, Args, &ammount, &reason, NULL) ) {
+		sendf(Client->Socket, "407 DONATE takes 2 arguments\n");
 		return ;
 	}
-	*reason = '\0';
-	reason ++;
 	
-	// Check the end of the reason
-	if( strchr(reason, ' ') ) {
-		sendf(Client->Socket, "407 Invalid Argument, expected 2 parameters, more encountered\n");
+	if( !Client->bIsAuthed ) {
+		sendf(Client->Socket, "401 Not Authenticated\n");
 		return ;
 	}
 
@@ -719,28 +738,16 @@ void Server_Cmd_ADD(tClient *Client, char *Args)
 	char	*user, *ammount, *reason;
 	 int	uid, iAmmount;
 	
-	if( !Client->bIsAuthed ) {
-		sendf(Client->Socket, "401 Not Authenticated\n");
-		return ;
-	}
-
-	user = Args;
-
-	ammount = strchr(Args, ' ');
-	if( !ammount ) {
-		sendf(Client->Socket, "407 Invalid Argument, expected 3 parameters, 1 encountered\n");
+	// Parse arguments
+	if( Server_int_ParseArgs(1, Args, &user, &ammount, &reason, NULL) ) {
+		sendf(Client->Socket, "407 ADD takes 3 arguments\n");
 		return ;
 	}
-	*ammount = '\0';
-	ammount ++;
-
-	reason = strchr(ammount, ' ');
-	if( !reason ) {
-		sendf(Client->Socket, "407 Invalid Argument, expected 3 parameters, 2 encountered\n");
+	
+	if( !Client->bIsAuthed ) {
+		sendf(Client->Socket, "401 Not Authenticated\n");
 		return ;
 	}
-	*reason = '\0';
-	reason ++;
 
 	// Check user permissions
 	if( !(Bank_GetFlags(Client->UID) & (USER_FLAG_COKE|USER_FLAG_ADMIN))  ) {
@@ -788,28 +795,16 @@ void Server_Cmd_SET(tClient *Client, char *Args)
 	char	*user, *ammount, *reason;
 	 int	uid, iAmmount;
 	
-	if( !Client->bIsAuthed ) {
-		sendf(Client->Socket, "401 Not Authenticated\n");
-		return ;
-	}
-
-	user = Args;
-
-	ammount = strchr(Args, ' ');
-	if( !ammount ) {
-		sendf(Client->Socket, "407 Invalid Argument, expected 3 parameters, 1 encountered\n");
+	// Parse arguments
+	if( Server_int_ParseArgs(1, Args, &user, &ammount, &reason, NULL) ) {
+		sendf(Client->Socket, "407 SET takes 3 arguments\n");
 		return ;
 	}
-	*ammount = '\0';
-	ammount ++;
-
-	reason = strchr(ammount, ' ');
-	if( !reason ) {
-		sendf(Client->Socket, "407 Invalid Argument, expected 3 parameters, 2 encountered\n");
+	
+	if( !Client->bIsAuthed ) {
+		sendf(Client->Socket, "401 Not Authenticated\n");
 		return ;
 	}
-	*reason = '\0';
-	reason ++;
 
 	// Check user permissions
 	if( !(Bank_GetFlags(Client->UID) & USER_FLAG_ADMIN)  ) {
@@ -872,6 +867,7 @@ void Server_Cmd_ENUMUSERS(tClient *Client, char *Args)
 		do
 		{
 			type = space;
+			while(*type == ' ')	type ++;
 			// Get next space
 			space = strchr(space, ' ');
 			if(space)	*space = '\0';
@@ -1025,19 +1021,22 @@ void Server_Cmd_ENUMUSERS(tClient *Client, char *Args)
 void Server_Cmd_USERINFO(tClient *Client, char *Args)
 {
 	 int	uid;
-	char	*user = Args;
-	char	*space;
+	char	*user;
 	
-	space = strchr(user, ' ');
-	if(space)	*space = '\0';
+	// Parse arguments
+	if( Server_int_ParseArgs(0, Args, &user, NULL) ) {
+		sendf(Client->Socket, "407 USER_INFO takes 1 argument\n");
+		return ;
+	}
 	
-	if( giDebugLevel )
-		Debug(Client, "User Info '%s'", user);
+	if( giDebugLevel )	Debug(Client, "User Info '%s'", user);
 	
 	// Get recipient
 	uid = Bank_GetAcctByName(user);
+	
+	if( giDebugLevel >= 2 )	Debug(Client, "uid = %i", uid);
 	if( uid == -1 ) {
-		sendf(Client->Socket, "404 Invalid user");
+		sendf(Client->Socket, "404 Invalid user\n");
 		return ;
 	}
 	
@@ -1072,15 +1071,21 @@ void _SendUserInfo(tClient *Client, int UserID)
 	
 	// TODO: User flags/type
 	sendf(
-		Client->Socket, "202 User %s %i %s%s\n",
+		Client->Socket, "202 User %s %i %s%s%s\n",
 		Bank_GetAcctName(UserID), Bank_GetBalance(UserID),
-		type, disabled
+		type, disabled, door
 		);
 }
 
 void Server_Cmd_USERADD(tClient *Client, char *Args)
 {
-	char	*username, *space;
+	char	*username;
+	
+	// Parse arguments
+	if( Server_int_ParseArgs(0, Args, &username, NULL) ) {
+		sendf(Client->Socket, "407 USER_ADD takes 1 argument\n");
+		return ;
+	}
 	
 	// Check permissions
 	if( !(Bank_GetFlags(Client->UID) & USER_FLAG_ADMIN) ) {
@@ -1088,12 +1093,6 @@ void Server_Cmd_USERADD(tClient *Client, char *Args)
 		return ;
 	}
 	
-	// Read arguments
-	username = Args;
-	while( *username == ' ' )	username ++;
-	space = strchr(username, ' ');
-	if(space)	*space = '\0';
-	
 	// Try to create user
 	if( Bank_CreateAcct(username) == -1 ) {
 		sendf(Client->Socket, "404 User exists\n");
@@ -1112,31 +1111,20 @@ void Server_Cmd_USERADD(tClient *Client, char *Args)
 void Server_Cmd_USERFLAGS(tClient *Client, char *Args)
 {
 	char	*username, *flags;
-	char	*space;
 	 int	mask=0, value=0;
 	 int	uid;
 	
-	// Check permissions
-	if( !(Bank_GetFlags(Client->UID) & USER_FLAG_ADMIN) ) {
-		sendf(Client->Socket, "403 Not a coke admin\n");
+	// Parse arguments
+	if( Server_int_ParseArgs(0, Args, &username, &flags, NULL) ) {
+		sendf(Client->Socket, "407 USER_FLAGS takes 2 arguments\n");
 		return ;
 	}
 	
-	// Read arguments
-	// - Username
-	username = Args;
-	while( *username == ' ' )	username ++;
-	space = strchr(username, ' ');
-	if(!space) {
-		sendf(Client->Socket, "407 USER_FLAGS requires 2 arguments, 1 given\n");
+	// Check permissions
+	if( !(Bank_GetFlags(Client->UID) & USER_FLAG_ADMIN) ) {
+		sendf(Client->Socket, "403 Not a coke admin\n");
 		return ;
 	}
-	*space = '\0';
-	// - Flags
-	flags = space + 1;
-	while( *flags == ' ' )	flags ++;
-	space = strchr(flags, ' ');
-	if(space)	*space = '\0';
 	
 	// Get UID
 	uid = Bank_GetAcctByName(username);
@@ -1149,6 +1137,10 @@ void Server_Cmd_USERFLAGS(tClient *Client, char *Args)
 	if( Server_int_ParseFlags(Client, flags, &mask, &value) )
 		return ;
 	
+	if( giDebugLevel )
+		Debug(Client, "Set %i(%s) flags to %x (masked %x)\n",
+			uid, username, mask, value);
+	
 	// Apply flags
 	Bank_SetFlags(uid, mask, value);
 	
@@ -1160,9 +1152,10 @@ void Server_Cmd_USERFLAGS(tClient *Client, char *Args)
 void Debug(tClient *Client, const char *Format, ...)
 {
 	va_list	args;
-	printf("%010i [%i] ", (int)time(NULL), Client->ID);
+	//printf("%010i [%i] ", (int)time(NULL), Client->ID);
+	printf("[%i] ", Client->ID);
 	va_start(args, Format);
-	vprintf(NULL, 0, Format, args);
+	vprintf(Format, args);
 	va_end(args);
 	printf("\n");
 }
@@ -1190,6 +1183,81 @@ int sendf(int Socket, const char *Format, ...)
 	}
 }
 
+// Takes a series of char *'s in
+/**
+ * \brief Parse space-separated entries into 
+ */
+int Server_int_ParseArgs(int bUseLongLast, char *ArgStr, ...)
+{
+	va_list args;
+	char	savedChar;
+	char	**dest;
+	va_start(args, ArgStr);
+
+	// Check for null
+	if( !ArgStr )
+	{
+		while( (dest = va_arg(args, char **)) )
+			*dest = NULL;
+		va_end(args);
+		return 1;
+	}
+
+	savedChar = *ArgStr;
+	
+	while( (dest = va_arg(args, char **)) )
+	{
+		// Trim leading spaces
+		while( *ArgStr == ' ' || *ArgStr == '\t' )
+			ArgStr ++;
+		
+		// ... oops, not enough arguments
+		if( *ArgStr == '\0' )
+		{
+			// NULL unset arguments
+			do {
+				*dest = NULL;
+			}	while( (dest = va_arg(args, char **)) );
+		va_end(args);
+			return -1;
+		}
+		
+		if( *ArgStr == '"' )
+		{
+			ArgStr ++;
+			*dest = ArgStr;
+			// Read until quote
+			while( *ArgStr && *ArgStr != '"' )
+				ArgStr ++;
+		}
+		else
+		{
+			// Set destination
+			*dest = ArgStr;
+			// Read until a space
+			while( *ArgStr && *ArgStr != ' ' && *ArgStr != '\t' )
+				ArgStr ++;
+		}
+		savedChar = *ArgStr;	// savedChar is used to un-mangle the last string
+		*ArgStr = '\0';
+		ArgStr ++;
+	}
+	va_end(args);
+	
+	// Oops, extra arguments, and greedy not set
+	if( (savedChar == ' ' || savedChar == '\t') && !bUseLongLast ) {
+		return -1;
+	}
+	
+	// Un-mangle last
+	if(bUseLongLast) {
+		ArgStr --;
+		*ArgStr = savedChar;
+	}
+	
+	return 0;	// Success!
+}
+
 int Server_int_ParseFlags(tClient *Client, const char *Str, int *Mask, int *Value)
 {
 	struct {