[gentoo-commits] eselect r641 - in trunk: . modules

[Ulrich Mueller (ulm)]

Author: ulm
Date: 2009-09-08 12:11:14 +0000 (Tue, 08 Sep 2009)
New Revision: 641

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/modules/env.eselect
Log:
Make parsing of files in env.d more robust, fixes bug 283932.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-08-27 20:10:11 UTC (rev 640)
+++ trunk/ChangeLog	2009-09-08 12:11:14 UTC (rev 641)
@@ -1,3 +1,9 @@
[phone]  Ulrich Mueller  <ulm@g.o>
+
+	* modules/env.eselect (create_profile_env): Ignore leading
+	"export" in env files, fixes bug 283932. Accept only valid shell
+	identifiers as variable names.
+
 2009-08-27  Ulrich Mueller  <ulm@g.o>
 
 	* configure.ac: Update version to 1.2.

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2009-08-27 20:10:11 UTC (rev 640)
+++ trunk/NEWS	2009-09-08 12:11:14 UTC (rev 641)
@@ -1,6 +1,10 @@
 This file contains a summary of changes in released versions.  Please read the
 ChangeLog file for a more detailed listing of changes/bug fixes.
 
+trunk:
+    Bug fixes:
+    - Fixed bug #283932: Make parsing of files in env.d more robust.
+
 1.2:
     Bug fixes:
     - Fixed bug #280598: POSIX compliant basename and dirname functions.

Modified: trunk/modules/env.eselect
===================================================================
--- trunk/modules/env.eselect	2009-08-27 20:10:11 UTC (rev 640)
+++ trunk/modules/env.eselect	2009-09-08 12:11:14 UTC (rev 641)
@@ -103,8 +103,11 @@
 
 		# Which vars are to be loaded?
 		# TODO: Change to bash magic?
-		vars=$(sed \
-			-e '/^#/d' -e '/^\s*$/d' -e '/^.*=/s/^\([^=]*\)=.*/\1/' \
+		vars=$(LC_ALL=C sed \
+			-e 's/^\s*//' \
+			-e 's/^export\s\+//' \
+			-e '/^[[:alpha:]_]\w*=/!d' \
+			-e 's/=.*//' \
 			${envfile})
 		[[ -z ${vars} ]] && continue
 		for var in ${vars} ; do