Fixes fixes fixes, init.d script
[tpg/opendispense2.git] / src / client / main.c
index 315dbd1..4d33de1 100644 (file)
@@ -15,6 +15,7 @@
 #include <stdarg.h>
 #include <regex.h>
 #include <ncurses.h>
+#include <limits.h>
 
 #include <unistd.h>    // close
 #include <netdb.h>     // gethostbyname
 #include <openssl/sha.h>       // SHA1
 
 #define        USE_NCURSES_INTERFACE   0
+#define DEBUG_TRACE_SERVER     0
+#define USE_AUTOAUTH   1
+
+#define MAX_TXT_ARGS   5       // Maximum number of textual arguments (including command)
+
+enum eUI_Modes
+{
+       UI_MODE_BASIC,  // Non-NCurses
+       UI_MODE_STANDARD,
+       UI_MODE_DRINKSONLY,
+       UI_MODE_ALL,
+       NUM_UI_MODES
+};
 
 // === TYPES ===
 typedef struct sItem {
-       char    *Ident;
+       char    *Type;
+        int    ID;
+        int    Status; // 0: Availiable, 1: Sold out, -1: Error
        char    *Desc;
         int    Price;
 }      tItem;
 
 // === PROTOTYPES ===
+ int   main(int argc, char *argv[]);
+void   ShowUsage(void);
 // --- GUI ---
  int   ShowNCursesUI(void);
-void   ShowItemAt(int Row, int Col, int Width, int Index);
+ int   ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted);
 void   PrintAlign(int Row, int Col, int Width, const char *Left, char Pad1, const char *Mid, char Pad2, const char *Right, ...);
 // --- Coke Server Communication ---
  int   OpenConnection(const char *Host, int Port);
  int   Authenticate(int Socket);
+ int   GetUserBalance(int Socket);
 void   PopulateItemList(int Socket);
