Client - Fix uninitialised value in 'acct'
[tpg/opendispense2.git] / src / client / main.c
index 4d33de1..82d7326 100644 (file)
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>     // isspace
-#include <stdarg.h>
-#include <regex.h>
-#include <ncurses.h>
-#include <limits.h>
-
-#include <unistd.h>    // close
-#include <netdb.h>     // gethostbyname
 #include <pwd.h>       // getpwuids
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <openssl/sha.h>       // SHA1
+#include <unistd.h>    // close/getuid
+#include <limits.h>    // INT_MIN/INT_MAX
+#include "common.h"
 
 #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
-};
+#define DISPENSE_MULTIPLE_MAX  20      // Maximum argument to -c
 
 // === TYPES ===
-typedef struct sItem {
-       char    *Type;
-        int    ID;
-        int    Status; // 0: Availiable, 1: Sold out, -1: Error
-       char    *Desc;
-        int    Price;
-}      tItem;
 
 // === PROTOTYPES ===
- int   main(int argc, char *argv[]);
 void   ShowUsage(void);
-// --- GUI ---
- int   ShowNCursesUI(void);
- 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, ...);
+ int   main(int argc, char *argv[]);
+ int   ParseArguments(int argc, char *argv[]);
 // --- Coke Server Communication ---
- int   OpenConnection(const char *Host, int Port);
- int   Authenticate(int Socket);
- int   GetUserBalance(int Socket);
-void   PopulateItemList(int Socket);
- 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 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, ...);
 char   *trim(char *string);
  int   RunRegex(regex_t *regex, const char *string, int nMatches, regmatch_t *matches, const char *errorMessage);
 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;
@@ -90,304 +47,625 @@ regex_t   gArrayRegex, gItemRegex, gSaltRegex, gUserInfoRegex, gUserItemIdentRegex
 
 char   *gsItemPattern; //!< Item pattern
 char   *gsEffectiveUser;       //!< '-u' Dispense as another user
- int   giUIMode = UI_MODE_STANDARD;
+
+enum eUI_Modes giUIMode = UI_MODE_STANDARD;
  int   gbDryRun = 0;   //!< '-n' Read-only
+ int   gbDisallowSelectWithoutBalance = 1;     //!< Don't allow items to be hilighted if not affordable
+
  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  *gsUserName;    //!< User that dispense will happen as
 char   *gsUserFlags;   //!< User's flag set
- int   giUserBalance=-1;       //!< User balance (set by Authenticate)
+ int   giUserBalance = -1;     //!< User balance (set by Authenticate)
+ int   giDispenseCount = 1;    //!< Number of dispenses to do
+
+char   *gsTextArgs[MAX_TXT_ARGS];
+ int   giTextArgc;
 
 // === CODE ===
