From c68ecb8b21bef3908cb17f8d1d4af694bf7e7137 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Mon, 27 Mar 2000 03:37:59 -0500 Subject: snapshot of project "lynx", label v2-8-3dev_23 --- WWW/Library/Implementation/HTFile.c | 72 ++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 41 deletions(-) (limited to 'WWW/Library/Implementation/HTFile.c') diff --git a/WWW/Library/Implementation/HTFile.c b/WWW/Library/Implementation/HTFile.c index e5596265..571968c9 100644 --- a/WWW/Library/Implementation/HTFile.c +++ b/WWW/Library/Implementation/HTFile.c @@ -121,7 +121,6 @@ PUBLIC int HTDirReadme = HT_DIR_README_TOP; #endif /* DIRED_SUPPORT */ extern BOOL HTPassEightBitRaw; -extern HTCJKlang HTCJK; PRIVATE char *HTMountRoot = "/Net/"; /* Where to find mounts */ #ifdef VMS @@ -716,6 +715,9 @@ PUBLIC char * HTnameOfFile_WWW ARGS3( FREE(path); FREE(acc_method); + CTRACE((tfp, "HTnameOfFile_WWW(%s,%d,%d) = %s\n", + name, WWW_prefix, expand_all, result)); + return result; } @@ -1445,6 +1447,9 @@ PUBLIC BOOL HTDirTitles ARGS3( /* ** Make link back to parent directory. */ +#ifdef DOSPATH + if (current != path) /* leave "/c:" alone */ +#endif if (current && current[1]) { /* was a slash AND something else too */ char * parent = NULL; char * relative = NULL; @@ -1466,15 +1471,14 @@ PUBLIC BOOL HTDirTitles ARGS3( #ifdef DOSPATH if (local_link) { - if (strlen(parent) == 3 ) + if (parent != 0 && strlen(parent) == 3 ) { StrAllocCat(relative, "/."); + } } + else #endif #if !defined (VMS) -#ifdef DOSPATH - if(!local_link) -#endif { /* ** On Unix, if it's not ftp and the directory cannot @@ -1571,13 +1575,9 @@ PUBLIC BOOL HTDirTitles ARGS3( PRIVATE void do_readme ARGS2(HTStructured *, target, CONST char *, localname) { FILE * fp; - char * readme_file_name = - malloc(strlen(localname)+ 1 + strlen(HT_DIR_README_FILE) + 1); - if (readme_file_name == NULL) - outofmem(__FILE__, "do_readme"); - strcpy(readme_file_name, localname); - strcat(readme_file_name, "/"); - strcat(readme_file_name, HT_DIR_README_FILE); + char * readme_file_name = NULL; + + HTSprintf0(&readme_file_name, "%s/%s", localname, HT_DIR_README_FILE); fp = fopen(readme_file_name, "r"); @@ -1635,6 +1635,7 @@ PRIVATE int print_local_dir ARGS5( BOOL need_parent_link = FALSE; struct stat file_info; int status; + int i; CTRACE((tfp, "print_local_dir() started\n")); @@ -1675,10 +1676,8 @@ PRIVATE int print_local_dir ARGS5( target = HTML_new(anchor, format_out, sink); targetClass = *target->isa; /* Copy routine entry points */ - { int i; - for (i = 0; i < HTML_A_ATTRIBUTES; i++) - present[i] = (BOOL) (i == HTML_A_HREF); - } + for (i = 0; i < HTML_A_ATTRIBUTES; i++) + present[i] = (BOOL) (i == HTML_A_HREF); /* ** The need_parent_link flag will be set if an @@ -2100,14 +2099,9 @@ PUBLIC int HTLoadFile ARGS4( } if (HTDirAccess == HT_DIR_SELECTIVE) { - char * enable_file_name = - malloc(strlen(filename)+ 1 + - strlen(HT_DIR_ENABLE_FILE) + 1); - if (enable_file_name == NULL) - outofmem(__FILE__, "HTLoadFile"); - strcpy(enable_file_name, filename); - strcat(enable_file_name, "/"); - strcat(enable_file_name, HT_DIR_ENABLE_FILE); + char * enable_file_name = NULL; + + HTSprintf0(&enable_file_name, "%s/%s", filename, HT_DIR_ENABLE_FILE); if (HTStat(enable_file_name, &stat_info) == -1) { FREE(filename); FREE(nodename); @@ -2476,14 +2470,9 @@ PUBLIC int HTLoadFile ARGS4( if (HTDirAccess == HT_DIR_SELECTIVE) { - char * enable_file_name = - malloc(strlen(localname)+ 1 + - strlen(HT_DIR_ENABLE_FILE) + 1); - if (enable_file_name == NULL) - outofmem(__FILE__, "HTLoadFile"); - strcpy(enable_file_name, localname); - strcat(enable_file_name, "/"); - strcat(enable_file_name, HT_DIR_ENABLE_FILE); + char * enable_file_name = NULL; + + HTSprintf0(&enable_file_name, "%s/%s", localname, HT_DIR_ENABLE_FILE); if (stat(enable_file_name, &file_info) != 0) { FREE(localname); FREE(nodename); @@ -2492,6 +2481,7 @@ PUBLIC int HTLoadFile ARGS4( } } + CTRACE((tfp, "Opening directory %s\n", localname)); dp = opendir(localname); if (!dp) { FREE(localname); @@ -2535,7 +2525,7 @@ PUBLIC int HTLoadFile ARGS4( CTRACE((tfp, "HTLoadFile: Opening `%s' gives %p\n", localname, (void*)fp)); if (fp) { /* Good! */ - int len; + int len2; char *cp = NULL; if (HTEditable(localname)) { @@ -2571,11 +2561,11 @@ PUBLIC int HTLoadFile ARGS4( StrAllocCopy(anchor->content_encoding, HTAtom_name(myEncoding)); format = HTAtom_for("www/compressed"); } - } else if ((len = strlen(localname)) > 2) { - if (localname[len - 1] == 'Z' && - localname[len - 2] == '.') { + } else if ((len2 = strlen(localname)) > 2) { + if (localname[len2 - 1] == 'Z' && + localname[len2 - 2] == '.') { StrAllocCopy(cp, localname); - cp[len - 2] = '\0'; + cp[len2 - 2] = '\0'; format = HTFileFormat(cp, &encoding, NULL); FREE(cp); format = HTCharsetFormat(format, anchor, @@ -2583,12 +2573,12 @@ PUBLIC int HTLoadFile ARGS4( StrAllocCopy(anchor->content_type, format->name); StrAllocCopy(anchor->content_encoding, "x-compress"); format = HTAtom_for("www/compressed"); - } else if ((len > 3) && - !strcasecomp((char *)&localname[len - 2], + } else if ((len2 > 3) && + !strcasecomp((char *)&localname[len2 - 2], "gz") && - localname[len - 3] == '.') { + localname[len2 - 3] == '.') { StrAllocCopy(cp, localname); - cp[len - 3] = '\0'; + cp[len2 - 3] = '\0'; format = HTFileFormat(cp, &encoding, NULL); FREE(cp); format = HTCharsetFormat(format, anchor, -- cgit 1.4.1-2-gfad0 2b9'>^ 
4a943d4e ^



