Process UDF label correctly when creating new UDF file system
Mkudffs from udftools prior to version 1.1 damages the label if it contains non-ASCII characters. The Volume Identifier (--vid) can only contain 30 bytes, either 30 ISO-8859-1 (Latin 1) characters or 15 UCS-2BE characters. Store the most characters possible in the Volume Identifier.
This commit is contained in:
parent
2a118753ae
commit
db13a4bab9
108
src/fs/udf.cpp
108
src/fs/udf.cpp
|
@ -23,6 +23,7 @@
|
||||||
|
|
||||||
#include <KLocalizedString>
|
#include <KLocalizedString>
|
||||||
|
|
||||||
|
#include <QRegularExpression>
|
||||||
#include <QString>
|
#include <QString>
|
||||||
#include <QStringList>
|
#include <QStringList>
|
||||||
|
|
||||||
|
@ -37,6 +38,7 @@ constexpr qint64 MIN_UDF_BLOCKS = 282;
|
||||||
constexpr qint64 MAX_UDF_BLOCKS = ((1ULL << 32) - 1);
|
constexpr qint64 MAX_UDF_BLOCKS = ((1ULL << 32) - 1);
|
||||||
|
|
||||||
FileSystem::CommandSupportType udf::m_Create = FileSystem::cmdSupportNone;
|
FileSystem::CommandSupportType udf::m_Create = FileSystem::cmdSupportNone;
|
||||||
|
bool udf::m_OnlyAsciiLabel = false;
|
||||||
|
|
||||||
udf::udf(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label) :
|
udf::udf(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label) :
|
||||||
FileSystem(firstsector, lastsector, sectorsused, label, FileSystem::Udf)
|
FileSystem(firstsector, lastsector, sectorsused, label, FileSystem::Udf)
|
||||||
|
@ -46,6 +48,10 @@ udf::udf(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QStrin
|
||||||
void udf::init()
|
void udf::init()
|
||||||
{
|
{
|
||||||
m_Create = findExternal(QStringLiteral("mkudffs"), {}, 1) ? cmdSupportFileSystem : cmdSupportNone;
|
m_Create = findExternal(QStringLiteral("mkudffs"), {}, 1) ? cmdSupportFileSystem : cmdSupportNone;
|
||||||
|
|
||||||
|
// Detect old mkudffs prior to version 1.1 by lack of --label option
|
||||||
|
ExternalCommand cmd(QStringLiteral("mkudffs"), { QStringLiteral("--help") });
|
||||||
|
m_OnlyAsciiLabel = cmd.run(-1) && !cmd.output().contains(QStringLiteral("--label"));
|
||||||
}
|
}
|
||||||
|
|
||||||
bool udf::supportToolFound() const
|
bool udf::supportToolFound() const
|
||||||
|
@ -78,58 +84,82 @@ qint64 udf::maxLabelLength() const
|
||||||
|
|
||||||
bool udf::create(Report& report, const QString& deviceNode)
|
bool udf::create(Report& report, const QString& deviceNode)
|
||||||
{
|
{
|
||||||
int blkSize = blockSize(report, deviceNode);
|
return createWithLabel(report, deviceNode, QString());
|
||||||
if (blkSize == -1)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
ExternalCommand cmd(report, QStringLiteral("mkudffs"), {
|
|
||||||
QStringLiteral("--utf8"),
|
|
||||||
// TODO: Add GUI option for choosing different optical disks and UDF revision
|
|
||||||
// For now format as UDF revision 2.01 for hard disk media type
|
|
||||||
QStringLiteral("--media-type=hd"),
|
|
||||||
QStringLiteral("--udfrev=0x201"),
|
|
||||||
QStringLiteral("--blocksize=") + QString::number(blkSize),
|
|
||||||
// TODO: Pass label as udf::create() parameter
|
|
||||||
// QStringLiteral("--lvid=") + label,
|
|
||||||
// QStringLiteral("--vid=") + shortlabel,
|
|
||||||
deviceNode
|
|
||||||
});
|
|
||||||
return cmd.run(-1) && cmd.exitCode() == 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool udf::createWithLabel(Report& report, const QString& deviceNode, const QString& label)
|
bool udf::createWithLabel(Report& report, const QString& deviceNode, const QString& label)
|
||||||
{
|
{
|
||||||
|
// mkudffs from udftools prior to 1.1 does not check for partition limits and crashes
|
||||||
|
if (length() > MAX_UDF_BLOCKS) {
|
||||||
|
report.line() << xi18nc("@info:status", "Partition is too large");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (length() < MIN_UDF_BLOCKS) {
|
||||||
|
report.line() << xi18nc("@info:status", "Partition is too small");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
int blkSize = blockSize(report, deviceNode);
|
int blkSize = blockSize(report, deviceNode);
|
||||||
if (blkSize == -1)
|
if (blkSize == -1)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
ExternalCommand cmd(report, QStringLiteral("mkudffs"), {
|
// It is not possible to create UDF filesystem without a label or with empty label
|
||||||
QStringLiteral("--utf8"),
|
// When --lvid or --vid option is not specified, mkudffs use sane default
|
||||||
// TODO: Add GUI option for choosing different optical disks and UDF revision
|
QStringList labelArgs;
|
||||||
// For now format as UDF revision 2.01 for hard disk media type
|
if (!label.isEmpty()) {
|
||||||
QStringLiteral("--media-type=hd"),
|
const QRegularExpression nonAsciiRegExp = QRegularExpression(QStringLiteral("[^\\x{0000}-\\x{007F}]"));
|
||||||
QStringLiteral("--udfrev=0x201"),
|
const QRegularExpression nonLatin1RegExp = QRegularExpression(QStringLiteral("[^\\x{0000}-\\x{00FF}]"));
|
||||||
QStringLiteral("--blocksize=") + QString::number(blkSize),
|
|
||||||
// TODO: Pass label as udf::create() parameter
|
// Mkudffs from udftools prior to version 1.1 damages the label if it
|
||||||
QStringLiteral("--lvid=") + label,
|
// contains non-ASCII characters. Therefore do not allow a label with
|
||||||
// QStringLiteral("--vid=") + shortlabel,
|
// such characters with old versions of mkudffs.
|
||||||
deviceNode
|
if (m_OnlyAsciiLabel && label.contains(nonAsciiRegExp)) {
|
||||||
});
|
report.line() << xi18nc("@info:status", "mkudffs prior to version 1.1 does not support non-ASCII characters in the label");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// NOTE: According to the OSTA specification, UDF supports only strings
|
||||||
|
// encoded in 8-bit or 16-bit OSTA Compressed Unicode format. They are
|
||||||
|
// equivalent to ISO-8859-1 (Latin 1) and UCS-2BE respectively.
|
||||||
|
// Conversion from UTF-8 passed on the command line to OSTA format is done
|
||||||
|
// by mkudffs. Strictly speaking UDF does not support UTF-16 as the UDF
|
||||||
|
// specification was created before the introduction of UTF-16, but lots
|
||||||
|
// of UDF tools are able to decode UTF-16 including UTF-16 Surrogate pairs
|
||||||
|
// outside the BMP (Basic Multilingual Plane).
|
||||||
|
//
|
||||||
|
// The Volume Identifier (--vid) can only contain 30 bytes, either 30
|
||||||
|
// ISO-8859-1 (Latin 1) characters or 15 UCS-2BE characters. Store the
|
||||||
|
// most characters possible in the Volume Identifier. Either up to 15
|
||||||
|
// UCS-2BE characters when a character needing 16-bit encoding is found in
|
||||||
|
// the first 15 characters, or up to 30 characters when a character
|
||||||
|
// needing 16-bit encoding is found in the second 15 characters.
|
||||||
|
QString shortLabel = label.left(30);
|
||||||
|
int firstNonLatin1Pos = shortLabel.indexOf(nonLatin1RegExp);
|
||||||
|
if (firstNonLatin1Pos != -1 && firstNonLatin1Pos < 15)
|
||||||
|
shortLabel = shortLabel.left(15);
|
||||||
|
else if (firstNonLatin1Pos != -1 && firstNonLatin1Pos < 30)
|
||||||
|
shortLabel = shortLabel.left(firstNonLatin1Pos);
|
||||||
|
|
||||||
|
labelArgs << QStringLiteral("--lvid=") + label;
|
||||||
|
labelArgs << QStringLiteral("--vid=") + shortLabel;
|
||||||
|
}
|
||||||
|
|
||||||
|
QStringList cmdArgs;
|
||||||
|
cmdArgs << QStringLiteral("--utf8");
|
||||||
|
// TODO: Add GUI option for choosing different optical disks and UDF revision
|
||||||
|
// For now format as UDF revision 2.01 for hard disk media type
|
||||||
|
cmdArgs << QStringLiteral("--media-type=hd");
|
||||||
|
cmdArgs << QStringLiteral("--udfrev=0x201");
|
||||||
|
cmdArgs << QStringLiteral("--blocksize=") + QString::number(blkSize);
|
||||||
|
cmdArgs << labelArgs;
|
||||||
|
cmdArgs << deviceNode;
|
||||||
|
|
||||||
|
ExternalCommand cmd(report, QStringLiteral("mkudffs"), cmdArgs);
|
||||||
return cmd.run(-1) && cmd.exitCode() == 0;
|
return cmd.run(-1) && cmd.exitCode() == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int udf::blockSize(Report& report, const QString& deviceNode)
|
int udf::blockSize(Report& report, const QString& deviceNode)
|
||||||
{
|
{
|
||||||
// mkudffs from udftools prior to 1.1 does not check for partition limits and crashes
|
|
||||||
if ( length() > MAX_UDF_BLOCKS ) {
|
|
||||||
report.line() << xi18nc("@info:status", "Partition is too large");
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
if ( length() < MIN_UDF_BLOCKS ) {
|
|
||||||
report.line() << xi18nc("@info:status", "Partition is too small");
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
// mkudffs from udftools prior to 1.1 is not able to detect logical (sector) size
|
// mkudffs from udftools prior to 1.1 is not able to detect logical (sector) size
|
||||||
// and UDF block size must match logical sector size of underlying media
|
// and UDF block size must match logical sector size of underlying media
|
||||||
int fd = open(deviceNode.toLocal8Bit().data(), O_RDONLY);
|
int fd = open(deviceNode.toLocal8Bit().data(), O_RDONLY);
|
||||||
|
|
|
@ -75,6 +75,7 @@ public:
|
||||||
|
|
||||||
public:
|
public:
|
||||||
static CommandSupportType m_Create;
|
static CommandSupportType m_Create;
|
||||||
|
static bool m_OnlyAsciiLabel;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
int blockSize(Report& report, const QString& deviceNode);
|
int blockSize(Report& report, const QString& deviceNode);
|
||||||
|
|
Loading…
Reference in New Issue