-int main(int argc, char *argv[])
+void ShowUsage(void)
 {
-        int    sock;
-        int    i, ret = 0;
-       char    buffer[BUFSIZ];
-       char    *text_args[MAX_TXT_ARGS];       // Non-flag arguments
-        int    text_argc = 0;
+       printf( "Usage:\n" );
+       if( giTextArgc == 0 )
+               printf(
+                       "  == Everyone ==\n"
+                       "    dispense\n"
+                       "        Show interactive list\n"
+                       "    dispense <name>|<index>|<itemid>\n"
+                       "        Dispense named item (<name> matches if it is a unique prefix)\n"
+                       "    dispense finger\n"
+                       "        Show the finger output\n"
+                       );
+       if( giTextArgc == 0 || strcmp(gsTextArgs[0], "give") == 0 )
+               printf(
+                       "    dispense give <user> <amount> \"<reason>\"\n"
+                       "        Give money to another user\n"
+                       );
        
-       text_args[0] = "";
+       if( giTextArgc == 0 || strcmp(gsTextArgs[0], "donate") == 0 )
+               printf(
+                       "    dispense donate <amount> \"<reason>\"\n"
+                       "        Donate to the club\n"
+                       );
+       if( giTextArgc == 0 || strcmp(gsTextArgs[0], "iteminfo") == 0 )
+               printf(
+                       "    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 )
+               printf(
+                       "    dispense acct [<user>]\n"
+                       "        Show user balances\n"
+                       "    dispense acct <user> [+-]<amount> \"<reason>\"\n"
+                       "        Alter a account value\n"
+                       "    dispense acct <user> =<amount> \"<reason>\"\n"
+                       "        Set an account balance\n"
+                       );
+       if( giTextArgc == 0 || strcmp(gsTextArgs[0], "refund") == 0 )
+               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(
+                       "    dispense slot <itemid> <price> <name>\n"
+                       "        Rename/Re-price a slot\n"
+                       );
+       if( giTextArgc == 0 )
+               printf("  == Dispense administrators ==\n");
+       if( giTextArgc == 0 || strcmp(gsTextArgs[0], "user") == 0 )
+               printf(
+                       "    dispense user add <user>\n"
+                       "        Create new account\n"
+                       "    dispense user type <user> <flags> <reason>\n"
+                       "        Alter a user's flags\n"
+                       "        <flags> is a comma-separated list of user, coke, admin, internal or disabled\n"
+                       "        Flags are removed by preceding the name with '-' or '!'\n"
+                       );
+       if( giTextArgc == 0 )
+               printf( "\n"
+                       "General Options:\n"
+                       "    -c <count>\n"
+                       "        Dispense multiple times\n"
+                       "    -u <username>\n"
+                       "        Set a different user (Coke members only)\n"
+                       "    -h / -?\n"
+                       "        Show help text\n"
+                       "    -G\n"
+                       "        Use simple textual interface (instead of ncurses)\n"
+                       "    -n\n"
+                       "        Dry run - Do not actually do dispenses\n"
+                       "    -m <min balance>\n"
+                       "    -M <max balance>\n"
+                       "        Set the Maximum/Minimum balances shown in `dispense acct`\n"
+                       "Definitions:\n"
+                       "    <itemid>\n"
+                       "        Item ID of the form <type>:<num> where <type> is a non-empty string of alpha-numeric characters, and <num> is a non-negative integer\n"
+//                     "    <user>\n"
+//                     "        Account name\n"
+                       );
+}
 
-       // -- Create regular expressions
-       // > Code Type Count ...
-       CompileRegex(&gArrayRegex, "^([0-9]{3})\\s+([A-Za-z]+)\\s+([0-9]+)", 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);
+//
+// `dispense finger`
+// - Display [email protected] finger output
+//
+int subcommand_finger(void)
+{
+       // Connect to server
+       int sock = OpenConnection(gsDispenseServer, giDispensePort);
+       if( sock < 0 )  return RV_SOCKET_ERROR;
 
-       // Parse Arguments
-       for( i = 1; i < argc; i ++ )
-       {
-               char    *arg = argv[i];
-               
-               if( arg[0] == '-' )
-               {                       
-                       switch(arg[1])
-                       {
-                       case 'h':
-                       case '?':
-                               ShowUsage();
-                               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
-                               if( i + 1 >= argc ) {
-                                       fprintf(stderr, "%s: -u takes an argument\n", argv[0]);
-                                       ShowUsage();
-                               }
-                               gsEffectiveUser = argv[++i];
-                               break;
-                       
-                       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;
-                       }
+       // Get items
+       PopulateItemList(sock);
 
-                       continue;
-               }
+       printf("The UCC Coke machine.\n\n");
 
-               if( text_argc + 1 == MAX_TXT_ARGS )
+       // Only get coke slot statuses
+       for( int i = 0; i <= 6; i ++ )
+       {
+               const char *status;
+               switch(gaItems[i].Status)
                {
-                       fprintf(stderr, "ERROR: Too many arguments\n");
-                       return 1;
+               case 0: status = "Avail";       break;
+               case 1: status = "Sold ";       break;
+               default:
+                       status = "Error";
+                       break;
                }
-       
-               text_args[text_argc++] = argv[i];
-       
+               printf("%i - %s %3i %s\n", gaItems[i].ID, status, gaItems[i].Price, gaItems[i].Desc);
        }
 
-       //
-       // `dispense acct`
-       // - 
-       if( strcmp(text_args[0], "acct") == 0 )
-       {
-               // Connect to server
-               sock = OpenConnection(gsDispenseServer, giDispensePort);
-               if( sock < 0 )  return -1;
-                       // List accounts?
-               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;
-                       
-                       // text_args[1]: Username
-                       // text_args[2]: Ammount
-                       // text_args[3]: Reason
-                       
-                       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);
-                               }
-                               
-                               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]);
-               
+       printf("\nMay your pink fish bing into the distance.\n");
+
+       return 0;
+}
+
+//
+// `dispense acct`
+// - Display/manipulate account balances
+//
+int subcommand_acct(void)
+{
+       int ret = 0;
+
+       // Connect to server
+       int sock = OpenConnection(gsDispenseServer, giDispensePort);
+       if( sock < 0 )  return RV_SOCKET_ERROR;
+       // List accounts?
+       if( giTextArgc == 1 ) {
+               ret = Dispense_EnumUsers(sock);
                close(sock);
-               return 0;
+               return ret;
        }
-       //
-       // `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 )
+       // gsTextArgs[1]: Username
+       
+       // Alter account?
+       if( giTextArgc != 2 )
        {
-               // Check argument count
-               if( text_argc == 1 ) {
-                       fprintf(stderr, "Error: `dispense user` requires arguments\n");
+               if( giTextArgc != 4 ) {
+                       fprintf(stderr, "`dispense acct` requires a reason\n");
                        ShowUsage();
-                       exit(1);
+                       return RV_ARGUMENTS;
                }
                
-               // Connect to server
-               sock = OpenConnection(gsDispenseServer, giDispensePort);
-               if( sock < 0 )  return -1;
-               
-               // Attempt authentication
-               if( Authenticate(sock) )
-                       return -1;
+               // Authentication required
+               ret = Authenticate(sock);
+               if(ret) return ret;
                
-               // 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_AddUser(sock, text_args[2]);
+               // gsTextArgs[1]: Username
+               // gsTextArgs[2]: Ammount
+               // gsTextArgs[3]: Reason
+                char   *tmp = NULL;
+               long int balance = strtol(gsTextArgs[2]+(gsTextArgs[2][0] == '='), &tmp, 10);
+               if(!tmp || *tmp != '\0') {
+                       fprintf(stderr, "dispense acct: Value must be a decimal number of cents\n");
+                       return RV_ARGUMENTS;
                }
-               // 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);
-                       }
-                       
-                       Dispense_SetUserType(sock, text_args[2], text_args[3]);
+               
+               if( gsTextArgs[2][0] == '=' ) {
+                       // Set balance
+                       ret = Dispense_SetBalance(sock, gsTextArgs[1], balance, gsTextArgs[3]);
                }
-               else
-               {
-                       fprintf(stderr, "Error: Unknown sub-command for `dispense user`\n");
-                       ShowUsage();
-                       exit(1);
+               else {
+                       // Alter balance
+                       ret = Dispense_AlterBalance(sock, gsTextArgs[1], balance, gsTextArgs[3]);
                }
-               return 0;
+       }
+       // On error, quit
+       if( ret ) {
+               close(sock);
+               return ret;
        }
        
-       // Donation!
-       if( strcmp(text_args[0], "donate") == 0 )
+       // Show user information
+       ret = Dispense_ShowUser(sock, gsTextArgs[1]);
+       
+       close(sock);
+       return ret;
+}
+
+//
+// `dispense give`
+// - Transfer credit from the current user to another account
+//
+// "Here, have some money."
+//
+int subcommand_give(int argc, char *args[])
+{
+       int ret;
+       
+       if( argc != 3 ) {
+               fprintf(stderr, "`dispense give` takes three arguments\n");
+               ShowUsage();
+               return RV_ARGUMENTS;
+       }
+       
+       const char *dst_acct = args[0];
+       const char *amt_str = args[1];
+       const char *message = args[2];
+       
+       // Connect to server
+       int sock = OpenConnection(gsDispenseServer, giDispensePort);
+       if( sock < 0 )  return RV_SOCKET_ERROR;
+       
+       // Authenticate
+       ret = Authenticate(sock);
+       if(ret) return ret;
+
+       char *end = NULL;
+       long amt = strtol(amt_str, &end, 10);
+       if( !end || *end != '\0' ) {
+               fprintf(stderr, "dispense give: Balance is invalid, must be decimal number of cents");
+               return RV_ARGUMENTS;
+       }
+       ret = Dispense_Give(sock, dst_acct, amt, message);
+
+       close(sock);
+       return ret;
+}
+
+// 
+// `dispense user`
+// - User administration (Admin Only)
+//
+int subcommand_user(int argc, char *args[])
+{
+        int    ret;
+       
+       // Check argument count
+       if( argc == 0 ) {
+               fprintf(stderr, "Error: `dispense user` requires arguments\n");
+               ShowUsage();
+               return RV_ARGUMENTS;
+       }
+       
+       // Connect to server
+       int sock = OpenConnection(gsDispenseServer, giDispensePort);
+       if( sock < 0 )  return RV_SOCKET_ERROR;
+       
+       // Attempt authentication
+       ret = Authenticate(sock);
+       if(ret) return ret;
+       
+       // Add new user?
+       if( strcmp(args[0], "add") == 0 )
        {
-               // Check argument count
-               if( text_argc != 3 ) {
-                       fprintf(stderr, "Error: `dispense donate` requires two arguments\n");
+               if( giTextArgc != 3 ) {
+                       fprintf(stderr, "Error: `dispense user add` requires an argument\n");
                        ShowUsage();
-                       exit(1);
+                       return RV_ARGUMENTS;
                }
                
-               // 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]);
+               ret = Dispense_AddUser(sock, args[1]);
+       }
+       // Update a user
+       else if( strcmp(args[0], "type") == 0 || strcmp(args[0], "flags") == 0 )
+       {
+               if( argc < 3 || argc > 4 ) {
+                       fprintf(stderr, "Error: `dispense user type` requires two arguments\n");
+                       ShowUsage();
+                       return RV_ARGUMENTS;
+               }
                
-               return 0;
+               ret = Dispense_SetUserType(sock, args[1], args[2], (argc == 3 ? "" : args[3]));
        }
-       else {
-               // Item name / pattern
-               gsItemPattern = text_args[0];
+       else
+       {
+               fprintf(stderr, "Error: Unknown sub-command for `dispense user`\n");
+               ShowUsage();
+               return RV_ARGUMENTS;
+       }
+       close(sock);
+       return ret;
+}
+
+//
+// `dispense donate`
+// - Donate money to the club
+//
+int subcommand_donate(int argc, char *args[])
+{
+        int    ret;
+       
+       // Check argument count
+       if( argc != 2 ) {
+               fprintf(stderr, "Error: `dispense donate` requires two arguments\n");
+               ShowUsage();
+               return RV_ARGUMENTS;
        }
        
        // Connect to server
-       sock = OpenConnection(gsDispenseServer, giDispensePort);
-       if( sock < 0 )  return -1;
+       int sock = OpenConnection(gsDispenseServer, giDispensePort);
+       if( sock < 0 )  return RV_SOCKET_ERROR;
+       
+       // Attempt authentication
+       ret = Authenticate(sock);
+       if(ret) return ret;
+       
+       // Do donation
+       ret = Dispense_Donate(sock, atoi(args[0]), args[1]);
+                       
+       close(sock);
+
+       return ret;
+}
+
+//
+// `dispense refund`
+// - Refund a purchased item
+//
+// "Well excuuuuse me, princess"
+//
+int subcommand_refund(int argc, char *args[])
+{
+        int    ret;
+
+       // Check argument count
+       if( argc != 2 && argc != 3 ) {
+              fprintf(stderr, "Error: `dispense refund` takes 2 or 3 arguments\n");
+              ShowUsage();
+              return RV_ARGUMENTS;
+       }
+
+       // Connect to server
+       int sock = OpenConnection(gsDispenseServer, giDispensePort);
+       if(sock < 0)    return RV_SOCKET_ERROR; 
 
-       // Get the user's balance
-       GetUserBalance(sock);
+       // Attempt authentication
+       ret = Authenticate(sock);
+       if(ret) return ret;
 
-       // Get items
-       PopulateItemList(sock);
+        int     price = 0;
+       if( argc > 2 ) {
+              price = atoi(args[2]);
+              if( price <= 0 ) {
+                      fprintf(stderr, "Error: Override price is invalid (should be > 0)\n");
+                      return RV_ARGUMENTS;
+              }
+       }
+
+       // Username, Item, cost
+       ret = Dispense_Refund(sock, args[0], args[1], price);
+
+       // TODO: More
+       close(sock);
+       return ret;
+}
+
+//
+// `dispense iteminfo`
+// - Get the state of an item
+//
+int subcommand_iteminfo(int argc, char *args[])
+{
+        int    ret;
+
+        // Check argument count
+       if( argc != 1 ) {
+               fprintf(stderr, "Error: `dispense iteminfo` takes one argument\n");
+               ShowUsage();
+               return RV_ARGUMENTS;
+       }
+
+       char *item_id = args[0];
+
+       regmatch_t matches[3];
+       // Parse item ID
+       if( RunRegex(&gUserItemIdentRegex, item_id, 3, matches, NULL) != 0 ) {
+               fprintf(stderr, "Error: Invalid item ID passed (<type>:<id> expected)\n");
+               return RV_ARGUMENTS;
+       }
+       char    *type = item_id + matches[1].rm_so;
+       item_id[ matches[1].rm_eo ] = '\0';
+        int    id = atoi( item_id + matches[2].rm_so );
+
+       int sock = OpenConnection(gsDispenseServer, giDispensePort);
+       if( sock < 0 )  return RV_SOCKET_ERROR;
        
-       // Disconnect from server
+       ret = Dispense_ItemInfo(sock, type, id);
        close(sock);
+       return ret;
+}
+
+//
+// `dispense slot`
+// - Update the name/price of an item
+//
+int subcommand_slot(int argc, char *args[])
+{
+        int    ret;
        
-       if( gsItemPattern && gsItemPattern[0] )
+       // Check arguments
+       if( argc != 3 ) {
+               fprintf(stderr, "Error: `dispense slot` takes three arguments\n");
+               ShowUsage();
+               return RV_ARGUMENTS;
+       }
+       char *slot_id = args[0];
+       char *price_str = args[1];
+       char *newname = args[2];
+       
+       // Parse arguments
+       regmatch_t matches[3];
+       if( RunRegex(&gUserItemIdentRegex, slot_id, 3, matches, NULL) != 0 ) {
+               fprintf(stderr, "Error: Invalid item ID passed (<type>:<id> expected)\n");
+               return RV_ARGUMENTS;
+       }
+       const char *item_type = slot_id + matches[1].rm_so;
+       slot_id[ matches[1].rm_eo ] = '\0';
+       int item_id = atoi( slot_id + matches[2].rm_so );
+
+       // - Price
+       char *end;
+       int price = strtol( price_str, &end, 0 );
+       if( price < 0 || *end != '\0' ) {
+               fprintf(stderr, "Error: Invalid price passed (must be >= 0)\n");
+               return RV_ARGUMENTS;
+       }
+       
+       // -- Sanity
+       for( char *pos = newname; *pos; pos ++ )
        {
-               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);
+               if( !isalnum(*pos) && *pos != ' ' ) {
+                       fprintf(stderr, "Error: You should only have letters, numbers and spaces in an item name\n");
+                       return RV_ARGUMENTS;
+               }
+       }
+       
+       // Connect & Authenticate
+       int sock = OpenConnection(gsDispenseServer, giDispensePort);
+       if( sock < 0 )  return RV_SOCKET_ERROR;
+       
+       ret = Authenticate(sock);
+       if(ret) return ret;
+       
+       // Update the slot
+       ret = Dispense_SetItem(sock, item_type, item_id, price, newname);
+       
+       close(sock);
+       return ret;
+}
+
+//
+// `dispense pincheck`
+// - Validate a user's pin (used by the snack machine)
+//
+int subcommand_pincheck(int argc, char *args[])
+{
+        int    ret;
+       
+       if( argc < 1 || argc > 2 ) {
+               fprintf(stderr, "Error: `dispense pincheck` takes one/two arguments\n");
+               ShowUsage();
+               return RV_ARGUMENTS;
+       }
+
+       struct passwd   *pwd = getpwuid( getuid() );
+       gsUserName = strdup(pwd->pw_name);
+       
+       const char *pin = args[0];
+       const char *user = (argc > 1 ? args[1] : gsUserName);
+       
+       int sock = OpenConnection(gsDispenseServer, giDispensePort);
+       if( sock < 0 )  return RV_SOCKET_ERROR;
+       
+       ret = Authenticate(sock);
+       if(ret) return ret;
+       
+       ret = DispenseCheckPin(sock, user, pin);
+       
+       close(sock);
+       return ret;
+}
+
+//
+// `dispense pinset`
+// - Set the pin of the current account
+//
+int subcommand_pinset(int argc, char *args[])
+{
+        int    ret;
+       
+       if( argc != 1 ) {
+               fprintf(stderr, "Error: `dispense pinset` takes one argument\n");
+               ShowUsage();
+               return RV_ARGUMENTS;
+       }
+       
+       const char *pin = args[0];
+       
+       int sock = OpenConnection(gsDispenseServer, giDispensePort);
+       if( sock < 0 )  return RV_SOCKET_ERROR;
+
+       ret = Authenticate(sock);
+       if(ret) return ret;
+
+       ret = DispenseSetPin(sock, pin);
+       
+       close(sock);
+       return ret;
+}
+
+int main(int argc, char *argv[])
+{
+        int    i, ret = 0;
+       char    buffer[BUFSIZ];
+       
+       gsTextArgs[0] = "";
+
+       // -- Create regular expressions
+       // > Code Type Count ...
+       CompileRegex(&gArrayRegex, "^([0-9]{3})\\s+([A-Za-z]+)\\s+([0-9]+)", 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
+       ret = ParseArguments(argc, argv);
+       if( ret )
+               return ret;
+
+       // Sub-commands
+       if( strcmp(gsTextArgs[0], "finger") == 0 ) {
+               return subcommand_finger();
+       }
+       else if( strcmp(gsTextArgs[0], "acct") == 0 ) {
+               return subcommand_acct();
+       }
+       else if( strcmp(gsTextArgs[0], "give") == 0 ) {
+               return subcommand_give(giTextArgc-1, gsTextArgs+1);
+       }
+       else if( strcmp(gsTextArgs[0], "user") == 0 ) {
+               return subcommand_user(giTextArgc-1, gsTextArgs+1);
+       }
+       else if( strcmp(gsTextArgs[0], "donate") == 0 ) {
+               return subcommand_donate(giTextArgc-1, gsTextArgs+1);
+       }
+       else if( strcmp(gsTextArgs[0], "refund") == 0 ) {
+               return subcommand_refund(giTextArgc-1, gsTextArgs+1);
+       }
+       else if( strcmp(gsTextArgs[0], "iteminfo") == 0 ) {
+               return subcommand_iteminfo(giTextArgc-1, gsTextArgs+1);
+       }
+       else if( strcmp(gsTextArgs[0], "slot") == 0 ) {
+               return subcommand_slot(giTextArgc-1, gsTextArgs+1);
+       }
+       else if(strcmp(gsTextArgs[0], "pincheck") == 0) {
+               return subcommand_pincheck(giTextArgc-1, gsTextArgs+1);
+       }
+       else if(strcmp(gsTextArgs[0], "pinset") == 0) {
+               return subcommand_pinset(giTextArgc-1, gsTextArgs+1);
+       }
+       else {
+               // Item name / pattern
+               gsItemPattern = gsTextArgs[0];
+       }
+       
+       // Connect to server
+       int sock = OpenConnection(gsDispenseServer, giDispensePort);
+       if( sock < 0 )  return RV_SOCKET_ERROR;
+
+       // Get the user's balance
+       ret = GetUserBalance(sock);
+       if(ret) return ret;
+
+       // Get items
+       PopulateItemList(sock);
+       
+       // 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 RV_SOCKET_ERROR;
+                       ret = Authenticate(sock);
+                       if(ret) return ret;
+                       ret = DispenseItem(sock, "door", 0);
                        close(sock);
-                       return 0;
+                       return ret;
                }
                // Item id (<type>:<num>)
                else if( RunRegex(&gUserItemIdentRegex, gsItemPattern, 3, matches, NULL) == 0 )
@@ -403,14 +681,15 @@ int main(int argc, char *argv[])
                        
                        // Connect, Authenticate, dispense and close
                        sock = OpenConnection(gsDispenseServer, giDispensePort);
-                       if( sock < 0 )  return -1;
+                       if( sock < 0 )  return RV_SOCKET_ERROR;
                        
                        Dispense_ItemInfo(sock, ident, id);
                        
-                       Authenticate(sock);
-                       DispenseItem(sock, ident, id);
+                       ret = Authenticate(sock);
+                       if(ret) return ret;
+                       ret = DispenseItem(sock, ident, id);
                        close(sock);
-                       return 0;
+                       return ret;
                }
                // Item number (6 = coke)
                else if( strcmp(gsItemPattern, "0") == 0 || atoi(gsItemPattern) > 0 )
@@ -451,7 +730,7 @@ int main(int argc, char *argv[])
                                        // TODO: Allow ambiguous matches?
                                        // or just print a wanrning
                                        printf("Warning - Ambiguous pattern, stopping\n");
-                                       return 1;
+                                       return RV_BAD_ITEM;
                                }
                        }
                        
