Tcl Source Code

Hex Artifact Content
Login

Artifact 23e35f75790a3f6513d428c44c128b2a5288fc57:

Attachment "tfn.diff" to ticket [971976ffff] added by dkf 2004-07-05 01:22:58.
0000: 49 6e 64 65 78 3a 20 67 65 6e 65 72 69 63 2f 74  Index: generic/t
0010: 63 6c 46 69 6c 65 4e 61 6d 65 2e 63 0a 3d 3d 3d  clFileName.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 3d 3d 3d  ================
0060: 0a 52 43 53 20 66 69 6c 65 3a 20 2f 63 76 73 72  .RCS file: /cvsr
0070: 6f 6f 74 2f 74 63 6c 2f 74 63 6c 2f 67 65 6e 65  oot/tcl/tcl/gene
0080: 72 69 63 2f 74 63 6c 46 69 6c 65 4e 61 6d 65 2e  ric/tclFileName.
0090: 63 2c 76 0a 72 65 74 72 69 65 76 69 6e 67 20 72  c,v.retrieving r
00a0: 65 76 69 73 69 6f 6e 20 31 2e 35 35 0a 64 69 66  evision 1.55.dif
00b0: 66 20 2d 75 20 2d 72 31 2e 35 35 20 74 63 6c 46  f -u -r1.55 tclF
00c0: 69 6c 65 4e 61 6d 65 2e 63 0a 2d 2d 2d 20 67 65  ileName.c.--- ge
00d0: 6e 65 72 69 63 2f 74 63 6c 46 69 6c 65 4e 61 6d  neric/tclFileNam
00e0: 65 2e 63 09 38 20 4d 61 79 20 32 30 30 34 20 31  e.c.8 May 2004 1
00f0: 35 3a 35 31 3a 34 31 20 2d 30 30 30 30 09 31 2e  5:51:41 -0000.1.
0100: 35 35 0a 2b 2b 2b 20 67 65 6e 65 72 69 63 2f 74  55.+++ generic/t
0110: 63 6c 46 69 6c 65 4e 61 6d 65 2e 63 09 34 20 4a  clFileName.c.4 J
0120: 75 6c 20 32 30 30 34 20 31 38 3a 32 31 3a 33 30  ul 2004 18:21:30
0130: 20 2d 30 30 30 30 0a 40 40 20 2d 37 35 34 2c 31   -0000.@@ -754,1
0140: 30 20 2b 37 35 34 2c 38 20 40 40 0a 20 09 09 20  0 +754,8 @@. .. 
0150: 20 20 20 77 68 69 6c 65 20 28 70 5b 31 5d 20 3d     while (p[1] =
0160: 3d 20 27 2f 27 29 20 7b 0a 20 09 09 09 70 2b 2b  = '/') {. ...p++
0170: 3b 0a 20 09 09 20 20 20 20 7d 0a 2d 09 09 20 20  ;. ..    }.-..  
0180: 20 20 69 66 20 28 70 5b 31 5d 20 21 3d 20 27 5c    if (p[1] != '\
0190: 30 27 29 20 7b 0a 2d 09 09 09 69 66 20 28 6e 65  0') {.-...if (ne
01a0: 65 64 73 53 65 70 29 20 7b 0a 2d 09 09 09 20 20  edsSep) {.-...  
01b0: 20 20 2a 64 65 73 74 2b 2b 20 3d 20 27 2f 27 3b    *dest++ = '/';
01c0: 0a 2d 09 09 09 7d 0a 2b 09 09 20 20 20 20 69 66  .-...}.+..    if
01d0: 20 28 6e 65 65 64 73 53 65 70 29 20 7b 0a 2b 09   (needsSep) {.+.
01e0: 09 09 2a 64 65 73 74 2b 2b 20 3d 20 27 2f 27 3b  ..*dest++ = '/';
01f0: 0a 20 09 09 20 20 20 20 7d 0a 20 09 09 7d 20 65  . ..    }. ..} e
0200: 6c 73 65 20 7b 0a 20 09 09 20 20 20 20 2a 64 65  lse {. ..    *de
0210: 73 74 2b 2b 20 3d 20 2a 70 3b 0a 40 40 20 2d 37  st++ = *p;.@@ -7
0220: 39 32 2c 37 20 2b 37 39 30 2c 37 20 40 40 0a 20  92,7 +790,7 @@. 
0230: 09 09 20 20 20 20 77 68 69 6c 65 20 28 28 70 5b  ..    while ((p[
0240: 31 5d 20 3d 3d 20 27 2f 27 29 20 7c 7c 20 28 70  1] == '/') || (p
0250: 5b 31 5d 20 3d 3d 20 27 5c 5c 27 29 29 20 7b 0a  [1] == '\\')) {.
0260: 20 09 09 09 70 2b 2b 3b 0a 20 09 09 20 20 20 20   ...p++;. ..    
0270: 7d 0a 2d 09 09 20 20 20 20 69 66 20 28 28 70 5b  }.-..    if ((p[
0280: 31 5d 20 21 3d 20 27 5c 30 27 29 20 26 26 20 6e  1] != '\0') && n
0290: 65 65 64 73 53 65 70 29 20 7b 0a 2b 09 09 20 20  eedsSep) {.+..  
02a0: 20 20 69 66 20 28 6e 65 65 64 73 53 65 70 29 20    if (needsSep) 
02b0: 7b 0a 20 09 09 09 2a 64 65 73 74 2b 2b 20 3d 20  {. ...*dest++ = 
02c0: 27 2f 27 3b 0a 20 09 09 20 20 20 20 7d 0a 20 09  '/';. ..    }. .
02d0: 09 7d 20 65 6c 73 65 20 7b 0a                    .} else {.