Artifact
470bf11c0e245d8bcb866e6d2d1d70de08a5c20278477aad696c2ed00c11b4b8:
Attachment "file-delete-racecond.diff" to
ticket [27b6822849]
added by
raimue
2018-04-06 14:05:33.
(unpublished)
0000: 49 6e 64 65 78 3a 20 67 65 6e 65 72 69 63 2f 74 Index: generic/t
0010: 63 6c 46 43 6d 64 2e 63 0a 3d 3d 3d 3d 3d 3d 3d clFCmd.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 0a 2d 2d 2d 20 ===========.---
0060: 67 65 6e 65 72 69 63 2f 74 63 6c 46 43 6d 64 2e generic/tclFCmd.
0070: 63 0a 2b 2b 2b 20 67 65 6e 65 72 69 63 2f 74 63 c.+++ generic/tc
0080: 6c 46 43 6d 64 2e 63 0a 40 40 20 2d 34 30 31 2c lFCmd.c.@@ -401,
0090: 31 30 20 2b 34 30 31 2c 31 38 20 40 40 0a 20 09 10 +401,18 @@. .
00a0: 09 20 20 20 20 65 72 72 66 69 6c 65 20 3d 20 6f . errfile = o
00b0: 62 6a 76 5b 69 5d 3b 0a 20 09 09 7d 0a 20 09 20 bjv[i];. ..}. .
00c0: 20 20 20 7d 0a 20 09 7d 20 65 6c 73 65 20 7b 0a }. .} else {.
00d0: 20 09 20 20 20 20 72 65 73 75 6c 74 20 3d 20 54 . result = T
00e0: 63 6c 5f 46 53 44 65 6c 65 74 65 46 69 6c 65 28 cl_FSDeleteFile(
00f0: 6f 62 6a 76 5b 69 5d 29 3b 0a 2b 20 20 20 20 20 objv[i]);.+
0100: 20 20 20 20 20 20 20 69 66 20 28 72 65 73 75 6c if (resul
0110: 74 20 21 3d 20 54 43 4c 5f 4f 4b 20 26 26 20 65 t != TCL_OK && e
0120: 72 72 6e 6f 20 3d 3d 20 45 4e 4f 45 4e 54 29 20 rrno == ENOENT)
0130: 7b 0a 2b 20 20 20 20 20 20 20 20 20 20 20 20 20 {.+
0140: 20 20 20 2f 2a 0a 2b 20 20 20 20 20 20 20 20 20 /*.+
0150: 20 20 20 20 20 20 20 20 2a 20 54 68 65 20 66 69 * The fi
0160: 6c 65 20 77 61 73 20 61 6c 72 65 61 64 79 20 64 le was already d
0170: 65 6c 65 74 65 64 20 62 65 66 6f 72 65 20 77 65 eleted before we
0180: 20 63 6f 75 6c 64 20 64 6f 20 69 74 2e 0a 2b 20 could do it..+
0190: 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20
01a0: 2a 20 44 65 6c 65 74 69 6e 67 20 61 20 6e 6f 6e * Deleting a non
01b0: 2d 65 78 69 73 74 65 6e 74 20 66 69 6c 65 20 69 -existent file i
01c0: 73 20 6e 6f 74 20 61 6e 20 65 72 72 6f 72 2e 0a s not an error..
01d0: 2b 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 +
01e0: 20 20 2a 2f 0a 2b 0a 2b 20 20 20 20 20 20 20 20 */.+.+
01f0: 20 20 20 20 20 20 20 20 72 65 73 75 6c 74 20 3d result =
0200: 20 54 43 4c 5f 4f 4b 3b 0a 2b 20 20 20 20 20 20 TCL_OK;.+
0210: 20 20 20 20 20 20 7d 0a 20 09 7d 0a 20 0a 20 09 }. .}. . .
0220: 69 66 20 28 72 65 73 75 6c 74 20 21 3d 20 54 43 if (result != TC
0230: 4c 5f 4f 4b 29 20 7b 0a 20 09 20 20 20 20 72 65 L_OK) {. . re
0240: 73 75 6c 74 20 3d 20 54 43 4c 5f 45 52 52 4f 52 sult = TCL_ERROR
0250: 3b 0a 20 0a 0a ;. ..