wimlib-imagex: Add --solid as alias for --pack-streams

diff --git a/NEWS b/NEWS
index 033d704964e29833102c01ebcc6407c9fa51d654..2a7c32bfa1f50a532630dd1b1795d7d41571747e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -14,11 +14,14 @@ Version 1.6.1:
        Paths passed to wimlib_extract_paths() and wimlib_iterate_dir_tree() may
        now use either forwards or backwards slashes, as documented.
 
        Paths passed to wimlib_extract_paths() and wimlib_iterate_dir_tree() may
        now use either forwards or backwards slashes, as documented.
 

-       Fixed a potential stack overflow when extracting solid archives (packed
-       streams) containing more than about 100000 files.
+       Fixed a potential stack overflow when extracting solid archives
+       containing more than about 100000 files.

 
        Memory usage for LZMS and LZX compression has been decreased.
 
 
        Memory usage for LZMS and LZX compression has been decreased.
 

+       For wimcapture, wimoptimize, and wimexport, '--solid' may now be used as
+       an alias for '--pack-streams'.
+

 Version 1.6.0:
        Support for extracting and updating the new version 3584 WIMs has been
        added.  These WIMs typically pack many streams ("files") together into a
 Version 1.6.0:
        Support for extracting and updating the new version 3584 WIMs has been
        added.  These WIMs typically pack many streams ("files") together into a

diff --git a/README b/README
index 2b74214189b1397ace2d304938243935d306c42b..7b7eaf0320c7a0cdf276a12ae4c5e40a2f25014f 100644 (file)
--- a/README
+++ b/README
@@ -108,14 +108,13 @@ Notes:
        compression type is not generally recommended due to its limited
        compatibility with the MS implementations.
 
        compression type is not generally recommended due to its limited
        compatibility with the MS implementations.
 

-   [7] '--compress=recovery --packed-streams' or
-       '--compress=LZMS --packed-streams' for wimlib-imagex;
-       WIMCreateFile with WIM_COMPRESSION_LZMS and flag 0x20000000 for WIMGAPI.
-       Compression chunk size in packed resources is 33554432 for wimlib,
-       67108864 for WIMGAPI.  Note: this compression type is not generally
-       recommended due to its limited compatibility with the MS implementations.
-       Also, due to the large chunk size, wimlib uses about 500MB of memory per
-       thread when compressing in this format.
+   [7] '--compress=recovery --solid' or '--compress=LZMS --solid' for
+       wimlib-imagex; WIMCreateFile with WIM_COMPRESSION_LZMS and flag
+       0x20000000 for WIMGAPI.  Compression chunk size in packed resources is
+       33554432 for wimlib, 67108864 for WIMGAPI.  Note: this compression type
+       is not generally recommended due to its limited compatibility with the MS
+       implementations.  Also, due to the large chunk size, wimlib uses about
+       500MB of memory per thread when compressing in this format.

 
 The above timings were done on Windows 8 (x86) so that side-by-side comparisons
 with the Microsoft implementation would be possible; however, wimlib may have
 
 The above timings were done on Windows 8 (x86) so that side-by-side comparisons
 with the Microsoft implementation would be possible; however, wimlib may have

diff --git a/doc/imagex-capture.1.in b/doc/imagex-capture.1.in
index 7f7ca9a3cd9df8379fa78ec14c0d780c650427e3..410546674e53b648777414cc6c38c64fff2b9f18 100644 (file)
--- a/doc/imagex-capture.1.in
+++ b/doc/imagex-capture.1.in
@@ -215,7 +215,7 @@ compression, the maximum allowed chunk size is 2^21 (2097152), and for XPRESS
 ("fast") and LZMS ("recovery") compression, the maximum allowed chunk size is
 2^26 (67108644).
 .TP
 ("fast") and LZMS ("recovery") compression, the maximum allowed chunk size is
 2^26 (67108644).
 .TP

-\fB--pack-streams\fR
+\fB--pack-streams\fR, \fB--solid\fR

 Create a "solid" archive that compresses multiple unique streams ("files")
 together, rather than each unique stream ("file") independently.  This can
 result in a significantly better compression ratio, but this format greatly
 Create a "solid" archive that compresses multiple unique streams ("files")
 together, rather than each unique stream ("file") independently.  This can
 result in a significantly better compression ratio, but this format greatly

diff --git a/doc/imagex-export.1.in b/doc/imagex-export.1.in
index 80c31ebe156cb7310e5652e6bfa261502c2938de..32eea666422bb263c001a9d867fe0dcd61a159e6 100644 (file)
--- a/doc/imagex-export.1.in
+++ b/doc/imagex-export.1.in
@@ -79,7 +79,7 @@ and "LZX", instead of "fast" and "maximum", respectively.
 reduced compatibility.  See the documentation for this option to
 \fB@IMAGEX_PROGNAME@ capture\fR (1) for more details.
 .TP
 reduced compatibility.  See the documentation for this option to
 \fB@IMAGEX_PROGNAME@ capture\fR (1) for more details.
 .TP

-\fB--pack-streams\fR
+\fB--pack-streams\fR, \fB--solid\fR

 Create a "solid" archive that compresses multiple files together.  This can
 result in a higher compression ratio, but has disadvantages such as reduced
 compatibility; see the documentation for this option to
 Create a "solid" archive that compresses multiple files together.  This can
 result in a higher compression ratio, but has disadvantages such as reduced
 compatibility; see the documentation for this option to

