Commit c51d82f8 authored by Natanael Copa's avatar Natanael Copa

url: fix fetching from local repositories

parent 01ec60f7
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include <fcntl.h>
#include "apk_defines.h" #include "apk_defines.h"
#include "apk_blob.h" #include "apk_blob.h"
...@@ -91,7 +92,7 @@ static inline struct apk_istream *apk_istream_from_fd(int fd) ...@@ -91,7 +92,7 @@ static inline struct apk_istream *apk_istream_from_fd(int fd)
} }
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(-1, url); return apk_istream_from_fd_url(AT_FDCWD, url);
} }
struct apk_bstream *apk_bstream_from_istream(struct apk_istream *istream); struct apk_bstream *apk_bstream_from_istream(struct apk_istream *istream);
...@@ -108,7 +109,7 @@ static inline struct apk_bstream *apk_bstream_from_fd(int fd) ...@@ -108,7 +109,7 @@ static inline struct apk_bstream *apk_bstream_from_fd(int fd)
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(-1, url); return apk_bstream_from_fd_url(AT_FDCWD, url);
} }
struct apk_ostream *apk_ostream_to_fd(int fd); struct apk_ostream *apk_ostream_to_fd(int fd);
......
...@@ -91,7 +91,7 @@ struct apk_istream *apk_istream_from_fd_url(int atfd, const char *url) ...@@ -91,7 +91,7 @@ struct apk_istream *apk_istream_from_fd_url(int atfd, const char *url)
pid_t pid; pid_t pid;
int fd; int fd;
if (atfd >= 0 && apk_url_local_file(url) != NULL) if (apk_url_local_file(url) != NULL)
return apk_istream_from_file(atfd, apk_url_local_file(url)); return apk_istream_from_file(atfd, apk_url_local_file(url));
fd = fork_wget(url, &pid); fd = fork_wget(url, &pid);
...@@ -108,8 +108,8 @@ struct apk_bstream *apk_bstream_from_fd_url(int atfd, const char *url) ...@@ -108,8 +108,8 @@ struct apk_bstream *apk_bstream_from_fd_url(int atfd, const char *url)
pid_t pid; pid_t pid;
int fd; int fd;
if (atfd >= 0 && apk_url_local_file(url)) if (apk_url_local_file(url) != NULL)
return apk_bstream_from_file(atfd, url); return apk_bstream_from_file(atfd, apk_url_local_file(url));
fd = fork_wget(url, &pid); fd = fork_wget(url, &pid);
return apk_bstream_from_fd_pid(fd, pid, translate_wget); return apk_bstream_from_fd_pid(fd, pid, translate_wget);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment