summaryrefslogtreecommitdiff
path: root/doio.c
diff options
context:
space:
mode:
authorAndy Lester <andy@petdance.com>2006-01-09 17:42:43 -0600
committerRafael Garcia-Suarez <rgarciasuarez@gmail.com>2006-01-10 10:51:16 +0000
commit6136c704e4e88f5381eda30a0d872d75aa9b9d11 (patch)
treed55b3c3db1fb6e481c40ca5c792663ec29bd75e7 /doio.c
parentb77de8c7a7a97830b8f0702cd830d615db2a1523 (diff)
downloadperl-6136c704e4e88f5381eda30a0d872d75aa9b9d11.tar.gz
It's the Barbie bus patch
Message-ID: <20060110054243.GA26165@petdance.com> p4raw-id: //depot/perl@26764
Diffstat (limited to 'doio.c')
-rw-r--r--doio.c22
1 files changed, 10 insertions, 12 deletions
diff --git a/doio.c b/doio.c
index 1dc4169beb..84744658f2 100644
--- a/doio.c
+++ b/doio.c
@@ -1381,7 +1381,7 @@ Perl_do_aexec5(pTHX_ SV *really, register SV **mark, register SV **sp,
#else
if (sp > mark) {
char **a;
- const char *tmps = Nullch;
+ const char *tmps = NULL;
Newx(PL_Argv, sp - mark + 1, char*);
a = PL_Argv;
@@ -1391,7 +1391,7 @@ Perl_do_aexec5(pTHX_ SV *really, register SV **mark, register SV **sp,
else
*a++ = "";
}
- *a = Nullch;
+ *a = NULL;
if (really)
tmps = SvPV_nolen_const(really);
if ((!really && *PL_Argv[0] != '/') ||
@@ -1544,7 +1544,7 @@ Perl_do_exec3(pTHX_ const char *incmd, int fd, int do_report)
if (*s)
*s++ = '\0';
}
- *a = Nullch;
+ *a = NULL;
if (PL_Argv[0]) {
PERL_FPU_PRE_EXEC
PerlProc_execvp(PL_Argv[0],PL_Argv);
@@ -1553,15 +1553,13 @@ Perl_do_exec3(pTHX_ const char *incmd, int fd, int do_report)
do_execfree();
goto doshell;
}
- {
- if (ckWARN(WARN_EXEC))
- Perl_warner(aTHX_ packWARN(WARN_EXEC), "Can't exec \"%s\": %s",
- PL_Argv[0], Strerror(errno));
- if (do_report) {
- const int e = errno;
- PerlLIO_write(fd, (void*)&e, sizeof(int));
- PerlLIO_close(fd);
- }
+ if (ckWARN(WARN_EXEC))
+ Perl_warner(aTHX_ packWARN(WARN_EXEC), "Can't exec \"%s\": %s",
+ PL_Argv[0], Strerror(errno));
+ if (do_report) {
+ const int e = errno;
+ PerlLIO_write(fd, (const void*)&e, sizeof(int));
+ PerlLIO_close(fd);
}
}
do_execfree();