http://bugs.winehq.org/show_bug.cgi?id=14866
Summary: expand: Wine's expand program fails on /r option Product: Wine Version: CVS/GIT Platform: All OS/Version: All Status: UNCONFIRMED Severity: normal Priority: P3 Component: programs AssignedTo: wine-bugs@winehq.org ReportedBy: royshea@gmail.com
Created an attachment (id=15414) --> (http://bugs.winehq.org/attachment.cgi?id=15414) File compressed using "compress.exe -r test.txt"
The MS-DOS "expand" utility accepts the /r option to automatically rename files compressed using "compress" with the /r option. The version of "expand" included in wine fails to accept the /r option.
Attached is an example file originally named "test.txt" and compressed using /r into the file "test.tx_". Executing "expand.exe /r test.tx_" should successfully expand the file into "test.txt".
http://bugs.winehq.org/show_bug.cgi?id=14866
--- Comment #1 from Roy Shea royshea@gmail.com 2008-08-14 15:04:55 --- Created an attachment (id=15415) --> (http://bugs.winehq.org/attachment.cgi?id=15415) Patch adding /r option to expand
Proposed patch to add /r option to Wine's expand program.
http://bugs.winehq.org/show_bug.cgi?id=14866
Austin English austinenglish@gmail.com changed:
What |Removed |Added ---------------------------------------------------------------------------- Keywords| |patch
http://bugs.winehq.org/show_bug.cgi?id=14866
Hans Leidekker hans@meelstraat.net changed:
What |Removed |Added ---------------------------------------------------------------------------- CC| |hans@meelstraat.net
--- Comment #2 from Hans Leidekker hans@meelstraat.net 2008-08-15 02:45:46 --- +static BOOL option_equal(LPCSTR str1, LPCSTR str2) +{ + if (str1[0] != '/' && str1[0] != '-') + return FALSE; + return lstrcmpA( str1 + 1, str2 ); +}
You mean !lstrcmpA( str1 + 1, str2 ), right?
http://bugs.winehq.org/show_bug.cgi?id=14866
--- Comment #3 from Roy Shea royshea@gmail.com 2008-08-15 12:09:39 ---
You mean !lstrcmpA( str1 + 1, str2 ), right?
Yes, thanks for the catch. In addition to that change the patch requires a bit more work.
The compress program generates both LZX and MS-ZIP (aka MS Cabinet) formats. The solution using GetExpandedName in the earlier patch only works for LZX compression. Expand should successfully handle both formats. I need to dig around to find how to extract the full name from a cabinet archive generated with the /r option.
http://bugs.winehq.org/show_bug.cgi?id=14866
--- Comment #4 from Roy Shea royshea@gmail.com 2008-08-15 12:17:11 --- Created an attachment (id=15436) --> (http://bugs.winehq.org/attachment.cgi?id=15436) File compressed using "compress.exe -r -Z a.txt"
Alternate MS-ZIP (cabinet archive) format of compression that accepts automatic renaming. Need to revise patch to handle this format.
http://bugs.winehq.org/show_bug.cgi?id=14866
Roy Shea royshea@gmail.com changed:
What |Removed |Added ---------------------------------------------------------------------------- Attachment #15415|0 |1 is obsolete| |
--- Comment #5 from Roy Shea royshea@gmail.com 2008-08-21 01:26:50 --- Created an attachment (id=15515) --> (http://bugs.winehq.org/attachment.cgi?id=15515) Add -r support for LZX and MS-ZIP archives
This patch adds support for expanding archives using -r with either LZX or MS-ZIP archives. Renamed files are expanded into the directory containing the archive, as is done in the native version.
The patch is a bit larger than I wanted. The best way I found to extract the expanded name from a MS-ZIP archive uses SetupIterateCabinet with a custom call back.
http://bugs.winehq.org/show_bug.cgi?id=14866
--- Comment #6 from Hans Leidekker hans@meelstraat.net 2008-08-21 02:26:54 --- Looks good, please submit.
http://bugs.winehq.org/show_bug.cgi?id=14866
Austin English austinenglish@gmail.com changed:
What |Removed |Added ---------------------------------------------------------------------------- Version|CVS/GIT |unspecified
--- Comment #7 from Austin English austinenglish@gmail.com 2009-01-20 02:39:57 --- Removing deprecated CVS/GIT version tag. Please retest in current git. If the bug is still present in today's wine, but was not present in some earlier version of wine, please update version field to earliest known version of wine that had the bug. Thanks!
http://bugs.winehq.org/show_bug.cgi?id=14866
André H. nerv@dawncrow.de changed:
What |Removed |Added ---------------------------------------------------------------------------- Status|UNCONFIRMED |NEW CC| |nerv@dawncrow.de Ever Confirmed|0 |1
--- Comment #8 from André H. nerv@dawncrow.de 2009-07-21 13:14:09 --- confirming in wine 1.1.26
http://bugs.winehq.org/show_bug.cgi?id=14866
Austin English austinenglish@gmail.com changed:
What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED
--- Comment #9 from Austin English austinenglish@gmail.com 2010-05-26 15:53:54 --- Patch was committed: http://source.winehq.org/git/wine.git/?a=commitdiff;h=44941a55fa97b40b4c9ffa...
http://bugs.winehq.org/show_bug.cgi?id=14866
Alexandre Julliard julliard@winehq.org changed:
What |Removed |Added ---------------------------------------------------------------------------- Status|RESOLVED |CLOSED
--- Comment #10 from Alexandre Julliard julliard@winehq.org 2010-05-28 12:50:35 --- Closing bugs fixed in 1.2-rc2.
http://bugs.winehq.org/show_bug.cgi?id=14866
Austin English austinenglish@gmail.com changed:
What |Removed |Added ---------------------------------------------------------------------------- Platform|All |Other OS/Version|All |other
--- Comment #11 from Austin English austinenglish@gmail.com 2012-02-23 15:11:25 CST --- Removing deprecated 'All' Platform/OS.
https://bugs.winehq.org/show_bug.cgi?id=14866
André H. nerv@dawncrow.de changed:
What |Removed |Added ---------------------------------------------------------------------------- Fixed by SHA1| |44941a55fa97b40b4c9ffa8e414 | |e3a8a26efc65b
-
wine-bugs＠winehq.org