208384 2009-09-24 14:02:19 +0000 Extracting selected files will always create the whole directory structure 2016-02-19 11:49:27 +0000 1 1 2 Applications ark general unspecified unspecified Linux RESOLVED FIXED NOR normal --- 1 vdboor rthomsen6 alessandro.ufms arthur aspotashev b.brachaczek Erwin.Mascher finex francescortiz get.sonic info knizek l.arvanitis mmodem00 mte90net null oracle2b rakuco rion4ik rthomsen6 sammiestoel sean simonandric5 sjakub tesfabpel victor.varvariuc yorsh http://commits.kde.org/ark/7c025dd5765c41957787493786248157f29b4e13 15.08.2 133 oldest_to_newest 835036 0 vdboor 2009-09-24 14:02:19 +0000 Version: 2.13 (using 4.3.1 (KDE 4.3.1) "release 161", KDE:KDE4:Factory:Desktop / openSUSE_11.1) Compiler: gcc OS: Linux (i686) release 2.6.31-rc5-8-pae I've tried to extract a file by dragging it to dolphin. To my surprise the folder structure (of the archive) was re-created. Instead, I only expect the single file to be extracted in the target folder. Example use case: - download jquery.mousewheel.3.0.2.zip - open it in ark - drag the relevant JS file to your project. 836099 1 finex 2009-09-26 21:36:37 +0000 *** This bug has been marked as a duplicate of bug 204323 *** 927465 2 rakuco 2010-03-03 04:24:07 +0000 Reopening, this actually isn't related to kioslaves. 959090 3 rakuco 2010-05-09 03:25:05 +0000 SVN commit 1124377 by rkcosta: Do not preserve paths when extracting via drag'n'drop. CCBUG: 208384 M +1 -2 part.cpp M +1 -1 part.h WebSVN link: http://websvn.kde.org/?view=rev&revision=1124377 959097 4 rakuco 2010-05-09 03:33:05 +0000 SVN commit 1124379 by rkcosta: Backport r1124377. Do not preserve paths when extracting via drag'n'drop. BUG: 208384 M +1 -2 part.cpp M +1 -1 part.h WebSVN link: http://websvn.kde.org/?view=rev&revision=1124379 964630 5 Erwin.Mascher 2010-05-20 12:03:15 +0000 please reopen. this bug is only partially fixed. dragging files now works as expected, but when dragging a folder from ark to dolphin, it should recreate the partial folder structure beginning with the dragged folder. so if my archive contains: a/b/c.txt and i drag the folder b into my home directory, i should have: /home/b/ /home/b/c.txt but currently i get: /home/c.txt 966013 6 rakuco 2010-05-23 06:16:56 +0000 This seems to be true only to zip files, which are extracted via the 'unzip' utility. It has no way of specifying which directory to start extracting from. A possible workaround in this case would be extracting with the full path to a temporary directory and moving the desired parts to the final directory. 966017 7 rakuco 2010-05-23 07:35:42 +0000 SVN commit 1129641 by rkcosta: Revert 1124377. All plugins but clizip support RootNode, and PreservePaths is needed in order for dragging and dropping a directory to create the proper structure. CCBUG: 208384 M +1 -0 part.cpp WebSVN link: http://websvn.kde.org/?view=rev&revision=1129641 966018 8 rakuco 2010-05-23 07:37:12 +0000 SVN commit 1129642 by rkcosta: Backport 1129641. Revert 1124379. All plugins but clizip support RootNode, and PreservePaths is needed in order for dragging and dropping a directory to create the proper structure. CCBUG: 208384 M +1 -0 part.cpp WebSVN link: http://websvn.kde.org/?view=rev&revision=1129642 1002460 9 b.brachaczek 2010-08-12 22:09:49 +0000 The funny thing is that it works properly when dragging to Folder View Plasma widget. Actually it looks like it triggers another action since it opens a context menu after dropping, just like with regular files from the filesystem. 1055183 10 rakuco 2010-12-08 02:19:11 +0000 Changing the default assignee in the currently open Ark bug reports to me. 1114215 11 sjakub 2011-05-02 23:27:06 +0000 I have the same behaviour, when I have the following directory structure inside zip archive: dir dir/dir.txt dir/a dir/a/a.txt Dragging and dropping the 'a' element into /tmp/test/ results in: test/dir test/dir/a test/dir/a/a.txt I would expect it to be: test/a test/a/a.txt 1114217 12 sjakub 2011-05-02 23:28:42 +0000 On the other hand, when that directory structure is inside RAR archive I end up having: test/dir test/dir/a test/dir/a/a test/dir/a/a/a.txt (which is also related to bug 272281 - but maybe this helps too...) 1114218 13 59557 sjakub 2011-05-02 23:29:22 +0000 Created attachment 59557 An archive that demonstrates the problem 1114219 14 59558 sjakub 2011-05-02 23:29:34 +0000 Created attachment 59558 An archive that demonstrates the problem 1122009 15 alessandro.ufms 2011-05-22 20:11:24 +0000 I have this problem too. And here, drag n drop with multiple files do not working here. It extract only a single file. 1169971 16 info 2011-10-04 13:32:24 +0000 I have the same problem with multible archive formats: - it is possible to drag&drop ONE file from the archive to dolphin ( in my case) - if i try to d&d multiple files (2 or mor or just a coice of files) id just copies one a fix of this issue wold be great help to me! thanks all that are working so hard on the fix! 1170021 17 rakuco 2011-10-04 16:08:02 +0000 (In reply to comment #16) > - if i try to d&d multiple files (2 or mor or just a coice of files) id just > copies one This is actually a different issue, please see bug 187152. 1194924 18 rakuco 2011-12-05 03:37:20 +0000 Changing the title of the bug from "Dragging a file to dolphin to extract, will create a folder structure" to "Extracting selected files will always create the whole directory structure". This better reflects the reality and shows it is a more general problem not restricted to dragging and dropping. While working on bug 187152 today, I came to think about this report again. Let us consider the example described in comment #11 again: > dir > dir/dir.txt > dir/a > dir/a/a.txt If that directory structure was present in the filesystem and one used a file manager such as Dolphin to drag or copy "/tmp/dir/a" to "/tmp/other-dir", the resulting structure would be "/tmp/other-dir/a", not "/tmp/other-dir/dir/a/" or "/tmp/other-dir/tmp/dir/a". From the comments in this report, it looks like people expect Ark to act the same way; that is, selecting "a" in the tree structure and extracting (or dragging it) to "/tmp/other-dir" would result in "/tmp/other-dir/a", not "/tmp/other-dir/dir/a/". The latter is what both dragging'n'dropping _and_ regular extraction create. Replicating the expected behavior with compressed archives is made more difficult due to the archive management programs themselves (unzip, unrar, lha and 7z), as they are usually not capable of easily handling this. As I mentioned in comment #6, a possible workaround involves extracting the desired files into a temporary location and later moving them (I'd like to avoid this because the temporary directory might be in another partition with little disk space, for example), or separating the selected files by common parent and extracting them separately. Other ideas welcome :) 1194932 19 sjakub 2011-12-05 05:40:13 +0000 (In reply to comment #18) > As I mentioned in comment #6, a possible workaround involves extracting the > desired files into a temporary location and later moving them (I'd like to > avoid this because the temporary directory might be in another partition with > little disk space, for example), or separating the selected files by common > parent and extracting them separately. Other ideas welcome :) How about creating the directory structure manually, not through the archiving tool, and extracting individual files to appropriate directories, while making the archiving tool skip the directories altogether? I haven't check all the tools, but at least the main ones allow to do that. All of the following extract 'file.txt' into the current directory: unzip -j arch.zip dir/a/b/c/file.txt unrar e arch.rar dir/a/b/c/file.txt 7z e arch.7z dir/a/b/c/file.txt For tar, I couldn't find an option that would prevent it from recreating the whole directory structure, but -O can be used and the output redirected to a specific file (at the cost of loosing all the attributes): tar -O -xzf arch.tar.gz dir/a/b/c/file.txt > file.txt 1195056 20 rakuco 2011-12-05 12:44:39 +0000 (In reply to comment #19) > How about creating the directory structure manually, not through the archiving > tool, > and extracting individual files to appropriate directories, > while making the archiving tool skip the directories altogether? This is a variation on the second idea I mentioned. The potential downside is that we may end up creating a lot of jobs in case the selected files all live in separate directories with no common ancestors. Unfortunately, this may be the only way to go... 1195072 21 l.arvanitis 2011-12-05 13:47:21 +0000 How about extract in a tmp dir in the target location which then gets deleted? ie. extracting dir/a -> /tmp/other-dir would: extract dir/a -> /tmp/other-dir/.ark_temp/dir/a mv /tmp/other-dir/.ark_temp/dir/a -> /tmp/other-dir/a rm -rf /tmp/other-dir/.ark_temp That way it works independently of what each tool supports while the different filesystem problem is also solved. Just make sure '.ark_temp' gets removed on a failed extraction and in case it exists (for whatever reason), work on '.ark_temp(2)' etc. 1195569 22 rakuco 2011-12-06 15:32:34 +0000 (In reply to comment #21) > How about extract in a tmp dir in the target location which then gets deleted? > ie. > extracting dir/a -> /tmp/other-dir would: > extract dir/a -> /tmp/other-dir/.ark_temp/dir/a > mv /tmp/other-dir/.ark_temp/dir/a -> > /tmp/other-dir/a > rm -rf /tmp/other-dir/.ark_temp > > That way it works independently of what each tool supports while the different > filesystem problem is also solved. > > Just make sure '.ark_temp' gets removed on a failed extraction and in case it > exists (for whatever reason), work on '.ark_temp(2)' etc. Hmm, that might be a good idea. The cumbersome side is handling filenames which already exist (Ark would need to do that after the extraction has finished) and moving things around, but I think this is the best proposal so far :) 1205970 23 rakuco 2011-12-28 18:14:27 +0000 *** Bug 290034 has been marked as a duplicate of this bug. *** 1205971 24 mmodem00 2011-12-28 18:19:34 +0000 This bug is 2 years old! And this is a very important feature broken... 1206217 25 mmodem00 2011-12-29 14:50:41 +0000 I have build ark from master (SHA 8a3e5d96d295b78734845bd3358b55c0534da5a1) that icludes your latest changes and this bug continues being valid... 1206226 26 rakuco 2011-12-29 15:27:13 +0000 (In reply to comment #25) > I have build ark from master (SHA 8a3e5d96d295b78734845bd3358b55c0534da5a1) > that icludes your latest changes and this bug continues being valid... That's why the bug is still open :) 1239718 27 mte90net 2012-03-25 13:34:05 +0000 It's a annoying problem! please fix it! 1262888 28 oracle2b 2012-06-06 18:36:21 +0000 Is a fix in the works?? 1298549 29 cfeck 2012-09-19 09:48:12 +0000 *** Bug 307017 has been marked as a duplicate of this bug. *** 1306514 30 tesfabpel 2012-10-16 15:28:10 +0000 Please fix this... is a very annoying bug, especially when other archive managers like GNOME's file-roller work very well... :P 1323650 31 knizek 2012-12-14 09:01:09 +0000 Is there any known workaround for this bug? AFAIK it is not possible to use File-Roller or Xarchiver since drag&drop XDS [1] property is not supported by KDE file managers (Dolphin). I tried few other archivers, but to no avail either. One method to be used with some supported archive types would be to open the archive within Dolphin itself, but that seems pretty buggy, too. (Works for some ZIP files, not for others. Similar like described here [2] and here [3].) Krusader works fine, but it is too much complicated for a simple mouse driven use style... [1] http://freedesktop.org/wiki/Specifications/XDS?action=show&redirect=Standards%2FXDS [2] https://bugs.kde.org/show_bug.cgi?id=216672 [3] http://forum.kde.org/viewtopic.php?f=224&t=107415 1340320 32 tesfabpel 2013-02-11 10:45:46 +0000 I've tried the latest Kubuntu 13.04 daily build and it seems to be fixed. Can anyone else confirm as well? :-) 1340477 33 knizek 2013-02-11 17:19:29 +0000 (In reply to comment #32) > I've tried the latest Kubuntu 13.04 daily build and it seems to be fixed. Arch linux, KDE 4.10.00, Ark 2.19. With ZIP or 7ZIP files, it is still buggy (full path is extracted via drag&drop). With TAR.GZ files, things work as expected (though it should ask whether the files/folders should be extracted with full path or not). To me, it seems still buggy. 1369259 34 rakuco 2013-05-16 15:08:50 +0000 *** Bug 319911 has been marked as a duplicate of this bug. *** 1369705 35 79952 francescortiz 2013-05-18 17:36:01 +0000 Created attachment 79952 Proposed patch for CLI apps like unzip 1369706 36 francescortiz 2013-05-18 17:41:55 +0000 The patch I just submited makes cli apps that do not support "rootNode" extraction (the problem described here) makes this cli apps work on a tmp directory called "._ark_extract". I just realized that it is not safe if you extract many zips simultaneously to the same destination directory. I will post another patch shortly that adds a random uuid to the directory. 1369710 37 79954 francescortiz 2013-05-18 17:50:26 +0000 Created attachment 79954 Extract to temporary subdirectory safe for simultaneous extracts Previous patch with the addition of random uuid to the temporary directory 1369726 38 rakuco 2013-05-18 18:49:11 +0000 Thank you for the patch. Please note, though, that patches should be submitted via ReviewBoard instead of Bugzilla. See http://techbase.kde.org/Contribute/Send_Patches#Reviewboard for more information. 1369739 39 francescortiz 2013-05-18 21:29:53 +0000 Thank you. Patch submited: https://git.reviewboard.kde.org/r/110516/ 1375425 40 francescortiz 2013-06-10 08:23:56 +0000 The patch has not been accepted because it overwrites without prompt. This is caused because I use QFile->rename instead of the corresponding KIO call. I've been trying to create a move job for this patch but I don't seem to be able to make it work. The notifier widget always shows that I create a blank job and no file gets moved at all. I've been trying to find documentation and examples of KIO::move() with no luck. I found the API documentation, but it seems to be focused on developers who already understand KIO Jobs. I would really appreciate if someone could give me a link with KIO Jobs or KIO::move documentation and/or examples. This is what I tried: http://pastebin.com/2ce3aRes 1442532 41 rakuco 2014-04-21 10:25:36 +0000 *** Bug 333670 has been marked as a duplicate of this bug. *** 1504286 42 rion4ik 2015-03-09 10:23:18 +0000 the bug is still here with ark-4.14.3 1545326 43 rthomsen6 2015-09-21 19:27:21 +0000 Git commit 7c025dd5765c41957787493786248157f29b4e13 by Ragnar Thomsen. Committed on 21/09/2015 at 19:25. Pushed by rthomsen into branch 'Applications/15.08'. Fix drag'n'drop extraction with CLI-plugins This fixes drag'n'drop extraction of selected entries from Ark to e.g. Dolphin for archives handled by CLI-plugins. Previously, the entries would be extracted with full path, which is not what the user expects and not how the libarchive-plugin handles tar-based archives. This was due to CLI-plugins not supporting individual root nodes (i.e. removing a part of the path from entry to be extracted). This is now circumvented by extracting to a QTemporaryDir, removing the root node from the path, and finally moving the files to their final destination. The moving to final destination is done in a new member function in CliInterface (moveToFinalDest). This function checks if the destination file exists and prompts the user for action if that is the case. The finished signal() is now emitted from copyFiles()/addFiles()/ deleteFiles()/list(), instead of from processFinished(). FIXED-IN: 15.08.2 REVIEW: 125293 M +108 -9 kerfuffle/cliinterface.cpp M +3 -0 kerfuffle/cliinterface.h http://commits.kde.org/ark/7c025dd5765c41957787493786248157f29b4e13 1575176 44 elvis.angelaccio 2016-02-06 09:49:05 +0000 *** Bug 359049 has been marked as a duplicate of this bug. *** 1577461 45 elvis.angelaccio 2016-02-19 11:49:27 +0000 *** Bug 359565 has been marked as a duplicate of this bug. *** 59557 2011-05-02 23:29:22 +0000 2011-05-02 23:29:22 +0000 An archive that demonstrates the problem dir.zip application/octet-stream 604 sjakub UEsDBAoAAAAAALq7oj4AAAAAAAAAAAAAAAAEABwAZGlyL1VUCQADsHa/TSJzv011eAsAAQToAwAA BGQAAABQSwMECgACAAAAErqiPo292i8EAAAABAAAAAsAHABkaXIvZGlyLnR4dFVUCQADlHO/TZRz v011eAsAAQToAwAABGQAAABkaXIKUEsDBAoAAAAAAKK7oj4AAAAAAAAAAAAAAAAGABwAZGlyL2Ev VVQJAAOAdr9NsXK/TXV4CwABBOgDAAAEZAAAAFBLAwQKAAIAAAChuaI+B6Hq3QIAAAACAAAACwAc AGRpci9hL2EudHh0VVQJAAO9cr9NvXK/TXV4CwABBOgDAAAEZAAAAGEKUEsBAh4DCgAAAAAAurui PgAAAAAAAAAAAAAAAAQAGAAAAAAAAAAQAO1BAAAAAGRpci9VVAUAA7B2v011eAsAAQToAwAABGQA AABQSwECHgMKAAIAAAASuqI+jb3aLwQAAAAEAAAACwAYAAAAAAABAAAApIE+AAAAZGlyL2Rpci50 eHRVVAUAA5Rzv011eAsAAQToAwAABGQAAABQSwECHgMKAAAAAACiu6I+AAAAAAAAAAAAAAAABgAY AAAAAAAAABAA7UGHAAAAZGlyL2EvVVQFAAOAdr9NdXgLAAEE6AMAAARkAAAAUEsBAh4DCgACAAAA obmiPgeh6t0CAAAAAgAAAAsAGAAAAAAAAQAAAKSBxwAAAGRpci9hL2EudHh0VVQFAAO9cr9NdXgL AAEE6AMAAARkAAAAUEsFBgAAAAAEAAQAOAEAAA4BAAAAAA== 59558 2011-05-02 23:29:34 +0000 2011-05-02 23:29:34 +0000 An archive that demonstrates the problem dir.rar application/octet-stream 212 sjakub UmFyIRoHAM+QcwAADQAAAAAAAAAkTnQggCsADgAAAAQAAAADjb3aLxK6oj4dMwsApIEAAGRpclxk aXIudHh0AAi/CK7ziJU/8H/2G3RqknQgkC0ACwAAAAIAAAADB6Hq3aC5oj4dMwsApIEAAGRpclxh XGEudHh0AMAAz/SG/S8/hPf7LefMdOCAJQAAAAAAAAAAAAMAAAAAoruiPhQwBQDtQQAAZGlyXGEs P3TggCMAAAAAAAAAAAADAAAAALq7oj4UMAMA7UEAAGRpcsQ9ewBABwA= 79952 2013-05-18 17:36:01 +0000 2013-05-18 17:50:26 +0000 Proposed patch for CLI apps like unzip ark_cli_no_dirs.patch text/plain 2910 francescortiz ZGlmZiAtLWdpdCBhL2tlcmZ1ZmZsZS9jbGlpbnRlcmZhY2UuY3BwIGIva2VyZnVmZmxlL2NsaWlu dGVyZmFjZS5jcHAKaW5kZXggM2NiZTMxYi4uMDg3ZmIwMyAxMDA2NDQKLS0tIGEva2VyZnVmZmxl L2NsaWludGVyZmFjZS5jcHAKKysrIGIva2VyZnVmZmxlL2NsaWludGVyZmFjZS5jcHAKQEAgLTEw Myw2ICsxMDMsOCBAQCBib29sIENsaUludGVyZmFjZTo6Y29weUZpbGVzKGNvbnN0IFFMaXN0PFFW YXJpYW50PiAmIGZpbGVzLCBjb25zdCBRU3RyaW5nICYgZGVzdAogCiAgICAgLy9zdGFydCBwcmVw YXJpbmcgdGhlIGFyZ3VtZW50IGxpc3QKICAgICBRU3RyaW5nTGlzdCBhcmdzID0gbV9wYXJhbS52 YWx1ZShFeHRyYWN0QXJncykudG9TdHJpbmdMaXN0KCk7CisgICAgCisgICAgYm9vbCByb290Tm9k ZVN3aXRjaCA9IGZhbHNlOwogCiAgICAgLy9ub3cgcmVwbGFjZSB0aGUgdmFyaW91cyBlbGVtZW50 cyBpbiB0aGUgbGlzdAogICAgIGZvciAoaW50IGkgPSAwOyBpIDwgYXJncy5zaXplKCk7ICsraSkg ewpAQCAtMTgxLDYgKzE4Myw3IEBAIGJvb2wgQ2xpSW50ZXJmYWNlOjpjb3B5RmlsZXMoY29uc3Qg UUxpc3Q8UVZhcmlhbnQ+ICYgZmlsZXMsIGNvbnN0IFFTdHJpbmcgJiBkZXN0CiAgICAgICAgIH0K IAogICAgICAgICBpZiAoYXJndW1lbnQgPT0gUUxhdGluMVN0cmluZyggIiRSb290Tm9kZVN3aXRj aCIgKSkgeworCSAgICByb290Tm9kZVN3aXRjaCA9IHRydWU7CiAgICAgICAgICAgICAvL2lmIHRo ZSBSb290Tm9kZVN3aXRjaCBhcmd1bWVudCBoYXMgYmVlbiBhZGRlZCwgd2UgYXQgbGVhc3QKICAg ICAgICAgICAgIC8vYXNzdW1lIHRoYXQgdGhlIGZvcm1hdCBvZiB0aGUgc3dpdGNoIGhhcyBiZWVu IGFkZGVkIGFzIHdlbGwKICAgICAgICAgICAgIFFfQVNTRVJUKG1fcGFyYW0uY29udGFpbnMoUm9v dE5vZGVTd2l0Y2gpKTsKQEAgLTIyMSwxNCArMjI0LDUzIEBAIGJvb2wgQ2xpSW50ZXJmYWNlOjpj b3B5RmlsZXMoY29uc3QgUUxpc3Q8UVZhcmlhbnQ+ICYgZmlsZXMsIGNvbnN0IFFTdHJpbmcgJiBk ZXN0CiAgICAgICAgICAgICAtLWk7CiAgICAgICAgIH0KICAgICB9Ci0KLSAgICBrRGVidWcoKSA8 PCAiU2V0dGluZyBjdXJyZW50IGRpciB0byAiIDw8IGRlc3RpbmF0aW9uRGlyZWN0b3J5OwotICAg IFFEaXI6OnNldEN1cnJlbnQoZGVzdGluYXRpb25EaXJlY3RvcnkpOwotCisgICAgCisgICAgLy8g SWYgdGhlIGNsaSBkaWRuJ3QgaGFuZGxlIHRoZSByb290IG5vZGUgd29yayBvbiBhIHRlbXBvcmFy eSBkaXJlY3RvcnkKKyAgICBRU3RyaW5nIHdvcmtpbmdEaXJlY3RvcnkgPSBkZXN0aW5hdGlvbkRp cmVjdG9yeTsKKyAgICBpZiAoIXJvb3ROb2RlU3dpdGNoKSB7CisgICAgICAgIGNvbnN0IFFTdHJp bmcgdG1wRGlyID0gUVN0cmluZzo6ZnJvbUFzY2lpKCIuX2Fya19leHRyYWN0IiwgMTMpOworICAg ICAgICB3b3JraW5nRGlyZWN0b3J5LmFwcGVuZChRU3RyaW5nOjpmcm9tQXNjaWkoIi8iLCAxKSk7 CisgICAgICAgIHdvcmtpbmdEaXJlY3RvcnkuYXBwZW5kKHRtcERpcik7CisJUURpciBkZXN0RGly KGRlc3RpbmF0aW9uRGlyZWN0b3J5KTsKKwlpZiAoIWRlc3REaXIubWtkaXIodG1wRGlyKSkgewor CSAgICBrRGVidWcoKTw8ICJDcmVhdGlvbiBvZiB0ZW1wb3JhcnkgZGlyZWN0b3J5IGZhaWxlZCAi IDw8IHdvcmtpbmdEaXJlY3Rvcnk7CisJICAgIGZhaWxPcGVyYXRpb24oKTsKKwkgICAgcmV0dXJu IGZhbHNlOworCX0KKyAgICB9CisKKyAgICBrRGVidWcoKSA8PCAiU2V0dGluZyBjdXJyZW50IGRp ciB0byAiIDw8IHdvcmtpbmdEaXJlY3Rvcnk7CisgICAgUURpcjo6c2V0Q3VycmVudCh3b3JraW5n RGlyZWN0b3J5KTsKKworICAgIC8vIENhbGwgQ0xJIGFwcGxpY2F0aW9uCiAgICAgaWYgKCFydW5Q cm9jZXNzKG1fcGFyYW0udmFsdWUoRXh0cmFjdFByb2dyYW0pLnRvU3RyaW5nTGlzdCgpLCBhcmdz KSkgewogICAgICAgICBmYWlsT3BlcmF0aW9uKCk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAg ICB9CisgICAgCisgICAgLy8gSWYgd2UgaGF2ZSBhIHJvb3ROb2RlIG1vdmUgZmlsZXMgb3V0c2lk ZSBpZiB0aGUgZXh0cmFjdGlvbiBjb3VsZG4ndCBoYW5kbGUgaXQKKyAgICBpZiAoIXJvb3ROb2Rl U3dpdGNoKSB7CisJUVN0cmluZyByb290Tm9kZTsKKwlpZiAob3B0aW9ucy5jb250YWlucyhRTGF0 aW4xU3RyaW5nKCAiUm9vdE5vZGUiICkpKSB7CisJICAgIHJvb3ROb2RlID0gb3B0aW9ucy52YWx1 ZShRTGF0aW4xU3RyaW5nKCAiUm9vdE5vZGUiICkpLnRvU3RyaW5nKCk7CisJICAgIGtEZWJ1Zygp IDw8ICJTZXQgcm9vdCBub2RlICIgPDwgcm9vdE5vZGU7CisJfQorCQorCS8vIE1vdmUgZmlsZXMg b3V0c2lkZSBvZiByb290Tm9kZQorCVFEaXIgcm9vdChyb290Tm9kZSk7CisJaWYgKCFyb290Tm9k ZS5pc0VtcHR5KCkpIHsKKwkgICAgUVN0cmluZ0xpc3QgY29udGVudHMgPSByb290LmVudHJ5TGlz dChRRGlyOjpOb0RvdEFuZERvdERvdCB8IFFEaXI6OlN5c3RlbSB8IFFEaXI6OkhpZGRlbiAgfCBR RGlyOjpBbGxEaXJzIHwgUURpcjo6RmlsZXMpOworCSAgICBmb3JlYWNoIChRU3RyaW5nIGZpbGUs IGNvbnRlbnRzKSB7CisJICAgICAgICBRRmlsZShyb290Tm9kZSArIFFTdHJpbmc6OmZyb21MYXRp bjEoIi8iLCAxKSArIGZpbGUpLnJlbmFtZShRU3RyaW5nOjpmcm9tQXNjaWkoIi4uLyIsIDMpICsg ZmlsZSk7CisJICAgIH0KKwl9CisJCisJLy8gUmVtb3ZlIHJvb3ROb2RlCisJUURpciB3b3JrRGly KHdvcmtpbmdEaXJlY3RvcnkpOworCXdvcmtEaXIucm1wYXRoKHJvb3ROb2RlKTsKKwlRRGlyIGRl c3REaXIoZGVzdGluYXRpb25EaXJlY3RvcnkpOworCWRlc3REaXIucm1kaXIoUVN0cmluZzo6ZnJv bUFzY2lpKCIuX2Fya19leHRyYWN0IiwgMTMpKTsKKyAgICB9CiAKICAgICByZXR1cm4gdHJ1ZTsK IH0K 79954 2013-05-18 17:50:26 +0000 2013-05-18 21:28:50 +0000 Extract to temporary subdirectory safe for simultaneous extracts ark_cli_no_dirs.patch text/plain 5945 francescortiz ZGlmZiAtLWdpdCBhL2tlcmZ1ZmZsZS9jbGlpbnRlcmZhY2UuY3BwIGIva2VyZnVmZmxlL2NsaWlu dGVyZmFjZS5jcHAKaW5kZXggM2NiZTMxYi4uMDg3ZmIwMyAxMDA2NDQKLS0tIGEva2VyZnVmZmxl L2NsaWludGVyZmFjZS5jcHAKKysrIGIva2VyZnVmZmxlL2NsaWludGVyZmFjZS5jcHAKQEAgLTEw Myw2ICsxMDMsOCBAQCBib29sIENsaUludGVyZmFjZTo6Y29weUZpbGVzKGNvbnN0IFFMaXN0PFFW YXJpYW50PiAmIGZpbGVzLCBjb25zdCBRU3RyaW5nICYgZGVzdAogCiAgICAgLy9zdGFydCBwcmVw YXJpbmcgdGhlIGFyZ3VtZW50IGxpc3QKICAgICBRU3RyaW5nTGlzdCBhcmdzID0gbV9wYXJhbS52 YWx1ZShFeHRyYWN0QXJncykudG9TdHJpbmdMaXN0KCk7CisgICAgCisgICAgYm9vbCByb290Tm9k ZVN3aXRjaCA9IGZhbHNlOwogCiAgICAgLy9ub3cgcmVwbGFjZSB0aGUgdmFyaW91cyBlbGVtZW50 cyBpbiB0aGUgbGlzdAogICAgIGZvciAoaW50IGkgPSAwOyBpIDwgYXJncy5zaXplKCk7ICsraSkg ewpAQCAtMTgxLDYgKzE4Myw3IEBAIGJvb2wgQ2xpSW50ZXJmYWNlOjpjb3B5RmlsZXMoY29uc3Qg UUxpc3Q8UVZhcmlhbnQ+ICYgZmlsZXMsIGNvbnN0IFFTdHJpbmcgJiBkZXN0CiAgICAgICAgIH0K IAogICAgICAgICBpZiAoYXJndW1lbnQgPT0gUUxhdGluMVN0cmluZyggIiRSb290Tm9kZVN3aXRj aCIgKSkgeworCSAgICByb290Tm9kZVN3aXRjaCA9IHRydWU7CiAgICAgICAgICAgICAvL2lmIHRo ZSBSb290Tm9kZVN3aXRjaCBhcmd1bWVudCBoYXMgYmVlbiBhZGRlZCwgd2UgYXQgbGVhc3QKICAg ICAgICAgICAgIC8vYXNzdW1lIHRoYXQgdGhlIGZvcm1hdCBvZiB0aGUgc3dpdGNoIGhhcyBiZWVu IGFkZGVkIGFzIHdlbGwKICAgICAgICAgICAgIFFfQVNTRVJUKG1fcGFyYW0uY29udGFpbnMoUm9v dE5vZGVTd2l0Y2gpKTsKQEAgLTIyMSwxNCArMjI0LDUzIEBAIGJvb2wgQ2xpSW50ZXJmYWNlOjpj b3B5RmlsZXMoY29uc3QgUUxpc3Q8UVZhcmlhbnQ+ICYgZmlsZXMsIGNvbnN0IFFTdHJpbmcgJiBk ZXN0CiAgICAgICAgICAgICAtLWk7CiAgICAgICAgIH0KICAgICB9Ci0KLSAgICBrRGVidWcoKSA8 PCAiU2V0dGluZyBjdXJyZW50IGRpciB0byAiIDw8IGRlc3RpbmF0aW9uRGlyZWN0b3J5OwotICAg IFFEaXI6OnNldEN1cnJlbnQoZGVzdGluYXRpb25EaXJlY3RvcnkpOwotCisgICAgCisgICAgLy8g SWYgdGhlIGNsaSBkaWRuJ3QgaGFuZGxlIHRoZSByb290IG5vZGUgd29yayBvbiBhIHRlbXBvcmFy eSBkaXJlY3RvcnkKKyAgICBRU3RyaW5nIHdvcmtpbmdEaXJlY3RvcnkgPSBkZXN0aW5hdGlvbkRp cmVjdG9yeTsKKyAgICBpZiAoIXJvb3ROb2RlU3dpdGNoKSB7CisgICAgICAgIGNvbnN0IFFTdHJp bmcgdG1wRGlyID0gUVN0cmluZzo6ZnJvbUFzY2lpKCIuX2Fya19leHRyYWN0IiwgMTMpOworICAg ICAgICB3b3JraW5nRGlyZWN0b3J5LmFwcGVuZChRU3RyaW5nOjpmcm9tQXNjaWkoIi8iLCAxKSk7 CisgICAgICAgIHdvcmtpbmdEaXJlY3RvcnkuYXBwZW5kKHRtcERpcik7CisJUURpciBkZXN0RGly KGRlc3RpbmF0aW9uRGlyZWN0b3J5KTsKKwlpZiAoIWRlc3REaXIubWtkaXIodG1wRGlyKSkgewor CSAgICBrRGVidWcoKTw8ICJDcmVhdGlvbiBvZiB0ZW1wb3JhcnkgZGlyZWN0b3J5IGZhaWxlZCAi IDw8IHdvcmtpbmdEaXJlY3Rvcnk7CisJICAgIGZhaWxPcGVyYXRpb24oKTsKKwkgICAgcmV0dXJu IGZhbHNlOworCX0KKyAgICB9CisKKyAgICBrRGVidWcoKSA8PCAiU2V0dGluZyBjdXJyZW50IGRp ciB0byAiIDw8IHdvcmtpbmdEaXJlY3Rvcnk7CisgICAgUURpcjo6c2V0Q3VycmVudCh3b3JraW5n RGlyZWN0b3J5KTsKKworICAgIC8vIENhbGwgQ0xJIGFwcGxpY2F0aW9uCiAgICAgaWYgKCFydW5Q cm9jZXNzKG1fcGFyYW0udmFsdWUoRXh0cmFjdFByb2dyYW0pLnRvU3RyaW5nTGlzdCgpLCBhcmdz KSkgewogICAgICAgICBmYWlsT3BlcmF0aW9uKCk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAg ICB9CisgICAgCisgICAgLy8gSWYgd2UgaGF2ZSBhIHJvb3ROb2RlIG1vdmUgZmlsZXMgb3V0c2lk ZSBpZiB0aGUgZXh0cmFjdGlvbiBjb3VsZG4ndCBoYW5kbGUgaXQKKyAgICBpZiAoIXJvb3ROb2Rl U3dpdGNoKSB7CisJUVN0cmluZyByb290Tm9kZTsKKwlpZiAob3B0aW9ucy5jb250YWlucyhRTGF0 aW4xU3RyaW5nKCAiUm9vdE5vZGUiICkpKSB7CisJICAgIHJvb3ROb2RlID0gb3B0aW9ucy52YWx1 ZShRTGF0aW4xU3RyaW5nKCAiUm9vdE5vZGUiICkpLnRvU3RyaW5nKCk7CisJICAgIGtEZWJ1Zygp IDw8ICJTZXQgcm9vdCBub2RlICIgPDwgcm9vdE5vZGU7CisJfQorCQorCS8vIE1vdmUgZmlsZXMg b3V0c2lkZSBvZiByb290Tm9kZQorCVFEaXIgcm9vdChyb290Tm9kZSk7CisJaWYgKCFyb290Tm9k ZS5pc0VtcHR5KCkpIHsKKwkgICAgUVN0cmluZ0xpc3QgY29udGVudHMgPSByb290LmVudHJ5TGlz dChRRGlyOjpOb0RvdEFuZERvdERvdCB8IFFEaXI6OlN5c3RlbSB8IFFEaXI6OkhpZGRlbiAgfCBR RGlyOjpBbGxEaXJzIHwgUURpcjo6RmlsZXMpOworCSAgICBmb3JlYWNoIChRU3RyaW5nIGZpbGUs IGNvbnRlbnRzKSB7CisJICAgICAgICBRRmlsZShyb290Tm9kZSArIFFTdHJpbmc6OmZyb21MYXRp bjEoIi8iLCAxKSArIGZpbGUpLnJlbmFtZShRU3RyaW5nOjpmcm9tQXNjaWkoIi4uLyIsIDMpICsg ZmlsZSk7CisJICAgIH0KKwl9CisJCisJLy8gUmVtb3ZlIHJvb3ROb2RlCisJUURpciB3b3JrRGly KHdvcmtpbmdEaXJlY3RvcnkpOworCXdvcmtEaXIucm1wYXRoKHJvb3ROb2RlKTsKKwlRRGlyIGRl c3REaXIoZGVzdGluYXRpb25EaXJlY3RvcnkpOworCWRlc3REaXIucm1kaXIoUVN0cmluZzo6ZnJv bUFzY2lpKCIuX2Fya19leHRyYWN0IiwgMTMpKTsKKyAgICB9CiAKICAgICByZXR1cm4gdHJ1ZTsK IH0KZGlmZiAtLWdpdCBhL2tlcmZ1ZmZsZS9jbGlpbnRlcmZhY2UuY3BwIGIva2VyZnVmZmxlL2Ns aWludGVyZmFjZS5jcHAKaW5kZXggM2NiZTMxYi4uZGVjZjlmYSAxMDA2NDQKLS0tIGEva2VyZnVm ZmxlL2NsaWludGVyZmFjZS5jcHAKKysrIGIva2VyZnVmZmxlL2NsaWludGVyZmFjZS5jcHAKQEAg LTQ4LDYgKzQ4LDcgQEAKICNpbmNsdWRlIDxRUHJvY2Vzcz4KICNpbmNsdWRlIDxRVGhyZWFkPgog I2luY2x1ZGUgPFFUaW1lcj4KKyNpbmNsdWRlIDxRVXVpZD4KIAogbmFtZXNwYWNlIEtlcmZ1ZmZs ZQogewpAQCAtMTAzLDYgKzEwNCw4IEBAIGJvb2wgQ2xpSW50ZXJmYWNlOjpjb3B5RmlsZXMoY29u c3QgUUxpc3Q8UVZhcmlhbnQ+ICYgZmlsZXMsIGNvbnN0IFFTdHJpbmcgJiBkZXN0CiAKICAgICAv L3N0YXJ0IHByZXBhcmluZyB0aGUgYXJndW1lbnQgbGlzdAogICAgIFFTdHJpbmdMaXN0IGFyZ3Mg PSBtX3BhcmFtLnZhbHVlKEV4dHJhY3RBcmdzKS50b1N0cmluZ0xpc3QoKTsKKyAgICAKKyAgICBi b29sIHJvb3ROb2RlU3dpdGNoID0gZmFsc2U7CiAKICAgICAvL25vdyByZXBsYWNlIHRoZSB2YXJp b3VzIGVsZW1lbnRzIGluIHRoZSBsaXN0CiAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBhcmdzLnNp emUoKTsgKytpKSB7CkBAIC0xODEsNiArMTg0LDcgQEAgYm9vbCBDbGlJbnRlcmZhY2U6OmNvcHlG aWxlcyhjb25zdCBRTGlzdDxRVmFyaWFudD4gJiBmaWxlcywgY29uc3QgUVN0cmluZyAmIGRlc3QK ICAgICAgICAgfQogCiAgICAgICAgIGlmIChhcmd1bWVudCA9PSBRTGF0aW4xU3RyaW5nKCAiJFJv b3ROb2RlU3dpdGNoIiApKSB7CisJICAgIHJvb3ROb2RlU3dpdGNoID0gdHJ1ZTsKICAgICAgICAg ICAgIC8vaWYgdGhlIFJvb3ROb2RlU3dpdGNoIGFyZ3VtZW50IGhhcyBiZWVuIGFkZGVkLCB3ZSBh dCBsZWFzdAogICAgICAgICAgICAgLy9hc3N1bWUgdGhhdCB0aGUgZm9ybWF0IG9mIHRoZSBzd2l0 Y2ggaGFzIGJlZW4gYWRkZWQgYXMgd2VsbAogICAgICAgICAgICAgUV9BU1NFUlQobV9wYXJhbS5j b250YWlucyhSb290Tm9kZVN3aXRjaCkpOwpAQCAtMjIxLDE0ICsyMjUsNTQgQEAgYm9vbCBDbGlJ bnRlcmZhY2U6OmNvcHlGaWxlcyhjb25zdCBRTGlzdDxRVmFyaWFudD4gJiBmaWxlcywgY29uc3Qg UVN0cmluZyAmIGRlc3QKICAgICAgICAgICAgIC0taTsKICAgICAgICAgfQogICAgIH0KLQotICAg IGtEZWJ1ZygpIDw8ICJTZXR0aW5nIGN1cnJlbnQgZGlyIHRvICIgPDwgZGVzdGluYXRpb25EaXJl Y3Rvcnk7Ci0gICAgUURpcjo6c2V0Q3VycmVudChkZXN0aW5hdGlvbkRpcmVjdG9yeSk7Ci0KKyAg ICAKKyAgICAvLyBJZiB0aGUgY2xpIGRpZG4ndCBoYW5kbGUgdGhlIHJvb3Qgbm9kZSB3b3JrIG9u IGEgdGVtcG9yYXJ5IGRpcmVjdG9yeQorICAgIFFTdHJpbmcgd29ya2luZ0RpcmVjdG9yeSA9IGRl c3RpbmF0aW9uRGlyZWN0b3J5OworICAgIFFTdHJpbmcgdG1wRGlyID0gUVN0cmluZzo6ZnJvbUFz Y2lpKCIuX2Fya19leHRyYWN0XyIsIDE0KTsKKyAgICBpZiAoIXJvb3ROb2RlU3dpdGNoKSB7Cisg ICAgICAgIHRtcERpci5hcHBlbmQoUVV1aWQ6OmNyZWF0ZVV1aWQoKSk7CisgICAgICAgIHdvcmtp bmdEaXJlY3RvcnkuYXBwZW5kKFFTdHJpbmc6OmZyb21Bc2NpaSgiLyIsIDEpKTsKKyAgICAgICAg d29ya2luZ0RpcmVjdG9yeS5hcHBlbmQodG1wRGlyKTsKKwlRRGlyIGRlc3REaXIoZGVzdGluYXRp b25EaXJlY3RvcnkpOworCWlmICghZGVzdERpci5ta2Rpcih0bXBEaXIpKSB7CisJICAgIGtEZWJ1 ZygpPDwgIkNyZWF0aW9uIG9mIHRlbXBvcmFyeSBkaXJlY3RvcnkgZmFpbGVkICIgPDwgd29ya2lu Z0RpcmVjdG9yeTsKKwkgICAgZmFpbE9wZXJhdGlvbigpOworCSAgICByZXR1cm4gZmFsc2U7CisJ fQorICAgIH0KKworICAgIGtEZWJ1ZygpIDw8ICJTZXR0aW5nIGN1cnJlbnQgZGlyIHRvICIgPDwg d29ya2luZ0RpcmVjdG9yeTsKKyAgICBRRGlyOjpzZXRDdXJyZW50KHdvcmtpbmdEaXJlY3Rvcnkp OworCisgICAgLy8gQ2FsbCBDTEkgYXBwbGljYXRpb24KICAgICBpZiAoIXJ1blByb2Nlc3MobV9w YXJhbS52YWx1ZShFeHRyYWN0UHJvZ3JhbSkudG9TdHJpbmdMaXN0KCksIGFyZ3MpKSB7CiAgICAg ICAgIGZhaWxPcGVyYXRpb24oKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KKyAgICAK KyAgICAvLyBJZiB3ZSBoYXZlIGEgcm9vdE5vZGUgbW92ZSBmaWxlcyBvdXRzaWRlIGlmIHRoZSBl eHRyYWN0aW9uIGNvdWxkbid0IGhhbmRsZSBpdAorICAgIGlmICghcm9vdE5vZGVTd2l0Y2gpIHsK KwlRU3RyaW5nIHJvb3ROb2RlOworCWlmIChvcHRpb25zLmNvbnRhaW5zKFFMYXRpbjFTdHJpbmco ICJSb290Tm9kZSIgKSkpIHsKKwkgICAgcm9vdE5vZGUgPSBvcHRpb25zLnZhbHVlKFFMYXRpbjFT dHJpbmcoICJSb290Tm9kZSIgKSkudG9TdHJpbmcoKTsKKwkgICAga0RlYnVnKCkgPDwgIlNldCBy b290IG5vZGUgIiA8PCByb290Tm9kZTsKKwl9CisJCisJLy8gTW92ZSBmaWxlcyBvdXRzaWRlIG9m IHJvb3ROb2RlCisJUURpciByb290KHJvb3ROb2RlKTsKKwlpZiAoIXJvb3ROb2RlLmlzRW1wdHko KSkgeworCSAgICBRU3RyaW5nTGlzdCBjb250ZW50cyA9IHJvb3QuZW50cnlMaXN0KFFEaXI6Ok5v RG90QW5kRG90RG90IHwgUURpcjo6U3lzdGVtIHwgUURpcjo6SGlkZGVuICB8IFFEaXI6OkFsbERp cnMgfCBRRGlyOjpGaWxlcyk7CisJICAgIGZvcmVhY2ggKFFTdHJpbmcgZmlsZSwgY29udGVudHMp IHsKKwkgICAgICAgIFFGaWxlKHJvb3ROb2RlICsgUVN0cmluZzo6ZnJvbUxhdGluMSgiLyIsIDEp ICsgZmlsZSkucmVuYW1lKFFTdHJpbmc6OmZyb21Bc2NpaSgiLi4vIiwgMykgKyBmaWxlKTsKKwkg ICAgfQorCX0KKwkKKwkvLyBSZW1vdmUgcm9vdE5vZGUKKwlRRGlyIHdvcmtEaXIod29ya2luZ0Rp cmVjdG9yeSk7CisJd29ya0Rpci5ybXBhdGgocm9vdE5vZGUpOworCVFEaXIgZGVzdERpcihkZXN0 aW5hdGlvbkRpcmVjdG9yeSk7CisJZGVzdERpci5ybWRpcih0bXBEaXIpOworICAgIH0KIAogICAg IHJldHVybiB0cnVlOwogfQo=