aboutsummaryrefslogtreecommitdiff
path: root/archival/cpio.c
diff options
context:
space:
mode:
authorbug1 <bug1@69ca8d6d-28ef-0310-b511-8ec308f3f277>2002-11-04 23:47:31 +0000
committerbug1 <bug1@69ca8d6d-28ef-0310-b511-8ec308f3f277>2002-11-04 23:47:31 +0000
commit1d4a9b676b6562a9be9991eeb0eb939e526e61e6 (patch)
tree5864c9961fdbfbcb8ecf09e78077544f9c8d12c3 /archival/cpio.c
parent4d040125f07ae51b59fc392ae69371def69bfae1 (diff)
downloadbusybox-w32-1d4a9b676b6562a9be9991eeb0eb939e526e61e6.tar.gz
busybox-w32-1d4a9b676b6562a9be9991eeb0eb939e526e61e6.tar.bz2
busybox-w32-1d4a9b676b6562a9be9991eeb0eb939e526e61e6.zip
Change filter paramaters, filters can be more powefull now
git-svn-id: svn://busybox.net/trunk/busybox@5806 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'archival/cpio.c')
-rw-r--r--archival/cpio.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/archival/cpio.c b/archival/cpio.c
index 0d0614932..2aa11943e 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -116,7 +116,7 @@ extern int cpio_main(int argc, char **argv)
116 tmp = tmp->next; 116 tmp = tmp->next;
117 } 117 }
118 pending_hardlinks = 0; /* No more pending hardlinks, read next file entry */ 118 pending_hardlinks = 0; /* No more pending hardlinks, read next file entry */
119 } 119 }
120 120
121 /* There can be padding before archive header */ 121 /* There can be padding before archive header */
122 data_align(archive_handle, 4); 122 data_align(archive_handle, 4);
@@ -138,7 +138,7 @@ extern int cpio_main(int argc, char **argv)
138 138
139 if ((cpio_header[5] != '1') && (cpio_header[5] != '2')) { 139 if ((cpio_header[5] != '1') && (cpio_header[5] != '2')) {
140 error_msg_and_die("Unsupported cpio format, use newc or crc"); 140 error_msg_and_die("Unsupported cpio format, use newc or crc");
141 } 141 }
142 142
143 sscanf(cpio_header, "%6c%8x%8x%8x%8x%8x%8lx%8lx%16c%8x%8x%8x%8c", 143 sscanf(cpio_header, "%6c%8x%8x%8x%8x%8x%8lx%8lx%16c%8x%8x%8x%8c",
144 dummy, &inode, (unsigned int*)&file_header->mode, 144 dummy, &inode, (unsigned int*)&file_header->mode,
@@ -206,7 +206,7 @@ extern int cpio_main(int argc, char **argv)
206 file_header->device = (major << 8) | minor; 206 file_header->device = (major << 8) | minor;
207 207
208 extract_flag = FALSE; 208 extract_flag = FALSE;
209 if (archive_handle->filter(archive_handle->accept, archive_handle->reject, file_header->name) == EXIT_SUCCESS) { 209 if (archive_handle->filter(archive_handle) == EXIT_SUCCESS) {
210 struct stat statbuf; 210 struct stat statbuf;
211 211
212 extract_flag = TRUE; 212 extract_flag = TRUE;