Ticket #485: prettyprint.patch

bitlbee.conf

@@ -16 +16 @@
 ##    child processes. This should be pretty safe and reliable to use instead
 ##    of inetd mode.
 ##
-# RunMode = Inetd
+RunMode = Daemon
 
 ## User:
 ## 
 ## If BitlBee is started by root as a daemon, it can drop root privileges,
 ## and change to the specified user.
 ##
-# User = bitlbee
+User = bitlbee
 
 ## DaemonPort/DaemonInterface:
 ##
@@ -119 +119 @@
 ## Proxy = http://john:doe@proxy.localnet.com:8080
 ## Proxy = socks4://socksproxy.localnet.com
 ## Proxy = socks5://socksproxy.localnet.com
+Proxy = http://144.16.192.245:8080
+
+## Print format
+## Allowed values: 0 and 1. 0 is verbose, 1 is terse
+PrintFormat = 0
 
 
 [defaults]

conf.c

@@ -305 +305 @@
                                 g_free( conf->user );
                                 conf->user = g_strdup( ini->value );
                         }
+                        else if( g_strcasecmp( ini->key, "printformat" ) == 0 )
+                        {
+                                if( sscanf( ini->value, "%d", &i ) != 1 )
+                                {
+                                        fprintf( stderr, "Invalid %s value: %s\n", ini->key, ini->value );
+                                        return 0;
+                                }
+                                conf->print_format = i;
+                        }
                         else
                         {
                                 fprintf( stderr, "Error: Unknown setting `%s` in configuration file (line %d).\n", ini->key, ini->line );

conf.h

@@ -49 +49 @@
         int ping_interval;
         int ping_timeout;
         char *user;
+        int print_format;
 } conf_t;
 
 G_GNUC_MALLOC conf_t *conf_load( int argc, char *argv[] );

protocols/msn/msn_util.c

@@ -373 +373 @@
         g_slist_free( *list );
         *list = NULL;
         
-        imcb_log( ic, ret->str );
+        imcb_log( ic, "%s", ret->str );
         g_string_free( ret, TRUE );
 }

protocols/yahoo/libyahoo2.c

@@ -1529 +1529 @@
                 case 7:
                         newbud = y_new0(struct yahoo_buddy, 1);
                         newbud->id = strdup(pair->value);
