KTar::openArchive: Don't assert if file has two root dirs
ClosedPublic
Actions

Authored by aacid on Jul 28 2019, 3:30 PM.

Details

Reviewers

apol
dfaure

Commits

R243:5ef722f5d4c7: KTar::openArchive: Don't assert if file has two root dirs

Summary

I was wondering if adding this check in KArchive::setRootDir
instead but i ended doing it here since i think an assert in setRootDir is
valid for when C++ users of that class do it wrong.

Diff Detail

Repository

R243 KArchive

Branch

arcpatch-D22786

Lint

No Linters Available

Unit

No Unit Test Coverage

Build Status

Buildable 14547
Build 14565: arc lint + arc unit

aacid created this revision.Jul 28 2019, 3:30 PM

Restricted Application added a project: Frameworks. · View Herald TranscriptJul 28 2019, 3:30 PM

Restricted Application added a subscriber: kde-frameworks-devel. · View Herald Transcript

aacid requested review of this revision.Jul 28 2019, 3:30 PM

Harbormaster completed remote builds in B14499: Diff 62684.Jul 28 2019, 3:30 PM

aacid added subscribers: apol, dfaure.Jul 28 2019, 3:31 PM

apol accepted this revision.Jul 28 2019, 10:27 PM

This revision is now accepted and ready to land.Jul 28 2019, 10:27 PM

Let's be tolerant and skip the second root dir (with a warning, but without return false). This would be more in line with what we do in case of duplicated subdirs, and with what tar does.

Testcase:

mkdir /tmp/tar
touch /tmp/tar/file
cd /tmp/tar
tar cf /tmp/tar.tar.gz . .
tar tf /tmp/tar.tar.gz
./
./file
./tar.tar.gz
./
./file
./tar.tar.gz
(back to karchive builddir)
bin/ktartest /tmp/tar.tar.gz
-> ASSERT

This revision now requires changes to proceed.Jul 29 2019, 7:54 AM

don't return false on the "two roots scenario" as suggested by dfaure

Harbormaster completed remote builds in B14547: Diff 62749.Jul 29 2019, 5:05 PM

dfaure accepted this revision.Jul 29 2019, 8:07 PM

This revision is now accepted and ready to land.Jul 29 2019, 8:07 PM

aacid closed this revision.Jul 29 2019, 8:11 PM

Revision Contents
Changeset List

			Path	Packages
M			src/karchive_p.h (5 lines)
M			src/ktar.cpp (7 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	62684	3aa8d78		Jul 28 2019, 3:30 PM	★	★
Diff 2	62749	3aa8d78	don't return false on the "two roots scenario" as suggested by dfaure	Jul 29 2019, 5:05 PM	★	★

KTar::openArchive: Don't assert if file has two root dirsClosedPublicActions

Details

Diff Detail

Revision ContentsChangeset List

Diff 62749

src/karchive_p.h

src/ktar.cpp

KTar::openArchive: Don't assert if file has two root dirs
ClosedPublic
Actions

Revision Contents
Changeset List