83c67014 ^

4a943d4e ^












fc455c96 ^


50dcc0c1 ^


c442a5ad ^

fc455c96 ^



fc455c96 ^



0f851e48 ^

50dcc0c1 ^

82a24dfc ^

4a943d4e ^




83c67014 ^

4a943d4e ^












fc455c96 ^


50dcc0c1 ^


fc455c96 ^

066e01f8 ^

fc455c96 ^





4a943d4e ^




83c67014 ^

4a943d4e ^












fc455c96 ^



0f851e48 ^

50dcc0c1 ^

82a24dfc ^

4a943d4e ^




83c67014 ^

4a943d4e ^












fc455c96 ^


5c26afb1 ^

50dcc0c1 ^

fc455c96 ^

066e01f8 ^

fc455c96 ^





4a943d4e ^




83c67014 ^

4a943d4e ^












fc455c96 ^



0f851e48 ^

656b840e ^


82a24dfc ^

4a943d4e ^






83c67014 ^

4a943d4e ^












fc455c96 ^


50dcc0c1 ^


fc455c96 ^

066e01f8 ^

fc455c96 ^




94f2de6d ^

aaab91b8 ^

94f2de6d ^






fc455c96 ^

4a943d4e ^






83c67014 ^

4a943d4e ^












fc455c96 ^