- int   DispenseItem(int Socket, int ItemID);
+ int   Dispense_ItemInfo(int Socket, const char *Type, int ID);
+ int   DispenseItem(int Socket, const char *Type, int ID);
+ int   Dispense_AlterBalance(int Socket, const char *Username, int Ammount, const char *Reason);
+ int   Dispense_SetBalance(int Socket, const char *Username, int 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 = "localhost";
+char   *gsDispenseServer = "heathred";
  int   giDispensePort = 11020;
+
 tItem  *gaItems;
  int   giNumItems;
-regex_t        gArrayRegex, gItemRegex, gSaltRegex;
+regex_t        gArrayRegex, gItemRegex, gSaltRegex, gUserInfoRegex, gUserItemIdentRegex;
+ int   gbIsAuthenticated = 0;
 
-char   *gsOverrideUser;        //!< '-u' argument (dispense as another user)
- int   gbUseNCurses = 0;       //!< '-G' Use the NCurses GUI?
+char   *gsItemPattern; //!< Item pattern
+char   *gsEffectiveUser;       //!< '-u' Dispense as another user
+ int   giUIMode = UI_MODE_STANDARD;
+ int   gbDryRun = 0;   //!< '-n' Read-only
+ int   giMinimumBalance = INT_MIN;     //!< '-m' Minumum balance for `dispense acct`
+ int   giMaximumBalance = INT_MAX;     //!< '-M' Maximum balance for `dispense acct`
+char   *gsUserName;    //!< User that dispense will happen as
+char   *gsUserFlags;   //!< User's flag set
+ int   giUserBalance=-1;       //!< User balance (set by Authenticate)
 
 // === CODE ===
 int main(int argc, char *argv[])
 {
         int    sock;
-        int    i;
+        int    i, ret = 0;
        char    buffer[BUFSIZ];
+       char    *text_args[MAX_TXT_ARGS];       // Non-flag arguments
+        int    text_argc = 0;
        
+       text_args[0] = "";
+
        // -- Create regular expressions
        // > Code Type Count ...
        CompileRegex(&gArrayRegex, "^([0-9]{3})\\s+([A-Za-z]+)\\s+([0-9]+)", REG_EXTENDED);     //
-       // > Code Type Ident Price Desc
-       CompileRegex(&gItemRegex, "^([0-9]{3})\\s+([A-Za-z]+)\\s+([A-Za-z0-9:]+?)\\s+([0-9]+)\\s+(.+)$", REG_EXTENDED);
+       // > Code Type Ident Status Price Desc
+       CompileRegex(&gItemRegex, "^([0-9]{3})\\s+([A-Za-z]+)\\s+([A-Za-z]+):([0-9]+)\\s+(avail|sold|error)\\s+([0-9]+)\\s+(.+)$", REG_EXTENDED);
        // > Code 'SALT' salt
-       CompileRegex(&gSaltRegex, "^([0-9]{3})\\s+(.+)\\s+(.+)$", REG_EXTENDED);
-       
-       // Connect to server
-       sock = OpenConnection(gsDispenseServer, giDispensePort);
-       if( sock < 0 )  return -1;
-
-       // Authenticate
-       Authenticate(sock);
+       CompileRegex(&gSaltRegex, "^([0-9]{3})\\s+([A-Za-z]+)\\s+(.+)$", REG_EXTENDED);
+       // > Code 'User' Username Balance Flags
+       CompileRegex(&gUserInfoRegex, "^([0-9]{3})\\s+([A-Za-z]+)\\s+([^ ]+)\\s+(-?[0-9]+)\\s+(.+)$", REG_EXTENDED);
+       // > Item Ident
+       CompileRegex(&gUserItemIdentRegex, "^([A-Za-z]+):([0-9]+)$", REG_EXTENDED);
 
        // Parse Arguments
        for( i = 1; i < argc; i ++ )
@@ -90,39 +130,355 @@ int main(int argc, char *argv[])
                {                       
                        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
-                               gsOverrideUser = argv[++i];
+                               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':       // Use GUI
-                               gbUseNCurses = 1;
+                       case 'G':       // Don't use GUI
+                               giUIMode = UI_MODE_BASIC;
+                               break;
+                       case 'D':       // Drinks only
+                               giUIMode = UI_MODE_DRINKSONLY;
+                               break;
+                       case 'n':       // Dry Run / read-only
+                               gbDryRun = 1;
+                               break;
+                       case '0':       case '1':
+                       case '2':       case '3':
+                       case '4':       case '5':
+                       case '6':       case '7':
+                       case '8':       case '9':
+                               if( text_argc + 1 ==  MAX_TXT_ARGS )
+                               {
+                                       fprintf(stderr, "ERROR: Too many arguments\n");
+                                       return 1;
+                               }
+                               text_args[text_argc++] = argv[i];
                                break;
                        }
 
                        continue;
                }
-               
-               if( strcmp(argv[1], "acct") == 0 ) {
-                       // Alter account
-                       // List accounts
+
+               if( text_argc + 1 == MAX_TXT_ARGS )
+               {
+                       fprintf(stderr, "ERROR: Too many arguments\n");
+                       return 1;
+               }
+       
+               text_args[text_argc++] = argv[i];
+       
+       }
+
+       //
+       // `dispense acct`
+       // - 
+       if( strcmp(text_args[0], "acct") == 0 )
+       {
+               // Connect to server
+               sock = OpenConnection(gsDispenseServer, giDispensePort);
+               if( sock < 0 )  return -1;
+                       // List accounts?
+               if( text_argc == 1 ) {
+                       Dispense_EnumUsers(sock);
                        return 0;
                }
-               else {
-                       // Item name / pattern
+                       
+               // 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]);
+               
+               close(sock);
+               return 0;
+       }
+       //
+       // `dispense give`
+       // - "Here, have some money."
+       if( strcmp(text_args[0], "give") == 0 )
+       {
+               if( text_argc != 3 ) {
+                       fprintf(stderr, "`dispense give` takes three arguments\n");
+                       ShowUsage();
+                       return -1;
+               }
+               
+               // text_args[1]: Destination
+               // text_args[2]: Ammount
+               // text_args[3]: Reason
+               
+               // Connect to server
+               sock = OpenConnection(gsDispenseServer, giDispensePort);
+               if( sock < 0 )  return -1;
+               
+               // Authenticate
+               if( Authenticate(sock) )
+                       return -1;
+               
+               Dispense_Give(sock, text_args[1], atoi(text_args[2]), text_args[3]);
+               return 0;
+       }
+       // 
+       // `dispense user`
+       // - User administration (Admin Only)
+       if( strcmp(text_args[0], "user") == 0 )
+       {
+               // Check argument count
+               if( text_argc == 1 ) {
+                       fprintf(stderr, "Error: `dispense user` requires arguments\n");
+                       ShowUsage();
+                       exit(1);
                }
+               
+               // Connect to server
+               sock = OpenConnection(gsDispenseServer, giDispensePort);
+               if( sock < 0 )  return -1;
+               
+               // Attempt authentication
+               if( Authenticate(sock) )
+                       return -1;
+               
+               // Add new user?
+               if( strcmp(text_args[1], "add") == 0 )
+               {
+                       if( text_argc != 3 ) {
+                               fprintf(stderr, "Error: `dispense user add` requires an argument\n");
+                               ShowUsage();
+                               exit(1);
+                       }
+                       
+                       Dispense_AddUser(sock, text_args[2]);
+               }
+               // Update a user
+               else if( strcmp(text_args[1], "type") == 0 )
+               {
+                       if( text_argc != 4 ) {
+                               fprintf(stderr, "Error: `dispense user type` requires two arguments\n");
+                               ShowUsage();
+                               exit(1);
+                       }
+                       
+                       Dispense_SetUserType(sock, text_args[2], text_args[3]);
+               }
+               else
+               {
+                       fprintf(stderr, "Error: Unknown sub-command for `dispense user`\n");
+                       ShowUsage();
+                       exit(1);
+               }
+               return 0;
        }
+       
+       // Donation!
+       if( strcmp(text_args[0], "donate") == 0 )
+       {
+               // Check argument count
+               if( text_argc != 3 ) {
+                       fprintf(stderr, "Error: `dispense donate` requires two arguments\n");
+                       ShowUsage();
+                       exit(1);
+               }
+               
+               // Connect to server
+               sock = OpenConnection(gsDispenseServer, giDispensePort);
+               if( sock < 0 )  return -1;
+               
+               // Attempt authentication
+               if( Authenticate(sock) )
+                       return -1;
+               
+               // Do donation
+               Dispense_Donate(sock, atoi(text_args[1]), text_args[2]);
+               
+               return 0;
+       }
+       else {
+               // Item name / pattern
+               gsItemPattern = text_args[0];
+       }
+       
+       // Connect to server
+       sock = OpenConnection(gsDispenseServer, giDispensePort);
+       if( sock < 0 )  return -1;
+
+       // Get the user's balance
+       GetUserBalance(sock);
 
        // Get items
        PopulateItemList(sock);
        
-       if( gbUseNCurses )
+       // Disconnect from server
+       close(sock);
+       
+       if( gsItemPattern && gsItemPattern[0] )
+       {
+               regmatch_t matches[3];
+               // Door (hard coded)
+               if( strcmp(gsItemPattern, "door") == 0 )
+               {
+                       // Connect, Authenticate, dispense and close
+                       sock = OpenConnection(gsDispenseServer, giDispensePort);
+                       if( sock < 0 )  return -1;
+                       Authenticate(sock);
+                       DispenseItem(sock, "door", 0);
+                       close(sock);
+                       return 0;
+               }
+               // Item id (<type>:<num>)
+               else if( RunRegex(&gUserItemIdentRegex, gsItemPattern, 3, matches, NULL) == 0 )
+               {
+                       char    *ident;
+                        int    id;
+                       
+                       // Get and finish ident
+                       ident = gsItemPattern + matches[1].rm_so;
+                       gsItemPattern[matches[1].rm_eo] = '\0';
+                       // Get ID
+                       id = atoi( gsItemPattern + matches[2].rm_so );
+                       
+                       // Connect, Authenticate, dispense and close
+                       sock = OpenConnection(gsDispenseServer, giDispensePort);
+                       if( sock < 0 )  return -1;
+                       
+                       Dispense_ItemInfo(sock, ident, id);
+                       
+                       Authenticate(sock);
+                       DispenseItem(sock, ident, id);
+                       close(sock);
+                       return 0;
+               }
+               // Item number (6 = coke)
+               else if( strcmp(gsItemPattern, "0") == 0 || atoi(gsItemPattern) > 0 )
+               {
+                       i = atoi(gsItemPattern);
+               }
+               // Item prefix
+               else
+               {
+                        int    j;
+                        int    best = -1;
+                       for( i = 0; i < giNumItems; i ++ )
+                       {
+                               // Prefix match (with case-insensitive match)
+                               for( j = 0; gsItemPattern[j]; j ++ )
+                               {
+                                       if( gaItems[i].Desc[j] == gsItemPattern[j] )
+                                               continue;
+                                       if( tolower(gaItems[i].Desc[j]) == tolower(gsItemPattern[j]) )
+                                               continue;
+                                       break;
+                               }
+                               // Check if the prefix matched
+                               if( gsItemPattern[j] != '\0' )
+                                       continue;
+                               
+                               // Prefect match
+                               if( gaItems[i].Desc[j] == '\0' ) {
+                                       best = i;
+                                       break;
+                               }
+                               
+                               // Only one match allowed
+                               if( best == -1 ) {
+                                       best = i;
+                               }
+                               else {
+                                       // TODO: Allow ambiguous matches?
+                                       // or just print a wanrning
+                                       printf("Warning - Ambiguous pattern, stopping\n");
+                                       return 1;
+                               }
+                       }
+                       
+                       // Was a match found?
+                       if( best == -1 )
+                       {
+                               fprintf(stderr, "No item matches the passed string\n");
+                               return 1;
+                       }
+                       
+                       i = best;
+               }
+       }
+       else if( giUIMode != UI_MODE_BASIC )
        {
                i = ShowNCursesUI();
        }
        else
        {
-               for( i = 0; i < giNumItems; i ++ ) {            
-                       printf("%2i %s\t%3i %s\n", i, gaItems[i].Ident, gaItems[i].Price, gaItems[i].Desc);
+               // Very basic dispense interface
+               for( i = 0; i < giNumItems; i ++ ) {
+                       // Add a separator
+                       if( i && strcmp(gaItems[i].Type, gaItems[i-1].Type) != 0 )
+                               printf("   ---\n");
+                       
+                       printf("%2i %s:%i\t%3i %s\n", i, gaItems[i].Type, gaItems[i].ID,
+                               gaItems[i].Price, gaItems[i].Desc);
                }
                printf(" q Quit\n");
                for(;;)
@@ -150,13 +506,63 @@ int main(int argc, char *argv[])
                }
        }
        
+       
        // Check for a valid item ID
        if( i >= 0 )
-               DispenseItem(sock, i);
+       {
+               // Connect, Authenticate, dispense and close
+               sock = OpenConnection(gsDispenseServer, giDispensePort);
+               if( sock < 0 )  return -1;
+                       
+               Dispense_ItemInfo(sock, gaItems[i].Type, gaItems[i].ID);
+               
+               Authenticate(sock);
+               ret = DispenseItem(sock, gaItems[i].Type, gaItems[i].ID);
+               close(sock);
+       }
 
-       close(sock);
+       return ret;
+}
 
-       return 0;
+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"
+               );
 }
 
 // -------------------