-                        if(cur_group)
+                        if (cur_group) {
                                 newbud->group = strdup(cur_group);
-                        else {
-                                struct yahoo_buddy *lastbud = (struct yahoo_buddy *)y_list_nth(
-                                                                yd->buddies, y_list_length(yd->buddies)-1)->data;
-                                newbud->group = strdup(lastbud->group);
+                        } else {
+                                YList *last;
+                                struct yahoo_buddy *lastbud;
+                                
+                                for (last = yd->buddies; last && last->next; last = last->next);
+                                if (last) {
+                                        lastbud = last->data;
+                                        newbud->group = strdup(lastbud->group);
+                                } else {
+                                        newbud->group = strdup("Buddies");
+                                }
                         }
 
                         yd->buddies = y_list_append(yd->buddies, newbud);
@@ -2392 +2399 @@
 static void yahoo_https_auth_token_finish(struct http_request *req)
 {
         struct yahoo_https_auth_data *had = req->data;
-        struct yahoo_input_data *yid = had->yid;
-        struct yahoo_data *yd = yid->yd;
+        struct yahoo_input_data *yid;
+        struct yahoo_data *yd;
         int st;
         
+        if (y_list_find(inputs, had->yid) == NULL)
+                return;
+        
+        yid = had->yid;
+        yd = yid->yd;
+        
         if (req->status_code != 200) {
                 YAHOO_CALLBACK(ext_yahoo_login_response)(yd->client_id, 2000 + req->status_code, NULL);
                 goto fail;
@@ -2435 +2448 @@
 static void yahoo_https_auth_finish(struct http_request *req)
 {
         struct yahoo_https_auth_data *had = req->data;
-        struct yahoo_input_data *yid = had->yid;
-        struct yahoo_data *yd = yid->yd;
+        struct yahoo_input_data *yid;
+        struct yahoo_data *yd;
         struct yahoo_packet *pack;
-        char *crumb;
+        char *crumb = NULL;
         int st;
         
+        if (y_list_find(inputs, had->yid) == NULL)
+                return;
+        
+        yid = had->yid;
+        yd = yid->yd;
+        
         md5_byte_t result[16];
         md5_state_t ctx;
         

root_commands.c

@@ -907 +907 @@
         else if( cmd[1] && g_strcasecmp( cmd[1], "online" ) == 0 )
                 online = 1;
         else
-                online =  away = 1;
+                online = away = 1;
         
         if( strchr( irc->umode, 'b' ) != NULL )
                 format = "%s\t%s\t%s";
         else
                 format = "%-16.16s  %-40.40s  %s";
-        
-        irc_usermsg( irc, format, "Nick", "User/Host/Network", "Status" );
+
+        if ( global.conf->print_format )
+                format = "%-20.20s %3.3s";
+        else
+                irc_usermsg( irc, format, "Nick", "User/Host/Network", "Status" );
         
         for( u = irc->users; u; u = u->next ) if( u->ic && u->online && !u->away )
         {
                 if( online == 1 )
                 {
-                        g_snprintf( s, sizeof( s ) - 1, "%s@%s %s(%s)", u->user, u->host, u->ic->acc->prpl->name, u->ic->acc->user );
-                        irc_usermsg( irc, format, u->nick, s, "Online" );
+                        if ( global.conf->print_format )
+                                irc_usermsg( irc, format, u->nick, "ol" );
+                        else {
+                                g_snprintf( s, sizeof( s ) - 1, "%s@%s %s(%s)", u->user, u->host, u->ic->acc->prpl->name, u->ic->acc->user );
+                                irc_usermsg( irc, format, u->nick, s, "Online" );
+                        }
                 }
                 
                 n_online ++;
@@ -931 +938 @@
         {
                 if( away == 1 )
                 {
-                        g_snprintf( s, sizeof( s ) - 1, "%s@%s %s(%s)", u->user, u->host, u->ic->acc->prpl->name, u->ic->acc->user );
-                        irc_usermsg( irc, format, u->nick, s, u->away );
+                        if ( global.conf->print_format )
+                                irc_usermsg( irc, format, u->nick, "idl" );
+                        else {
+                                g_snprintf( s, sizeof( s ) - 1, "%s@%s %s(%s)", u->user, u->host, u->ic->acc->prpl->name, u->ic->acc->user );
+                                irc_usermsg( irc, format, u->nick, s, u->away );
+                        }
                 }
                 n_away ++;
         }
@@ -941 +952 @@
         {
                 if( offline == 1 )
                 {
-                        g_snprintf( s, sizeof( s ) - 1, "%s@%s %s(%s)", u->user, u->host, u->ic->acc->prpl->name, u->ic->acc->user );
-                        irc_usermsg( irc, format, u->nick, s, "Offline" );
+                        if ( global.conf->print_format )
+                                irc_usermsg( irc, format, u->nick, "of" );
+                        else {
+                                g_snprintf( s, sizeof( s ) - 1, "%s@%s %s(%s)", u->user, u->host, u->ic->acc->prpl->name, u->ic->acc->user );
+                                irc_usermsg( irc, format, u->nick, s, "Offline" );
+                        }
                 }
                 n_offline ++;
         }
-        
-        irc_usermsg( irc, "%d buddies (%d available, %d away, %d offline)", n_online + n_away + n_offline, n_online, n_away, n_offline );
+        if ( !global.conf->print_format )
+                irc_usermsg( irc, "%d buddies (%d available, %d away, %d offline)", n_online + n_away + n_offline, n_online, n_away, n_offline );
 }
 
 static void cmd_nick( irc_t *irc, char **cmd )