Artifact
4747801b080344d0d69a7413f3defe15a2a122a7:
Attachment "dup.patch" to
ticket [2827015fff]
added by
ferrieux
2009-07-26 06:09:36.
0000: 49 6e 64 65 78 3a 20 75 6e 69 78 2f 74 63 6c 55 Index: unix/tclU
0010: 6e 69 78 50 69 70 65 2e 63 0a 3d 3d 3d 3d 3d 3d nixPipe.c.======
0020: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================
0030: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================
0040: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================
0050: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 0a 52 43 =============.RC
0060: 53 20 66 69 6c 65 3a 20 2f 63 76 73 72 6f 6f 74 S file: /cvsroot
0070: 2f 74 63 6c 2f 74 63 6c 2f 75 6e 69 78 2f 74 63 /tcl/tcl/unix/tc
0080: 6c 55 6e 69 78 50 69 70 65 2e 63 2c 76 0a 72 65 lUnixPipe.c,v.re
0090: 74 72 69 65 76 69 6e 67 20 72 65 76 69 73 69 6f trieving revisio
00a0: 6e 20 31 2e 34 38 0a 64 69 66 66 20 2d 75 20 2d n 1.48.diff -u -
00b0: 72 31 2e 34 38 20 74 63 6c 55 6e 69 78 50 69 70 r1.48 tclUnixPip
00c0: 65 2e 63 0a 2d 2d 2d 20 75 6e 69 78 2f 74 63 6c e.c.--- unix/tcl
00d0: 55 6e 69 78 50 69 70 65 2e 63 09 39 20 4a 61 6e UnixPipe.c.9 Jan
00e0: 20 32 30 30 39 20 31 31 3a 32 31 3a 34 36 20 2d 2009 11:21:46 -
00f0: 30 30 30 30 09 31 2e 34 38 0a 2b 2b 2b 20 75 6e 0000.1.48.+++ un
0100: 69 78 2f 74 63 6c 55 6e 69 78 50 69 70 65 2e 63 ix/tclUnixPipe.c
0110: 09 32 35 20 4a 75 6c 20 32 30 30 39 20 32 33 3a .25 Jul 2009 23:
0120: 30 33 3a 35 30 20 2d 30 30 30 30 0a 40 40 20 2d 03:50 -0000.@@ -
0130: 34 35 31 2c 32 33 20 2b 34 35 31 2c 35 30 20 40 451,23 +451,50 @
0140: 40 0a 20 20 20 20 20 70 69 64 20 3d 20 66 6f 72 @. pid = for
0150: 6b 28 29 3b 0a 20 20 20 20 20 69 66 20 28 70 69 k();. if (pi
0160: 64 20 3d 3d 20 30 29 20 7b 0a 20 09 69 6e 74 20 d == 0) {. .int
0170: 6a 6f 69 6e 54 68 69 73 45 72 72 6f 72 20 3d 20 joinThisError =
0180: 65 72 72 6f 72 46 69 6c 65 20 26 26 20 28 65 72 errorFile && (er
0190: 72 6f 72 46 69 6c 65 20 3d 3d 20 6f 75 74 70 75 rorFile == outpu
01a0: 74 46 69 6c 65 29 3b 0a 2b 09 69 6e 74 20 66 64 tFile);.+.int fd
01b0: 30 2c 66 64 31 2c 66 64 32 3b 0a 2b 09 69 6e 74 0,fd1,fd2;.+.int
01c0: 20 63 6c 6f 73 65 4f 75 74 3d 30 2c 63 6c 6f 73 closeOut=0,clos
01d0: 65 45 72 72 3d 30 3b 0a 20 0a 20 09 66 64 20 3d eErr=0;. . .fd =
01e0: 20 47 65 74 46 64 28 65 72 72 50 69 70 65 4f 75 GetFd(errPipeOu
01f0: 74 29 3b 0a 20 0a 20 09 2f 2a 0a 20 09 20 2a 20 t);. . ./*. . *
0200: 53 65 74 20 75 70 20 73 74 64 69 6f 20 66 69 6c Set up stdio fil
0210: 65 20 68 61 6e 64 6c 65 73 20 66 6f 72 20 74 68 e handles for th
0220: 65 20 63 68 69 6c 64 20 70 72 6f 63 65 73 73 2e e child process.
0230: 0a 20 09 20 2a 2f 0a 2b 09 66 64 30 20 3d 20 47 . . */.+.fd0 = G
0240: 65 74 46 64 28 69 6e 70 75 74 46 69 6c 65 29 3b etFd(inputFile);
0250: 0a 2b 09 66 64 31 20 3d 20 47 65 74 46 64 28 6f .+.fd1 = GetFd(o
0260: 75 74 70 75 74 46 69 6c 65 29 3b 0a 2b 09 66 64 utputFile);.+.fd
0270: 32 20 3d 20 47 65 74 46 64 28 6f 75 74 70 75 74 2 = GetFd(output
0280: 46 69 6c 65 29 3b 0a 2b 09 0a 2b 09 69 66 20 28 File);.+..+.if (
0290: 66 64 31 20 3d 3d 20 30 29 20 7b 0a 2b 09 20 20 fd1 == 0) {.+.
02a0: 20 20 6f 75 74 70 75 74 46 69 6c 65 20 3d 20 4d outputFile = M
02b0: 61 6b 65 46 69 6c 65 28 64 75 70 28 30 29 29 3b akeFile(dup(0));
02c0: 0a 2b 09 20 20 20 20 63 6c 6f 73 65 4f 75 74 20 .+. closeOut
02d0: 3d 20 31 3b 0a 2b 20 20 20 20 20 20 20 20 7d 0a = 1;.+ }.
02e0: 2b 09 69 66 20 28 66 64 32 20 3d 3d 20 30 29 20 +.if (fd2 == 0)
02f0: 7b 0a 2b 09 20 20 20 20 65 72 72 6f 72 46 69 6c {.+. errorFil
0300: 65 20 3d 20 4d 61 6b 65 46 69 6c 65 28 64 75 70 e = MakeFile(dup
0310: 28 30 29 29 3b 0a 2b 09 20 20 20 20 63 6c 6f 73 (0));.+. clos
0320: 65 45 72 72 20 3d 20 31 3b 0a 2b 20 20 20 20 20 eErr = 1;.+
0330: 20 20 20 7d 0a 2b 09 69 66 20 28 21 53 65 74 75 }.+.if (!Setu
0340: 70 53 74 64 46 69 6c 65 28 69 6e 70 75 74 46 69 pStdFile(inputFi
0350: 6c 65 2c 20 54 43 4c 5f 53 54 44 49 4e 29 29 20 le, TCL_STDIN))
0360: 67 6f 74 6f 20 65 72 72 6f 72 3b 0a 2b 0a 2b 09 goto error;.+.+.
0370: 69 66 20 28 66 64 32 20 3d 3d 20 31 29 20 7b 0a if (fd2 == 1) {.
0380: 2b 09 20 20 20 20 65 72 72 6f 72 46 69 6c 65 20 +. errorFile
0390: 3d 20 4d 61 6b 65 46 69 6c 65 28 64 75 70 28 31 = MakeFile(dup(1
03a0: 29 29 3b 0a 2b 09 20 20 20 20 63 6c 6f 73 65 45 ));.+. closeE
03b0: 72 72 20 3d 20 31 3b 0a 2b 09 7d 0a 2b 09 69 66 rr = 1;.+.}.+.if
03c0: 20 28 21 53 65 74 75 70 53 74 64 46 69 6c 65 28 (!SetupStdFile(
03d0: 6f 75 74 70 75 74 46 69 6c 65 2c 20 54 43 4c 5f outputFile, TCL_
03e0: 53 54 44 4f 55 54 29 29 20 67 6f 74 6f 20 65 72 STDOUT)) goto er
03f0: 72 6f 72 3b 0a 20 0a 2d 09 69 66 20 28 21 53 65 ror;. .-.if (!Se
0400: 74 75 70 53 74 64 46 69 6c 65 28 69 6e 70 75 74 tupStdFile(input
0410: 46 69 6c 65 2c 20 54 43 4c 5f 53 54 44 49 4e 29 File, TCL_STDIN)
0420: 0a 2d 09 09 7c 7c 20 21 53 65 74 75 70 53 74 64 .-..|| !SetupStd
0430: 46 69 6c 65 28 6f 75 74 70 75 74 46 69 6c 65 2c File(outputFile,
0440: 20 54 43 4c 5f 53 54 44 4f 55 54 29 0a 2d 09 09 TCL_STDOUT).-..
0450: 7c 7c 20 28 21 6a 6f 69 6e 54 68 69 73 45 72 72 || (!joinThisErr
0460: 6f 72 20 26 26 20 21 53 65 74 75 70 53 74 64 46 or && !SetupStdF
0470: 69 6c 65 28 65 72 72 6f 72 46 69 6c 65 2c 20 54 ile(errorFile, T
0480: 43 4c 5f 53 54 44 45 52 52 29 29 0a 2b 09 69 66 CL_STDERR)).+.if
0490: 20 28 21 6a 6f 69 6e 54 68 69 73 45 72 72 6f 72 (!joinThisError
04a0: 20 26 26 20 21 53 65 74 75 70 53 74 64 46 69 6c && !SetupStdFil
04b0: 65 28 65 72 72 6f 72 46 69 6c 65 2c 20 54 43 4c e(errorFile, TCL
04c0: 5f 53 54 44 45 52 52 29 0a 20 09 09 7c 7c 20 28 _STDERR). ..|| (
04d0: 6a 6f 69 6e 54 68 69 73 45 72 72 6f 72 20 26 26 joinThisError &&
04e0: 0a 2d 09 09 09 28 28 64 75 70 32 28 31 2c 32 29 .-...((dup2(1,2)
04f0: 20 3d 3d 20 2d 31 29 20 7c 7c 20 28 66 63 6e 74 == -1) || (fcnt
0500: 6c 28 32 2c 20 46 5f 53 45 54 46 44 2c 20 30 29 l(2, F_SETFD, 0)
0510: 20 21 3d 20 30 29 29 29 29 20 7b 0a 2d 09 20 20 != 0)))) {.-.
0520: 20 20 73 70 72 69 6e 74 66 28 65 72 72 53 70 61 sprintf(errSpa
0530: 63 65 2c 0a 2d 09 09 20 20 20 20 22 25 64 66 6f ce,.-.. "%dfo
0540: 72 6b 65 64 20 70 72 6f 63 65 73 73 20 63 6f 75 rked process cou
0550: 6c 64 6e 27 74 20 73 65 74 20 75 70 20 69 6e 70 ldn't set up inp
0560: 75 74 2f 6f 75 74 70 75 74 3a 20 22 2c 20 65 72 ut/output: ", er
0570: 72 6e 6f 29 3b 0a 2d 09 20 20 20 20 28 76 6f 69 rno);.-. (voi
0580: 64 29 77 72 69 74 65 28 66 64 2c 20 65 72 72 53 d)write(fd, errS
0590: 70 61 63 65 2c 20 28 73 69 7a 65 5f 74 29 20 73 pace, (size_t) s
05a0: 74 72 6c 65 6e 28 65 72 72 53 70 61 63 65 29 29 trlen(errSpace))
05b0: 3b 0a 2d 09 20 20 20 20 5f 65 78 69 74 28 31 29 ;.-. _exit(1)
05c0: 3b 0a 2d 09 7d 0a 2b 09 09 20 20 20 20 28 28 64 ;.-.}.+.. ((d
05d0: 75 70 32 28 31 2c 32 29 20 3d 3d 20 2d 31 29 20 up2(1,2) == -1)
05e0: 7c 7c 20 28 66 63 6e 74 6c 28 32 2c 20 46 5f 53 || (fcntl(2, F_S
05f0: 45 54 46 44 2c 20 30 29 20 21 3d 20 30 29 29 29 ETFD, 0) != 0)))
0600: 29 0a 2b 09 20 20 20 20 67 6f 74 6f 20 65 72 72 ).+. goto err
0610: 6f 72 3b 0a 2b 0a 2b 09 77 68 69 6c 65 28 30 29 or;.+.+.while(0)
0620: 0a 2b 09 20 20 20 20 7b 0a 2b 09 20 20 20 20 65 .+. {.+. e
0630: 72 72 6f 72 3a 0a 2b 09 09 73 70 72 69 6e 74 66 rror:.+..sprintf
0640: 28 65 72 72 53 70 61 63 65 2c 0a 2b 09 09 09 22 (errSpace,.+..."
0650: 25 64 66 6f 72 6b 65 64 20 70 72 6f 63 65 73 73 %dforked process
0660: 20 63 6f 75 6c 64 6e 27 74 20 73 65 74 20 75 70 couldn't set up
0670: 20 69 6e 70 75 74 2f 6f 75 74 70 75 74 3a 20 22 input/output: "
0680: 2c 20 65 72 72 6e 6f 29 3b 0a 2b 09 09 28 76 6f , errno);.+..(vo
0690: 69 64 29 77 72 69 74 65 28 66 64 2c 20 65 72 72 id)write(fd, err
06a0: 53 70 61 63 65 2c 20 28 73 69 7a 65 5f 74 29 20 Space, (size_t)
06b0: 73 74 72 6c 65 6e 28 65 72 72 53 70 61 63 65 29 strlen(errSpace)
06c0: 29 3b 0a 2b 09 09 5f 65 78 69 74 28 31 29 3b 0a );.+.._exit(1);.
06d0: 2b 09 20 20 20 20 7d 0a 2b 0a 2b 09 69 66 20 28 +. }.+.+.if (
06e0: 63 6c 6f 73 65 4f 75 74 29 20 63 6c 6f 73 65 28 closeOut) close(
06f0: 47 65 74 46 64 28 6f 75 74 70 75 74 46 69 6c 65 GetFd(outputFile
0700: 29 29 3b 0a 2b 09 69 66 20 28 63 6c 6f 73 65 45 ));.+.if (closeE
0710: 72 72 29 20 63 6c 6f 73 65 28 47 65 74 46 64 28 rr) close(GetFd(
0720: 65 72 72 6f 72 46 69 6c 65 29 29 3b 0a 20 0a 20 errorFile));. .
0730: 09 2f 2a 0a 20 09 20 2a 20 43 6c 6f 73 65 20 74 ./*. . * Close t
0740: 68 65 20 69 6e 70 75 74 20 73 69 64 65 20 6f 66 he input side of
0750: 20 74 68 65 20 65 72 72 6f 72 20 70 69 70 65 2e the error pipe.
0760: 0a .