diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 1998-05-29 02:31:44 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1998-05-29 02:31:44 +0000 |
| commit | 1d2dff63f533f62282a700198c67c41dcb6ad6df (patch) | |
| tree | 7eac820768f3a944fd0395294df59cec1ad9bedc /doio.c | |
| parent | be44fb0e48bd19a864cf6b6d066beef8e960db7d (diff) | |
| download | perl-1d2dff63f533f62282a700198c67c41dcb6ad6df.tar.gz | |
[win32] merge changes#1014,1038 from maintbranch
p4raw-link: @1038 on //depot/maint-5.004/perl: c3cf4c2be38f0215f451c3dd6cb13089e5f2329f
p4raw-link: @1014 on //depot/maint-5.004/perl: d14230f9721c31ac6e9e2fdb706c7fc95118b4e6
p4raw-id: //depot/win32/perl@1052
Diffstat (limited to 'doio.c')
| -rw-r--r-- | doio.c | 15 |
1 files changed, 9 insertions, 6 deletions
@@ -579,14 +579,17 @@ do_close(GV *gv, bool not_implicit) if (!gv) gv = argvgv; if (!gv || SvTYPE(gv) != SVt_PVGV) { - SETERRNO(EBADF,SS$_IVCHAN); + if (not_implicit) + SETERRNO(EBADF,SS$_IVCHAN); return FALSE; } io = GvIO(gv); if (!io) { /* never opened */ - if (dowarn && not_implicit) - warn("Close on unopened file <%s>",GvENAME(gv)); - SETERRNO(EBADF,SS$_IVCHAN); + if (not_implicit) { + if (dowarn) + warn("Close on unopened file <%s>",GvENAME(gv)); + SETERRNO(EBADF,SS$_IVCHAN); + } return FALSE; } retval = io_close(io); @@ -1085,7 +1088,7 @@ apply(I32 type, register SV **mark, register SV **sp) SV **oldmark = mark; #define APPLY_TAINT_PROPER() \ - if (!(tainting && tainted)) {} else { goto taint_proper; } + if (!(tainting && tainted)) {} else { goto taint_proper_label; } /* This is a first heuristic; it doesn't catch tainting magic. */ if (tainting) { @@ -1271,7 +1274,7 @@ nothing in the core. } return tot; - taint_proper: + taint_proper_label: TAINT_PROPER(what); return 0; /* this should never happen */ |