Added merlo to trusted list and changed default server to merlo
[tpg/opendispense2.git] / src / client / main.c
index 7d43db7..b16c495 100644 (file)
@@ -23,7 +23,7 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <openssl/sha.h>       // SHA1
+//#include <openssl/sha.h>     // SHA1
 
 #define        USE_NCURSES_INTERFACE   0
 #define DEBUG_TRACE_SERVER     0
@@ -87,7 +87,8 @@ void  PopulateItemList(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);
+ int   Dispense_SetUserType(int Socket, const char *Username, const char *TypeString, const char *Reason);
+ int   Dispense_SetItem(int Socket, const char *Type, int ID, int NewPrice, const char *NewName);
 // --- Helpers ---
 char   *ReadLine(int Socket);
  int   sendf(int Socket, const char *Format, ...);
@@ -96,7 +97,7 @@ char  *trim(char *string);
 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;
@@ -114,60 +115,91 @@ char      *gsUserName;    //!< User that dispense will happen as
 char   *gsUserFlags;   //!< User's flag set
  int   giUserBalance=-1;       //!< User balance (set by Authenticate)
  int   giDispenseCount = 1;    //!< Number of dispenses to do
+char   *gsTextArgs[MAX_TXT_ARGS];
+ int   giTextArgc;
 
 // === CODE ===
 void ShowUsage(void)
 {
-       printf(
-               "Usage:\n"
-               "  == 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 give <user> <ammount> \"<reason>\"\n"
-               "        Give money to another user\n"
-               "    dispense donate <ammount> \"<reason>\"\n"
-               "        Donate to the club\n"
-               "    dispense iteminfo <itemid>\n"
-               "        Get the name and price for an item\n"
-               "  == Coke members == \n"
-               "    dispense acct [<user>]\n"
-               "        Show user balances\n"
-               "    dispense acct <user> [+-]<ammount> \"<reason>\"\n"
-               "        Alter a account value\n"
-               "    dispense refund <user> <itemid> [<price>]\n"
-               "        Refund an item to a user (with optional price override)\n"
-               "  == Dispense administrators ==\n"
-               "    dispense acct <user> =<ammount> \"<reason>\"\n"
-               "        Set an account balance\n"
-               "    dispense user add <user>\n"
-               "        Create new account\n"
-               "    dispense user type <user> <flags>\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"
-               "\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 alternate GUI\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"
-               );
+       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"
+                       );
+       if( giTextArgc == 0 || strcmp(gsTextArgs[0], "give") == 0 )
+               printf(
+                       "    dispense give <user> <ammount> \"<reason>\"\n"
+                       "        Give money to another user\n"
+                       );
+       
+       if( giTextArgc == 0 || strcmp(gsTextArgs[0], "donate") == 0 )
+               printf(
+                       "    dispense donate <ammount> \"<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 )
+               printf("  == Coke members == \n");
+       if( giTextArgc == 0 || strcmp(gsTextArgs[0], "acct") == 0 )
+               printf(
+                       "    dispense acct [<user>]\n"
+                       "        Show user balances\n"
+                       "    dispense acct <user> [+-]<ammount> \"<reason>\"\n"
+                       "        Alter a account value\n"
+                       "    dispense acct <user> =<ammount> \"<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"
+                       );
+       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"
+                       );
 }
 
 int main(int argc, char *argv[])
@@ -175,10 +207,8 @@ int main(int argc, char *argv[])
         int    sock;
         int    i, ret = 0;
        char    buffer[BUFSIZ];
-       char    *text_args[MAX_TXT_ARGS];       // Non-flag arguments
-        int    text_argc = 0;
        
-       text_args[0] = "";
+       gsTextArgs[0] = "";
 
        // -- Create regular expressions
        // > Code Type Count ...
@@ -263,6 +293,17 @@ int main(int argc, char *argv[])
                                giDispensePort = atoi(argv[++i]);
                                break;
                        
+                       // 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;
+                       
                        case 'G':       // Don't use GUI
                                giUIMode = UI_MODE_BASIC;
                                break;
@@ -272,50 +313,68 @@ int main(int argc, char *argv[])
                        case 'n':       // Dry Run / read-only
                                gbDryRun = 1;
                                break;
+                       case '-':
+                               if( strcmp(argv[i], "--help") == 0 ) {
+                                       ShowUsage();
+                                       return 0;
+                               }
+                               else {
+                                       fprintf(stderr, "%s: Unknown switch '%s'\n", argv[0], argv[i]);
+                                       ShowUsage();
+                                       return RV_ARGUMENTS;
+                               }
+                               break;
                        default:
-                               if( text_argc + 1 ==  MAX_TXT_ARGS )
+                               // 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;
                                }
-                               text_args[text_argc++] = argv[i];
+                               gsTextArgs[giTextArgc++] = argv[i];
                                break;
                        }
 
                        continue;
                }
 
-               if( text_argc + 1 == MAX_TXT_ARGS )
+               if( giTextArgc == MAX_TXT_ARGS )
                {
                        fprintf(stderr, "ERROR: Too many arguments\n");
                        return RV_ARGUMENTS;
                }
        
-               text_args[text_argc++] = argv[i];
+               gsTextArgs[giTextArgc++] = argv[i];
        
        }
 
        //
        // `dispense acct`
        // - 
-       if( strcmp(text_args[0], "acct") == 0 )
+       if( strcmp(gsTextArgs[0], "acct") == 0 )
        {
                // Connect to server
                sock = OpenConnection(gsDispenseServer, giDispensePort);
                if( sock < 0 )  return RV_SOCKET_ERROR;
                // List accounts?
-               if( text_argc == 1 ) {
+               if( giTextArgc == 1 ) {
                        ret = Dispense_EnumUsers(sock);
                        close(sock);
                        return ret;
                }
                        
-               // text_args[1]: Username
+               // gsTextArgs[1]: Username
                
                // Alter account?
-               if( text_argc != 2 )
+               if( giTextArgc != 2 )
                {
-                       if( text_argc != 4 ) {
+                       if( giTextArgc != 4 ) {
                                fprintf(stderr, "`dispense acct` requires a reason\n");
                                ShowUsage();
                                return RV_ARGUMENTS;
@@ -325,28 +384,32 @@ int main(int argc, char *argv[])
                        ret = Authenticate(sock);
                        if(ret) return ret;
                        
-                       // text_args[1]: Username
-                       // text_args[2]: Ammount
-                       // text_args[3]: Reason
+                       // gsTextArgs[1]: Username
+                       // gsTextArgs[2]: Ammount
+                       // gsTextArgs[3]: Reason
                        
-                       if( text_args[2][0] == '=' ) {
+                       if( gsTextArgs[2][0] == '=' ) {
                                // Set balance
-                               if( text_args[2][1] != '0' && atoi(text_args[2]+1) == 0 ) {
+                               if( gsTextArgs[2][1] != '0' && atoi(gsTextArgs[2]+1) == 0 ) {
                                        fprintf(stderr, "Error: Invalid balance to be set\n");
                                        exit(1);
                                }
                                
-                               ret = Dispense_SetBalance(sock, text_args[1], atoi(text_args[2]+1), text_args[3]);
+                               ret = Dispense_SetBalance(sock, gsTextArgs[1], atoi(gsTextArgs[2]+1), gsTextArgs[3]);
                        }
                        else {
                                // Alter balance
-                               ret = Dispense_AlterBalance(sock, text_args[1], atoi(text_args[2]), text_args[3]);
+                               ret = Dispense_AlterBalance(sock, gsTextArgs[1], atoi(gsTextArgs[2]), gsTextArgs[3]);
                        }
                }
-               // TODO: Preserve ret if non-zero
+               // On error, quit
+               if( ret ) {
+                       close(sock);
+                       return ret;
+               }
                
                // Show user information
-               ret = Dispense_ShowUser(sock, text_args[1]);
+               ret = Dispense_ShowUser(sock, gsTextArgs[1]);
                
                close(sock);
                return ret;
@@ -354,17 +417,17 @@ int main(int argc, char *argv[])
        //
        // `dispense give`
        // - "Here, have some money."
-       if( strcmp(text_args[0], "give") == 0 )
+       else if( strcmp(gsTextArgs[0], "give") == 0 )
        {
-               if( text_argc != 4 ) {
+               if( giTextArgc != 4 ) {
                        fprintf(stderr, "`dispense give` takes three arguments\n");
                        ShowUsage();
                        return RV_ARGUMENTS;
                }
                
-               // text_args[1]: Destination
-               // text_args[2]: Ammount
-               // text_args[3]: Reason
+               // gsTextArgs[1]: Destination
+               // gsTextArgs[2]: Ammount
+               // gsTextArgs[3]: Reason
                
                // Connect to server
                sock = OpenConnection(gsDispenseServer, giDispensePort);
@@ -374,7 +437,7 @@ int main(int argc, char *argv[])
                ret = Authenticate(sock);
                if(ret) return ret;
                
-               ret = Dispense_Give(sock, text_args[1], atoi(text_args[2]), text_args[3]);
+               ret = Dispense_Give(sock, gsTextArgs[1], atoi(gsTextArgs[2]), gsTextArgs[3]);
 
                close(sock);
        
@@ -383,10 +446,10 @@ int main(int argc, char *argv[])
        // 
        // `dispense user`
        // - User administration (Admin Only)
-       if( strcmp(text_args[0], "user") == 0 )
+       if( strcmp(gsTextArgs[0], "user") == 0 )
        {
                // Check argument count
-               if( text_argc == 1 ) {
+               if( giTextArgc == 1 ) {
                        fprintf(stderr, "Error: `dispense user` requires arguments\n");
                        ShowUsage();
                        return RV_ARGUMENTS;
@@ -401,26 +464,29 @@ int main(int argc, char *argv[])
                if(ret) return ret;
                
                // Add new user?
-               if( strcmp(text_args[1], "add") == 0 )
+               if( strcmp(gsTextArgs[1], "add") == 0 )
                {
-                       if( text_argc != 3 ) {
+                       if( giTextArgc != 3 ) {
                                fprintf(stderr, "Error: `dispense user add` requires an argument\n");
                                ShowUsage();
                                return RV_ARGUMENTS;
                        }
                        
-                       ret = Dispense_AddUser(sock, text_args[2]);
+                       ret = Dispense_AddUser(sock, gsTextArgs[2]);
                }
                // Update a user
-               else if( strcmp(text_args[1], "type") == 0 || strcmp(text_args[1], "flags") == 0 )
+               else if( strcmp(gsTextArgs[1], "type") == 0 || strcmp(gsTextArgs[1], "flags") == 0 )
                {
-                       if( text_argc != 4 ) {
-                               fprintf(stderr, "Error: `dispense user flags` requires two arguments\n");
+                       if( giTextArgc < 4 || giTextArgc > 5 ) {
+                               fprintf(stderr, "Error: `dispense user type` requires two arguments\n");
                                ShowUsage();
                                return RV_ARGUMENTS;
                        }
                        
-                       ret = Dispense_SetUserType(sock, text_args[2], text_args[3]);
+                       if( giTextArgc == 4 )
+                               ret = Dispense_SetUserType(sock, gsTextArgs[2], gsTextArgs[3], "");
+                       else
+                               ret = Dispense_SetUserType(sock, gsTextArgs[2], gsTextArgs[3], gsTextArgs[4]);
                }
                else
                {
@@ -432,10 +498,10 @@ int main(int argc, char *argv[])
                return ret;
        }
        // Donation!
-       else if( strcmp(text_args[0], "donate") == 0 )
+       else if( strcmp(gsTextArgs[0], "donate") == 0 )
        {
                // Check argument count
-               if( text_argc != 3 ) {
+               if( giTextArgc != 3 ) {
                        fprintf(stderr, "Error: `dispense donate` requires two arguments\n");
                        ShowUsage();
                        return RV_ARGUMENTS;
@@ -450,18 +516,18 @@ int main(int argc, char *argv[])
                if(ret) return ret;
                
                // Do donation
-               ret = Dispense_Donate(sock, atoi(text_args[1]), text_args[2]);
+               ret = Dispense_Donate(sock, atoi(gsTextArgs[1]), gsTextArgs[2]);
                                
                close(sock);
 
                return ret;
        }
        // Refund an item
-       else if( strcmp(text_args[0], "refund") == 0 )
+       else if( strcmp(gsTextArgs[0], "refund") == 0 )
        {
                 int     price = 0;
                // Check argument count
-               if( text_argc != 3 && text_argc != 4 ) {
+               if( giTextArgc != 3 && giTextArgc != 4 ) {
                        fprintf(stderr, "Error: `dispense refund` takes 2 or 3 arguments\n");
                        ShowUsage();
                        return RV_ARGUMENTS;
@@ -475,8 +541,8 @@ int main(int argc, char *argv[])
                ret = Authenticate(sock);
                if(ret) return ret;
 
-               if( text_argc == 4 ) {
-                       price = atoi(text_args[3]);
+               if( giTextArgc == 4 ) {
+                       price = atoi(gsTextArgs[3]);
                        if( price <= 0 ) {
                                fprintf(stderr, "Error: Override price is invalid (should be > 0)\n");
                                return RV_ARGUMENTS;
@@ -484,32 +550,32 @@ int main(int argc, char *argv[])
                }
 
                // Username, Item, cost
-               ret = Dispense_Refund(sock, text_args[1], text_args[2], price);
+               ret = Dispense_Refund(sock, gsTextArgs[1], gsTextArgs[2], price);
 
                // TODO: More
                close(sock);
-               return RV_UNKNOWN_ERROR;
+               return ret;
        }
        // Query an item price
-       else if( strcmp(text_args[0], "iteminfo") == 0 )
+       else if( strcmp(gsTextArgs[0], "iteminfo") == 0 )
        {
                regmatch_t matches[3];
                char    *type;
                 int    id;
                // Check argument count
-               if( text_argc != 2 ) {
+               if( giTextArgc != 2 ) {
                        fprintf(stderr, "Error: `dispense iteminfo` requires an argument\n");
                        ShowUsage();
                        return RV_ARGUMENTS;
                }
                // Parse item ID
-               if( RunRegex(&gUserItemIdentRegex, text_args[1], 3, matches, NULL) != 0 ) {
+               if( RunRegex(&gUserItemIdentRegex, gsTextArgs[1], 3, matches, NULL) != 0 ) {
                        fprintf(stderr, "Error: Invalid item ID passed (<type>:<id> expected)\n");
                        return RV_ARGUMENTS;
                }
-               type = text_args[1] + matches[1].rm_so;
-               text_args[1][ matches[1].rm_eo ] = '\0';
-               id = atoi( text_args[1] + matches[2].rm_so );
+               type = gsTextArgs[1] + matches[1].rm_so;
+               gsTextArgs[1][ matches[1].rm_eo ] = '\0';
+               id = atoi( gsTextArgs[1] + matches[2].rm_so );
 
                sock = OpenConnection(gsDispenseServer, giDispensePort);
                if( sock < 0 )  return RV_SOCKET_ERROR;
@@ -518,9 +584,65 @@ int main(int argc, char *argv[])
                close(sock);
                return ret;
        }
+       // Set slot
+       else if( strcmp(gsTextArgs[0], "slot") == 0 )
+       {
+               regmatch_t matches[3];
+               char    *item_type, *newname;
+                int    item_id, price;
+               
+               // Check arguments
+               if( giTextArgc != 4 ) {
+                       fprintf(stderr, "Error: `dispense slot` takes three arguments\n");
+                       ShowUsage();
+                       return RV_ARGUMENTS;
+               }
+               
+               // Parse arguments
+               if( RunRegex(&gUserItemIdentRegex, gsTextArgs[1], 3, matches, NULL) != 0 ) {
+                       fprintf(stderr, "Error: Invalid item ID passed (<type>:<id> expected)\n");
+                       return RV_ARGUMENTS;
+               }
+               item_type = gsTextArgs[1] + matches[1].rm_so;
+               gsTextArgs[1][ matches[1].rm_eo ] = '\0';
+               item_id = atoi( gsTextArgs[1] + matches[2].rm_so );
+
+               // - Price
+               price = atoi( gsTextArgs[2] );
+               if( price <= 0 && gsTextArgs[2][0] != '0' ) {
+                       fprintf(stderr, "Error: Invalid price passed (must be >= 0)\n");
+                       return RV_ARGUMENTS;
+               }
+               
+               // - New name
+               newname = gsTextArgs[3];
+               // -- Sanity
+               {
+                       char *pos;
+                       for( pos = newname; *pos; pos ++ )
+                       {
+                               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
+               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;
+       }
        // Item name / pattern
-       else {
-               gsItemPattern = text_args[0];
+       else
+       {
+               gsItemPattern = gsTextArgs[0];
        }
        
        // Connect to server
@@ -695,6 +817,8 @@ int main(int argc, char *argv[])
                close(sock);
        }
 
+       Dispense_ShowUser(sock, gsUserName);
+
        return ret;
 }
 
@@ -1001,7 +1125,7 @@ int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted)
        }
        
        // If the item isn't availiable for sale, return -1 (so it's skipped)
-       if( status )
+       if( status || price > giUserBalance )
                Index = -1;
        
        return Index;
@@ -1413,7 +1537,7 @@ void PopulateItemList(int Socket)
        char    *buf;
         int    responseCode;
        
-       char    *itemType, *itemStart;
+       char    *arrayType;
         int    count, i;
        regmatch_t      matches[4];
        
@@ -1436,19 +1560,16 @@ void PopulateItemList(int Socket)
        //  202 Item <count>
        RunRegex(&gArrayRegex, buf, 4, matches, "Malformed server response");
                
-       itemType = &buf[ matches[2].rm_so ];    buf[ matches[2].rm_eo ] = '\0';
+       arrayType = &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 ) {
+       if( strcmp(arrayType, "Items") != 0 ) {
                // What the?!
                fprintf(stderr, "Unexpected array type, expected 'Items', got '%s'\n",
-                       itemType);
+                       arrayType);
                exit(RV_UNKNOWN_ERROR);
        }
-               
-       itemStart = &buf[ matches[3].rm_eo ];
-       
        free(buf);
        
        giNumItems = count;
@@ -1563,7 +1684,7 @@ int DispenseItem(int Socket, const char *Type, int ID)
 int Dispense_AlterBalance(int Socket, const char *Username, int Ammount, const char *Reason)
 {
        char    *buf;
-        int    responseCode;
+        int    responseCode, rv = -1;
        
        // Check for a dry run
        if( gbDryRun ) {
@@ -1581,26 +1702,32 @@ int Dispense_AlterBalance(int Socket, const char *Username, int Ammount, const c
        buf = ReadLine(Socket);
        
        responseCode = atoi(buf);
-       free(buf);
        
        switch(responseCode)
        {
-       case 200:       return 0;       // OK
+       case 200:
+               rv = 0; // OK
+               break;
        case 402:
                fprintf(stderr, "Insufficient balance\n");
-               return RV_BAD_ITEM;
+               rv = RV_BAD_ITEM;
+               break;
        case 403:       // Not in coke
                fprintf(stderr, "You are not in coke (sucker)\n");
-               return RV_PERMISSIONS;
+               rv = RV_PERMISSIONS;
+               break;
        case 404:       // Unknown user
                fprintf(stderr, "Unknown user '%s'\n", Username);
-               return RV_INVALID_USER;
+               rv = RV_INVALID_USER;
+               break;
        default:
-               fprintf(stderr, "Unknown response code %i\n", responseCode);
-               return RV_UNKNOWN_RESPONSE;
+               fprintf(stderr, "Unknown response code %i\n'%s'\n", responseCode, buf);
+               rv = RV_UNKNOWN_RESPONSE;
+               break;
        }
+       free(buf);
        
-       return -1;
+       return rv;
 }
 
 /**
@@ -1915,7 +2042,7 @@ void _PrintUserLine(const char *Line)
                flags[flagsLen] = '\0';
                
                bal = atoi(Line + matches[4].rm_so);
-               printf("%-15s: $%4i.%02i (%s)\n", username, bal/100, abs(bal)%100, flags);
+               printf("%-15s: $%8.02f (%s)\n", username, ((float)bal)/100, flags);
        }
 }
 
@@ -1963,7 +2090,7 @@ int Dispense_AddUser(int Socket, const char *Username)
        return ret;
 }
 
-int Dispense_SetUserType(int Socket, const char *Username, const char *TypeString)
+int Dispense_SetUserType(int Socket, const char *Username, const char *TypeString, const char *Reason)
 {
        char    *buf;
         int    responseCode, ret;
@@ -1976,7 +2103,7 @@ int Dispense_SetUserType(int Socket, const char *Username, const char *TypeStrin
        
        // TODO: Pre-validate the string
        
-       sendf(Socket, "USER_FLAGS %s %s\n", Username, TypeString);
+       sendf(Socket, "USER_FLAGS %s %s %s\n", Username, TypeString, Reason);
        
        buf = ReadLine(Socket);
        responseCode = atoi(buf);
@@ -1989,19 +2116,63 @@ int Dispense_SetUserType(int Socket, const char *Username, const char *TypeStrin
                break;
                
        case 403:
-               printf("Only wheel can modify users\n");
-               ret = 1;
+               printf("Only dispense admins can modify users\n");
+               ret = RV_PERMISSIONS;
                break;
        
        case 404:
                printf("User '%s' does not exist\n", Username);
-               ret = 0;
+               ret = RV_INVALID_USER;
                break;
        
        case 407:
                printf("Flag string is invalid\n");
+               ret = RV_ARGUMENTS;
+               break;
+       
+       default:
+               fprintf(stderr, "Unknown response code %i '%s'\n", responseCode, buf);
+               ret = RV_UNKNOWN_RESPONSE;
+               break;
+       }
+       
+       free(buf);
+       
+       return ret;
+}
+
+int Dispense_SetItem(int Socket, const char *Type, int ID, int NewPrice, const char *NewName)
+{
+       char    *buf;
+        int    responseCode, ret;
+       
+       // Check for a dry run
+       if( gbDryRun ) {
+               printf("Dry Run - No action\n");
+               return 0;
+       }
+       
+       sendf(Socket, "UPDATE_ITEM %s:%i %i %s\n", Type, ID, NewPrice, NewName);
+       
+       buf = ReadLine(Socket);
+       responseCode = atoi(buf);
+       
+       switch(responseCode)
+       {
+       case 200:
+               printf("Item %s:%i updated\n", Type, ID);
                ret = 0;
                break;
+               
+       case 403:
+               printf("Only coke members can modify the slots\n");
+               ret = RV_PERMISSIONS;
+               break;
+       
+       case 406:
+               printf("Invalid item passed\n");
+               ret = RV_BAD_ITEM;
+               break;
        
        default:
                fprintf(stderr, "Unknown response code %i '%s'\n", responseCode, buf);
@@ -2029,8 +2200,8 @@ char *ReadLine(int Socket)
        
        #if DEBUG_TRACE_SERVER
        printf("ReadLine: ");
-       #endif
        fflush(stdout);
+       #endif
        
        ret[0] = '\0';
        
@@ -2041,8 +2212,12 @@ char *ReadLine(int Socket)
                }
                else {
                        len = recv(Socket, buf+bufPos, BUFSIZ-1-bufPos, 0);
-                       buf[bufPos+len] = '\0';
+                       if( len < 0 ) {
+                               free(ret);
+                               return strdup("599 Client Connection Error\n");
+                       }
                }
+               buf[bufPos+len] = '\0';
                
                newline = strchr( buf+bufPos, '\n' );
                if( newline ) {

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