@@ -459,7 +738,7 @@ int main(int argc, char *argv[])
                        if( best == -1 )
                        {
                                fprintf(stderr, "No item matches the passed string\n");
-                               return 1;
+                               return RV_BAD_ITEM;
                        }
                        
                        i = best;
@@ -510,1386 +789,181 @@ int main(int argc, char *argv[])
        // Check for a valid item ID
        if( i >= 0 )
        {
+                int j;
                // Connect, Authenticate, dispense and close
                sock = OpenConnection(gsDispenseServer, giDispensePort);
-               if( sock < 0 )  return -1;
+               if( sock < 0 )  return RV_SOCKET_ERROR;
                        
-               Dispense_ItemInfo(sock, gaItems[i].Type, gaItems[i].ID);
+               ret = Dispense_ItemInfo(sock, gaItems[i].Type, gaItems[i].ID);
+               if(ret) return ret;
                
-               Authenticate(sock);
-               ret = DispenseItem(sock, gaItems[i].Type, gaItems[i].ID);
+               ret = Authenticate(sock);
+               if(ret) return ret;
+               
+               for( j = 0; j < giDispenseCount; j ++ ) {
+                       ret = DispenseItem(sock, gaItems[i].Type, gaItems[i].ID);
+                       if( ret )       break;
+               }
+               if( j > 1 ) {
+                       printf("%i items dispensed\n", j);
+               }
+               Dispense_ShowUser(sock, gsUserName);
                close(sock);
+
        }
 
        return ret;
 }
 