diff --git a/doc/imagex-optimize.1.in b/doc/imagex-optimize.1.in
index d718f55e41e94f9f4a4ab3bd8d2dbc51104b672e..37eb71bb6a9dbcc53e64673b9c514a94e892854c 100644 (file)
--- a/doc/imagex-optimize.1.in
+++ b/doc/imagex-optimize.1.in
@@ -60,7 +60,7 @@ reduced compatibility.  See the documentation for this option to
 Set the WIM compression chunk size to \fISIZE\fR.  See the documentation for
 this option to \fB@IMAGEX_PROGNAME@ capture\fR (1) for more details.
 .TP
 Set the WIM compression chunk size to \fISIZE\fR.  See the documentation for
 this option to \fB@IMAGEX_PROGNAME@ capture\fR (1) for more details.
 .TP

-\fB--pack-streams\fR
+\fB--pack-streams\fR, \fB--solid\fR

 Create a "solid" archive that compresses multiple files together.  This can
 result in a higher compression ratio, but has disadvantages such as reduced
 compatibility; see the documentation for this option to
 Create a "solid" archive that compresses multiple files together.  This can
 result in a higher compression ratio, but has disadvantages such as reduced
 compatibility; see the documentation for this option to

diff --git a/programs/imagex.c b/programs/imagex.c
index ad000407897c4d46bada4280228248f8cc4e0afd..9ebe277181dee6b7eb559f26131214f51b177c7d 100644 (file)
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -196,6 +196,7 @@ static const struct option capture_or_append_options[] = {
        {T("compress-slow"), no_argument,     NULL, IMAGEX_COMPRESS_SLOW_OPTION},
        {T("chunk-size"),  required_argument, NULL, IMAGEX_CHUNK_SIZE_OPTION},
        {T("pack-streams"), no_argument,      NULL, IMAGEX_PACK_STREAMS_OPTION},
        {T("compress-slow"), no_argument,     NULL, IMAGEX_COMPRESS_SLOW_OPTION},
        {T("chunk-size"),  required_argument, NULL, IMAGEX_CHUNK_SIZE_OPTION},
        {T("pack-streams"), no_argument,      NULL, IMAGEX_PACK_STREAMS_OPTION},

+       {T("solid"),       no_argument,      NULL, IMAGEX_PACK_STREAMS_OPTION},

        {T("config"),      required_argument, NULL, IMAGEX_CONFIG_OPTION},
        {T("dereference"), no_argument,       NULL, IMAGEX_DEREFERENCE_OPTION},
        {T("flags"),       required_argument, NULL, IMAGEX_FLAGS_OPTION},
        {T("config"),      required_argument, NULL, IMAGEX_CONFIG_OPTION},
        {T("dereference"), no_argument,       NULL, IMAGEX_DEREFERENCE_OPTION},
        {T("flags"),       required_argument, NULL, IMAGEX_FLAGS_OPTION},


@@ -234,6 +235,7 @@ static const struct option export_options[] = {
        {T("no-check"),    no_argument,       NULL, IMAGEX_NOCHECK_OPTION},
        {T("compress"),    required_argument, NULL, IMAGEX_COMPRESS_OPTION},
        {T("pack-streams"),no_argument,       NULL, IMAGEX_PACK_STREAMS_OPTION},
        {T("no-check"),    no_argument,       NULL, IMAGEX_NOCHECK_OPTION},
        {T("compress"),    required_argument, NULL, IMAGEX_COMPRESS_OPTION},
        {T("pack-streams"),no_argument,       NULL, IMAGEX_PACK_STREAMS_OPTION},

+       {T("solid"),       no_argument,       NULL, IMAGEX_PACK_STREAMS_OPTION},

        {T("chunk-size"),  required_argument, NULL, IMAGEX_CHUNK_SIZE_OPTION},
        {T("ref"),         required_argument, NULL, IMAGEX_REF_OPTION},
        {T("threads"),     required_argument, NULL, IMAGEX_THREADS_OPTION},
        {T("chunk-size"),  required_argument, NULL, IMAGEX_CHUNK_SIZE_OPTION},
        {T("ref"),         required_argument, NULL, IMAGEX_REF_OPTION},
        {T("threads"),     required_argument, NULL, IMAGEX_THREADS_OPTION},


@@ -298,6 +300,7 @@ static const struct option optimize_options[] = {
        {T("recompress-slow"), no_argument,     NULL, IMAGEX_COMPRESS_SLOW_OPTION},
        {T("chunk-size"),  required_argument, NULL, IMAGEX_CHUNK_SIZE_OPTION},
        {T("pack-streams"),no_argument,       NULL, IMAGEX_PACK_STREAMS_OPTION},
        {T("recompress-slow"), no_argument,     NULL, IMAGEX_COMPRESS_SLOW_OPTION},
        {T("chunk-size"),  required_argument, NULL, IMAGEX_CHUNK_SIZE_OPTION},
        {T("pack-streams"),no_argument,       NULL, IMAGEX_PACK_STREAMS_OPTION},

+       {T("solid"),       no_argument,       NULL, IMAGEX_PACK_STREAMS_OPTION},

        {T("threads"),     required_argument, NULL, IMAGEX_THREADS_OPTION},
        {T("pipable"),     no_argument,       NULL, IMAGEX_PIPABLE_OPTION},
        {T("not-pipable"), no_argument,       NULL, IMAGEX_NOT_PIPABLE_OPTION},
        {T("threads"),     required_argument, NULL, IMAGEX_THREADS_OPTION},
        {T("pipable"),     no_argument,       NULL, IMAGEX_PIPABLE_OPTION},
        {T("not-pipable"), no_argument,       NULL, IMAGEX_NOT_PIPABLE_OPTION},