Mercurial > hg > xemacs-beta
view src/ndir.h @ 5784:0cb4f494a548
Have the result of coding_character_tell() reflect str->convert_to, too.
src/ChangeLog addition:
2014-01-22 Aidan Kehoe <kehoea@parhasard.net>
* text.c (buffered_bytecount_to_charcount): New.
Return the number of characters in a coding or lstream buffer,
including partial characters at the beginning of the buffer, but
not including those at the end. Refactored from
Lstream_character_tell().
* text.h:
* text.h (buffered_bytecount_to_charcount): Declare it.
* lstream.c (Lstream_character_tell):
Use the refactored buffered_bytecount_to_charcount () here, both
for the unget buffer and in_buffer.
* file-coding.c (coding_character_tell):
Check the character count of the lstream buffer too, when passing
back the character count from the coding stream.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Wed, 22 Jan 2014 17:52:00 +0000 |
parents | 308d34e9f07d |
children | 574f0cded429 |
line wrap: on
line source
/* definitions for 4.2BSD-compatible directory access This file is part of XEmacs. XEmacs is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ /* Synched up with: FSF 19.30. */ #ifndef INCLUDED_ndir_h_ #define INCLUDED_ndir_h_ #define DIRBLKSIZ 512 /* size of directory block */ #ifdef WIN32_NATIVE #define MAXNAMLEN 4095 #else /* not WIN32_NATIVE */ #define MAXNAMLEN 15 /* maximum filename length */ #endif /* not WIN32_NATIVE */ /* NOTE: MAXNAMLEN must be one less than a multiple of 4 */ struct direct /* data from readdir() */ { long d_ino; /* inode number of entry */ unsigned short d_reclen; /* length of this record */ unsigned short d_namlen; /* length of string in d_name */ char d_name[MAXNAMLEN+1]; /* name of file */ }; typedef struct { int dd_fd; /* file descriptor */ int dd_loc; /* offset in block */ int dd_size; /* amount of valid data */ char dd_buf[DIRBLKSIZ]; /* directory block */ } DIR; /* stream data from opendir() */ #ifdef WIN32_NATIVE DIR *mswindows_opendir (const Ibyte *filename); int mswindows_closedir (DIR *dirp); struct direct *mswindows_readdir (DIR *dirp); #else /* not WIN32_NATIVE */ DIR *opendir (const Extbyte *filename); int closedir (DIR *dirp); struct direct *readdir (DIR *dirp); struct direct *readdirver (DIR *dirp); long telldir (DIR *dirp); void seekdir (DIR *dirp, long loc); #define rewinddir( dirp ) seekdir( dirp, 0L ) #endif /* WIN32_NATIVE */ #endif /* INCLUDED_ndir_h_ */