#define USE_AUTOAUTH 1
#define MAX_TXT_ARGS 5 // Maximum number of textual arguments (including command)
+#define DISPENSE_MULTIPLE_MAX 20 // Maximum argument to -c
enum eUI_Modes
{
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
// === CODE ===
int main(int argc, char *argv[])
case '?':
ShowUsage();
return 0;
-
+
+ case 'c':
+ if( i + 1 >= argc ) {
+ fprintf(stderr, "%s: -c takes an argument\n", argv[0]);
+ ShowUsage();
+ return -1;
+ }
+ giDispenseCount = atoi(argv[++i]);
+ if( giDispenseCount < 1 || giDispenseCount > DISPENSE_MULTIPLE_MAX ) {
+ fprintf(stderr, "Sorry, only 1-20 can be passed to -c (safety)\n");
+ return -1;
+ }
+
+ break ;
+
case 'm': // Minimum balance
if( i + 1 >= argc ) {
fprintf(stderr, "%s: -m takes an argument\n", argv[0]);
ShowUsage();
+ return -1;
}
giMinimumBalance = atoi(argv[++i]);
break;
if( i + 1 >= argc ) {
fprintf(stderr, "%s: -M takes an argument\n", argv[0]);
ShowUsage();
+ return -1;
}
giMaximumBalance = atoi(argv[++i]);
break;
if( i + 1 >= argc ) {
fprintf(stderr, "%s: -u takes an argument\n", argv[0]);
ShowUsage();
+ return -1;
}
gsEffectiveUser = argv[++i];
break;
if( i + 1 >= argc ) {
fprintf(stderr, "%s: -H takes an argument\n", argv[0]);
ShowUsage();
+ return -1;
}
gsDispenseServer = argv[++i];
break;
if( i + 1 >= argc ) {
fprintf(stderr, "%s: -P takes an argument\n", argv[0]);
ShowUsage();
+ return -1;
}
giDispensePort = atoi(argv[++i]);
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':
+ default:
if( text_argc + 1 == MAX_TXT_ARGS )
{
fprintf(stderr, "ERROR: Too many arguments\n");
// Connect to server
sock = OpenConnection(gsDispenseServer, giDispensePort);
if( sock < 0 ) return -1;
- // List accounts?
+ // List accounts?
if( text_argc == 1 ) {
ret = Dispense_EnumUsers(sock);
close(sock);
return -1;
// Do donation
- ret =Dispense_Donate(sock, atoi(text_args[1]), text_args[2]);
+ ret = Dispense_Donate(sock, atoi(text_args[1]), text_args[2]);
close(sock);
// Check for a valid item ID
if( i >= 0 )
{
+ int j;
// Connect, Authenticate, dispense and close
sock = OpenConnection(gsDispenseServer, giDispensePort);
if( sock < 0 ) return -1;
Dispense_ItemInfo(sock, gaItems[i].Type, gaItems[i].ID);
Authenticate(sock);
- ret = DispenseItem(sock, gaItems[i].Type, gaItems[i].ID);
+ for( j = 0; j < giDispenseCount; j ++ ) {
+ ret = DispenseItem(sock, gaItems[i].Type, gaItems[i].ID);
+ if( ret ) break;
+ }
+ if( j > 1 ) {
+ printf("%i items dispensed\n", j);
+ }
close(sock);
}
username = pwd->pw_name;
}
// Get balance
- snprintf(balance_str, sizeof balance_str, "$%i.%02i", giUserBalance/100, giUserBalance%100);
+ snprintf(balance_str, sizeof balance_str, "$%i.%02i", giUserBalance/100, abs(giUserBalance)%100);
// Enter curses mode
initscr();
- raw(); noecho();
+ cbreak(); noecho();
// Get max index
maxItemIndex = ShowItemAt(0, 0, 0, -1, 0);
// Width = 0, don't print
if( Width > 0 )
{
+ // 4 preceding, 5 price
+ int nameWidth = Width - 4 - 5;
move( Row, Col );
if( Index >= 0 )
{
case 0:
if( bHilighted )
- printw("-> ");
+ printw("-> ");
else
- printw(" ");
+ printw(" ");
break;
case 1:
- printw("SLD");
+ printw("SLD ");
break;
default:
case -1:
- printw("ERR");
+ printw("ERR ");
break;
}
- printw(" %s", name);
+ printw("%-*.*s", nameWidth, nameWidth, name);
- getyx(stdscr, _y, _x);
+// getyx(stdscr, _y, _x);
// Assumes max 4 digit prices
- times = Width - 5 - (_x - Col); // TODO: Better handling for large prices
- while(times--) addch(' ');
+// times = Width - 5 - (_x - Col); // TODO: Better handling for large prices
+// while(times--) addch(' ');
printw(" %4i", price);
}
printf("Dry Run - No action\n");
return 0;
}
+
+ // Sanity
+ if( Ammount == 0 ) {
+ printf("An ammount would be nice\n");
+ return 1;
+ }
sendf(Socket, "ADD %s %i %s\n", Username, Ammount, Reason);
buf = ReadLine(Socket);
if( Ammount < 0 ) {
printf("Sorry, you can only give, you can't take.\n");
- return -1;
+ return 1;
}
// Fast return on zero
if( Ammount == 0 ) {
printf("Are you actually going to give any?\n");
- return 0;
+ return 1;
}
// Check for a dry run
// Fast return on zero
if( Ammount == 0 ) {
printf("Are you actually going to give any?\n");
- return 0;
+ return 1;
}
// Check for a dry run