[gentoo-commits] gentoolkit r788 - in trunk/gentoolkit-dev: . src/ekeyword

[Christian Ruppert (idl0r)]

Author: idl0r
Date: 2010-07-02 15:34:12 +0000 (Fri, 02 Jul 2010)
New Revision: 788

Modified:
   trunk/gentoolkit-dev/ChangeLog
   trunk/gentoolkit-dev/src/ekeyword/ekeyword
Log:
Validate user input/arch, bug 326029.


Modified: trunk/gentoolkit-dev/ChangeLog
===================================================================
--- trunk/gentoolkit-dev/ChangeLog	2010-07-02 15:30:13 UTC (rev 787)
+++ trunk/gentoolkit-dev/ChangeLog	2010-07-02 15:34:12 UTC (rev 788)
@@ -9,6 +9,7 @@
 		get_architectures reads $PORTDIR/profiles/arch.list and adds all
 		available architectures to the %ARCH hash which can be used for
 		validation.
+		Validate user input/arch, bug 326029.
 
 2010-05-17: Christian Ruppert <idl0r@g.o>
 	* echangelog: Update copyright in other files too (except binaries and

Modified: trunk/gentoolkit-dev/src/ekeyword/ekeyword
===================================================================
--- trunk/gentoolkit-dev/src/ekeyword/ekeyword	2010-07-02 15:30:13 UTC (rev 787)
+++ trunk/gentoolkit-dev/src/ekeyword/ekeyword	2010-07-02 15:34:12 UTC (rev 788)
@@ -13,6 +13,9 @@
 my ($kw_re) = '^(?:([-~^]?)(\w[\w-]*)|([-^]\*))$';
 my (@kw);
 
+my $PORTDIR = undef;
+my %ARCH = ();
+
 sub file_parse {
 	my $fname = shift;
 	my @content = ();
@@ -71,9 +74,21 @@
 	die "I don't understand $a\n";
 }
 
+$PORTDIR = get_portdir();
+get_architectures();
+
 my $files = 0;
 for my $f (@ARGV) {
-	if ($f =~ /$kw_re/o) {
+	if ($f =~ m/$kw_re/o) {
+		my $arch = $2;
+
+		if(length($arch) > 0 && $arch ne "all") {
+			if(!defined($ARCH{$arch})) {
+				printf STDERR ("'%s' is an unknown architecture! skipping...\n", $arch);
+				next;
+			}
+		}
+
 		push @kw, $f;
 		next;
 	}