Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tail: fix function params #864

Merged
merged 1 commit into from
Dec 6, 2024
Merged

tail: fix function params #864

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions bin/tail
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ License: perl
# 99/03/02 : first version
#

$| = 1;

use strict;

use File::Basename qw(basename);
Expand All @@ -39,6 +37,8 @@ use vars qw($opt_b $opt_c $opt_f $opt_n $opt_r);

my $me = basename $0;

$| = 1;

sub usage
{
my $msg = shift;
Expand All @@ -58,7 +58,7 @@ my $block_size = 512;

# Command-line parsing

sub check_number($)
sub check_number
{
my $opt = shift;
if ($opt =~ m/\A\+(\d+)\Z/) {
Expand Down Expand Up @@ -91,7 +91,7 @@ sub new_argv
return @new;
}

sub parse_args()
sub parse_args
{
my $files;
my $point=-10;
Expand Down Expand Up @@ -134,7 +134,7 @@ sub parse_args()

# Prints the tail of a file according to the options passed on the
# command line.
sub print_tail(*$$$)
sub print_tail
{
my ($fh, $f, $point, $type) = @_;

Expand Down Expand Up @@ -241,7 +241,7 @@ my %info;
my @filelist;
my @dirlist;

sub get_existing_files(\@\@)
sub get_existing_files
{
my ($filelist, $dirlist) = @_;

Expand Down Expand Up @@ -272,11 +272,11 @@ sub get_existing_files(\@\@)
# xtail C source code, improvements could be obtained using fstat() on file
# handles instead of stat(). I'll do something if people need it.

sub tail_f(\@\@$$)
sub tail_f
{
@filelist = @{shift @_};
@dirlist = @{shift @_};
my ($point, $type) = @_;
my ($files, $dirs, $point, $type) = @_;
@filelist = @{ $files };
@dirlist = @{ $dirs };

local $SIG{'INT'} = \&handle_INT;
local $SIG{'QUIT'} = sub { exit 0 }; # do not core dump
Expand All @@ -287,7 +287,7 @@ sub tail_f(\@\@$$)
(undef, $ino, undef, undef, undef, undef, undef, $size,
undef, $mtime) = stat($_);
$info{$_} = [$ino, $size, $mtime];
} get_existing_files(@filelist, @dirlist);
} get_existing_files($files, $dirs);

my $current;

Expand All @@ -301,7 +301,7 @@ sub tail_f(\@\@$$)
# Set size to zero to print the whole new file
$info{$_} = [$ino, 0, $mtime];
}
} get_existing_files(@filelist, @dirlist);
} get_existing_files($files, $dirs);

# Loop on files
for my $file (keys %info) {
Expand Down Expand Up @@ -331,7 +331,7 @@ sub tail_f(\@\@$$)
print "\n*** '$file' has been truncated or replaced ***\n";
print "\n*** $file ***\n";
$current = $file;
print_tail \*FH, $file, $point, $type;
print_tail(\*FH, $file, $point, $type);
close FH;
}
elsif($size > $oldsize)
Expand Down Expand Up @@ -364,7 +364,7 @@ sub tail_f(\@\@$$)
}

# Prints the recently changed files, the most recent first
sub handle_INT()
sub handle_INT
{
print "\n*** recently changed files ***\n";

Expand All @@ -373,7 +373,7 @@ sub handle_INT()
print sprintf("%3d %s %s", $i, scalar localtime($info{$f}[2]), $f)."\n";
$i++;
}
my @existing = get_existing_files(@filelist, @dirlist);
my @existing = get_existing_files(\@filelist, \@dirlist);
my @unknown = grep {! -e $_} @filelist;

print "currently watching: ".
Expand All @@ -388,7 +388,7 @@ sub handle_INT()
#
# Main function
#
sub handle_args($$$)
sub handle_args
{
my ($point, $type, $files_) = @_;
my $rc = EX_SUCCESS;
Expand Down Expand Up @@ -428,19 +428,19 @@ sub handle_args($$$)
# Do not print the tail of the files if we are using xtail
unless($me eq "xtail") {
print "==> $file <==\n" if(scalar @files >= 2);
print_tail \*FH, $file, $point, $type;
print_tail(\*FH, $file, $point, $type);
print "\n" if(++$i < scalar(@files));
}

close FH;
}

if($opt_f or ($me eq "xtail")) {
tail_f(@files, @dirs, $point, $type);
tail_f(\@files, \@dirs, $point, $type);
}

} else {
print_tail \*STDIN, "stdout", $point, $type;
print_tail(\*STDIN, "stdout", $point, $type);
# Ignore the -f option
}
return $rc;
Expand Down
Loading