* ifdata: Fix bug in argument parsing that could make it segfault.

* combine: Allow operators to be written in any case.

diff --git a/combine b/combine
index ef16aaf57a5f15215b57ae97ca61dc14cb6c48d6..6ab3b43374354f0942a8199a09bc81dd23c66e0d 100755 (executable)
--- 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 11f68e4805ecce5b0ba8b8c70f58819c447e2506..2c2ff5324c0c945099c0b837a59e97dfbba8c6a8 100644 (file)
--- 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 <joeyh@debian.org>  Sat, 24 Jun 2006 22:10:53 -0400
+ -- Joey Hess <joeyh@debian.org>  Wed, 28 Jun 2006 14:03:21 -0400
 
 moreutils (0.11) unstable; urgency=low
 

diff --git a/ifdata.c b/ifdata.c
index bdf69cd4cad8b57d5cea6120fee914b7a0e2026f..2bdf6ba7cb17f4aed8d135e352665944af2a1319 100644 (file)
--- 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;