-void ShowUsage(void)
-{
-       printf(
-               "Usage:\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"
-               "    -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"
-               );
-}
-
-// -------------------
-// --- NCurses GUI ---
-// -------------------
-/**
- * \brief Render the NCurses UI
- */
-int ShowNCursesUI(void)
+int ParseArguments(int argc, char *argv[])
 {
-       // TODO: ncurses interface (with separation between item classes)
-       // - Hmm... that would require standardising the item ID to be <class>:<index>
-       // Oh, why not :)
-        int    ch;
-        int    i, times;
-        int    xBase, yBase;
-       const int       displayMinWidth = 40;
-       char    *titleString = "Dispense";
-        int    itemCount;
-        int    maxItemIndex;
-        int    itemBase = 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 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 > maxItemIndex )
-               itemCount = maxItemIndex;
-       // Get first index
-       currentItem = 0;
-       while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 )
-               currentItem ++;
-       
-       
-       // Get dimensions
-       height = itemCount + 3;
-       width = displayMinWidth;
-       
-       // Get positions
-       xBase = COLS/2 - width/2;
-       yBase = LINES/2 - height/2;
-       
-       for( ;; )
+       for( int i = 1; i < argc; i ++ )
        {
-               // Header
-               PrintAlign(yBase, xBase, width, "/", '-', titleString, '-', "\\");
+               char    *arg = argv[i];
                
-               // Items
-               for( i = 0; i < itemCount; i ++ )
-               {
-                        int    pos = 0;
-                       
-                       move( yBase + 1 + i, xBase );
-                       printw("| ");
-                       
-                       pos += 2;
-                       
-                       // Check for the '...' row
-                       // - Oh god, magic numbers!
-                       if( (i == 0 && itemBase > 0)
-                        || (i == itemCount - 1 && itemBase < maxItemIndex - itemCount) )
+               if( arg[0] == '-' )
+               {                       
+                       switch(arg[1])
                        {
-                               printw("     ...");     pos += 8;
-                               times = (width - pos) - 1;
-                               while(times--)  addch(' ');
-                       }
-                       // Show an item
-                       else {
-                               ShowItemAt(
-                                       yBase + 1 + i, xBase + pos,     // Position
-                                       (width - pos) - 3,      // Width
-                                       itemBase + i,   // Index
-                                       !!(currentItem == itemBase + i) // Hilighted
-                                       );
-                               printw("  ");
-                       }
-                       
-                       // Scrollbar (if needed)
-                       if( maxItemIndex > itemCount ) {
-                               if( i == 0 ) {
-                                       addch('A');
-                               }
-                               else if( i == itemCount - 1 ) {
-                                       addch('V');
+                       case 'h':
+                       case '?':
+                               ShowUsage();
+                               return 0;
+                                       
+                       case 'c':
+                               if( i > 2 && strcmp(argv[i-1], "type") == 0 )
+                                       goto _default;
+                               if( i + 1 >= argc ) {
+                                       fprintf(stderr, "%s: -c takes an argument\n", argv[0]);
+                                       ShowUsage();
+                                       return -1;
                                }
-                               else {
-                                        int    percentage = itemBase * 100 / (maxItemIndex-itemCount);
-                                       if( i-1 == percentage*(itemCount-3)/100 ) {
-                                               addch('#');
-                                       }
-                                       else {
-                                               addch('|');
-                                       }
+                               giDispenseCount = atoi(argv[++i]);
+                               if( giDispenseCount < 1 || giDispenseCount > DISPENSE_MULTIPLE_MAX ) {
+                                       fprintf(stderr, "Sorry, only 1-20 can be passed to -c (safety)\n");
+                                       return -1;
                                }
-                       }
-                       else {
-                               addch('|');
-                       }
-               }
-               
-               // 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();
-               
-               if( ch == '\x1B' ) {
-                       ch = getch();
-                       if( ch == '[' ) {
-                               ch = getch();
                                
-                               switch(ch)
-                               {
-                               case 'B':
-                                       currentItem ++;
-                                       // Skip over spacers
-                                       while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 )
-                                               currentItem ++;
-                                       
-                                       if( currentItem >= maxItemIndex ) {
-                                               currentItem = 0;
-                                               // Skip over spacers
-                                               while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 )
-                                                       currentItem ++;
-                                       }
-                                       break;
-                               case 'A':
-                                       currentItem --;
-                                       // Skip over spacers
-                                       while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 )
-                                               currentItem --;
-                                       
-                                       if( currentItem < 0 ) {
-                                               currentItem = maxItemIndex - 1;
-                                               // Skip over spacers
-                                               while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 )
-                                                       currentItem --;
-                                       }
-                                       break;
+                               break ;
+       
+                       case 'm':       // Minimum balance
+                               if( i + 1 >= argc ) {
+                                       fprintf(stderr, "%s: -m takes an argument\n", argv[0]);
+                                       ShowUsage();
+                                       return RV_ARGUMENTS;
                                }
-                       }
-                       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 = ShowItemAt(0, 0, 0, currentItem, 0);
+                               giMinimumBalance = atoi(argv[++i]);
                                break;
-                       case 'q':
-                               ret = -1;       // -1: Return with no dispense
+                       case 'M':       // Maximum balance
+                               if( i + 1 >= argc ) {
+                                       fprintf(stderr, "%s: -M takes an argument\n", argv[0]);
+                                       ShowUsage();
+                                       return RV_ARGUMENTS;
+                               }
+                               giMaximumBalance = atoi(argv[++i]);
                                break;
-                       }
                        
-                       // Check if the return value was changed
-                       if( ret != -2 ) break;
-               }
-               
-       }
-       
-       
-       // Leave
-       endwin();
-       return ret;
-}
-
-/**
- * \brief Show item \a Index at (\a Col, \a Row)
- * \return Dispense index of item
- * \note Part of the NCurses UI
- */
-int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted)
-{
-        int    _x, _y, times;
-       char    *name = NULL;
-        int    price = 0;
-        int    status = -1;
-       
-       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;
-       }
-       
-       // 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");
+                       case 'u':       // Override User
+                               if( i + 1 >= argc ) {
+                                       fprintf(stderr, "%s: -u takes an argument\n", argv[0]);
+                                       ShowUsage();
+                                       return RV_ARGUMENTS;
+                               }
+                               gsEffectiveUser = argv[++i];
                                break;
                        
