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

url: fix fetching from local repositories

cute-signatures
Natanael Copa 2013-06-18 07:52:23 +00:00
parent 01ec60f718
commit c51d82f8f6
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/apk_io.h
View File

@ -13,6 +13,7 @@
#include <sys/types.h>
#include <openssl/evp.h>
#include <fcntl.h>
#include "apk_defines.h"
#include "apk_blob.h"
@ -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)
{
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);
@ -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)
{
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);

6
src/url.c
View File

@ -91,7 +91,7 @@ struct apk_istream *apk_istream_from_fd_url(int atfd, const char *url)
pid_t pid;
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));
fd = fork_wget(url, &pid);
@ -108,8 +108,8 @@ struct apk_bstream *apk_bstream_from_fd_url(int atfd, const char *url)
pid_t pid;
int fd;
if (atfd >= 0 && apk_url_local_file(url))
return apk_bstream_from_file(atfd, url);
if (apk_url_local_file(url) != NULL)
return apk_bstream_from_file(atfd, apk_url_local_file(url));
fd = fork_wget(url, &pid);
return apk_bstream_from_fd_pid(fd, pid, translate_wget);