From: Abhijit Menon-Sen <ams@wiw.org>
Date: Wed, 8 Aug 2007 21:58:29 +0000 (+0000)
Subject: Revert #31690, because it can make -x eat arguments. Even if the
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=304334dafcf24508b017cfdd22e0883402e1d769;p=p5sagit%2Fp5-mst-13.2.git

Revert #31690, because it can make -x eat arguments. Even if the
next argument happens to be a directory name, changing this does
not seem worthwhile. It's as likely as not to break something.

The many -x users clamouring for consistency must go home
empty-handed, alas.

p4raw-id: //depot/perl@31691
---

diff --git a/perl.c b/perl.c
index 8b43a81..6b02712 100644
--- a/perl.c
+++ b/perl.c
@@ -1997,13 +1997,8 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit)
 	case 'x':
 	    PL_doextract = TRUE;
 	    s++;
-	    if (*s) {
+	    if (*s)
 		cddir = s;
-	    }
-	    else if ((s=argv[1]) && *s != '-') {
-		argc--,argv++;
-		cddir = s;
-	    }
 	    break;
 	case 0:
 	    break;