@@ -174,21 +580,45 @@ int ShowNCursesUI(void)
         int    i, times;
         int    xBase, yBase;
        const int       displayMinWidth = 40;
-       const int       displayMinItems = 8;
        char    *titleString = "Dispense";
-        int    itemCount = displayMinItems;
+        int    itemCount;
+        int    maxItemIndex;
         int    itemBase = 0;
-        int    currentItem = 0;
+        int    currentItem;
+        int    ret = -2;       // -2: Used for marking "no return yet"
+       
+       char    balance_str[5+1+2+1];   // If $9999.99 is too little, something's wrong
+       char    *username;
+       struct passwd *pwd;
         
         int    height, width;
         
+       // Get Username
+       if( gsEffectiveUser )
+               username = gsEffectiveUser;
+       else {
+               pwd = getpwuid( getuid() );
+               username = pwd->pw_name;
+       }
+       // Get balance
+       snprintf(balance_str, sizeof balance_str, "$%i.%02i", giUserBalance/100, giUserBalance%100);
+       
        // Enter curses mode
        initscr();
        raw(); noecho();
        
+       // Get max index
+       maxItemIndex = ShowItemAt(0, 0, 0, -1, 0);
+       // Get item count per screen
+       // - 6: randomly chosen (Need at least 3)
        itemCount = LINES - 6;