-                       default:
-                       case -1:
-                               printw("ERR");
+                       case 'H':       // Override remote host
+                               if( i + 1 >= argc ) {
+                                       fprintf(stderr, "%s: -H takes an argument\n", argv[0]);
+                                       ShowUsage();
+                                       return RV_ARGUMENTS;
+                               }
+                               gsDispenseServer = argv[++i];
+                               break;
+                       case 'P':       // Override remote port
+                               if( i + 1 >= argc ) {
+                                       fprintf(stderr, "%s: -P takes an argument\n", argv[0]);
+                                       ShowUsage();
+                                       return RV_ARGUMENTS;
+                               }
+                               giDispensePort = atoi(argv[++i]);
                                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(' ');
+                       // Set slot name/price
+                       case 's':
+                               if( giTextArgc != 0 ) {
+                                       fprintf(stderr, "%s: -s must appear before other arguments\n", argv[0]);
+                                       ShowUsage();
+                                       return RV_ARGUMENTS;
+                               }
+                               gsTextArgs[0] = "slot"; // HACK!!
+                               giTextArgc ++;
+                               break;
                        
-                       printw(" %4i", price);
+                       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 '-':
+                               if( strcmp(argv[i], "--help") == 0 ) {
+                                       ShowUsage();
+                                       return 0;
+                               }
+                               else if( strcmp(argv[i], "--dry-run") == 0 ) {
+                                       gbDryRun = 1;
+                               }
+                               else if( strcmp(argv[i], "--drinks-only") == 0 ) {
+                                       giUIMode = UI_MODE_DRINKSONLY;
+                               }
+                               else if( strcmp(argv[i], "--can-select-all") == 0 ) {
+                                       gbDisallowSelectWithoutBalance = 0;
+                               }
+                               else {
+                                       fprintf(stderr, "%s: Unknown switch '%s'\n", argv[0], argv[i]);
+                                       ShowUsage();
+                                       return RV_ARGUMENTS;
+                               }
+                               break;
+                       default: _default:
+                               // The first argument is not allowed to begin with 'i'
+                               // (catches most bad flags)
+                               if( giTextArgc == 0 ) {
+                                       fprintf(stderr, "%s: Unknown switch '%s'\n", argv[0], argv[i]);
+                                       ShowUsage();
+                                       return RV_ARGUMENTS;
+                               }
+                               if( giTextArgc == MAX_TXT_ARGS )
+                               {
+                                       fprintf(stderr, "ERROR: Too many arguments\n");
+                                       return RV_ARGUMENTS;
+                               }
+                               gsTextArgs[giTextArgc++] = argv[i];
+                               break;
+                       }
+
+                       continue;
                }
