From b21b76ed6a5d574890637b97b21517edd2920fae Mon Sep 17 00:00:00 2001 From: joeyh Date: Wed, 28 Jun 2006 18:04:23 +0000 Subject: [PATCH] * ifdata: Fix bug in argument parsing that could make it segfault. * combine: Allow operators to be written in any case. --- combine | 2 +- debian/changelog | 4 +++- ifdata.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/combine b/combine index ef16aaf..6ab3b43 100755 --- a/combine +++ b/combine @@ -126,7 +126,7 @@ if (@ARGV != 3) { } my $file1=shift; -my $op=shift; +my $op=lc shift; my $file2=shift; if ($::{"compare_$op"}) { diff --git a/debian/changelog b/debian/changelog index 11f68e4..2c2ff53 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ moreutils (0.12) UNRELEASED; urgency=low * Really fix typo. Closes: #369485 * zrun: Add usage message. + * ifdata: Fix bug in argument parsing that could make it segfault. + * combine: Allow operators to be written in any case. - -- Joey Hess Sat, 24 Jun 2006 22:10:53 -0400 + -- Joey Hess Wed, 28 Jun 2006 14:03:21 -0400 moreutils (0.11) unstable; urgency=low diff --git a/ifdata.c b/ifdata.c index bdf69cd..2bdf6ba 100644 --- a/ifdata.c +++ b/ifdata.c @@ -463,7 +463,7 @@ int main(int argc, char *argv[]) { return 1; } - while (narg < argc) { + while (narg < argc - 1) { narg++; found = 0; -- 2.39.5