comparison src/doc.c @ 647:b39c14581166

[xemacs-hg @ 2001-08-13 04:45:47 by ben] removal of unsigned, size_t, etc.
author ben
date Mon, 13 Aug 2001 04:46:48 +0000
parents 183866b06e0b
children fdefd0186b75
comparison
equal deleted inserted replaced
646:00c54252fe4f 647:b39c14581166
194 If it is relative, combine it with Vdoc_directory. */ 194 If it is relative, combine it with Vdoc_directory. */
195 195
196 tem = Ffile_name_absolute_p (file); 196 tem = Ffile_name_absolute_p (file);
197 if (NILP (tem)) 197 if (NILP (tem))
198 { 198 {
199 size_t minsize; 199 Bytecount minsize;
200 /* XEmacs: Move this check here. OK if called during loadup to 200 /* XEmacs: Move this check here. OK if called during loadup to
201 load byte code instructions. */ 201 load byte code instructions. */
202 if (!STRINGP (Vdoc_directory)) 202 if (!STRINGP (Vdoc_directory))
203 return Qnil; 203 return Qnil;
204 204
205 minsize = XSTRING_LENGTH (Vdoc_directory); 205 minsize = XSTRING_LENGTH (Vdoc_directory);
206 /* sizeof ("../lib-src/") == 12 */ 206 /* sizeof ("../lib-src/") == 12 */
207 if (minsize < 12) 207 if (minsize < 12)
208 minsize = 12; 208 minsize = 12;
209 name_nonreloc = (char *) alloca (minsize + XSTRING_LENGTH (file) + 8); 209 name_nonreloc =
210 (char *) alloca (minsize + XSTRING_LENGTH (file) + 8);
210 string_join (name_nonreloc, Vdoc_directory, file); 211 string_join (name_nonreloc, Vdoc_directory, file);
211 } 212 }
212 else 213 else
213 name_reloc = file; 214 name_reloc = file;
214 215
451 filled = 0; 452 filled = 0;
452 pos = 0; 453 pos = 0;
453 while (1) 454 while (1)
454 { 455 {
455 if (filled < 512) 456 if (filled < 512)
456 filled += read (fd, &buf[filled], sizeof buf - 1 - filled); 457 filled += read (fd, &buf[filled], sizeof (buf) - 1 - filled);
457 if (!filled) 458 if (!filled)
458 break; 459 break;
459 460
460 buf[filled] = 0; 461 buf[filled] = 0;
461 p = buf; 462 p = buf;