Changeset eb4ad8d

Timestamp:

2015-01-17T20:13:19Z (10 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e26aa72

Parents:

1065dd4 (diff), 664bac3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging random other fixes/cleanups.

Files:

• configure (modified) (1 diff)
• ipc.c (modified) (3 diffs)
• irc_channel.c (modified) (1 diff)
• irc_commands.c (modified) (1 diff)
• irc_im.c (modified) (1 diff)
• lib/misc.c (modified) (1 diff)
• lib/misc.h (modified) (1 diff)
• lib/ns_parse.c (modified) (1 diff)
• lib/proxy.c (modified) (7 diffs)
• nick.c (modified) (3 diffs)
• otr.c (modified) (1 diff)
• protocols/bee_chat.c (modified) (3 diffs)
• protocols/jabber/jabber_util.c (modified) (2 diffs)
• protocols/msn/ns.c (modified) (1 diff)
• protocols/oscar/conn.c (modified) (1 diff)
• protocols/twitter/twitter.c (modified) (2 diffs)
• protocols/twitter/twitter_lib.c (modified) (9 diffs)
• protocols/yahoo/libyahoo2.c (modified) (5 diffs)
• protocols/yahoo/yahoo_util.h (modified) (1 diff)
• set.c (modified) (1 diff)
• tests/check_arc.c (modified) (1 diff)
• tests/check_irc.c (modified) (1 diff)
• tests/check_jabber_sasl.c (modified) (1 diff)

configure

@@ -56 +56 @@
 
 echo BitlBee configure
+
+# Cygwin and Darwin don't support PIC/PIE
+case "$arch" in
+    CYGWIN* )
+        pie=0;;
+    Darwin )
+        pie=0;;
+esac
 
 while [ -n "$1" ]; do

ipc.c

@@ -463 +463 @@
         {
                 GSList *l;
-                irc_t *old;
+                irc_t *old = NULL;
                 char *to_init[] = { "TAKEOVER", "INIT", NULL };
                 
@@ -477 +477 @@
                                 break;
                 }
