diff options
| -rw-r--r-- | _data/scripts.yaml | 6 | ||||
| -rw-r--r-- | scripts/buf.pl | 42 | ||||
| -rw-r--r-- | scripts/cgrep.pl | 1 |
3 files changed, 32 insertions, 17 deletions
diff --git a/_data/scripts.yaml b/_data/scripts.yaml index 24db681..8b6281e 100644 --- a/_data/scripts.yaml +++ b/_data/scripts.yaml @@ -777,10 +777,10 @@ description: 'Saves the buffer for /upgrade, so that no information is lost' filename: buf.pl license: 'Public Domain' - modified: '2014-10-17 20:34:00' + modified: '2016-09-22 02:26:09' name: 'Scroll buffer restorer' url: http://juerd.nl/irssi/ - version: '2.13' + version: '2.20' - authors: 'Pablo Martín Báez Echevarría' contact: pab_24n@outlook.com @@ -868,7 +868,7 @@ description: 'Lists users on the channel matching the specified regexp' filename: cgrep.pl license: 'GPLv2 or later' - modified: '2014-10-17 20:34:00' + modified: '2016-09-20 14:26:40' name: cgrep url: http://pieter-bas.ijdens.com/irssi/ version: 1.0.0 diff --git a/scripts/buf.pl b/scripts/buf.pl index da50e82..6d907f1 100644 --- a/scripts/buf.pl +++ b/scripts/buf.pl @@ -5,7 +5,7 @@ use Irssi qw(command signal_add signal_add_first active_win settings_get_str settings_get_bool channels windows settings_add_str settings_add_bool get_irssi_dir window_find_refnum signal_stop); -$VERSION = '2.13'; +$VERSION = '2.20'; %IRSSI = ( authors => 'Juerd', contact => 'juerd@juerd.nl', @@ -13,10 +13,8 @@ $VERSION = '2.13'; description => 'Saves the buffer for /upgrade, so that no information is lost', license => 'Public Domain', url => 'http://juerd.nl/irssi/', - changed => 'Mon May 13 19:41 CET 2002', - changes => 'Severe formatting bug removed * oops, I ' . - 'exposed Irssi to ircII foolishness * sorry ' . - '** removed logging stuff (this is a fix)', + changed => 'Thu Sep 22 01:37 CEST 2016', + changes => 'Fixed file permissions (leaked everything via filesystem)', note1 => 'This script HAS TO BE in your scripts/autorun!', note2 => 'Perl support must be static or in startup', ); @@ -39,9 +37,15 @@ use Data::Dumper; my %suppress; +sub _filename { sprintf '%s/scrollbuffer', get_irssi_dir } + sub upgrade { - open BUF, q{>}, sprintf('%s/scrollbuffer', get_irssi_dir) or die $!; - print BUF join("\0", map $_->{server}->{address} . $_->{name}, channels), "\n"; + my $fn = _filename; + my $old_umask = umask 0077; + open my $fh, q{>}, $fn or die "open $fn: $!"; + umask $old_umask; + + print $fh join("\0", map $_->{server}->{address} . $_->{name}, channels), "\n"; for my $window (windows) { next unless defined $window; next if $window->{name} eq 'status'; @@ -57,36 +61,39 @@ sub upgrade { redo if defined $line; } } - printf BUF "%s:%s\n%s", $window->{refnum}, $lines, $buf; + printf $fh "%s:%s\n%s", $window->{refnum}, $lines, $buf; } - close BUF; + close $fh; unlink sprintf("%s/sessionconfig", get_irssi_dir); command 'layout save'; command 'save'; } sub restore { - open BUF, q{<}, sprintf('%s/scrollbuffer', get_irssi_dir) or die $!; - my @suppress = split /\0/, <BUF>; + my $fn = _filename; + open my $fh, q{<}, $fn or die "open $fn: $!"; + unlink $fn or warn "unlink $fn: $!"; + + my @suppress = split /\0/, readline $fh; if (settings_get_bool 'upgrade_suppress_join') { chomp $suppress[-1]; @suppress{@suppress} = (2) x @suppress; } active_win->command('^window scroll off'); - while (my $bla = <BUF>){ + while (my $bla = readline $fh){ chomp $bla; my ($refnum, $lines) = split /:/, $bla; next unless $lines; my $window = window_find_refnum $refnum; unless (defined $window){ - <BUF> for 1..$lines; + readline $fh for 1..$lines; next; } my $view = $window->view; $view->remove_all_lines(); $view->redraw(); my $buf = ''; - $buf .= <BUF> for 1..$lines; + $buf .= readline $fh for 1..$lines; my $sep = settings_get_str 'upgrade_separator'; $sep .= "\n" if $sep ne ''; $window->gui_printtext_after(undef, MSGLEVEL_CLIENTNOTICE, "$buf\cO$sep"); @@ -119,3 +126,10 @@ signal_add 'event join' => 'suppress'; unless (-f sprintf('%s/scripts/autorun/buf.pl', get_irssi_dir)) { Irssi::print('PUT THIS SCRIPT IN ~/.irssi/scripts/autorun/ BEFORE /UPGRADING!!'); } + +# Remove any left-over file. If 'session' doesn't exist (created by irssi +# during /UPGRADE), neither should our file. +unless (-e sprintf('%s/session', get_irssi_dir)) { + my $fn = _filename; + unlink $fn or warn "unlink $fn: $!" if -e $fn; +} diff --git a/scripts/cgrep.pl b/scripts/cgrep.pl index f55f86e..e7afc7c 100644 --- a/scripts/cgrep.pl +++ b/scripts/cgrep.pl @@ -71,6 +71,7 @@ sub event_who_result if ($busy) { + my($start,$realname); if ($data =~ /^(.*):([^:]{1,})$/) { $start = $1; |