Work around a bug in irssi on gentoo, leading to random zombies lurching about

[twirssi-net-twitter-lite.git] / twirssi.pl

diff --git a/twirssi.pl b/twirssi.pl
index 221e086162972b15a0bd4a4cf19a1c5d5a7be20e..267db1114d01e79c6f437a22e70544f9eb1d7552 100644 (file)
--- a/twirssi.pl
+++ b/twirssi.pl
@@ -7,6 +7,7 @@ use File::Temp;
 use LWP::Simple;
 use Data::Dumper;
 use Encode;
 use LWP::Simple;
 use Data::Dumper;
 use Encode;

+use POSIX qw/:sys_wait_h/;

 $Data::Dumper::Indent = 1;
 
 use vars qw($VERSION %IRSSI);
 $Data::Dumper::Indent = 1;
 
 use vars qw($VERSION %IRSSI);


@@ -1185,6 +1186,9 @@ sub monitor_child {
       if &debug;
     my ($new_last_poll);
 
       if &debug;
     my ($new_last_poll);
 

+    # reap any random leftover processes - work around a bug in irssi on gentoo
+    waitpid(-1, WNOHANG);
+

     # first time we run we don't want to print out *everything*, so we just
     # pretend
 
     # first time we run we don't want to print out *everything*, so we just
     # pretend
 


@@ -1664,7 +1668,7 @@ sub get_text {
     my $text   = decode_entities( $tweet->{text} );
     if ( $tweet->{truncated} ) {
         if ( exists $tweet->{retweeted_status} ) {
     my $text   = decode_entities( $tweet->{text} );
     if ( $tweet->{truncated} ) {
         if ( exists $tweet->{retweeted_status} ) {

-            $text = "RT $tweet->{retweeted_status}{user}{screen_name}: "
+            $text = "RT \@$tweet->{retweeted_status}{user}{screen_name}: "

               . "$tweet->{retweeted_status}{text}";
         } elsif ( $object->isa('Net::Twitter') ) {
             $text .= " -- http://twitter.com/$tweet->{user}{screen_name}"
               . "$tweet->{retweeted_status}{text}";
         } elsif ( $object->isa('Net::Twitter') ) {
             $text .= " -- http://twitter.com/$tweet->{user}{screen_name}"