-                if( l == NULL ||
+                if( l == NULL || old == NULL ||
                     !set_getbool( &irc->b->set, "allow_takeover" ) ||
                     !set_getbool( &old->b->set, "allow_takeover" ) )
@@ -524 +524 @@
                 {
                         /* There is no typo in this line: */
-                        for( j = 1; cmd[j]; j ++ ); j --;
+                        for( j = 1; cmd[j]; j ++ )
+                                ;
+                        j--;
                         
                         if( j < commands[i].required_parameters )

irc_channel.c

@@ -432 +432 @@
                         char *acc_s;
                         
-                        if( !aj && !( ic->flags & IRC_CHANNEL_JOINED ) )
+                        if( !aj || ( ic->flags & IRC_CHANNEL_JOINED ) )
                                 /* Only continue if this one's marked as auto_join
                                    or if we're in it already. (Possible if the

irc_commands.c

@@ -770 +770 @@
                 {
                         /* There should be no typo in the next line: */
-                        for( n_arg = 0; cmd[n_arg]; n_arg ++ ); n_arg --;
+                        for( n_arg = 0; cmd[n_arg]; n_arg ++ )
+                                ;
+                        n_arg--;
                         
                         if( irc_commands[i].flags & IRC_CMD_PRE_LOGIN && irc->status & USTATUS_LOGGED_IN )

irc_im.c

@@ -911 +911 @@
                 c->ic->acc->prpl->chat_leave( c );
         
-        /* Remove references in both directions now. We don't need each other anymore. */
+        /* Remove the reference. We don't need it anymore. */
         ic->data = NULL;
-        if( c )
-                c->ui_data = NULL;
         
         return TRUE;

lib/misc.c

@@ -780 +780 @@
         return NULL;
 }
+
+/* Takes a string, truncates it where it's safe, returns the new length */
+int truncate_utf8( char *string, int maxlen )
+{
+        char *end;
+        g_utf8_validate( (const gchar *) string, maxlen, (const gchar **) &end );
+        *end = '\0';
+        return end - string;
+}

lib/misc.h

@@ -150 +150 @@
 G_MODULE_EXPORT char **split_command_parts( char *command, int limit );
 G_MODULE_EXPORT char *get_rfc822_header( const char *text, const char *header, int len );
+G_MODULE_EXPORT int truncate_utf8( char *string, int maxlen );
 
 #endif

lib/ns_parse.c

@@ -19 +19 @@
 
 #ifndef lint
-static const char rcsid[] = "$Id: ns_parse.c,v 1.10 2009/01/23 19:59:16 each Exp $";
+//static const char rcsid[] = "$Id: ns_parse.c,v 1.10 2009/01/23 19:59:16 each Exp $";
 #endif
 

lib/proxy.c

@@ -66 +66 @@
 {
         struct PHB *phb = data;
-        unsigned int len;
+        socklen_t len;
         int error = ETIMEDOUT;
         len = sizeof(error);
@@ -86 +86 @@
                 closesocket(source);
                 b_event_remove(phb->inpa);
+                phb->inpa = 0;
                 if( phb->proxy_func )
                         phb->proxy_func(phb->proxy_data, -1, B_EV_IO_READ);
@@ -97 +98 @@
         sock_make_blocking(source);
         b_event_remove(phb->inpa);
+        phb->inpa = 0;
         if( phb->proxy_func )
                 phb->proxy_func(phb->proxy_data, source, B_EV_IO_READ);
@@ -174 +176 @@
 /* Connecting to HTTP proxies */
 
-#define HTTP_GOODSTRING "HTTP/1.0 200 Connection established"
-#define HTTP_GOODSTRING2 "HTTP/1.1 200 Connection established"
+#define HTTP_GOODSTRING "HTTP/1.0 200"
+#define HTTP_GOODSTRING2 "HTTP/1.1 200"
 
 static gboolean http_canread(gpointer data, gint source, b_input_condition cond)
@@ -214 +216 @@
         char cmd[384];
         struct PHB *phb = data;
-        unsigned int len;
+        socklen_t len;
         int error = ETIMEDOUT;
         if (phb->inpa > 0)
@@ -309 +311 @@
         struct hostent *hp;
         struct PHB *phb = data;
-        unsigned int len;
+        socklen_t len;
         int error = ETIMEDOUT;
         if (phb->inpa > 0)
@@ -501 +503 @@
         int i;
         struct PHB *phb = data;
-        unsigned int len;
+        socklen_t len;
         int error = ETIMEDOUT;
         if (phb->inpa > 0)

nick.c

@@ -227 +227 @@
         {
                 nick_strip( irc, rets );
-                rets[MAX_NICK_LENGTH] = '\0';
+                truncate_utf8( rets, MAX_NICK_LENGTH );
                 return rets;
         }
@@ -252 +252 @@
                 else
                 {
-                        nick[0] ++;
+                        /* We've got no more space for underscores,
+                           so truncate it and replace the last three
+                           chars with a random "_XX" suffix */
+                        int len = truncate_utf8( nick, MAX_NICK_LENGTH - 3 );
+                        nick[len] = '_';
+                        g_snprintf(nick + len + 1, 3, "%2x", rand() );
                 }
                 
@@ -400 +405 @@
                 if( strlen( down ) > strlen( nick ) )
                 {
-                        /* Well crap. Corrupt it if we have to. */
-                        down[strlen(nick)] = '\0';
+                        truncate_utf8( down, strlen( nick ) );
                 }
                 strcpy( nick, down );

otr.c

@@ -1117 +1117 @@
 void cmd_otr_keygen(irc_t *irc, char **args)
 {
-        int i, n;
         account_t *a;
         
-        n = atoi(args[1]);
-        if(n<0 || (!n && strcmp(args[1], "0"))) {
-                irc_rootmsg(irc, "%s: invalid account number", args[1]);
+        if ((a = account_get(irc->b, args[1])) == NULL) {
+                irc_rootmsg(irc, "Could not find account `%s'.", args[1]);
                 return;
         }
         
-        a = irc->b->accounts;
-        for(i=0; i<n && a; i++, a=a->next);
-        if(!a) {
-                irc_rootmsg(irc, "%s: no such account", args[1]);
+        if(keygen_in_progress(irc, a->user, a->prpl->name)) {
+                irc_rootmsg(irc, "keygen for account `%s' already in progress", a->tag);
                 return;
         }
         
-        if(keygen_in_progress(irc, a->user, a->prpl->name)) {
-                irc_rootmsg(irc, "keygen for account %d already in progress", n);
-                return;
-        }
-        
         if(otrl_privkey_find(irc->otr->us, a->user, a->prpl->name)) {
-                char *s = g_strdup_printf("account %d already has a key, replace it?", n);
+                char *s = g_strdup_printf("account `%s' already has a key, replace it?", a->tag);
                 query_add(irc, NULL, s, yes_keygen, NULL, NULL, a);
                 g_free(s);

protocols/bee_chat.c

@@ -85 +85 @@
         bee_t *bee = ic->bee;
         bee_user_t *bu;
+        gboolean temp;
         char *s;
         
@@ -92 +93 @@
         
         bu = bee_user_by_handle( bee, ic, who );
+        temp = ( bu == NULL );
+        
+        if( temp )
+                bu = bee_user_new( bee, ic, who, BEE_USER_ONLINE );
         
         s = set_getstr( &ic->bee->set, "strip_html" );
@@ -98 +103 @@
                 strip_html( msg );
         
-        if( bu && bee->ui->chat_msg )
+        if( bee->ui->chat_msg )
                 bee->ui->chat_msg( bee, c, bu, msg, sent_at );
-        else
-                imcb_chat_log( c, "Message from unknown participant %s: %s", who, msg );
+        
+        if( temp )
+                bee_user_free( bee, bu );
 }
 

protocols/jabber/jabber_util.c

@@ -330 +330 @@
 }
 
-/* Returns a new string. Don't leak it! */
+/* The /resource part is case sensitive. This stops once we see a slash.
+   Returns a new string. Don't leak it! */
 char *jabber_normalize( const char *orig )
 {
-        int len, i;
-        char *new;
-        
-        len = strlen( orig );
-        new = g_new( char, len + 1 );
-        
-        /* So it turns out the /resource part is case sensitive. Yeah, and
-           it's Unicode but feck Unicode. :-P So stop once we see a slash. */
-        for( i = 0; i < len && orig[i] != '/' ; i ++ )
-                new[i] = g_ascii_tolower( orig[i] );
-        for( ; orig[i]; i ++ )
-                new[i] = orig[i];
-        
-        new[i] = 0;
+        char *lower, *new, *s;
+
+        if ( ! ( s = strchr( orig, '/' ) ) )
+                return g_utf8_strdown( orig, -1 );
+
+        lower = g_utf8_strdown( orig, (s - orig) );  /* stop in s */
+        new = g_strconcat( lower, s, NULL );
+        g_free( lower );
+        return new;
+}
+
+/* Similar to jabber_normalize, but works with addresses in the form
+ * resource=chatroom@example.com */
+char *jabber_normalize_ext( const char *orig )
+{
+        char *lower, *new, *s;
+
+        if ( ! ( s = strchr( orig, '=' ) ) )
+                return g_utf8_strdown( orig, -1 );
+
+        lower = g_utf8_strdown( s, -1 ); /* start in s */
+
+        *s = 0;
+        new = g_strconcat( orig, lower, NULL );
+        *s = '=';
+
+        g_free( lower );
         return new;
 }
@@ -556 +570 @@
         char *s, *jid;
         
-        jid = jabber_normalize( jid_ );
+        jid = jabber_normalize_ext( jid_ );
         
         if( ( s = strchr( jid, '=' ) ) == NULL )

protocols/msn/ns.c

@@ -881 +881 @@
         struct msn_buddy_data *bd = bu->data;
         struct msn_data *md = bu->ic->proto_data;
-        char handle[strlen(bu->handle)];
+        char handle[strlen(bu->handle) + 1];
         char *domain;
         char l[4];

protocols/oscar/conn.c

@@ -571 +571 @@
 
         if (FD_ISSET(conn->fd, &fds) || FD_ISSET(conn->fd, &wfds)) {
-                unsigned int len = sizeof(error);
+                socklen_t len = sizeof(error);
 
                 if (getsockopt(conn->fd, SOL_SOCKET, SO_ERROR, &error, &len) < 0)

protocols/twitter/twitter.c

@@ -51 +51 @@
         struct twitter_data *td = ic->proto_data;
 
+        char *last_tweet = set_getstr(&ic->acc->set, "_last_tweet");
+        if (last_tweet)
+                td->timeline_id = g_ascii_strtoull(last_tweet, NULL, 0);
+
         /* Create the room now that we "logged in". */
         if (td->flags & TWITTER_MODE_CHAT)
@@ -327 +331 @@
         s = set_add(&acc->set, "strip_newlines", "false", set_eval_bool, acc);
         
+        s = set_add(&acc->set, "_last_tweet", "0", NULL, acc);
+        s->flags |= SET_HIDDEN | SET_NOSAVE;
+
         if (strcmp(acc->prpl->name, "twitter") == 0) {
                 s = set_add(&acc->set, "stream", "true", set_eval_bool, acc);

protocols/twitter/twitter_lib.c

@@ -234 +234 @@
 void twitter_get_friends_ids(struct im_connection *ic, gint64 next_cursor)
 {
-        // Primitive, but hey! It works...      
+        // Primitive, but hey! It works...
         char *args[2];
         args[0] = "cursor";
-        args[1] = g_strdup_printf("%lld", (long long) next_cursor);
+        args[1] = g_strdup_printf("%" G_GINT64_FORMAT, next_cursor);
         twitter_http(ic, TWITTER_FRIENDS_IDS_URL, twitter_http_get_friends_ids, ic, 0, args, 2);
 
@@ -721 +721 @@
 {
         struct twitter_data *td = ic->proto_data;
+        char *last_id_str;
         
         if (status->user == NULL || status->text == NULL)
@@ -738 +739 @@
         // we won't pick up the updates already in the list.
         td->timeline_id = MAX(td->timeline_id, status->rt_id);
+
+        last_id_str = g_strdup_printf("%" G_GUINT64_FORMAT, td->timeline_id);
+        set_setstr(&ic->acc->set, "last_tweet", last_id_str);
+        g_free(last_id_str);
 }
 
@@ -997 +1002 @@
         char *args[6];
         args[0] = "cursor";
-        args[1] = g_strdup_printf("%lld", (long long) next_cursor);
+        args[1] = g_strdup_printf("%" G_GINT64_FORMAT, next_cursor);
         args[2] = "include_entities";
         args[3] = "true";
         if (td->timeline_id) {
                 args[4] = "since_id";
-                args[5] = g_strdup_printf("%llu", (long long unsigned int) td->timeline_id);
+                args[5] = g_strdup_printf("%" G_GUINT64_FORMAT, td->timeline_id);
         }
 
@@ -1033 +1038 @@
         char *args[6];
         args[0] = "cursor";
-        args[1] = g_strdup_printf("%lld", (long long) next_cursor);
+        args[1] = g_strdup_printf("%" G_GINT64_FORMAT, next_cursor);
         args[2] = "include_entities";
         args[3] = "true";
         if (td->timeline_id) {
                 args[4] = "since_id";
-                args[5] = g_strdup_printf("%llu", (long long unsigned int) td->timeline_id);
+                args[5] = g_strdup_printf("%" G_GUINT64_FORMAT, td->timeline_id);
         } else {
                 args[4] = "count";
@@ -1167 +1172 @@
                 "status", msg,
                 "in_reply_to_status_id",
-                g_strdup_printf("%llu", (unsigned long long) in_reply_to)
+                g_strdup_printf("%" G_GUINT64_FORMAT, in_reply_to)
         };
         twitter_http(ic, TWITTER_STATUS_UPDATE_URL, twitter_http_post, ic, 1,
@@ -1201 +1206 @@
 {
         char *url;
-        url = g_strdup_printf("%s%llu%s", TWITTER_STATUS_DESTROY_URL,
-                              (unsigned long long) id, ".json");
+        url = g_strdup_printf("%s%" G_GUINT64_FORMAT "%s",
+                              TWITTER_STATUS_DESTROY_URL, id, ".json");
         twitter_http_f(ic, url, twitter_http_post, ic, 1, NULL, 0,
                        TWITTER_HTTP_USER_ACK);
@@ -1211 +1216 @@
 {
         char *url;
-        url = g_strdup_printf("%s%llu%s", TWITTER_STATUS_RETWEET_URL,
-                              (unsigned long long) id, ".json");
+        url = g_strdup_printf("%s%" G_GUINT64_FORMAT "%s",
+                              TWITTER_STATUS_RETWEET_URL, id, ".json");
         twitter_http_f(ic, url, twitter_http_post, ic, 1, NULL, 0,
                        TWITTER_HTTP_USER_ACK);
@@ -1241 +1246 @@
                 NULL,
         };
-        args[1] = g_strdup_printf("%llu", (unsigned long long) id);
+        args[1] = g_strdup_printf("%" G_GUINT64_FORMAT, id);
         twitter_http_f(ic, TWITTER_FAVORITE_CREATE_URL, twitter_http_post,
                        ic, 1, args, 2, TWITTER_HTTP_USER_ACK);

protocols/yahoo/libyahoo2.c

@@ -974 +974 @@
                         msg = pair->value;
 
-                if (pair->key == 13) ;
+                if (pair->key == 13) 
+                        ;
                 if (pair->key == 16)    /* error */
                         msg = pair->value;
@@ -1795 +1796 @@
         switch (code)
         {
-                case 1212: return YAHOO_LOGIN_PASSWD;
-                case 1213: return YAHOO_LOGIN_LOCK;
-                case 1235: return YAHOO_LOGIN_UNAME;
+                case 1212: return (enum yahoo_status) YAHOO_LOGIN_PASSWD;
+                case 1213: return (enum yahoo_status) YAHOO_LOGIN_LOCK;
+                case 1235: return (enum yahoo_status) YAHOO_LOGIN_UNAME;
                 default: return (enum yahoo_status) code;
         }
@@ -3610 +3611 @@
         yd = yid->yd;
 
-        pkt = yahoo_packet_new(YAHOO_SERVICE_MESSAGE, YAHOO_STATUS_OFFLINE,
+        pkt = yahoo_packet_new(YAHOO_SERVICE_MESSAGE, (enum ypacket_status) YAHOO_STATUS_OFFLINE,
                 yd->session_id);
 
@@ -3677 +3678 @@
         if (yd->current_status == YAHOO_STATUS_INVISIBLE) {
                 pkt = yahoo_packet_new(YAHOO_SERVICE_Y6_VISIBLE_TOGGLE,
-                        YAHOO_STATUS_AVAILABLE, 0);
+                        (enum ypacket_status) YAHOO_STATUS_AVAILABLE, 0);
                 yahoo_packet_hash(pkt, 13, "2");
                 yahoo_send_packet(yid, pkt, 0);
@@ -3696 +3697 @@
         if (old_status == YAHOO_STATUS_INVISIBLE) {
                 pkt = yahoo_packet_new(YAHOO_SERVICE_Y6_VISIBLE_TOGGLE,
-                        YAHOO_STATUS_AVAILABLE, 0);
+                        (enum ypacket_status) YAHOO_STATUS_AVAILABLE, 0);
                 yahoo_packet_hash(pkt, 13, "1");
                 yahoo_send_packet(yid, pkt, 0);

protocols/yahoo/yahoo_util.h

@@ -48 +48 @@
 
 # define snprintf       g_snprintf
+#ifdef vsnprintf
+#undef vsnprintf
+#endif
 # define vsnprintf      g_vsnprintf
 

set.c

@@ -175 +175 @@
 int set_setint( set_t **head, const char *key, int value )
 {
-        char s[24];     /* Not quite 128-bit clean eh? ;-) */
-        
-        g_snprintf( s, sizeof( s ), "%d", value );
-        return set_setstr( head, key, s );
+        char *s = g_strdup_printf( "%d", value );
+        int retval = set_setstr( head, key, s );
+        g_free( s );
+        return retval;
 }
 

tests/check_arc.c

@@ -88 +88 @@
                                   &decrypted, password );
                 
+                fail_if( len == -1, 
+                 "`%s' didn't decrypt properly", decrypt_tests[i].decrypted );
                 fail_if( strcmp( decrypt_tests[i].decrypted, decrypted ) != 0,
                          "`%s' didn't decrypt properly", decrypt_tests[i].decrypted );

tests/check_irc.c

@@ -28 +28 @@
         GIOChannel *ch1, *ch2;
         irc_t *irc;
-        GError *error = NULL;
         char *raw;
         fail_unless(g_io_channel_pair(&ch1, &ch2));

tests/check_jabber_sasl.c

@@ -87 +87 @@
                 tcase_fn_start( get_part_tests[i].key, __FILE__, i );
                 char *res;
-                int len;
                 
                 res = sasl_get_part( get_part_tests[i].challenge,