organicmaps/libexpat
13
Fork 0
mirror of https://github.com/libexpat/libexpat.git synced 2025-04-06 13:45:00 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

xmlwf: Support custom buffer size for XML_GetBuffer and read

Browse source
This commit is contained in:
Sebastian Pipping 2023-09-28 15:56:42 +02:00
parent f2a9d1155b
commit d248e7e923
4 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
expat/xmlwf/xmlfile.c
View file

@ -71,11 +71,7 @@
# endif
#endif
#ifdef _DEBUG
# define READ_SIZE 16
#else
# define READ_SIZE (1024 * 8)
#endif
int g_read_size_bytes = 1024 * 8;
typedef struct {
XML_Parser parser;
@ -195,7 +191,7 @@ processStream(const XML_Char *filename, XML_Parser parser) {
}
for (;;) {
int nread;
char *buf = (char *)XML_GetBuffer(parser, READ_SIZE);
char *buf = (char *)XML_GetBuffer(parser, g_read_size_bytes);
if (! buf) {
if (filename != NULL)
close(fd);
@ -203,7 +199,7 @@ processStream(const XML_Char *filename, XML_Parser parser) {
filename != NULL ? filename : T("xmlwf"));
return 0;
}
nread = read(fd, buf, READ_SIZE);
nread = read(fd, buf, g_read_size_bytes);
if (nread < 0) {
tperror(filename != NULL ? filename : T("STDIN"));
if (filename != NULL)

2
expat/xmlwf/xmlfile.h
View file

@ -42,5 +42,7 @@
# define XML_FMT_INT_MOD "l"
#endif
extern int g_read_size_bytes;
extern int XML_ProcessFile(XML_Parser parser, const XML_Char *filename,
unsigned flags);

21
expat/xmlwf/xmlwf.c
View file

@ -899,6 +899,7 @@ usage(const XML_Char *prog, int rc) {
T(" -e ENCODING override any in-document [e]ncoding declaration\n")
T(" -w enable support for [W]indows code pages\n")
T(" -r disable memory-mapping and use [r]ead calls instead\n")
T(" -g BYTES buffer size to request per call pair to XML_[G]etBuffer and read (default: 8 KiB)\n")
T(" -k when processing multiple files, [k]eep processing after first file with error\n")
T("\n")
T("output control arguments:\n")
@ -1042,6 +1043,26 @@ tmain(int argc, XML_Char **argv) {
case T('v'):
showVersion(argv[0]);
return 0;
case T('g'): {
const XML_Char *valueText = NULL;
XMLWF_SHIFT_ARG_INTO(valueText, argc, argv, i, j);
errno = 0;
XML_Char *afterValueText = (XML_Char *)valueText;
const long long read_size_bytes_candidate
= tcstoull(valueText, &afterValueText, 10);
if ((errno != 0) || (afterValueText[0] != T('\0'))
|| (read_size_bytes_candidate < 1)
|| (read_size_bytes_candidate > (INT_MAX / 2 + 1))) {
// This prevents tperror(..) from reporting misleading "[..]: Success"
errno = ERANGE;
tperror(T("invalid buffer size") T(
" (needs an integer from 1 to INT_MAX/2+1 i.e. 1,073,741,824 on most platforms)"));
exit(XMLWF_EXIT_USAGE_ERROR);
}
g_read_size_bytes = (int)read_size_bytes_candidate;
break;
}
case T('k'):
continueOnError = 1;
j++;

1
expat/xmlwf/xmlwf_helpgen.py
View file

@ -63,6 +63,7 @@ input_related.add_argument('-x', action='store_true', help='enable processing of
input_related.add_argument('-e', action='store', metavar='ENCODING', help='override any in-document [e]ncoding declaration')
input_related.add_argument('-w', action='store_true', help='enable support for [W]indows code pages')
input_related.add_argument('-r', action='store_true', help='disable memory-mapping and use [r]ead calls instead')
input_related.add_argument('-g', metavar='BYTES', help='buffer size to request per call pair to XML_[G]etBuffer and read (default: 8 KiB)')
input_related.add_argument('-k', action='store_true', help='when processing multiple files, [k]eep processing after first file with error')
output_related = parser.add_argument_group('output control arguments')