X-Git-Url: https://git.librecmc.org/?p=oweals%2Fopkg-lede.git;a=blobdiff_plain;f=libopkg%2Fpkg_extract.c;fp=libopkg%2Fpkg_extract.c;h=8a541e30ef5d081474458cb9fcd7ee19189131ae;hp=0f21e4011d418b32a0ab285202a7db4631032e6f;hb=4ea955bc7e5575bc1d8b34c364591c47653f2cfd;hpb=a79c1af5c0d3908a3ad30806530c754b42cf80e2 diff --git a/libopkg/pkg_extract.c b/libopkg/pkg_extract.c index 0f21e40..8a541e3 100644 --- a/libopkg/pkg_extract.c +++ b/libopkg/pkg_extract.c @@ -22,20 +22,18 @@ #include "file_util.h" #include "sprintf_alloc.h" -int -pkg_extract_control_file_to_stream(pkg_t *pkg, FILE *stream) +int pkg_extract_control_file_to_stream(pkg_t * pkg, FILE * stream) { int err; deb_extract(pkg->local_filename, stream, - extract_control_tar_gz - | extract_to_stream, - NULL, "control", &err); + extract_control_tar_gz + | extract_to_stream, NULL, "control", &err); return err; } int -pkg_extract_control_files_to_dir_with_prefix(pkg_t *pkg, const char *dir, - const char *prefix) +pkg_extract_control_files_to_dir_with_prefix(pkg_t * pkg, const char *dir, + const char *prefix) { int err; char *dir_with_prefix; @@ -43,57 +41,51 @@ pkg_extract_control_files_to_dir_with_prefix(pkg_t *pkg, const char *dir, sprintf_alloc(&dir_with_prefix, "%s/%s", dir, prefix); deb_extract(pkg->local_filename, stderr, - extract_control_tar_gz - | extract_all_to_fs| extract_preserve_date - | extract_unconditional, - dir_with_prefix, NULL, &err); + extract_control_tar_gz + | extract_all_to_fs | extract_preserve_date + | extract_unconditional, dir_with_prefix, NULL, &err); free(dir_with_prefix); return err; } -int -pkg_extract_control_files_to_dir(pkg_t *pkg, const char *dir) +int pkg_extract_control_files_to_dir(pkg_t * pkg, const char *dir) { return pkg_extract_control_files_to_dir_with_prefix(pkg, dir, ""); } - -int -pkg_extract_data_files_to_dir(pkg_t *pkg, const char *dir) +int pkg_extract_data_files_to_dir(pkg_t * pkg, const char *dir) { int err; deb_extract(pkg->local_filename, stderr, - extract_data_tar_gz - | extract_all_to_fs| extract_preserve_date - | extract_unconditional, - dir, NULL, &err); + extract_data_tar_gz + | extract_all_to_fs | extract_preserve_date + | extract_unconditional, dir, NULL, &err); return err; } -int -pkg_extract_data_file_names_to_stream(pkg_t *pkg, FILE *stream) +int pkg_extract_data_file_names_to_stream(pkg_t * pkg, FILE * stream) { int err; - /* XXX: DPKG_INCOMPATIBILITY: deb_extract will extract all of the - data file names with a '.' as the first character. I've taught - opkg how to cope with the presence or absence of the '.', but - this may trip up dpkg. + /* XXX: DPKG_INCOMPATIBILITY: deb_extract will extract all of the + data file names with a '.' as the first character. I've taught + opkg how to cope with the presence or absence of the '.', but + this may trip up dpkg. - For all I know, this could actually be a bug in opkg-build. So, - I'll have to try installing some .debs and comparing the *.list - files. + For all I know, this could actually be a bug in opkg-build. So, + I'll have to try installing some .debs and comparing the *.list + files. - If we wanted to, we could workaround the deb_extract behavior - right here, by writing to a tmpfile, then munging things as we - wrote to the actual stream. */ + If we wanted to, we could workaround the deb_extract behavior + right here, by writing to a tmpfile, then munging things as we + wrote to the actual stream. */ deb_extract(pkg->local_filename, stream, - extract_quiet | extract_data_tar_gz | extract_list, - NULL, NULL, &err); + extract_quiet | extract_data_tar_gz | extract_list, + NULL, NULL, &err); return err; }