-       if( itemCount > giNumItems )
-               itemCount = giNumItems;
+       if( itemCount > maxItemIndex )
+               itemCount = maxItemIndex;
+       // Get first index
+       currentItem = 0;
+       while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 )
+               currentItem ++;
+       
        
        // Get dimensions
        height = itemCount + 3;
@@ -206,35 +636,35 @@ int ShowNCursesUI(void)
                // Items
                for( i = 0; i < itemCount; i ++ )
                {
+                        int    pos = 0;
+                       
                        move( yBase + 1 + i, xBase );
+                       printw("| ");
                        
-                       if( currentItem == itemBase + i ) {
-                               printw("| -> ");
-                       }
-                       else {
-                               printw("|    ");
-                       }
+                       pos += 2;
                        
-                       // Check for ... row
+                       // Check for the '...' row
                        // - Oh god, magic numbers!
-                       if( i == 0 && itemBase > 0 ) {
-                               printw("   ...");
-                               times = width-1 - 8 - 3;
-                               while(times--)  addch(' ');
-                       }
-                       else if( i == itemCount - 1 && itemBase < giNumItems - itemCount ) {
-                               printw("   ...");
-                               times = width-1 - 8 - 3;
+                       if( (i == 0 && itemBase > 0)
+                        || (i == itemCount - 1 && itemBase < maxItemIndex - itemCount) )
+                       {
+                               printw("     ...");     pos += 8;
+                               times = (width - pos) - 1;
                                while(times--)  addch(' ');
                        }
                        // Show an item
                        else {
-                               ShowItemAt( yBase + 1 + i, xBase + 5, width - 7, itemBase + i);
-                               addch(' ');
+                               ShowItemAt(
+                                       yBase + 1 + i, xBase + pos,     // Position
+                                       (width - pos) - 3,      // Width
+                                       itemBase + i,   // Index
+                                       !!(currentItem == itemBase + i) // Hilighted
+                                       );
+                               printw("  ");
                        }
                        
                        // Scrollbar (if needed)
-                       if( giNumItems > itemCount ) {
+                       if( maxItemIndex > itemCount ) {
                                if( i == 0 ) {
                                        addch('A');
                                }
@@ -242,7 +672,7 @@ int ShowNCursesUI(void)
                                        addch('V');
                                }
                                else {
-                                        int    percentage = itemBase * 100 / (giNumItems-itemCount);
+                                        int    percentage = itemBase * 100 / (maxItemIndex-itemCount);
                                        if( i-1 == percentage*(itemCount-3)/100 ) {
                                                addch('#');
                                        }
@@ -259,6 +689,12 @@ int ShowNCursesUI(void)
                // Footer
                PrintAlign(yBase+height-2, xBase, width, "\\", '-', "", '-', "/");
                
+               // User line
+               // - Username, balance, flags
+               PrintAlign(yBase+height-1, xBase+1, width-2,
+                       username, ' ', balance_str, ' ', gsUserFlags);
+               
+               
                // Get input
                ch = getch();
                
@@ -270,29 +706,55 @@ int ShowNCursesUI(void)
                                switch(ch)
                                {
                                case 'B':
-                                       //if( itemBase < giNumItems - (itemCount) )
-                                       //      itemBase ++;
-                                       if( currentItem < giNumItems - 1 )
+                                       currentItem ++;
+                                       // Skip over spacers
+                                       while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 )
                                                currentItem ++;
-                                       if( itemBase + itemCount - 1 <= currentItem && itemBase + itemCount < giNumItems )
-                                               itemBase ++;
+                                       
+                                       if( currentItem >= maxItemIndex ) {
+                                               currentItem = 0;
+                                               // Skip over spacers
+                                               while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 )
+                                                       currentItem ++;
+                                       }
                                        break;
                                case 'A':
-                                       //if( itemBase > 0 )
-                                       //      itemBase --;
-                                       if( currentItem > 0 )
+                                       currentItem --;
+                                       // Skip over spacers
+                                       while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 )
                                                currentItem --;
-                                       if( itemBase + 1 > currentItem && itemBase > 0 )
-                                               itemBase --;
+                                       
+                                       if( currentItem < 0 ) {
+                                               currentItem = maxItemIndex - 1;
+                                               // Skip over spacers
+                                               while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 )
+                                                       currentItem --;
+                                       }
                                        break;
                                }
                        }
                        else {
                                
                        }
