f9421f0968
MSVC 2015 has a size limit on strings; sizeof (including the terminating '\0') must not exceed 0xffff. The generator for the suffix-list data worked round this by breaking its data into chunks of at most 0xffff bytes; however, it was limiting on the strlen, not the sizeof, so was off by one. It checked for this before adding each suffix, so has (until now) always happened to break early enough; but the latest update gave an exactly 0xffff chunk, whose terminating '\0' took it over MSVC's limit. So adjust the cutoff to effectively include the terminating '\0'. Task-number: QTBUG-72623 Change-Id: I76ea40060d9fc13c0f7002c5ba22e71b8d0af787 Reviewed-by: Peter Hartmann <peter-qt@hartmann.tk>
168 lines
6.8 KiB
C++
168 lines
6.8 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2016 The Qt Company Ltd.
|
|
** Contact: https://www.qt.io/licensing/
|
|
**
|
|
** This file is part of the utils of the Qt Toolkit.
|
|
**
|
|
** $QT_BEGIN_LICENSE:GPL-EXCEPT$
|
|
** Commercial License Usage
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
** accordance with the commercial license agreement provided with the
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
** a written agreement between you and The Qt Company. For licensing terms
|
|
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
** information use the contact form at https://www.qt.io/contact-us.
|
|
**
|
|
** GNU General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
** General Public License version 3 as published by the Free Software
|
|
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
** included in the packaging of this file. Please review the following
|
|
** information to ensure the GNU General Public License requirements will
|
|
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
**
|
|
** $QT_END_LICENSE$
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include <QtCore>
|
|
|
|
static QString utf8encode(const QByteArray &array) // turns e.g. tranøy.no to tran\xc3\xb8y.no
|
|
{
|
|
QString result;
|
|
result.reserve(array.length() + array.length() / 3);
|
|
for (int i = 0; i < array.length(); ++i) {
|
|
char c = array.at(i);
|
|
// if char is non-ascii, escape it
|
|
if (c < 0x20 || uchar(c) >= 0x7f) {
|
|
result += "\\x" + QString::number(uchar(c), 16);
|
|
} else {
|
|
// if previous char was escaped, we need to make sure the next char is not
|
|
// interpreted as part of the hex value, e.g. "äc.com" -> "\xabc.com"; this
|
|
// should be "\xab""c.com"
|
|
QRegExp hexEscape("\\\\x[a-fA-F0-9][a-fA-F0-9]$");
|
|
bool isHexChar = ((c >= '0' && c <= '9') ||
|
|
(c >= 'a' && c <= 'f') ||
|
|
(c >= 'A' && c <= 'F'));
|
|
if (result.contains(hexEscape) && isHexChar)
|
|
result += "\"\"";
|
|
result += c;
|
|
}
|
|
}
|
|
return result;
|
|
}
|
|
|
|
int main(int argc, char **argv) {
|
|
|
|
QCoreApplication app(argc, argv);
|
|
if (argc < 3) {
|
|
printf("\nusage: %s inputFile outputFile\n\n", argv[0]);
|
|
printf("'inputFile' should be a list of effective TLDs, one per line,\n");
|
|
printf("as obtained from http://publicsuffix.org . To create indices and data file\n");
|
|
printf("file, do the following:\n\n");
|
|
printf(" wget https://publicsuffix.org/list/effective_tld_names.dat -O effective_tld_names.dat\n");
|
|
printf(" grep '^[^\\/\\/]' effective_tld_names.dat > effective_tld_names.dat.trimmed\n");
|
|
printf(" %s effective_tld_names.dat.trimmed effective_tld_names.dat.qt\n\n", argv[0]);
|
|
printf("Now copy the data from effective_tld_names.dat.qt to the file src/corelib/io/qurltlds_p.h in your Qt repo\n\n");
|
|
exit(1);
|
|
}
|
|
QFile file(argv[1]);
|
|
QFile outFile(argv[2]);
|
|
file.open(QIODevice::ReadOnly);
|
|
outFile.open(QIODevice::WriteOnly);
|
|
|
|
QByteArray outIndicesBufferBA;
|
|
QBuffer outIndicesBuffer(&outIndicesBufferBA);
|
|
outIndicesBuffer.open(QIODevice::WriteOnly);
|
|
|
|
QByteArray outDataBufferBA;
|
|
QBuffer outDataBuffer(&outDataBufferBA);
|
|
outDataBuffer.open(QIODevice::WriteOnly);
|
|
|
|
int lineCount = 0;
|
|
while (!file.atEnd()) {
|
|
file.readLine();
|
|
lineCount++;
|
|
}
|
|
file.reset();
|
|
QVector<QString> strings(lineCount);
|
|
while (!file.atEnd()) {
|
|
QString s = QString::fromUtf8(file.readLine());
|
|
QString st = s.trimmed();
|
|
int num = qt_hash(st) % lineCount;
|
|
|
|
QString utf8String = utf8encode(st.toUtf8());
|
|
|
|
// for domain 1.com, we could get something like
|
|
// a.com\01.com, which would be interpreted as octal 01,
|
|
// so we need to separate those strings with quotes
|
|
QRegExp regexpOctalEscape(QLatin1String("^[0-9]"));
|
|
if (!strings.at(num).isEmpty() && st.contains(regexpOctalEscape))
|
|
strings[num].append("\"\"");
|
|
|
|
strings[num].append(utf8String);
|
|
strings[num].append("\\0");
|
|
}
|
|
|
|
outIndicesBuffer.write("static const quint16 tldCount = ");
|
|
outIndicesBuffer.write(QByteArray::number(lineCount));
|
|
outIndicesBuffer.write(";\n");
|
|
outIndicesBuffer.write("static const quint32 tldIndices[");
|
|
// outIndicesBuffer.write(QByteArray::number(lineCount+1)); // not needed
|
|
outIndicesBuffer.write("] = {\n");
|
|
|
|
int totalUtf8Size = 0;
|
|
int chunkSize = 0; // strlen of the current chunk (sizeof is bigger by 1)
|
|
int stringUtf8Size = 0;
|
|
QStringList chunks;
|
|
for (int a = 0; a < lineCount; a++) {
|
|
bool lineIsEmpty = strings.at(a).isEmpty();
|
|
if (!lineIsEmpty) {
|
|
strings[a].prepend("\"");
|
|
strings[a].append("\"");
|
|
}
|
|
int zeroCount = strings.at(a).count(QLatin1String("\\0"));
|
|
int utf8CharsCount = strings.at(a).count(QLatin1String("\\x"));
|
|
int quoteCount = strings.at(a).count('"');
|
|
stringUtf8Size = strings.at(a).count() - (zeroCount + quoteCount + utf8CharsCount * 3);
|
|
chunkSize += stringUtf8Size;
|
|
// MSVC 2015 chokes if sizeof(a single string) > 0xffff
|
|
if (chunkSize >= 0xffff) {
|
|
static int chunkCount = 0;
|
|
qWarning() << "chunk" << ++chunkCount << "has length" << chunkSize - stringUtf8Size;
|
|
outDataBuffer.write(",\n\n");
|
|
chunks.append(QByteArray::number(totalUtf8Size));
|
|
chunkSize = 0;
|
|
}
|
|
outDataBuffer.write(strings.at(a).toUtf8());
|
|
if (!lineIsEmpty)
|
|
outDataBuffer.write("\n");
|
|
outIndicesBuffer.write(QByteArray::number(totalUtf8Size));
|
|
outIndicesBuffer.write(",\n");
|
|
totalUtf8Size += stringUtf8Size;
|
|
}
|
|
chunks.append(QByteArray::number(totalUtf8Size));
|
|
outIndicesBuffer.write(QByteArray::number(totalUtf8Size));
|
|
outIndicesBuffer.write("};\n");
|
|
outIndicesBuffer.close();
|
|
outFile.write(outIndicesBufferBA);
|
|
|
|
outDataBuffer.close();
|
|
outFile.write("\nstatic const char *tldData[");
|
|
// outFile.write(QByteArray::number(charSize)); // not needed
|
|
outFile.write("] = {\n");
|
|
outFile.write(outDataBufferBA);
|
|
outFile.write("};\n");
|
|
|
|
// write chunk information
|
|
outFile.write("\nstatic const quint16 tldChunkCount = ");
|
|
outFile.write(QByteArray::number(chunks.count()));
|
|
outFile.write(";\nstatic const quint32 tldChunks[] = {");
|
|
outFile.write(chunks.join(", ").toLatin1());
|
|
outFile.write("};\n");
|
|
outFile.close();
|
|
printf("data generated to %s . Now copy the data from this file to src/corelib/io/qurltlds_p.h in your Qt repo\n", argv[2]);
|
|
exit(0);
|
|
}
|