[BusyBox-cvs] busybox/archival ar.c,1.42,1.43 cpio.c,1.9,1.10 dpkg.c,1.69,1.70 dpkg_deb.c,1.28,1.29 tar.c,1.167,1.168 unzip.c,1.3,1.4
Glenn McGrath
bug1 at busybox.net
Sun Dec 8 00:55:04 UTC 2002
Update of /var/cvs/busybox/archival
In directory winder:/tmp/cvs-serv20423/archival
Modified Files:
ar.c cpio.c dpkg.c dpkg_deb.c tar.c unzip.c
Log Message:
Move add_to_list from libunarchive to libbb so it can be of more general use (eg ifupdown). Changed the name to llist_add_to as i plan on adding more llist_ functions as needed (e.g. llist_free).
Index: ar.c
===================================================================
RCS file: /var/cvs/busybox/archival/ar.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- ar.c 3 Nov 2002 14:05:05 -0000 1.42
+++ ar.c 8 Dec 2002 00:54:29 -0000 1.43
@@ -124,7 +124,7 @@
/* TODO: This is the same as in tar, seperate function ? */
while (optind < argc) {
archive_handle->filter = filter_accept_list;
- archive_handle->accept = add_to_list(archive_handle->accept, argv[optind]);
+ archive_handle->accept = llist_add_to(archive_handle->accept, argv[optind]);
optind++;
}
Index: cpio.c
===================================================================
RCS file: /var/cvs/busybox/archival/cpio.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- cpio.c 4 Nov 2002 23:47:29 -0000 1.9
+++ cpio.c 8 Dec 2002 00:54:29 -0000 1.10
@@ -79,7 +79,7 @@
while (optind < argc) {
archive_handle->filter = filter_accept_list;
- archive_handle->accept = add_to_list(archive_handle->accept, argv[optind]);
+ archive_handle->accept = llist_add_to(archive_handle->accept, argv[optind]);
optind++;
}
Index: dpkg.c
===================================================================
RCS file: /var/cvs/busybox/archival/dpkg.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- dpkg.c 2 Dec 2002 00:01:34 -0000 1.69
+++ dpkg.c 8 Dec 2002 00:54:29 -0000 1.70
@@ -1330,10 +1330,10 @@
/* We dont care about data.tar.* or debian-binary, just control.tar.* */
#ifdef CONFIG_FEATURE_DEB_TAR_GZ
- ar_handle->accept = add_to_list(NULL, "control.tar.gz");
+ ar_handle->accept = llist_add_to(NULL, "control.tar.gz");
#endif
#ifdef CONFIG_FEATURE_DEB_TAR_BZ2
- ar_handle->accept = add_to_list(ar_handle->accept, "control.tar.bz2");
+ ar_handle->accept = llist_add_to(ar_handle->accept, "control.tar.bz2");
#endif
/* Assign the tar handle as a subarchive of the ar handle */
@@ -1353,10 +1353,10 @@
/* We dont care about data.tar.* or debian-binary, just control.tar.* */
#ifdef CONFIG_FEATURE_DEB_TAR_GZ
- tar_handle->accept = add_to_list(NULL, "data.tar.gz");
+ tar_handle->accept = llist_add_to(NULL, "data.tar.gz");
#endif
#ifdef CONFIG_FEATURE_DEB_TAR_BZ2
- tar_handle->accept = add_to_list(ar_handle->accept, "data.tar.bz2");
+ tar_handle->accept = llist_add_to(ar_handle->accept, "data.tar.bz2");
#endif
/* Assign the tar handle as a subarchive of the ar handle */
@@ -1365,7 +1365,7 @@
return;
}
-static char *deb_extract_control_file_to_buffer(archive_handle_t *ar_handle, const llist_t *accept)
+static char *deb_extract_control_file_to_buffer(archive_handle_t *ar_handle, llist_t *accept)
{
ar_handle->sub_archive->action_data = data_extract_to_buffer;
ar_handle->sub_archive->accept = accept;
@@ -1532,10 +1532,10 @@
deb_file[deb_count] = (deb_file_t *) xmalloc(sizeof(deb_file_t));
if (dpkg_opt & dpkg_opt_filename) {
archive_handle_t *archive_handle;
- const llist_t *control_list = NULL;
+ llist_t *control_list = NULL;
/* Extract the control file */
- control_list = add_to_list(NULL, "./control");
+ control_list = llist_add_to(NULL, "./control");
archive_handle = init_archive_deb_ar(argv[optind]);
init_archive_deb_control(archive_handle);
deb_file[deb_count]->control_file = deb_extract_control_file_to_buffer(archive_handle, control_list);
Index: dpkg_deb.c
===================================================================
RCS file: /var/cvs/busybox/archival/dpkg_deb.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- dpkg_deb.c 13 Nov 2002 00:24:19 -0000 1.28
+++ dpkg_deb.c 8 Dec 2002 00:54:30 -0000 1.29
@@ -27,7 +27,7 @@
archive_handle_t *tar_archive;
int opt = 0;
#ifndef CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY
- const llist_t *control_tar_llist = NULL;
+ llist_t *control_tar_llist = NULL;
#endif
/* Setup the tar archive handle */
@@ -39,16 +39,16 @@
ar_archive->filter = filter_accept_list_reassign;
#ifdef CONFIG_FEATURE_DEB_TAR_GZ
- ar_archive->accept = add_to_list(NULL, "data.tar.gz");
+ ar_archive->accept = llist_add_to(NULL, "data.tar.gz");
# ifndef CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY
- control_tar_llist = add_to_list(NULL, "control.tar.gz");
+ control_tar_llist = llist_add_to(NULL, "control.tar.gz");
# endif
#endif
#ifdef CONFIG_FEATURE_DEB_TAR_BZ2
- ar_archive->accept = add_to_list(ar_archive->accept, "data.tar.bz2");
+ ar_archive->accept = llist_add_to(ar_archive->accept, "data.tar.bz2");
# ifndef CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY
- control_tar_llist = add_to_list(control_tar_llist, "control.tar.bz2");
+ control_tar_llist = llist_add_to(control_tar_llist, "control.tar.bz2");
# endif
#endif
@@ -71,7 +71,7 @@
* it should accept a second argument which specifies a
* specific field to print */
ar_archive->accept = control_tar_llist;
- tar_archive->accept = add_to_list(NULL, "./control");;
+ tar_archive->accept = llist_add_to(NULL, "./control");;
tar_archive->filter = filter_accept_list;
tar_archive->action_data = data_extract_to_stdout;
break;
Index: tar.c
===================================================================
RCS file: /var/cvs/busybox/archival/tar.c,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -d -r1.167 -r1.168
--- tar.c 27 Nov 2002 07:52:22 -0000 1.167
+++ tar.c 8 Dec 2002 00:54:30 -0000 1.168
@@ -583,13 +583,13 @@
#endif /* tar_create */
#ifdef CONFIG_FEATURE_TAR_EXCLUDE
-static const llist_t *append_file_list_to_list(const char *filename, const llist_t *list)
+static llist_t *append_file_list_to_list(const char *filename, llist_t *list)
{
FILE *src_stream = xfopen(filename, "r");
char *line;
while((line = get_line_from_file(src_stream)) != NULL) {
chomp(line);
- list = add_to_list(list, line);
+ list = llist_add_to(list, line);
}
fclose(src_stream);
@@ -708,7 +708,7 @@
/* Setup an array of filenames to work with */
/* TODO: This is the same as in ar, seperate function ? */
while (optind < argc) {
- tar_handle->accept = add_to_list(tar_handle->accept, argv[optind]);
+ tar_handle->accept = llist_add_to(tar_handle->accept, argv[optind]);
optind++;
}
Index: unzip.c
===================================================================
RCS file: /var/cvs/busybox/archival/unzip.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- unzip.c 3 Nov 2002 14:05:05 -0000 1.3
+++ unzip.c 8 Dec 2002 00:54:30 -0000 1.4
@@ -147,7 +147,7 @@
while (optind < argc) {
archive_handle->filter = filter_accept_list;
- archive_handle->accept = add_to_list(archive_handle->accept, argv[optind]);
+ archive_handle->accept = llist_add_to(archive_handle->accept, argv[optind]);
optind++;
}
More information about the busybox-cvs
mailing list