From 171946457cccb7280f0918201093e79bbc9eac72 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Wed, 28 Jun 2006 16:47:05 +0200 Subject: Added random_bytes() function for better/more reliable randomization and moved set_eval_ops() to a slightly more suitable place. --- set.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'set.c') diff --git a/set.c b/set.c index 60912e10..a26bc17b 100644 --- a/set.c +++ b/set.c @@ -223,3 +223,17 @@ char *set_eval_ops( irc_t *irc, set_t *set, char *value ) return( NULL ); } +char *set_eval_charset( irc_t *irc, set_t *set, char *value ) +{ + GIConv cd; + + if ( g_strncasecmp( value, "none", 4 ) == 0 ) + return( value ); + + cd = g_iconv_open( "UTF-8", value ); + if( cd == (GIConv) -1 ) + return( NULL ); + + g_iconv_close( cd ); + return( value ); +} -- cgit v1.2.3 From 5c9512ffa716f2bc8bbf9e2c31ee40624a0ff842 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Fri, 30 Jun 2006 11:17:18 +0200 Subject: Made set.c API more generic so it's not specific to irc_t structures anymore, but can be used for account_t structures too, for example. --- set.c | 121 +++++++++++++++++++++++++++++++----------------------------------- 1 file changed, 56 insertions(+), 65 deletions(-) (limited to 'set.c') diff --git a/set.c b/set.c index a26bc17b..b511a358 100644 --- a/set.c +++ b/set.c @@ -25,23 +25,24 @@ #define BITLBEE_CORE #include "bitlbee.h" -set_t *set_add( irc_t *irc, char *key, char *def, void *eval ) +set_t *set_add( set_t **head, char *key, char *def, void *eval, void *data ) { - set_t *s = set_find( irc, key ); + set_t *s = set_find( head, key ); + /* Possibly the setting already exists. If it doesn't exist yet, + we create it. If it does, we'll just change the default. */ if( !s ) { - if( ( s = irc->set ) ) + if( ( s = *head ) ) { while( s->next ) s = s->next; - s->next = g_new ( set_t, 1 ); + s->next = g_new0( set_t, 1 ); s = s->next; } else { - s = irc->set = g_new( set_t, 1 ); + s = *head = g_new0( set_t, 1 ); } - memset( s, 0, sizeof( set_t ) ); s->key = g_strdup( key ); } @@ -52,19 +53,15 @@ set_t *set_add( irc_t *irc, char *key, char *def, void *eval ) } if( def ) s->def = g_strdup( def ); - if( s->eval ) - { - g_free( s->eval ); - s->eval = NULL; - } - if( eval ) s->eval = eval; + s->eval = eval; + s->data = data; - return( s ); + return s; } -set_t *set_find( irc_t *irc, char *key ) +set_t *set_find( set_t **head, char *key ) { - set_t *s = irc->set; + set_t *s = *head; while( s ) { @@ -73,46 +70,46 @@ set_t *set_find( irc_t *irc, char *key ) s = s->next; } - return( s ); + return s; } -char *set_getstr( irc_t *irc, char *key ) +char *set_getstr( set_t **head, char *key ) { - set_t *s = set_find( irc, key ); + set_t *s = set_find( head, key ); if( !s || ( !s->value && !s->def ) ) - return( NULL ); + return NULL; - return( s->value?s->value:s->def ); + return s->value ? s->value : s->def; } -int set_getint( irc_t *irc, char *key ) +int set_getint( set_t **head, char *key ) { - char *s = set_getstr( irc, key ); + char *s = set_getstr( head, key ); int i = 0; if( !s ) - return( 0 ); + return 0; if( ( g_strcasecmp( s, "true" ) == 0 ) || ( g_strcasecmp( s, "yes" ) == 0 ) || ( g_strcasecmp( s, "on" ) == 0 ) ) - return( 1 ); + return 1; if( sscanf( s, "%d", &i ) != 1 ) - return( 0 ); + return 0; - return( i ); + return i; } -int set_setstr( irc_t *irc, char *key, char *value ) +int set_setstr( set_t **head, char *key, char *value ) { - set_t *s = set_find( irc, key ); + set_t *s = set_find( head, key ); char *nv = value; if( !s ) - s = set_add( irc, key, NULL, NULL ); + s = set_add( head, key, NULL, NULL, NULL ); - if( s->eval && !( nv = s->eval( irc, s, value ) ) ) - return( 0 ); + if( s->eval && !( nv = s->eval( s, value ) ) ) + return 0; if( s->value ) { @@ -120,26 +117,28 @@ int set_setstr( irc_t *irc, char *key, char *value ) s->value = NULL; } + /* If there's a default setting and it's equal to what we're trying to + set, stick with s->value = NULL. Otherwise, remember the setting. */ if( !s->def || ( strcmp( nv, s->def ) != 0 ) ) s->value = g_strdup( nv ); if( nv != value ) g_free( nv ); - return( 1 ); + return 1; } -int set_setint( irc_t *irc, char *key, int value ) +int set_setint( set_t **head, char *key, int value ) { char s[24]; /* Not quite 128-bit clean eh? ;-) */ - sprintf( s, "%d", value ); - return( set_setstr( irc, key, s ) ); + g_snprintf( s, sizeof( s ), "%d", value ); + return set_setstr( head, key, s ); } -void set_del( irc_t *irc, char *key ) +void set_del( set_t **head, char *key ) { - set_t *s = irc->set, *t = NULL; + set_t *s = *head, *t = NULL; while( s ) { @@ -152,7 +151,7 @@ void set_del( irc_t *irc, char *key ) if( t ) t->next = s->next; else - irc->set = s->next; + *head = s->next; g_free( s->key ); if( s->value ) g_free( s->value ); @@ -161,27 +160,27 @@ void set_del( irc_t *irc, char *key ) } } -char *set_eval_int( irc_t *irc, set_t *set, char *value ) +char *set_eval_int( set_t *set, char *value ) { - char *s = value; + char *s; - for( ; *s; s ++ ) + for( s = value; *s; s ++ ) if( *s < '0' || *s > '9' ) - return( NULL ); + return NULL; - return( value ); + return value; } -char *set_eval_bool( irc_t *irc, set_t *set, char *value ) +char *set_eval_bool( set_t *set, char *value ) { if( ( g_strcasecmp( value, "true" ) == 0 ) || ( g_strcasecmp( value, "yes" ) == 0 ) || ( g_strcasecmp( value, "on" ) == 0 ) ) return( value ); if( ( g_strcasecmp( value, "false" ) == 0 ) || ( g_strcasecmp( value, "no" ) == 0 ) || ( g_strcasecmp( value, "off" ) == 0 ) ) return( value ); - return( set_eval_int( irc, set, value ) ); + return( set_eval_int( set, value ) ); } -char *set_eval_to_char( irc_t *irc, set_t *set, char *value ) +char *set_eval_to_char( set_t *set, char *value ) { char *s = g_new( char, 3 ); @@ -190,50 +189,42 @@ char *set_eval_to_char( irc_t *irc, set_t *set, char *value ) else sprintf( s, "%c ", *value ); - return( s ); + return s; } -char *set_eval_ops( irc_t *irc, set_t *set, char *value ) +char *set_eval_ops( set_t *set, char *value ) { + irc_t *irc = set->data; + if( g_strcasecmp( value, "user" ) == 0 ) - { irc_write( irc, ":%s!%s@%s MODE %s %s %s %s", irc->mynick, irc->mynick, irc->myhost, irc->channel, "+o-o", irc->nick, irc->mynick ); - return( value ); - } else if( g_strcasecmp( value, "root" ) == 0 ) - { irc_write( irc, ":%s!%s@%s MODE %s %s %s %s", irc->mynick, irc->mynick, irc->myhost, irc->channel, "-o+o", irc->nick, irc->mynick ); - return( value ); - } else if( g_strcasecmp( value, "both" ) == 0 ) - { irc_write( irc, ":%s!%s@%s MODE %s %s %s %s", irc->mynick, irc->mynick, irc->myhost, irc->channel, "+oo", irc->nick, irc->mynick ); - return( value ); - } else if( g_strcasecmp( value, "none" ) == 0 ) - { irc_write( irc, ":%s!%s@%s MODE %s %s %s %s", irc->mynick, irc->mynick, irc->myhost, irc->channel, "-oo", irc->nick, irc->mynick ); - return( value ); - } + else + return NULL; - return( NULL ); + return value; } -char *set_eval_charset( irc_t *irc, set_t *set, char *value ) +char *set_eval_charset( set_t *set, char *value ) { GIConv cd; if ( g_strncasecmp( value, "none", 4 ) == 0 ) - return( value ); + return value; cd = g_iconv_open( "UTF-8", value ); if( cd == (GIConv) -1 ) - return( NULL ); + return NULL; g_iconv_close( cd ); - return( value ); + return value; } -- cgit v1.2.3 From 5100caa16bb707d89f1873aca99b5f87abc1dd56 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Sat, 1 Jul 2006 17:52:05 +0200 Subject: Added "account set" command. --- set.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'set.c') diff --git a/set.c b/set.c index b511a358..4620264f 100644 --- a/set.c +++ b/set.c @@ -100,6 +100,16 @@ int set_getint( set_t **head, char *key ) return i; } +int set_getbool( set_t **head, char *key ) +{ + char *s = set_getstr( head, key ); + + if( !s ) + return 0; + + return bool2int( s ); +} + int set_setstr( set_t **head, char *key, char *value ) { set_t *s = set_find( head, key ); @@ -165,7 +175,7 @@ char *set_eval_int( set_t *set, char *value ) char *s; for( s = value; *s; s ++ ) - if( *s < '0' || *s > '9' ) + if( !isdigit( *s ) ) return NULL; return value; @@ -173,11 +183,7 @@ char *set_eval_int( set_t *set, char *value ) char *set_eval_bool( set_t *set, char *value ) { - if( ( g_strcasecmp( value, "true" ) == 0 ) || ( g_strcasecmp( value, "yes" ) == 0 ) || ( g_strcasecmp( value, "on" ) == 0 ) ) - return( value ); - if( ( g_strcasecmp( value, "false" ) == 0 ) || ( g_strcasecmp( value, "no" ) == 0 ) || ( g_strcasecmp( value, "off" ) == 0 ) ) - return( value ); - return( set_eval_int( set, value ) ); + return is_bool( value ) ? value : NULL; } char *set_eval_to_char( set_t *set, char *value ) -- cgit v1.2.3 From 0383943c38ee308805798974bfccbd3327369c6a Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Fri, 25 Aug 2006 00:06:52 +0200 Subject: Added message on successful creation of accounts and fixed "set password" command. --- set.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'set.c') diff --git a/set.c b/set.c index 4620264f..6a45fd14 100644 --- a/set.c +++ b/set.c @@ -25,7 +25,7 @@ #define BITLBEE_CORE #include "bitlbee.h" -set_t *set_add( set_t **head, char *key, char *def, void *eval, void *data ) +set_t *set_add( set_t **head, char *key, char *def, set_eval eval, void *data ) { set_t *s = set_find( head, key ); -- cgit v1.2.3 From 5eec897b4d962e643e26574d1bffc22ffcaddac6 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Sun, 15 Oct 2006 21:53:42 +0200 Subject: set_eval_int() now allows negative integers. --- set.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'set.c') diff --git a/set.c b/set.c index 6a45fd14..d172a79f 100644 --- a/set.c +++ b/set.c @@ -174,6 +174,10 @@ char *set_eval_int( set_t *set, char *value ) { char *s; + /* Allow a minus at the first position. */ + if( *s == '-' ) + s ++; + for( s = value; *s; s ++ ) if( !isdigit( *s ) ) return NULL; -- cgit v1.2.3 From 6237ded20b3f3058f1ada9b6afeaa07fcba535eb Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Sun, 22 Oct 2006 15:58:32 +0200 Subject: set_eval_int() was pretty broken... --- set.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'set.c') diff --git a/set.c b/set.c index d172a79f..8d872503 100644 --- a/set.c +++ b/set.c @@ -172,13 +172,13 @@ void set_del( set_t **head, char *key ) char *set_eval_int( set_t *set, char *value ) { - char *s; + char *s = value; /* Allow a minus at the first position. */ if( *s == '-' ) s ++; - for( s = value; *s; s ++ ) + for( ; *s; s ++ ) if( !isdigit( *s ) ) return NULL; -- cgit v1.2.3 From 723e611603236aab794ffbbc312705b8309b3f81 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Mon, 26 Feb 2007 04:46:35 +0000 Subject: Removed boolean code from set_getint() and added bits of help to set.h. --- set.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'set.c') diff --git a/set.c b/set.c index 8d872503..184c3243 100644 --- a/set.c +++ b/set.c @@ -91,9 +91,6 @@ int set_getint( set_t **head, char *key ) if( !s ) return 0; - if( ( g_strcasecmp( s, "true" ) == 0 ) || ( g_strcasecmp( s, "yes" ) == 0 ) || ( g_strcasecmp( s, "on" ) == 0 ) ) - return 1; - if( sscanf( s, "%d", &i ) != 1 ) return 0; -- cgit v1.2.3 From cd428e473fe4428041722fd373badef890edebd9 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Sat, 17 Nov 2007 12:20:51 +0000 Subject: Added (account) set -del. --- set.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'set.c') diff --git a/set.c b/set.c index 184c3243..6f09843b 100644 --- a/set.c +++ b/set.c @@ -167,6 +167,15 @@ void set_del( set_t **head, char *key ) } } +void set_reset( set_t **head, char *key ) +{ + set_t *s; + + s = set_find( head, key ); + if( s ) + set_setstr( head, key, s->def ); +} + char *set_eval_int( set_t *set, char *value ) { char *s = value; -- cgit v1.2.3 From a83442a7c4dbf99937e9e5397e5665c671694161 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Fri, 21 Mar 2008 00:39:16 +0000 Subject: Fixed handling of "set charset none". Fixes bug #373. --- set.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'set.c') diff --git a/set.c b/set.c index 6f09843b..90b29f91 100644 --- a/set.c +++ b/set.c @@ -234,7 +234,7 @@ char *set_eval_charset( set_t *set, char *value ) { GIConv cd; - if ( g_strncasecmp( value, "none", 4 ) == 0 ) + if( g_strcasecmp( value, "none" ) == 0 ) return value; cd = g_iconv_open( "UTF-8", value ); -- cgit v1.2.3 From f9756bd2e2711d58e06ad2a33ad3292ff10fc6da Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Sun, 30 Mar 2008 22:26:16 +0100 Subject: Changed charset handling: irc_t keeps two iconv structures, which are just used for every line sent and received, so now there's no need to use g_iconv_open() every time a message comes in/out. Also, fixed a small memory leak that was there for a long time but somehow never caught my attention. --- set.c | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'set.c') diff --git a/set.c b/set.c index 90b29f91..112e6937 100644 --- a/set.c +++ b/set.c @@ -229,18 +229,3 @@ char *set_eval_ops( set_t *set, char *value ) return value; } - -char *set_eval_charset( set_t *set, char *value ) -{ - GIConv cd; - - if( g_strcasecmp( value, "none" ) == 0 ) - return value; - - cd = g_iconv_open( "UTF-8", value ); - if( cd == (GIConv) -1 ) - return NULL; - - g_iconv_close( cd ); - return value; -} -- cgit v1.2.3