diff options
| author | P. J. McDermott <pj@pehjota.net> | 2014-08-20 16:42:58 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pj@pehjota.net> | 2014-08-20 16:47:42 (EDT) |
| commit | a284e52ee80674946fd2553b785bb3e8662eb690 (patch) | |
| tree | 871afa995f9c2fe802402ec2ad34a804e3fa5eb5 /lib/feed.sh | |
| parent | a5839ef83195af1892104c706fbf72c71c2d1b9f (diff) | |
feed_find_pkgs(): Take callbacks, not file names
Diffstat (limited to 'lib/feed.sh')
| -rw-r--r-- | lib/feed.sh | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/lib/feed.sh b/lib/feed.sh index 884cd0d..21f0f77 100644 --- a/lib/feed.sh +++ b/lib/feed.sh @@ -23,11 +23,11 @@ _FEED_SM=1 use fd use control -feed_pkg_cb= feed_dep_fields= +feed_pkg_cb= +feed_deps_cb= +feed_fname_cb= feed_pkgs= -feed_deps_fd= -feed_fnames_fd= feed_pkg_include= feed_pkg= feed_deps= @@ -46,26 +46,21 @@ feed_find_pkgs() local feed_idx="${1}" local dep_fields="${2}" local pkg_cb="${3}" - local deps_file="${4}" - local fnames_file="${5}" + local deps_cb="${4}" + local fname_cb="${5}" - feed_pkg_cb="${pkg_cb}" feed_dep_fields=" $(printf '%s ' ${dep_fields})" - feed_pkgs='' - - fopen "${deps_file}" 'a' - feed_deps_fd=${FD} - fopen "${fnames_file}" 'a' - feed_fnames_fd=${FD} + feed_pkg_cb="${pkg_cb}" + feed_deps_cb="${deps_cb}" + feed_fname_cb="${fname_cb}" + feed_pkgs='' feed_pkg_include='false' feed_pkg='' feed_deps='' parse_control "${feed_idx}" feed_field_cb feed_para_cb 'Package' - fclose ${feed_deps_fd} - printf '%s\n' "${feed_pkgs# }" return 0 @@ -79,7 +74,7 @@ feed_field_cb() if [ "x${name}" = 'xPackage' ]; then feed_pkg="${value}" elif [ "x${name}" = 'xFilename' ]; then - printf '%s %s\n' "${feed_pkg}" "${value}" >&${feed_fnames_fd} + ${feed_fname_cb} "${feed_pkg}" "${value}" elif [ "x${feed_dep_fields#* ${name} }" != "x${feed_dep_fields}" ]; then feed_deps="${feed_deps}${value}, " fi @@ -114,7 +109,7 @@ feed_para_cb() done unset IFS - printf '%s%s\n' "${feed_pkg}" "${new_deps}" >&${feed_deps_fd} + ${feed_deps_cb} "${feed_pkg}" "${new_deps# }" feed_pkg_include='false' feed_pkg='' |