+                       
+                       if( itemCount > maxItemIndex && currentItem < itemBase + 2 && itemBase > 0 )
+                               itemBase = currentItem - 2;
+                       if( itemCount > maxItemIndex && currentItem > itemBase + itemCount - 2 && itemBase < maxItemIndex-1 )
+                               itemBase = currentItem - itemCount + 2;
                }
                else {
-                       break;
+                       switch(ch)
+                       {
+                       case '\n':
+                               ret = ShowItemAt(0, 0, 0, currentItem, 0);
+                               break;
+                       case 'q':
+                               ret = -1;       // -1: Return with no dispense
+                               break;
+                       }
+                       
+                       // Check if the return value was changed
+                       if( ret != -2 ) break;
                }
                
        }
@@ -300,37 +762,116 @@ int ShowNCursesUI(void)
        
        // Leave
        endwin();
-       return -1;
+       return ret;
 }
 
 /**
  * \brief Show item \a Index at (\a Col, \a Row)
+ * \return Dispense index of item
  * \note Part of the NCurses UI
  */
-void ShowItemAt(int Row, int Col, int Width, int Index)
+int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted)
 {
         int    _x, _y, times;
-       char    *name;
-        int    price;
-       
-       move( Row, Col );
+       char    *name = NULL;
+        int    price = 0;
+        int    status = -1;
        
-       if( Index < 0 || Index >= giNumItems ) {
-               name = "OOR";
-               price = 0;
-       }
-       else {
+       switch(giUIMode)
+       {
+       // Standard UI
+       // - This assumes that 
+       case UI_MODE_STANDARD:
+               // Bounds check
+               // Index = -1, request limit
+               if( Index < 0 || Index >= giNumItems+2 )
+                       return giNumItems+2;
+               // Drink label
+               if( Index == 0 )
+               {
+                       price = 0;
+                       name = "Coke Machine";
+                       Index = -1;     // -1 indicates a label
+                       break;
+               }
+               Index --;
+               // Drinks 0 - 6
+               if( Index <= 6 )
+               {
+                       name = gaItems[Index].Desc;
+                       price = gaItems[Index].Price;
+                       status = gaItems[Index].Status;
+                       break;
+               }
+               Index -= 7;
+               // EPS label
+               if( Index == 0 )
+               {
+                       price = 0;
+                       name = "Electronic Payment System";
+                       Index = -1;     // -1 indicates a label
+                       break;
+               }
+               Index --;
+               Index += 7;
                name = gaItems[Index].Desc;
                price = gaItems[Index].Price;
+               status = gaItems[Index].Status;
+               break;
+       default:
+               return -1;
        }
-
-       printw("%02i %s", Index, name);
        
-       getyx(stdscr, _y, _x);
-       // Assumes max 4 digit prices
-       times = Width - 4 - (_x - Col); // TODO: Better handling for large prices
-       while(times--)  addch(' ');
-       printw("%4i", price);
+       // Width = 0, don't print
+       if( Width > 0 )
+       {
+               move( Row, Col );
+               
+               if( Index >= 0 )
+               {
+                       // Show hilight and status
+                       switch( status )
+                       {
+                       case 0:
+                               if( bHilighted )
+                                       printw("-> ");
+                               else
+                                       printw("   ");
+                               break;
+                       case 1:
+                               printw("SLD");
+                               break;
+                       
+                       default:
+                       case -1:
+                               printw("ERR");
+                               break;
+                       }
+                       
+                       printw(" %s", name);
+               
+                       getyx(stdscr, _y, _x);
+                       // Assumes max 4 digit prices
+                       times = Width - 5 - (_x - Col); // TODO: Better handling for large prices
+                       while(times--)  addch(' ');
+                       
+                       printw(" %4i", price);
+               }
+               else
+               {
+                       printw("-- %s", name);
+                       getyx(stdscr, _y, _x);
+                       times = Width - 4 - (_x - Col);
+                       while(times--)  addch(' ');
+                       printw("    ");
+               }
+       }
+       
+       // If the item isn't availiable for sale, return -1 (so it's skipped)
+       if( status )
+               Index = -1;
+       
+       return Index;
 }
 
 /**
@@ -375,7 +916,7 @@ void PrintAlign(int Row, int Col, int Width, const char *Left, char Pad1,
                addstr(tmp);
        }
        // - Left padding
-       times = Width/2 - mLen/2 - lLen;
+       times = (Width - mLen)/2 - lLen;
        while(times--)  addch(Pad1);
        // - Middle
        {
@@ -384,7 +925,8 @@ void PrintAlign(int Row, int Col, int Width, const char *Left, char Pad1,
                addstr(tmp);
        }
        // - Right Padding
-       times = Width/2 - mLen/2 - rLen;
+       times = (Width - mLen)/2 - rLen;
+       if( (Width - mLen) % 2 )        times ++;
        while(times--)  addch(Pad2);
        // - Right
        {
@@ -421,17 +963,29 @@ int OpenConnection(const char *Host, int Port)
                fprintf(stderr, "Failed to create socket\n");
                return -1;
        }
+
+//     printf("geteuid() = %i, getuid() = %i\n", geteuid(), getuid());
        
-       #if USE_AUTOAUTH
+       if( geteuid() == 0 || getuid() == 0 )
        {
+                int    i;
                struct sockaddr_in      localAddr;
                memset(&localAddr, 0, sizeof(localAddr));
                localAddr.sin_family = AF_INET; // IPv4
-               localAddr.sin_port = 1023;      // IPv4
-               // Attempt to bind to low port for autoauth
-               bind(sock, &localAddr, sizeof(localAddr));
+               
+               // Loop through all the top ports until one is avaliable
+               for( i = 512; i < 1024; i ++)
+               {
+                       localAddr.sin_port = htons(i);  // IPv4
+                       // Attempt to bind to low port for autoauth
+                       if( bind(sock, (struct sockaddr*)&localAddr, sizeof(localAddr)) == 0 )
+                               break;
+               }
+               if( i == 1024 )
+                       printf("Warning: AUTOAUTH unavaliable\n");
+//             else
+//                     printf("Bound to 0.0.0.0:%i\n", i);
        }
-       #endif
        
        if( connect(sock, (struct sockaddr *) &serverAddr, sizeof(serverAddr)) < 0 ) {
                fprintf(stderr, "Failed to connect to server\n");
@@ -448,12 +1002,14 @@ int OpenConnection(const char *Host, int Port)
 int Authenticate(int Socket)
 {
        struct passwd   *pwd;
-       char    buf[512];
+       char    *buf;
         int    responseCode;
        char    salt[32];
         int    i;
        regmatch_t      matches[4];
        
+       if( gbIsAuthenticated ) return 0;
+       
        // Get user name
        pwd = getpwuid( getuid() );
        
@@ -461,43 +1017,47 @@ int Authenticate(int Socket)
        sendf(Socket, "AUTOAUTH %s\n", pwd->pw_name);
        
        // Check if it worked
-       recv(Socket, buf, 511, 0);
-       trim(buf);
+       buf = ReadLine(Socket);
        
        responseCode = atoi(buf);
        switch( responseCode )
        {
-       case 200:       // Authenticated, return :)
-               return 0;
+       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);
                
-               recv(Socket, buf, 511, 0);
-               trim(buf);
+               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", responseCode);
+                       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;
                }
-               
-               // Get password
-               fflush(stdout);
+               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];
@@ -511,15 +1071,14 @@ int Authenticate(int Socket)
                        
                        // Hash all that
                        SHA1( (unsigned char*)tmp, ofs+20, h );
-                       sprintf(buf, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
+                       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]
                                );
-                       fflush(stdout); // Debug
                
                        // Send password
-                       sendf(Socket, "PASS %s\n", buf);
-                       recv(Socket, buf, 511, 0);
+                       sendf(Socket, "PASS %s\n", tmpBuf);
+                       buf = ReadLine(Socket);
                
                        responseCode = atoi(buf);
                        // Auth OK?
@@ -527,57 +1086,213 @@ int Authenticate(int Socket)
                        // Bad username/password
                        if( responseCode == 401 )       continue;
                        
-                       fprintf(stderr, "Unknown repsonse code %i from server\n", responseCode);
+                       fprintf(stderr, "Unknown repsonse code %i from server\n%s\n", responseCode, buf);
+                       free(buf);
                        return -1;
                }
-               return 2;       // 2 = Bad Password
+               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;
        }
        
-       printf("%s\n", buf);
-       return 0;       // Seems OK
+       // 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;
 }
 
-void PopulateItemList(int Socket)
+int GetUserBalance(int Socket)
 {
-       char    buffer[BUFSIZ];
-        int    len;
+       regmatch_t      matches[6];
+       struct passwd   *pwd;
+       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);
-       len = recv(Socket, buffer, BUFSIZ-1, 0);
-       buffer[len] = '\0';
+       if( !gsUserName )
+       {
+               if( gsEffectiveUser ) {
+                       gsUserName = gsEffectiveUser;
+               }
+               else {
+                       pwd = getpwuid( getuid() );
+                       gsUserName = strdup(pwd->pw_name);
+               }
+       }
        
-       trim(buffer);
+       sendf(Socket, "USER_INFO %s\n", gsUserName);
+       buf = ReadLine(Socket);
+       responseCode = atoi(buf);
+       switch(responseCode)
+       {
+       case 202:       break;  // Ok
        
-       //printf("Output: %s\n", buffer);
+       case 404:
+               printf("Invalid user? (USER_INFO failed)\n");
+               free(buf);
+               return -1;
        
-       responseCode = atoi(buffer);
-       if( responseCode != 201 ) {
-               fprintf(stderr, "Unknown response from dispense server (Response Code %i)\n", responseCode);
+       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> <item1> <item2> ...
-       RunRegex(&gArrayRegex, buffer, 4, matches, "Malformed server response");
+       // Expected format:
+       //  201 Items <count>
+       //  202 Item <count>
+       RunRegex(&gArrayRegex, buf, 4, matches, "Malformed server response");
                
-       itemType = &buffer[ matches[2].rm_so ]; buffer[ matches[2].rm_eo ] = '\0';
-       count = atoi( &buffer[ matches[3].rm_so ] );
+       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 ) {
@@ -587,87 +1302,571 @@ void PopulateItemList(int Socket)
                exit(-1);
        }
                
-       itemStart = &buffer[ matches[3].rm_eo ];
-               
-       gaItems = malloc( count * sizeof(tItem) );
-               
-       for( giNumItems = 0; giNumItems < count && itemStart; giNumItems ++ )
-       {
-               char    *next = strchr( ++itemStart, ' ' );
-               if( next )      *next = '\0';
-               gaItems[giNumItems].Ident = strdup(itemStart);
-               itemStart = next;
-       }
+       itemStart = &buf[ matches[3].rm_eo ];
+       
+       free(buf);
+       
+       giNumItems = count;
+       gaItems = malloc( giNumItems * sizeof(tItem) );
        
        // Fetch item information
        for( i = 0; i < giNumItems; i ++ )
        {
-               regmatch_t      matches[6];
-               
-               // Get item info
-               sendf(Socket, "ITEM_INFO %s\n", gaItems[i].Ident);
-               len = recv(Socket, buffer, BUFSIZ-1, 0);
-               buffer[len] = '\0';
-               trim(buffer);
-               
-               responseCode = atoi(buffer);
-               if( responseCode != 202 ) {
-                       fprintf(stderr, "Unknown response from dispense server (Response Code %i)\n", responseCode);
-                       exit(-1);
-               }
-               
-               RunRegex(&gItemRegex, buffer, 6, matches, "Malformed server response");
-               
-               buffer[ matches[3].rm_eo ] = '\0';
+               ReadItemInfo( Socket, &gaItems[i] );
+       }
+       
+       // Read end of list
+       buf = ReadLine(Socket);
+       responseCode = atoi(buf);
                
-               gaItems[i].Price = atoi( buffer + matches[4].rm_so );
-               gaItems[i].Desc = strdup( buffer + matches[5].rm_so );
+       if( responseCode != 200 ) {
+               fprintf(stderr, "Unknown response from dispense server %i\n'%s'",
+                       responseCode, buf
+                       );
+               exit(-1);
        }
+       
+       free(buf);
 }
 
-int DispenseItem(int Socket, int ItemID)
+
+/**
+ * \brief Get information on an item
+ * \return Boolean Failure
+ */
+int Dispense_ItemInfo(int Socket, const char *Type, int ID)
 {
-        int    len, responseCode;
-       char    buffer[BUFSIZ];
+       tItem   item;
        
-       if( ItemID < 0 || ItemID > giNumItems ) return -1;
+       // 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\n", gaItems[ItemID].Ident);
-       len = recv(Socket, buffer, BUFSIZ-1, 0);
-       buffer[len] = '\0';
-       trim(buffer);
+       sendf(Socket, "DISPENSE %s:%i\n", Type, ID);
+       buf = ReadLine(Socket);
        
-       responseCode = atoi(buffer);
+       responseCode = atoi(buf);
        switch( responseCode )
        {
        case 200:
                printf("Dispense OK\n");
-               return 0;
+               ret = 0;
+               break;
        case 401:
                printf("Not authenticated\n");
-               return 1;
+               ret = 1;
+               break;
        case 402:
                printf("Insufficient balance\n");
-               return 1;
+               ret = 1;
+               break;
        case 406:
-               printf("Bad item name, bug report\n");
-               return 1;
+               printf("Bad item name\n");
+               ret = 1;
+               break;
        case 500:
                printf("Item failed to dispense, is the slot empty?\n");
-               return 1;
+               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:
-               printf("Unknown response code %i ('%s')\n", responseCode, buffer);
-               return -2;
+               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;
 }
 
 // ---------------
 // --- 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;
@@ -683,6 +1882,10 @@ int sendf(int Socket, const char *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);
        }
 }
@@ -710,7 +1913,7 @@ int RunRegex(regex_t *regex, const char *string, int nMatches, regmatch_t *match
         int    ret;
        
        ret = regexec(regex, string, nMatches, matches, 0);
-       if( ret ) {
+       if( ret && errorMessage ) {
                size_t  len = regerror(ret, regex, NULL, 0);
                char    errorStr[len];
                regerror(ret, regex, errorStr, len);

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