wget: implement TLS verification with ENABLE_FEATURE_WGET_OPENSSL

[oweals/busybox.git] / archival / cpio.c

diff --git a/archival/cpio.c b/archival/cpio.c
index f2165be3a6303f2da8273b3313061cd3dcc6e85e..0f37ffbb9046330d8982bae97e376676b1fa9afa 100644 (file)
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -10,12 +10,8 @@
  * Doesn't check CRC's
  * Only supports new ASCII and CRC formats
  */
-#include "libbb.h"
-#include "common_bufsiz.h"
-#include "bb_archive.h"
-
 //config:config CPIO
-//config:      bool "cpio (14 kb)"
+//config:      bool "cpio (15 kb)"
 //config:      default y
 //config:      help
 //config:      cpio is an archival utility program used to create, modify, and
@@ -44,6 +40,7 @@
 //config:      Passthrough mode. Rarely used.
 
 //applet:IF_CPIO(APPLET(cpio, BB_DIR_BIN, BB_SUID_DROP))
+
 //kbuild:lib-$(CONFIG_CPIO) += cpio.o
 
 //usage:#define cpio_trivial_usage
@@ -67,15 +64,17 @@
 //usage:     "\n       -p DIR  Copy files to DIR"
 //usage:       )
 //usage:     "\nOptions:"
+//usage:       IF_FEATURE_CPIO_O(
+//usage:     "\n       -H newc Archive format"
+//usage:       )
 //usage:     "\n       -d      Make leading directories"
 //usage:     "\n       -m      Preserve mtime"
 //usage:     "\n       -v      Verbose"
 //usage:     "\n       -u      Overwrite"
 //usage:     "\n       -F FILE Input (-t,-i,-p) or output (-o) file"
 //usage:     "\n       -R USER[:GRP]   Set owner of created files"
-//usage:       IF_FEATURE_CPIO_O(
-//usage:     "\n       -H newc Archive format"
-//usage:       )
+//usage:     "\n       -L      Dereference symlinks"
+//usage:     "\n       -0      Input is separated by NULs"
 
 /* GNU cpio 2.9 --help (abridged):
 
@@ -142,6 +141,10 @@
   -u, --unconditional        Replace all files unconditionally
  */
 
+#include "libbb.h"
+#include "common_bufsiz.h"
+#include "bb_archive.h"
+
 enum {
        OPT_EXTRACT            = (1 << 0),
        OPT_TEST               = (1 << 1),
@@ -373,6 +376,7 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
 #endif
                "owner\0"        Required_argument "R"
                "verbose\0"      No_argument       "v"
+               "null\0"         No_argument       "0"
                "quiet\0"        No_argument       "\xff"
                "to-stdout\0"    No_argument       "\xfe"
                ;
@@ -507,6 +511,8 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
        while (get_header_cpio(archive_handle) == EXIT_SUCCESS)
                continue;
 
+       create_links_from_list(archive_handle->link_placeholders);
+
        if (archive_handle->cpio__blocks != (off_t)-1
         && !(opt & OPT_QUIET)
        ) {