From 96010cc2ed109f972277a8996eb625f4814dc8ad Mon Sep 17 00:00:00 2001
From: Ole Tange <ole@tange.dk>
Date: Mon, 13 Jan 2014 04:57:40 +0100
Subject: [PATCH] parallel: --gnu was ignored if env var started with space:
 PARALLEL=' --gnu'

---
 doc/release_new_version                     | 13 +++++++++++++
 src/parallel                                |  7 ++++---
 testsuite/tests-to-run/parallel-local164.sh |  3 +++
 testsuite/wanted-results/parallel-local164  |  3 +++
 testsuite/wanted-results/parallel-polarhome |  1 -
 5 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/doc/release_new_version b/doc/release_new_version
index cd0dec2c..fb58a344 100644
--- a/doc/release_new_version
+++ b/doc/release_new_version
@@ -211,12 +211,25 @@ available for download at: http://ftp.gnu.org/gnu/parallel/
 
 New in this release:
 
+* GNU Parallel was cited in: On the likelihood of multiple bit upsets
+  in logic circuits
+  http://arxiv-web3.library.cornell.edu/pdf/1401.1003
+
 * HaploClique uses GNU Parallel
   https://github.com/armintoepfer/haploclique
 
 * 30 Cool Open Source Software I Discovered in 2013
   http://www.cyberciti.biz/open-source/30-cool-best-open-source-softwares-of-2013/
 
+* [Unix] 13. The power of doing things in Parallel
+  http://leetaey.tistory.com/384
+
+* Parallel the execution of a job that read from stdin
+  http://www.linuxask.com/questions/parallel-the-execution-of-a-job-that-read-from-stdin
+
+* Shell-Abarbeitung beschleunigen: Wie Sie mit parallelen Prozesse effizienter in der Shell arbeiten
+  https://www.hosteurope.ch/blog/shell-abarbeitung-beschleunigen-wie-sie-mit-parallelen-prozesse-effizienter-in-der-shell-arbeiten/
+
 * Bug fixes and man page updates.
 
 
diff --git a/src/parallel b/src/parallel
index 2d470e0a..bf514641 100755
--- a/src/parallel
+++ b/src/parallel
@@ -625,7 +625,7 @@ sub get_options_from_array {
 sub parse_options {
     # Returns: N/A
     # Defaults:
-    $Global::version = 20140103;
+    $Global::version = 20140113;
     $Global::progname = 'parallel';
     $Global::infinity = 2**31;
     $Global::debug = 0;
@@ -1119,7 +1119,8 @@ sub read_options {
 	}
 	# Add options from shell variable $PARALLEL
 	if($ENV{'PARALLEL'}) {
-	    @ARGV_env = shell_unquote(split/(?<![\\])\s/, $ENV{'PARALLEL'});
+	    # Split options on space, but ignore empty options
+	    @ARGV_env = grep { /./ } shell_unquote(split/(?<![\\])\s/, $ENV{'PARALLEL'});
 	}
     }
     Getopt::Long::Configure("bundling","require_order");
@@ -5505,7 +5506,7 @@ sub replaced {
 	if($self->{'replaced'} =~ /^\s*(-\S+)/) {
 	    # Is this really a command in $PATH starting with '-'?
 	    my $cmd = $1;
-	    if(not which($cmd)) {
+	    if(not ::which($cmd)) {
 		::error("Command ($cmd) starts with '-'. Is this a wrong option?\n");
 		::wait_and_exit(255);
 	    }
diff --git a/testsuite/tests-to-run/parallel-local164.sh b/testsuite/tests-to-run/parallel-local164.sh
index 4fb71578..3ef0085a 100644
--- a/testsuite/tests-to-run/parallel-local164.sh
+++ b/testsuite/tests-to-run/parallel-local164.sh
@@ -151,4 +151,7 @@ echo 'bug #34241: --pipe should not spawn unneeded processes - part 2'
   echo No .par should exist; 
   stdout ls *.par
 
+echo "bug: --gnu was ignored if env var started with space: PARALLEL=' --gnu'"
+  export PARALLEL=" -v" &&  parallel echo ::: 'space in envvar OK'
+
 EOF
diff --git a/testsuite/wanted-results/parallel-local164 b/testsuite/wanted-results/parallel-local164
index 37353b66..1c99f8c5 100644
--- a/testsuite/wanted-results/parallel-local164
+++ b/testsuite/wanted-results/parallel-local164
@@ -263,3 +263,6 @@ bug #34241: --pipe should not spawn unneeded processes - part 2
 2
 No .par should exist
 ls: cannot access *.par: No such file or directory
+bug: --gnu was ignored if env var started with space: PARALLEL=' --gnu'
+echo space\ in\ envvar\ OK
+space in envvar OK
diff --git a/testsuite/wanted-results/parallel-polarhome b/testsuite/wanted-results/parallel-polarhome
index b8309cdd..d6ee48bd 100644
--- a/testsuite/wanted-results/parallel-polarhome
+++ b/testsuite/wanted-results/parallel-polarhome
@@ -65,4 +65,3 @@ hurd.polarhome.com	Works on hurd.polarhome.com
 copy_and_test raspberrypi.polarhome.com
 raspberrypi.polarhome.com	### Run the test on raspberrypi.polarhome.com
 raspberrypi.polarhome.com	Works on raspberrypi.polarhome.com
-raspberrypi.polarhome.com	parallel: Warning: Cannot figure out number of CPU cores. Using 1.