diff --git a/src/libs/utils/devicefileaccess.cpp b/src/libs/utils/devicefileaccess.cpp index 39bdc736e09..d3a8360136e 100644 --- a/src/libs/utils/devicefileaccess.cpp +++ b/src/libs/utils/devicefileaccess.cpp @@ -314,12 +314,10 @@ expected_str DeviceFileAccess::fileContents(const FilePath &filePath } expected_str DeviceFileAccess::writeFileContents(const FilePath &filePath, - const QByteArray &data, - qint64 offset) const + const QByteArray &data) const { Q_UNUSED(filePath) Q_UNUSED(data) - Q_UNUSED(offset) QTC_CHECK(false); return make_unexpected( Tr::tr("writeFileContents is not implemented for \"%1\".").arg(filePath.toUserOutput())); @@ -738,8 +736,7 @@ expected_str DesktopDeviceFileAccess::fileContents(const FilePath &f } expected_str DesktopDeviceFileAccess::writeFileContents(const FilePath &filePath, - const QByteArray &data, - qint64 offset) const + const QByteArray &data) const { QFile file(filePath.path()); const bool isOpened = file.open(QFile::WriteOnly | QFile::Truncate); @@ -747,8 +744,6 @@ expected_str DesktopDeviceFileAccess::writeFileContents(const FilePath & return make_unexpected( Tr::tr("Could not open file \"%1\" for writing.").arg(filePath.toUserOutput())); - if (offset != 0) - file.seek(offset); qint64 res = file.write(data); if (res != data.size()) return make_unexpected( @@ -1088,17 +1083,12 @@ expected_str UnixDeviceFileAccess::fileContents(const FilePath &file } expected_str UnixDeviceFileAccess::writeFileContents(const FilePath &filePath, - const QByteArray &data, - qint64 offset) const + const QByteArray &data) const { if (disconnected()) return make_unexpected_disconnected(); QStringList args = {"of=" + filePath.path()}; - if (offset != 0) { - args.append("bs=1"); - args.append(QString("seek=%1").arg(offset)); - } RunResult result = runInShell({"dd", args, OsType::OsTypeLinux}, data); if (result.exitCode != 0) { diff --git a/src/libs/utils/devicefileaccess.h b/src/libs/utils/devicefileaccess.h index ba484541275..8a0884ec1d0 100644 --- a/src/libs/utils/devicefileaccess.h +++ b/src/libs/utils/devicefileaccess.h @@ -69,8 +69,7 @@ protected: qint64 offset) const; virtual expected_str writeFileContents(const FilePath &filePath, - const QByteArray &data, - qint64 offset) const; + const QByteArray &data) const; virtual expected_str createTempFile(const FilePath &filePath); }; @@ -125,8 +124,7 @@ protected: qint64 limit, qint64 offset) const override; expected_str writeFileContents(const FilePath &filePath, - const QByteArray &data, - qint64 offset) const override; + const QByteArray &data) const override; expected_str createTempFile(const FilePath &filePath) override; @@ -178,8 +176,7 @@ protected: qint64 limit, qint64 offset) const override; expected_str writeFileContents(const FilePath &filePath, - const QByteArray &data, - qint64 offset) const override; + const QByteArray &data) const override; expected_str createTempFile(const FilePath &filePath) override; diff --git a/src/libs/utils/filepath.cpp b/src/libs/utils/filepath.cpp index 562f3247bd8..1b9b6e943c3 100644 --- a/src/libs/utils/filepath.cpp +++ b/src/libs/utils/filepath.cpp @@ -655,9 +655,9 @@ bool FilePath::ensureReachable(const FilePath &other) const return false; } -expected_str FilePath::writeFileContents(const QByteArray &data, qint64 offset) const +expected_str FilePath::writeFileContents(const QByteArray &data) const { - return fileAccess()->writeFileContents(*this, data, offset); + return fileAccess()->writeFileContents(*this, data); } FileStreamHandle FilePath::asyncCopy(const FilePath &target, QObject *context, diff --git a/src/libs/utils/filepath.h b/src/libs/utils/filepath.h index 2b1eb14069e..cb975248ec2 100644 --- a/src/libs/utils/filepath.h +++ b/src/libs/utils/filepath.h @@ -139,7 +139,7 @@ public: FilePaths dirEntries(const FileFilter &filter, QDir::SortFlags sort = QDir::NoSort) const; FilePaths dirEntries(QDir::Filters filters) const; expected_str fileContents(qint64 maxSize = -1, qint64 offset = 0) const; - expected_str writeFileContents(const QByteArray &data, qint64 offset = 0) const; + expected_str writeFileContents(const QByteArray &data) const; FilePathInfo filePathInfo() const; [[nodiscard]] FilePath operator/(const QString &str) const;