Patch from Felipe Kellermann, fix endless loop when first > last and

[oweals/busybox.git] / archival / Config.in

diff --git a/archival/Config.in b/archival/Config.in
index 2eab5abfaf3f9dd26c7ebe5dae005a57ca5c0210..db358db08e41293aad6bf3c69a7daf20955c7efe 100644 (file)
--- a/archival/Config.in
+++ b/archival/Config.in
@@ -46,11 +46,11 @@ config CONFIG_BUNZIP2
          sorting text compression algorithm, and Huffman coding.  Compression
          is generally considerably better than that achieved by more
          conventional LZ77/LZ78-based compressors, and approaches the
-         performance of the PPM family of statistical compressors.  
-         
+         performance of the PPM family of statistical compressors.
+       
          The BusyBox bunzip2 applet is limited to de-compression only.
          On an x86 system, this applet adds about 11K.
-         
+       
          Unless you have a specific application which requires bunzip2, you
          should probably say N here.
 
@@ -63,7 +63,7 @@ config CONFIG_CPIO
          cpio has 110 bytes of overheads for every stored file.
 
          This implementation of cpio can extract cpio archives created in the
-         "newc" or "crc" format, it cannot create or modify them. 
+         "newc" or "crc" format, it cannot create or modify them.
 
          Unless you have a specific application which requires cpio, you should
          probably say N here.
@@ -73,7 +73,7 @@ config CONFIG_DPKG
        default n
        help
          dpkg is a medium-level tool to install, build, remove and manage Debian packages.
-         
+       
          This implementation of dpkg has a number of limitations, you should use the
          official dpkg if possible.
 
@@ -82,9 +82,9 @@ config CONFIG_DPKG_DEB
        default n
        help
          dpkg-deb packs, unpacks and provides information about Debian archives.
-         
+       
          This implementation of dpkg-deb cannot pack archives.
-         
+       
          Unless you have a specific application which requires dpkg-deb, you should
          probably say N here.
 
@@ -94,29 +94,9 @@ config CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY
        depends on CONFIG_DPKG_DEB
        help
          This reduces dpkg-deb to the equivalent of "ar -p <deb> data.tar.gz | tar -zx".
-         However it saves space as none of the extra dpkg-deb, ar or tar options are 
+         However it saves space as none of the extra dpkg-deb, ar or tar options are
          needed, they are linked to internally.
 
-config CONFIG_FEATURE_DEB_TAR_GZ
-       bool "  gzip debian packages (normal)"
-       default y if CONFIG_DPKG || CONFIG_DPKG_DEB
-       depends on CONFIG_DPKG || CONFIG_DPKG_DEB
-       help
-         This is the default compression method inside the debian ar file.
-         
-         If you want compatibility with standard .deb's you should say yes here.
-
-config CONFIG_FEATURE_DEB_TAR_BZ2
-       bool "  bzip2 debian packages"
-       default n
-       depends on CONFIG_DPKG || CONFIG_DPKG_DEB
-       help
-         This allows dpkg and dpkg-deb to extract deb's that are compressed internally
-         with bzip2 instead of gzip.
-         
-         You only want this if you are creating your own custom debian packages that
-         use an internal control.tar.bz2 or data.tar.bz2.
-
 config CONFIG_GUNZIP
        bool "gunzip"
        default n
@@ -177,13 +157,13 @@ config CONFIG_FEATURE_TAR_BZIP2
          If you enable this option you'll be able to extract
          archives compressed with bzip2.
 
-config CONFIG_FEATURE_TAR_EXCLUDE
-       bool "  Enable -X and --exclude options (exclude files)"
+config CONFIG_FEATURE_TAR_FROM
+       bool "  Enable -X (exclude from) and -T (include from) options)"
        default n
        depends on CONFIG_TAR
        help
          If you enable this option you'll be able to specify
-         a list of files to exclude from an archive.
+         a list of files to include or exclude from an archive.
 
 config CONFIG_FEATURE_TAR_GZIP
        bool "  Enable -z option"
@@ -215,9 +195,16 @@ config CONFIG_FEATURE_TAR_GNU_EXTENSIONS
        default y
        depends on CONFIG_TAR
        help
-         With this option busybox supports GNU long filenames and 
+         With this option busybox supports GNU long filenames and
          linknames.
 
+config CONFIG_FEATURE_TAR_LONG_OPTIONS
+       bool "  Enable long options"
+       default n
+       depends on CONFIG_TAR
+       help
+               Enable use of long options, increases size by about 400 Bytes
+
 config CONFIG_UNCOMPRESS
        bool "uncompress"
        default n
@@ -245,4 +232,27 @@ config CONFIG_FEATURE_UNARCHIVE_TAPE
        help
          I don't think this is needed anymore.
 
+comment "Common options for dpkg and dpkg_deb"
+       depends on CONFIG_DPKG || CONFIG_DPKG_DEB
+
+config CONFIG_FEATURE_DEB_TAR_GZ
+       bool "  gzip debian packages (normal)"
+       default y if CONFIG_DPKG || CONFIG_DPKG_DEB
+       depends on CONFIG_DPKG || CONFIG_DPKG_DEB
+       help
+         This is the default compression method inside the debian ar file.
+       
+         If you want compatibility with standard .deb's you should say yes here.
+
+config CONFIG_FEATURE_DEB_TAR_BZ2
+       bool "  bzip2 debian packages"
+       default n
+       depends on CONFIG_DPKG || CONFIG_DPKG_DEB
+       help
+         This allows dpkg and dpkg-deb to extract deb's that are compressed internally
+         with bzip2 instead of gzip.
+       
+         You only want this if you are creating your own custom debian packages that
+         use an internal control.tar.bz2 or data.tar.bz2.
+
 endmenu