jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

io: remove the now unused pid association with istream

cute-signatures
Timo Teräs 2020-01-06 01:14:28 +02:00
parent e39334e44f
commit 3cd7d1e077
2 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/apk_io.h
View File

@ -106,9 +106,9 @@ static inline struct apk_istream *apk_bstream_gunzip(struct apk_bstream *bs)
struct apk_ostream *apk_ostream_gzip(struct apk_ostream *); struct apk_ostream *apk_ostream_gzip(struct apk_ostream *);
struct apk_ostream *apk_ostream_counter(off_t *); struct apk_ostream *apk_ostream_counter(off_t *);
struct apk_istream *apk_istream_from_fd_pid(int fd, pid_t pid, int (*translate_status)(int));
struct apk_istream *apk_istream_from_file(int atfd, const char *file); struct apk_istream *apk_istream_from_file(int atfd, const char *file);
struct apk_istream *apk_istream_from_file_gz(int atfd, const char *file); struct apk_istream *apk_istream_from_file_gz(int atfd, const char *file);
struct apk_istream *apk_istream_from_fd(int fd);
struct apk_istream *apk_istream_from_fd_url_if_modified(int atfd, const char *url, time_t since); struct apk_istream *apk_istream_from_fd_url_if_modified(int atfd, const char *url, time_t since);
struct apk_istream *apk_istream_from_url_gz(const char *url); struct apk_istream *apk_istream_from_url_gz(const char *url);
ssize_t apk_istream_skip(struct apk_istream *istream, size_t size); ssize_t apk_istream_skip(struct apk_istream *istream, size_t size);
@ -117,10 +117,6 @@ ssize_t apk_istream_skip(struct apk_istream *istream, size_t size);
ssize_t apk_istream_splice(struct apk_istream *is, int fd, size_t size, ssize_t apk_istream_splice(struct apk_istream *is, int fd, size_t size,
apk_progress_cb cb, void *cb_ctx); apk_progress_cb cb, void *cb_ctx);
static inline struct apk_istream *apk_istream_from_fd(int fd)
{
return apk_istream_from_fd_pid(fd, 0, NULL);
}
static inline struct apk_istream *apk_istream_from_url(const char *url) static inline struct apk_istream *apk_istream_from_url(const char *url)
{ {
return apk_istream_from_fd_url_if_modified(AT_FDCWD, url, 0); return apk_istream_from_fd_url_if_modified(AT_FDCWD, url, 0);
@ -147,17 +143,12 @@ static inline void apk_istream_close(struct apk_istream *is)
} }
struct apk_bstream *apk_bstream_from_istream(struct apk_istream *istream); struct apk_bstream *apk_bstream_from_istream(struct apk_istream *istream);
struct apk_bstream *apk_bstream_from_fd_pid(int fd, pid_t pid, int (*translate_status)(int));
struct apk_bstream *apk_bstream_from_file(int atfd, const char *file); struct apk_bstream *apk_bstream_from_file(int atfd, const char *file);
struct apk_bstream *apk_bstream_from_fd(int fd);
struct apk_bstream *apk_bstream_from_fd_url_if_modified(int atfd, const char *url, time_t since); struct apk_bstream *apk_bstream_from_fd_url_if_modified(int atfd, const char *url, time_t since);
struct apk_bstream *apk_bstream_tee(struct apk_bstream *from, int atfd, const char *to, int copy_meta, struct apk_bstream *apk_bstream_tee(struct apk_bstream *from, int atfd, const char *to, int copy_meta,
apk_progress_cb cb, void *cb_ctx); apk_progress_cb cb, void *cb_ctx);
static inline struct apk_bstream *apk_bstream_from_fd(int fd)
{
return apk_bstream_from_fd_pid(fd, 0, NULL);
}
static inline struct apk_bstream *apk_bstream_from_url(const char *url) static inline struct apk_bstream *apk_bstream_from_url(const char *url)
{ {
return apk_bstream_from_fd_url_if_modified(AT_FDCWD, url, 0); return apk_bstream_from_fd_url_if_modified(AT_FDCWD, url, 0);

27
src/io.c
View File

@ -59,8 +59,6 @@ void apk_file_meta_to_fd(int fd, struct apk_file_meta *meta)
struct apk_fd_istream { struct apk_fd_istream {
struct apk_istream is; struct apk_istream is;
int fd; int fd;
pid_t pid;
int (*translate_status)(int status);
}; };
static void fdi_get_meta(struct apk_istream *is, struct apk_file_meta *meta) static void fdi_get_meta(struct apk_istream *is, struct apk_file_meta *meta)
@ -88,12 +86,6 @@ static ssize_t fdi_read(struct apk_istream *is, void *ptr, size_t size)
break; break;
i += r; i += r;
} }
if (i == 0 && fis->pid != 0) {
int status;
if (waitpid(fis->pid, &status, 0) == fis->pid)
i = fis->translate_status(status);
fis->pid = 0;
}
return i; return i;
} }
@ -101,11 +93,8 @@ static ssize_t fdi_read(struct apk_istream *is, void *ptr, size_t size)
static void fdi_close(struct apk_istream *is) static void fdi_close(struct apk_istream *is)
{ {
struct apk_fd_istream *fis = container_of(is, struct apk_fd_istream, is); struct apk_fd_istream *fis = container_of(is, struct apk_fd_istream, is);
int status;
close(fis->fd); close(fis->fd);
if (fis->pid != 0)
waitpid(fis->pid, &status, 0);
free(fis); free(fis);
} }
@ -115,7 +104,7 @@ static const struct apk_istream_ops fd_istream_ops = {
.close = fdi_close, .close = fdi_close,
}; };
struct apk_istream *apk_istream_from_fd_pid(int fd, pid_t pid, int (*translate_status)(int)) struct apk_istream *apk_istream_from_fd(int fd)
{ {
struct apk_fd_istream *fis; struct apk_fd_istream *fis;
@ -130,8 +119,6 @@ struct apk_istream *apk_istream_from_fd_pid(int fd, pid_t pid, int (*translate_s
*fis = (struct apk_fd_istream) { *fis = (struct apk_fd_istream) {
.is.ops = &fd_istream_ops, .is.ops = &fd_istream_ops,
.fd = fd, .fd = fd,
.pid = pid,
.translate_status = translate_status,
}; };
return &fis->is; return &fis->is;
@ -395,19 +382,17 @@ static struct apk_bstream *apk_mmap_bstream_from_fd(int fd)
return &mbs->bs; return &mbs->bs;
} }
struct apk_bstream *apk_bstream_from_fd_pid(int fd, pid_t pid, int (*translate_status)(int)) struct apk_bstream *apk_bstream_from_fd(int fd)
{ {
struct apk_bstream *bs; struct apk_bstream *bs;
if (fd < 0) return ERR_PTR(-EBADF); if (fd < 0) return ERR_PTR(-EBADF);
if (pid == 0) { bs = apk_mmap_bstream_from_fd(fd);
bs = apk_mmap_bstream_from_fd(fd); if (!IS_ERR_OR_NULL(bs))
if (!IS_ERR_OR_NULL(bs)) return bs;
return bs;
}
return apk_bstream_from_istream(apk_istream_from_fd_pid(fd, pid, translate_status)); return apk_bstream_from_istream(apk_istream_from_fd(fd));
} }
struct apk_bstream *apk_bstream_from_file(int atfd, const char *file) struct apk_bstream *apk_bstream_from_file(int atfd, const char *file)