-               else
+
+               if( giTextArgc == MAX_TXT_ARGS )
                {
-                       printw("-- %s", name);
-                       getyx(stdscr, _y, _x);
-                       times = Width - 4 - (_x - Col);
-                       while(times--)  addch(' ');
-                       printw("    ");
+                       fprintf(stderr, "ERROR: Too many arguments\n");
+                       return RV_ARGUMENTS;
                }
-       }
        
-       // If the item isn't availiable for sale, return -1 (so it's skipped)
-       if( status )
-               Index = -1;
+               gsTextArgs[giTextArgc++] = argv[i];
        
-       return Index;
-}
-
-/**
- * \brief Print a three-part string at the specified position (formatted)
- * \note NCurses UI Helper
- * 
- * Prints \a Left on the left of the area, \a Right on the righthand side
- * and \a Mid in the middle of the area. These are padded with \a Pad1
- * between \a Left and \a Mid, and \a Pad2 between \a Mid and \a Right.
- * 
- * ::printf style format codes are allowed in \a Left, \a Mid and \a Right,
- * and the arguments to these are read in that order.
- */
-void PrintAlign(int Row, int Col, int Width, const char *Left, char Pad1,
-       const char *Mid, char Pad2, const char *Right, ...)
-{
-        int    lLen, mLen, rLen;
-        int    times;
-       
-       va_list args;
-       
-       // Get the length of the strings
-       va_start(args, Right);
-       lLen = vsnprintf(NULL, 0, Left, args);
-       mLen = vsnprintf(NULL, 0, Mid, args);
-       rLen = vsnprintf(NULL, 0, Right, args);
-       va_end(args);
-       
-       // Sanity check
-       if( lLen + mLen/2 > Width/2 || mLen/2 + rLen > Width/2 ) {
-               return ;        // TODO: What to do?
-       }
-       
-       move(Row, Col);
-       
-       // Render strings
-       va_start(args, Right);
-       // - Left
-       {
-               char    tmp[lLen+1];
-               vsnprintf(tmp, lLen+1, Left, args);
-               addstr(tmp);
-       }
-       // - Left padding
-       times = (Width - mLen)/2 - lLen;
-       while(times--)  addch(Pad1);
-       // - Middle
-       {
-               char    tmp[mLen+1];
-               vsnprintf(tmp, mLen+1, Mid, args);
-               addstr(tmp);
-       }
-       // - Right Padding
-       times = (Width - mLen)/2 - rLen;
-       if( (Width - mLen) % 2 )        times ++;
-       while(times--)  addch(Pad2);
-       // - Right
-       {
-               char    tmp[rLen+1];
-               vsnprintf(tmp, rLen+1, Right, args);
-               addstr(tmp);
-       }
-}
-
-// ---------------------
-// --- Coke Protocol ---
-// ---------------------
-int OpenConnection(const char *Host, int Port)
-{
-       struct hostent  *host;
-       struct sockaddr_in      serverAddr;
-        int    sock;
-       
-       host = gethostbyname(Host);
-       if( !host ) {
-               fprintf(stderr, "Unable to look up '%s'\n", Host);
-               return -1;
-       }
-       
-       memset(&serverAddr, 0, sizeof(serverAddr));
-       
-       serverAddr.sin_family = AF_INET;        // IPv4
-       // NOTE: I have a suspicion that IPv6 will play sillybuggers with this :)
-       serverAddr.sin_addr.s_addr = *((unsigned long *) host->h_addr_list[0]);
-       serverAddr.sin_port = htons(Port);
-       
-       sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
-       if( sock < 0 ) {
-               fprintf(stderr, "Failed to create socket\n");
-               return -1;
-       }
-
-//     printf("geteuid() = %i, getuid() = %i\n", geteuid(), getuid());
-       
-       if( geteuid() == 0 || getuid() == 0 )
-       {
-                int    i;
-               struct sockaddr_in      localAddr;
-               memset(&localAddr, 0, sizeof(localAddr));
-               localAddr.sin_family = AF_INET; // IPv4
-               
-               // 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);
-       }
-       
-       if( connect(sock, (struct sockaddr *) &serverAddr, sizeof(serverAddr)) < 0 ) {
-               fprintf(stderr, "Failed to connect to server\n");
-               return -1;
-       }
-       
-       return sock;
-}
-
-/**
- * \brief Authenticate with the server
- * \return Boolean Failure
- */
-int Authenticate(int Socket)
-{
-       struct passwd   *pwd;
-       char    *buf;
-        int    responseCode;
-       char    salt[32];
-        int    i;
-       regmatch_t      matches[4];
-       
-       if( gbIsAuthenticated ) return 0;
-       
-       // Get user name
-       pwd = getpwuid( getuid() );
-       
-       // Attempt automatic authentication
-       sendf(Socket, "AUTOAUTH %s\n", pwd->pw_name);
-       
-       // Check if it worked
-       buf = ReadLine(Socket);
-       
-       responseCode = atoi(buf);
-       switch( responseCode )
-       {
-       case 200:       // Autoauth succeeded, return
-               free(buf);
-               break;
-       
-       case 401:       // Untrusted, attempt password authentication
-               free(buf);
-               
-               sendf(Socket, "USER %s\n", pwd->pw_name);
-               printf("Using username %s\n", pwd->pw_name);
-               
-               buf = ReadLine(Socket);
-               
-               // TODO: Get Salt
-               // Expected format: 100 SALT <something> ...
-               // OR             : 100 User Set
-               RunRegex(&gSaltRegex, buf, 4, matches, "Malformed server response");
-               responseCode = atoi(buf);
-               if( responseCode != 100 ) {
-                       fprintf(stderr, "Unknown repsonse code %i from server\n%s\n", responseCode, buf);
-                       free(buf);
-                       return -1;      // ERROR
-               }
-               
-               // Check for salt
-               if( memcmp( buf+matches[2].rm_so, "SALT", matches[2].rm_eo - matches[2].rm_so) == 0) {
-                       // Store it for later
-                       memcpy( salt, buf + matches[3].rm_so, matches[3].rm_eo - matches[3].rm_so );
-                       salt[ matches[3].rm_eo - matches[3].rm_so ] = 0;
-               }
-               free(buf);
-               
-               // Give three attempts
-               for( i = 0; i < 3; i ++ )
-               {
-                        int    ofs = strlen(pwd->pw_name)+strlen(salt);
-                       char    tmpBuf[42];
-                       char    tmp[ofs+20];
-                       char    *pass = getpass("Password: ");
-                       uint8_t h[20];
-                       
-                       // Create hash string
-                       // <username><salt><hash>
-                       strcpy(tmp, pwd->pw_name);
-                       strcat(tmp, salt);
-                       SHA1( (unsigned char*)pass, strlen(pass), h );
-                       memcpy(tmp+ofs, h, 20);
-                       
-                       // Hash all that
-                       SHA1( (unsigned char*)tmp, ofs+20, h );
-                       sprintf(tmpBuf, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
-                               h[ 0], h[ 1], h[ 2], h[ 3], h[ 4], h[ 5], h[ 6], h[ 7], h[ 8], h[ 9],
-                               h[10], h[11], h[12], h[13], h[14], h[15], h[16], h[17], h[18], h[19]
-                               );
-               
-                       // Send password
-                       sendf(Socket, "PASS %s\n", tmpBuf);
-                       buf = ReadLine(Socket);
-               
-                       responseCode = atoi(buf);
-                       // Auth OK?
-                       if( responseCode == 200 )       break;
-                       // Bad username/password
-                       if( responseCode == 401 )       continue;
-                       
-                       fprintf(stderr, "Unknown repsonse code %i from server\n%s\n", responseCode, buf);
-                       free(buf);
-                       return -1;
-               }
-               free(buf);
-               if( i == 3 )
-                       return 2;       // 2 = Bad Password
-               break;
-       
-       case 404:       // Bad Username
-               fprintf(stderr, "Bad Username '%s'\n", pwd->pw_name);
-               free(buf);
-               return 1;
-       
-       default:
-               fprintf(stderr, "Unkown response code %i from server\n", responseCode);
-               printf("%s\n", buf);
-               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
- * \return Boolean Failure
- */
-void PopulateItemList(int Socket)
-{
-       char    *buf;
-        int    responseCode;
-       
-       char    *itemType, *itemStart;
-        int    count, i;
-       regmatch_t      matches[4];
-       
-       // Ask server for stock list
-       send(Socket, "ENUM_ITEMS\n", 11, 0);
-       buf = ReadLine(Socket);
-       
-       //printf("Output: %s\n", buf);
-       
-       responseCode = atoi(buf);
-       if( responseCode != 201 ) {
-               fprintf(stderr, "Unknown response from dispense server (Response Code %i)\n", responseCode);
-               exit(-1);
-       }
-       
-       // - Get item list -
-       
-       // Expected format:
-       //  201 Items <count>
-       //  202 Item <count>
-       RunRegex(&gArrayRegex, buf, 4, matches, "Malformed server response");
-               
-       itemType = &buf[ matches[2].rm_so ];    buf[ matches[2].rm_eo ] = '\0';
-       count = atoi( &buf[ matches[3].rm_so ] );
-               
-       // Check array type
-       if( strcmp(itemType, "Items") != 0 ) {
-               // What the?!
-               fprintf(stderr, "Unexpected array type, expected 'Items', got '%s'\n",
-                       itemType);
-               exit(-1);
-       }
-               
-       itemStart = &buf[ matches[3].rm_eo ];
-       
-       free(buf);
-       
-       giNumItems = count;
-       gaItems = malloc( giNumItems * sizeof(tItem) );
-       
-       // Fetch item information
-       for( i = 0; i < giNumItems; i ++ )
-       {
-               ReadItemInfo( Socket, &gaItems[i] );
-       }
-       
-       // Read end of list
-       buf = ReadLine(Socket);
-       responseCode = atoi(buf);
-               
-       if( responseCode != 200 ) {
-               fprintf(stderr, "Unknown response from dispense server %i\n'%s'",
-                       responseCode, buf
-                       );
-               exit(-1);
-       }
-       
-       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, const char *Type, int ID)
-{
-        int    ret, responseCode;
-       char    *buf;
-       
-       // Check for a dry run
-       if( gbDryRun ) {
-               printf("Dry Run - No action\n");
-               return 0;
-       }
-       
-       // Dispense!
-       sendf(Socket, "DISPENSE %s:%i\n", Type, ID);
-       buf = ReadLine(Socket);
-       
-       responseCode = atoi(buf);
-       switch( responseCode )
-       {
-       case 200:
-               printf("Dispense OK\n");
-               ret = 0;
-               break;
-       case 401:
-               printf("Not authenticated\n");
-               ret = 1;
-               break;
-       case 402:
-               printf("Insufficient balance\n");
-               ret = 1;
-               break;
-       case 406:
-               printf("Bad item name\n");
-               ret = 1;
-               break;
-       case 500:
-               printf("Item failed to dispense, is the slot empty?\n");
-               ret = 1;
-               break;
-       case 501:
-               printf("Dispense not possible (slot empty/permissions)\n");
-               ret = 1;
-               break;
-       default:
-               printf("Unknown response code %i ('%s')\n", responseCode, buf);
-               ret = -2;
-               break;
-       }
-       
-       free(buf);
-       return ret;
-}
-
-/**
- * \brief Alter a user's balance
- */
-int Dispense_AlterBalance(int Socket, const char *Username, int Ammount, const char *Reason)
-{
-       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);
-       
-       responseCode = atoi(buf);
-       free(buf);
-       
-       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;
-       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 Set a user's balance
- * \note Only avaliable to dispense admins
- */
-int Dispense_SetBalance(int Socket, const char *Username, int Balance, const char *Reason)
-{
-       char    *buf;
-        int    responseCode;
-       
-       // 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);
-       free(buf);
-       
-       switch(responseCode)
-       {
-       case 200:       return 0;       // OK
-       case 403:       // Not in coke
-               fprintf(stderr, "You are not an admin\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 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;
-        int    responseCode;
-        int    nUsers;
-       regmatch_t      matches[4];
-       
-       if( giMinimumBalance != INT_MIN ) {
-               if( giMaximumBalance != INT_MAX ) {
-                       sendf(Socket, "ENUM_USERS min_balance:%i max_balance:%i\n", giMinimumBalance, giMaximumBalance);
-               }
-               else {
-                       sendf(Socket, "ENUM_USERS min_balance:%i\n", giMinimumBalance);
-               }
-       }
-       else {
-               if( giMaximumBalance != INT_MAX ) {
-                       sendf(Socket, "ENUM_USERS max_balance:%i\n", giMaximumBalance);
-               }
-               else {
-                       sendf(Socket, "ENUM_USERS\n");
-               }
-       }
-       buf = ReadLine(Socket);
-       responseCode = atoi(buf);
-       
-       switch(responseCode)
-       {
-       case 201:       break;  // Ok, length follows
-       
-       default:
-               fprintf(stderr, "Unknown response code %i\n%s\n", responseCode, buf);
-               free(buf);
-               return -1;
-       }
-       
-       // Get count (not actually used)
-       RunRegex(&gArrayRegex, buf, 4, matches, "Malformed server response");
-       nUsers = atoi( buf + matches[3].rm_so );
-       printf("%i users returned\n", nUsers);
-       
-       // Free string
-       free(buf);
-       
-       // Read returned users
-       do {
-               buf = ReadLine(Socket);
-               responseCode = atoi(buf);
-               
-               if( responseCode != 202 )       break;
-               
-               _PrintUserLine(buf);
-               free(buf);
-       } while(responseCode == 202);
-       
-       // Check final response
-       if( responseCode != 200 ) {
-               fprintf(stderr, "Unknown response code %i\n%s\n", responseCode, buf);
-               free(buf);
-               return -1;
-       }
-       
-       free(buf);
-       
-       return 0;
-}
-
-int Dispense_ShowUser(int Socket, const char *Username)
-{
-       char    *buf;
-        int    responseCode, ret;
-       
-       sendf(Socket, "USER_INFO %s\n", Username);
-       buf = ReadLine(Socket);
-       
-       responseCode = atoi(buf);
-       
-       switch(responseCode)
-       {
-       case 202:
-               _PrintUserLine(buf);
-               ret = 0;
-               break;
-       
-       case 404:
-               printf("Unknown user '%s'\n", Username);
-               ret = 1;
-               break;
-       
-       default:
-               fprintf(stderr, "Unknown response code %i '%s'\n", responseCode, buf);
-               ret = -1;
-               break;
-       }
-       
-       free(buf);
-       
-       return ret;
-}
-
-void _PrintUserLine(const char *Line)
-{
-       regmatch_t      matches[6];
-        int    bal;
-       
-       RunRegex(&gUserInfoRegex, Line, 6, matches, "Malformed server response");
-       // 3: Username
-       // 4: Balance
-       // 5: Flags
-       {
-                int    usernameLen = matches[3].rm_eo - matches[3].rm_so;
-               char    username[usernameLen + 1];
-                int    flagsLen = matches[5].rm_eo - matches[5].rm_so;
-               char    flags[flagsLen + 1];
-               
-               memcpy(username, Line + matches[3].rm_so, usernameLen);
-               username[usernameLen] = '\0';
-               memcpy(flags, Line + matches[5].rm_so, flagsLen);
-               flags[flagsLen] = '\0';
-               
-               bal = atoi(Line + matches[4].rm_so);
-               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;
+       }
+       return 0;
 }
 
 // ---------------
 // --- Helpers ---
 // ---------------
-char *ReadLine(int Socket)
-{
-       static char     buf[BUFSIZ];
-       static int      bufPos = 0;
-       static int      bufValid = 0;
-        int    len;
-       char    *newline = NULL;
-        int    retLen = 0;
-       char    *ret = malloc(10);
-       
-       #if DEBUG_TRACE_SERVER
-       printf("ReadLine: ");
-       #endif
-       fflush(stdout);
-       
-       ret[0] = '\0';
-       
-       while( !newline )
-       {
-               if( bufValid ) {
-                       len = bufValid;
-               }
-               else {
-                       len = recv(Socket, buf+bufPos, BUFSIZ-1-bufPos, 0);
-                       buf[bufPos+len] = '\0';
-               }
-               
-               newline = strchr( buf+bufPos, '\n' );
-               if( newline ) {
-                       *newline = '\0';
-               }
-               
-               retLen += strlen(buf+bufPos);
-               ret = realloc(ret, retLen + 1);
-               strcat( ret, buf+bufPos );
-               
-               if( newline ) {
-                        int    newLen = newline - (buf+bufPos) + 1;
-                       bufValid = len - newLen;
-                       bufPos += newLen;
-               }
-               if( len + bufPos == BUFSIZ - 1 )        bufPos = 0;
-       }
-       
-       #if DEBUG_TRACE_SERVER
-       printf("%i '%s'\n", retLen, ret);
-       #endif
-       
-       return ret;
-}
-
-int sendf(int Socket, const char *Format, ...)
-{
-       va_list args;
-        int    len;
-       
-       va_start(args, Format);
-       len = vsnprintf(NULL, 0, Format, args);
-       va_end(args);
-       
-       {
-               char    buf[len+1];
-               va_start(args, Format);
-               vsnprintf(buf, len+1, Format, args);
-               va_end(args);
-               
-               #if DEBUG_TRACE_SERVER
-               printf("sendf: %s", buf);
-               #endif
-               
-               return send(Socket, buf, len, 0);
-       }
-}
-
 char *trim(char *string)
 {
         int    i;

UCC git Repository :: git.ucc.asn.au