0f851e48 ^

656b840e ^


82a24dfc ^

4a943d4e ^





83c67014 ^

4a943d4e ^












fc455c96 ^


50dcc0c1 ^


fc455c96 ^

066e01f8 ^

fc455c96 ^




94f2de6d ^








fc455c96 ^

4a943d4e ^





83c67014 ^

4a943d4e ^












fc455c96 ^



0f851e48 ^

656b840e ^


82a24dfc ^

4a943d4e ^






83c67014 ^

4a943d4e ^












fc455c96 ^


50dcc0c1 ^


fc455c96 ^

066e01f8 ^

fc455c96 ^




ce27f90f ^

94f2de6d ^







fc455c96 ^

4a943d4e ^






83c67014 ^

4a943d4e ^












fc455c96 ^



0f851e48 ^

656b840e ^


82a24dfc ^

4a943d4e ^






83c67014 ^

4a943d4e ^



















83c67014 ^

4a943d4e ^












fc455c96 ^


50dcc0c1 ^


fc455c96 ^

066e01f8 ^

fc455c96 ^




94f2de6d ^








fc455c96 ^

4a943d4e ^






83c67014 ^

4a943d4e ^












f9f419af ^
























1

2
3
4

5

6

7

8
9
10

11

12
13
14
15
16
17
18
19
20
21
22
23

24
25

26
27

28

29
30
31

32
33
34

35

36

37

38
39
40
41

42

43
44
45
46
47
48
49
50
51
52
53
54

55
56

57
58

59

60

61
62
63
64
65

66
67
68
69

70

71
72
73
74
75
76
77
78
79
80
81
82

83
84
85

86

87

88

89
90
91
92

93

94
95
96
97
98
99
100
101
102
103
104
105

106
107

108

109

110

111

112
113
114
115
116

117
118
119
120

121

122
123
124
125
126
127
128
129
130
131
132
133

134
135
136

137

138
139

140

141
142
143
144
145
146

147

148
149
150
151
152
153
154
155
156
157
158
159

160
161

162
163

164

165

166
167
168
169

170

171

172
173
174
175
176
177

178

179
180
181
182
183
184

185

186
187
188
189
190
191
192
193
194
195
196
197

198
199
200

201

202
203

204

205
206
207
208
209

210

211
212
213
214
215
216
217
218
219
220
221
222

223
224

225
226

227

228

229
230
231
232

233
234
235
236
237
238
239
240

241

242
243
244
245
246

247

248
249
250
251
252
253
254
255
256
257
258
259

260
261
262

263

264
265

266

267
268
269
270
271
272

273

274
275
276
277
278
279
280
281
282
283
284
285

286
287

288
289

290

291

292
293
294
295

296

297
298
299
300
301
302
303

304

305
306
307
308
309
310

311

312
313
314
315
316
317
318
319
320
321
322
323

324
325
326

327

328
329

330

331
332
333
334
335
336

337

338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356

357

358
359
360
361
362
363
364
365
366
367
368
369

370
371

372
373

374

375

376
377
378
379

380
381
382
383
384
385
386
387

388

389
390
391
392
393
394

395

396
397
398
399
400
401
402
403
404
405
406
407

408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431