diff options
| author | Ilya Zakharevich <ilya@math.berkeley.edu> | 2006-12-17 16:45:24 -0800 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2006-12-18 13:34:00 +0000 |
| commit | 9d419b5f6925ac8219b490513f2c0e4f2d7c7f74 (patch) | |
| tree | ade0148247a1332511a5db94e9ff95d8b80c9b4b /perl.c | |
| parent | dbf3bb275a8c67f06df1e6e24df320e3d78b2d60 (diff) | |
| download | perl-9d419b5f6925ac8219b490513f2c0e4f2d7c7f74.tar.gz | |
OS/2-specific fixes, round II
Message-ID: <20061218084524.GA14866@powdermilk.math.berkeley.edu>
p4raw-id: //depot/perl@29580
Diffstat (limited to 'perl.c')
| -rw-r--r-- | perl.c | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -1547,11 +1547,7 @@ setuid perl scripts securely.\n"); } /* Can we grab env area too to be used as the area for $0? */ if (s && PL_origenviron) { - if ((PL_origenviron[0] == s + 1 -#ifdef OS2 - || (PL_origenviron[0] == s + 9 && (s += 8)) -#endif - ) + if ((PL_origenviron[0] == s + 1) || (aligned && (PL_origenviron[0] > s && @@ -1559,7 +1555,7 @@ setuid perl scripts securely.\n"); INT2PTR(char *, PTR2UV(s + PTRSIZE) & mask))) ) { -#ifndef OS2 +#ifndef OS2 /* ENVIRON is read by the kernel too. */ s = PL_origenviron[0]; while (*s) s++; #endif |