1 files changed, 61 insertions, 17 deletions

diff --git a/account.c b/account.c
index cfe04c40..07df69e4 100644
--- a/account.c
+++ b/account.c
@@ -234,38 +234,82 @@ void account_off( irc_t *irc, account_t *a )
 	}
 }
 
-char *set_eval_account_reconnect_delay( set_t *set, char *value )
+struct account_reconnect_delay
 {
 	int start;
 	char op;
 	int step;
+	int max;
+};
+
+int account_reconnect_delay_parse( char *value, struct account_reconnect_delay *p )
+{
+	memset( p, 0, sizeof( *p ) );
+	/* A whole day seems like a sane "maximum maximum". */
+	p->max = 86400;
 	
-	if( sscanf( value, "%d%c%d", &start, &op, &step ) == 3 &&
-	    step > 0 && ( op == '+' || op == '*' ) )
-		return value;
-	else
-		return set_eval_int( set, value );
+	/* Format: /[0-9]+([*+][0-9]+(<[0-9+]))/ */
+	while( *value && isdigit( *value ) )
+		p->start = p->start * 10 + *value++ - '0';
+	
+	/* Sure, call me evil for implementing my own fscanf here, but it's
+	   dead simple and I'm immediately at the next part to parse. */
+	
+	if( *value == 0 )
+		/* If the string ends now, the delay is constant. */
+		return 1;
+	else if( *value != '+' && *value != '*' )
+		/* Otherwise allow either a + or a * */
+		return 0;
+	
+	p->op = *value++;
+	
+	/* + or * the delay by this number every time. */
+	while( *value && isdigit( *value ) )
+		p->step = p->step * 10 + *value++ - '0';
+	
+	if( *value == 0 )
+		/* Use the default maximum (one day). */
+		return 1;
+	else if( *value != '<' )
+		return 0;
+	
+	p->max = 0;
+	value ++;
+	while( *value && isdigit( *value ) )
+		p->max = p->max * 10 + *value++ - '0';
+	
+	return p->max > 0;
+}
+
+char *set_eval_account_reconnect_delay( set_t *set, char *value )
+{
+	struct account_reconnect_delay p;
+	
+	return account_reconnect_delay_parse( value, &p ) ? value : NULL;
 }
 
 int account_reconnect_delay( account_t *a )
 {
 	char *setting = set_getstr( &a->irc->set, "auto_reconnect_delay" );
-	int start, step;
-	char op;
+	struct account_reconnect_delay p;
 	
-	if( sscanf( setting, "%d%c%d", &start, &op, &step ) == 3 && step > 0 )
+	if( account_reconnect_delay_parse( setting, &p ) )
 	{
 		if( a->auto_reconnect_delay == 0 )
-			return a->auto_reconnect_delay = start;
-		else if( op == '+' )
-			return a->auto_reconnect_delay += step;
-		else if( op == '*' )
-			return a->auto_reconnect_delay *= step;
+			a->auto_reconnect_delay = p.start;
+		else if( p.op == '+' )
+			a->auto_reconnect_delay += p.step;
+		else if( p.op == '*' )
+			a->auto_reconnect_delay *= p.step;
+		
+		if( a->auto_reconnect_delay > p.max )
+			a->auto_reconnect_delay = p.max;
 	}
-	else if( sscanf( setting, "%d", &start ) == 1 )
+	else
 	{
-		return a->auto_reconnect_delay = start;
+		a->auto_reconnect_delay = 0;
 	}
 	
-	return 0;
+	return a->auto_reconnect_delay;
 }