summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoeyh <joeyh>2007-09-16 17:06:14 +0000
committerjoeyh <joeyh>2007-09-16 17:06:14 +0000
commit4a0cb2806a75ca4a36472835fcbe0f41085902b2 (patch)
treee946d07a961bd2a0a55a8578c5a1ab6a4c0dda45
parentcade3b932e3fc6f2fdc576a6ef0e061cf49a6653 (diff)
downloadmoreutils-4a0cb2806a75ca4a36472835fcbe0f41085902b2.tar.gz
* vidir: Force numbers to normalised integers.0.24
* vidir: Abort on unknown item numbers rather than deleting them. Closes: #442440
-rw-r--r--debian/changelog8
-rwxr-xr-xvidir5
2 files changed, 10 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 9e6e07c..eb0e554 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+moreutils (0.24) unstable; urgency=low
+
+ * vidir: Force numbers to normalised integers.
+ * vidir: Abort on unknown item numbers rather than deleting them.
+ Closes: #442440
+
+ -- Joey Hess <joeyh@debian.org> Sun, 16 Sep 2007 13:05:54 -0400
+
moreutils (0.23) unstable; urgency=low
* Add pointer to join from combine's man page. Closes: #435516
diff --git a/vidir b/vidir
index 6df58bd..ebc946d 100755
--- a/vidir
+++ b/vidir
@@ -123,11 +123,10 @@ open (IN, $tmp->filename) || die "$0: cannot read ".$tmp->filename.": $!\n";
while (<IN>) {
chomp;
if (/^(\d+)\t{0,1}(.*)/) {
- my $num=$1;
+ my $num=int($1);
my $name=$2;
if (! exists $item{$num}) {
- print STDERR "$0: unknown item number $num\n";
- $error=1;
+ die "$0: unknown item number $num\n";
}
elsif ($name ne $item{$num}) {
next unless length $name;