diff options
author | Nicholas Clark <nick@ccl4.org> | 2008-01-30 11:03:49 +0000 |
---|---|---|
committer | Nicholas Clark <nick@ccl4.org> | 2008-01-30 11:03:49 +0000 |
commit | 38bfb12dd0ecf0b89db3820a74f5b4711598bc8f (patch) | |
tree | c3be83aa17f2b8241f87369bebc22f9f88c09953 /os2 | |
parent | 411c0628a4ee42ca7415467e9a765667337eabaf (diff) | |
download | perl-38bfb12dd0ecf0b89db3820a74f5b4711598bc8f.tar.gz |
Integrate:
[ 32712]
Subject: [PATCH] Fix cygwin.c again
From: "Jerry D. Hedden" <jdhedden@cpan.org>
Date: Sat, 22 Dec 2007 16:11:48 -0500
Message-ID: <1ff86f510712221311v1c58d606jc8dfeee6a21e6194@mail.gmail.com>
Fixes breakage caused by change #32707
[ 32713]
Nullch and others were still alive and well in some of the operating
system specific directories. I think I've chainsawed all of them now,
but I can't guarantee that it compiles anywhere from win32.
[ 32721]
Subject: [PATCH] Remove Nullch etc. from x2p
From: "Jan Dubois" <jand@activestate.com>
Date: Mon, 24 Dec 2007 14:58:20 -0800
Message-ID: <0cca01c84680$7afc9170$70f5b450$@com>
[ 32723]
Subject: patch - chg 32721 missed a couple Nullstrs
From: jimc <jim.cromie@gmail.com>
Date: Tue, 25 Dec 2007 05:39:30 -0700
Message-ID: <4770FA02.2080800@gmail.com>
[ 32739]
Remove the last Null(...) from x2p/*
Something tells me that Win32 is compiling x2p with -DPERL_CORE
*nix dosn't do this.
p4raw-link: @32739 on //depot/perl: 7d879f32d6bc460c660bdefc13574ab1b05062e9
p4raw-link: @32723 on //depot/perl: 2421bbdb1200baaa9a87b6227e6892a09430146a
p4raw-link: @32721 on //depot/perl: d34ed59f585350f3dfb4fdf7eca3266cdce428a1
p4raw-link: @32713 on //depot/perl: 4e205ed637fa853d115099170e6e11407ca49619
p4raw-link: @32712 on //depot/perl: dfe169eecccf8121d08f5b1eedd95ae222cf7b9e
p4raw-link: @32707 on //depot/perl: 24792b8dabd61fb81a064d275b67bc65123a8d4c
p4raw-id: //depot/maint-5.10/perl@33121
p4raw-integrated: from //depot/perl@33120 'copy in' NetWare/nwstdio.h
(@12913..) NetWare/nw5.c vmesa/vmesa.c (@25101..)
NetWare/nwperlhost.h NetWare/nwperlsys.h (@25945..)
djgpp/djgpp.c (@26680..) os2/OS2/REXX/REXX.xs (@26901..)
win32/perlhost.h (@31428..) win32/win32.c (@31490..)
cygwin/cygwin.c (@32689..) x2p/a2p.h x2p/a2py.c x2p/str.c
x2p/str.h x2p/util.c x2p/walk.c (@32690..) vms/vms.c (@32704..)
x2p/hash.c (@32723..)
p4raw-integrated: from //depot/perl@32713 'copy in' win32/wince.c
(@31356..) vms/ext/Stdio/Stdio.xs (@31384..) os2/os2.c
(@32704..) 'merge in' util.c (@32678..)
Diffstat (limited to 'os2')
-rw-r--r-- | os2/OS2/REXX/REXX.xs | 4 | ||||
-rw-r--r-- | os2/os2.c | 26 |
2 files changed, 15 insertions, 15 deletions
diff --git a/os2/OS2/REXX/REXX.xs b/os2/OS2/REXX/REXX.xs index 2d1fa6ea21..428dfd57f5 100644 --- a/os2/OS2/REXX/REXX.xs +++ b/os2/OS2/REXX/REXX.xs @@ -223,7 +223,7 @@ PERLSTART(PCSZ name, ULONG argc, PRXSTRING argv, PCSZ queue, PRXSTRING ret) static ULONG PERLCALL(PCSZ name, ULONG argc, PRXSTRING argv, PCSZ queue, PRXSTRING ret) { - return PERLCALLcv(name, Nullsv, argc, argv, queue, ret); + return PERLCALLcv(name, NULL, argc, argv, queue, ret); } RexxFunctionHandler* PF = &PERLSTART; @@ -556,7 +556,7 @@ _REXX_eval_with(cmd,...) Newx(names, n, char*); Newx(cvs, n, SV*); /* XXX Unfinished... */ - RETVAL = Nullsv; + RETVAL = NULL; Safefree(names); Safefree(cvs); } @@ -998,7 +998,7 @@ do_spawn_ve(pTHX_ SV *really, U32 flag, U32 execf, char *inicmd, U32 addflag) if (flag == P_WAIT) flag = P_NOWAIT; if (really && !*(real_name = SvPV(really, n_a))) - really = Nullsv; + really = NULL; retry: if (strEQ(PL_Argv[0],"/bin/sh")) @@ -1265,7 +1265,7 @@ do_spawn_ve(pTHX_ SV *really, U32 flag, U32 execf, char *inicmd, U32 addflag) /* XXXX This is good only until we refuse quoted arguments... */ PL_Argv[0] = inicmd; - PL_Argv[1] = Nullch; + PL_Argv[1] = NULL; } } else if (!buf[0] && inicmd) { /* No file */ /* Start with the original cmdline. */ @@ -1273,7 +1273,7 @@ do_spawn_ve(pTHX_ SV *really, U32 flag, U32 execf, char *inicmd, U32 addflag) quoted arguments... */ PL_Argv[0] = inicmd; - PL_Argv[1] = Nullch; + PL_Argv[1] = NULL; nargs = 2; /* shell -c */ } @@ -1458,7 +1458,7 @@ do_spawn3(pTHX_ char *cmd, int execf, int flag) if (*s) *s++ = '\0'; } - *a = Nullch; + *a = NULL; if (PL_Argv[0]) rc = do_spawn_ve(aTHX_ NULL, flag, execf, cmd, mergestderr); else @@ -1500,7 +1500,7 @@ os2_aspawn_4(pTHX_ SV *really, register SV **args, I32 cnt, int execing) else *a++ = ""; } - *a = Nullch; + *a = NULL; if ( flag_set && (a == PL_Argv + 1) && !really && execing == ASPAWN_WAIT ) { /* One arg? */ @@ -1573,7 +1573,7 @@ my_syspopen4(pTHX_ char *cmd, char *mode, I32 cnt, SV** args) taint_proper("Insecure %s%s", "EXEC"); } if (pipe(p) < 0) - return Nullfp; + return NULL; /* Now we need to spawn the child. */ if (p[this] == (*mode == 'r')) { /* if fh 0/1 was initially closed. */ int new = dup(p[this]); @@ -1592,7 +1592,7 @@ my_syspopen4(pTHX_ char *cmd, char *mode, I32 cnt, SV** args) closepipes: close(p[0]); close(p[1]); - return Nullfp; + return NULL; } } else fh_fl = fcntl(*mode == 'r', F_GETFD); @@ -1605,7 +1605,7 @@ my_syspopen4(pTHX_ char *cmd, char *mode, I32 cnt, SV** args) if (newfd != -1) fcntl(newfd, F_SETFD, FD_CLOEXEC); if (cnt) { /* Args: "Real cmd", before first arg, the last, execing */ - pid = os2_aspawn_4(aTHX_ Nullsv, args, cnt, ASPAWN_NOWAIT); + pid = os2_aspawn_4(aTHX_ NULL, args, cnt, ASPAWN_NOWAIT); } else pid = do_spawn_nowait(aTHX_ cmd); if (newfd == -1) @@ -1620,7 +1620,7 @@ my_syspopen4(pTHX_ char *cmd, char *mode, I32 cnt, SV** args) close(p[that]); if (pid == -1) { close(p[this]); - return Nullfp; + return NULL; } if (p[that] < p[this]) { /* Make fh as small as possible */ dup2(p[this], p[that]); @@ -1879,8 +1879,8 @@ XS(XS_OS2_replaceModule) Perl_croak(aTHX_ "Usage: OS2::replaceModule(target [, source [, backup]])"); { char * target = (char *)SvPV_nolen(ST(0)); - char * source = (items < 2) ? Nullch : (char *)SvPV_nolen(ST(1)); - char * backup = (items < 3) ? Nullch : (char *)SvPV_nolen(ST(2)); + char * source = (items < 2) ? NULL : (char *)SvPV_nolen(ST(1)); + char * backup = (items < 3) ? NULL : (char *)SvPV_nolen(ST(2)); if (!replaceModule(target, source, backup)) croak_with_os2error("replaceModule() error"); @@ -2159,7 +2159,7 @@ dllname2buffer(pTHX_ char *buf, STRLEN l) { char *o; STRLEN ll; - SV *dll = Nullsv; + SV *dll = NULL; dll = module_name(mod_name_full); o = SvPV(dll, ll); @@ -4099,7 +4099,7 @@ XS(XS_OS2_pipe) int connect = 0, count, message_r = 0, message = 0, b = 0; ULONG ulInbufLength, ulOutbufLength, ulPipeMode, ulTimeout, rc; STRLEN len; - char *s, buf[10], *s1, *perltype = Nullch; + char *s, buf[10], *s1, *perltype = NULL; PerlIO *perlio; double timeout; |