Make a filter program be called with its arguments.

libarchive · Oct 5, 2012 · 40722a2 · 40722a2
1 parent 275000d
commit 40722a2
Show file tree

Hide file tree

Showing 12 changed files with 1,050 additions and 65 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -331,6 +331,7 @@ libarchive_test_SOURCES=					\
 	libarchive/test/test_read_disk_entry_from_file.c	\
 	libarchive/test/test_read_extract.c			\
 	libarchive/test/test_read_file_nonexistent.c		\
+	libarchive/test/test_read_filter_program_signature.c	\
 	libarchive/test/test_read_format_7zip.c			\
 	libarchive/test/test_read_format_ar.c			\
 	libarchive/test/test_read_format_cab.c			\

diff --git a/libarchive/archive.h b/libarchive/archive.h
@@ -328,9 +328,22 @@ __LA_DECL int archive_read_support_filter_lzma(struct archive *);
 __LA_DECL int archive_read_support_filter_none(struct archive *);
 __LA_DECL int archive_read_support_filter_program(struct archive *,
 		     const char *command);
+__LA_DECL int archive_read_support_filter_programl(struct archive *,
+		     const char *command, const char *arg,
+		     .../* (char *)0 */);
+__LA_DECL int archive_read_support_filter_programv(struct archive *,
+		     const char *command, char * const argv[]);
 __LA_DECL int archive_read_support_filter_program_signature
-		(struct archive *, const char *,
+		(struct archive *, const char * /* cmd */,
 				    const void * /* match */, size_t);
+__LA_DECL int archive_read_support_filter_programl_signature
+		(struct archive *, const char * /* cmd */,
+		 const char * /* arg */,
+		 .../* , (char *)0, const void *, size_t */);
+__LA_DECL int archive_read_support_filter_programv_signature
+		(struct archive *, const char * /* cmd */,
+		 char * const [] /* argv */,
+		 const void * /* match */, size_t);
 
 __LA_DECL int archive_read_support_filter_rpm(struct archive *);
 __LA_DECL int archive_read_support_filter_uu(struct archive *);
@@ -601,6 +614,10 @@ __LA_DECL int archive_write_add_filter_lzma(struct archive *);
 __LA_DECL int archive_write_add_filter_none(struct archive *);
 __LA_DECL int archive_write_add_filter_program(struct archive *,
 		     const char *cmd);
+__LA_DECL int archive_write_add_filter_programl(struct archive *,
+		     const char *cmd, const char *arg, .../*, (char *)0 */);
+__LA_DECL int archive_write_add_filter_programv(struct archive *,
+		     const char *cmd, char * const argv[]);
 __LA_DECL int archive_write_add_filter_xz(struct archive *);
 
 

diff --git a/libarchive/archive_read_private.h b/libarchive/archive_read_private.h
@@ -226,4 +226,8 @@ int64_t	__archive_read_filter_seek(struct archive_read_filter *, int64_t, int);
 int64_t	__archive_read_consume(struct archive_read *, int64_t);
 int64_t	__archive_read_filter_consume(struct archive_read_filter *, int64_t);
 int __archive_read_program(struct archive_read_filter *, const char *);
+int __archive_read_programl(struct archive_read_filter *, const char *,
+    const char *, .../*, (char *)0 */);
+int __archive_read_programv(struct archive_read_filter *, const char *,
+    char * const argv[]);
 #endif