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

io: move make_dirs as apk_make_dirs and use it

cute-signatures
Timo Teräs 2022-04-05 10:53:52 +03:00
parent 232067b3d1
commit 191e2d412d
5 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/apk_io.h
View File

@ -18,6 +18,7 @@
#include "apk_atom.h" #include "apk_atom.h"
#include "apk_crypto.h" #include "apk_crypto.h"
int apk_make_dirs(int root_fd, const char *dirname, mode_t dirmode, mode_t parentmode);
ssize_t apk_write_fully(int fd, const void *ptr, size_t size); ssize_t apk_write_fully(int fd, const void *ptr, size_t size);
struct apk_id_hash { struct apk_id_hash {

3
src/context.c
View File

@ -74,8 +74,7 @@ int apk_ctx_prepare(struct apk_ctx *ac)
const int lflags = O_WRONLY | O_APPEND | O_CREAT | O_CLOEXEC; const int lflags = O_WRONLY | O_APPEND | O_CREAT | O_CLOEXEC;
int fd = openat(ac->root_fd, log_path, lflags, 0644); int fd = openat(ac->root_fd, log_path, lflags, 0644);
if (fd < 0 && (ac->open_flags & APK_OPENF_CREATE)) { if (fd < 0 && (ac->open_flags & APK_OPENF_CREATE)) {
mkdirat(ac->root_fd, "var", 0755); apk_make_dirs(ac->root_fd, "var/log", 0755, 0755);
mkdirat(ac->root_fd, "var/log", 0755);
fd = openat(ac->root_fd, log_path, lflags, 0644); fd = openat(ac->root_fd, log_path, lflags, 0644);
} }
if (fd < 0) { if (fd < 0) {

15
src/database.c
View File

@ -1451,9 +1451,7 @@ static inline int setup_static_cache(struct apk_database *db, struct apk_ctx *ac
db->cache_dir = apk_static_cache_dir; db->cache_dir = apk_static_cache_dir;
db->cache_fd = openat(db->root_fd, db->cache_dir, O_RDONLY | O_CLOEXEC); db->cache_fd = openat(db->root_fd, db->cache_dir, O_RDONLY | O_CLOEXEC);
if (db->cache_fd < 0) { if (db->cache_fd < 0) {
mkdirat(db->root_fd, "var", 0755); apk_make_dirs(db->root_fd, db->cache_dir, 0755, 0755);
mkdirat(db->root_fd, "var/cache", 0755);
mkdirat(db->root_fd, "var/cache/apk", 0755);
db->cache_fd = openat(db->root_fd, db->cache_dir, O_RDONLY | O_CLOEXEC); db->cache_fd = openat(db->root_fd, db->cache_dir, O_RDONLY | O_CLOEXEC);
if (db->cache_fd < 0) { if (db->cache_fd < 0) {
if (ac->open_flags & APK_OPENF_WRITE) return -EROFS; if (ac->open_flags & APK_OPENF_WRITE) return -EROFS;
@ -1884,15 +1882,8 @@ int apk_db_write_config(struct apk_database *db)
return 0; return 0;
if (db->ctx->open_flags & APK_OPENF_CREATE) { if (db->ctx->open_flags & APK_OPENF_CREATE) {
if (faccessat(db->root_fd, "lib/apk/db", F_OK, 0) != 0) { apk_make_dirs(db->root_fd, "lib/apk/db", 0755, 0755);
mkdirat(db->root_fd, "lib", 0755); apk_make_dirs(db->root_fd, "etc/apk", 0755, 0755);
mkdirat(db->root_fd, "lib/apk", 0755);
mkdirat(db->root_fd, "lib/apk/db", 0755);
}
if (faccessat(db->root_fd, "etc/apk", F_OK, 0) != 0) {
mkdirat(db->root_fd, "etc", 0755);
mkdirat(db->root_fd, "etc/apk", 0755);
}
} else if (db->lock_fd == 0) { } else if (db->lock_fd == 0) {
apk_err(out, "Refusing to write db without write lock!"); apk_err(out, "Refusing to write db without write lock!");
return -1; return -1;

15
src/io.c
View File

@ -38,6 +38,21 @@ static inline int atfd_error(int atfd)
return atfd < -1 && atfd != AT_FDCWD; return atfd < -1 && atfd != AT_FDCWD;
} }
int apk_make_dirs(int root_fd, const char *dirname, mode_t dirmode, mode_t parentmode)
{
char parentdir[PATH_MAX], *slash;
if (faccessat(root_fd, dirname, F_OK, 0) == 0) return 0;
if (mkdirat(root_fd, dirname, dirmode) == 0) return 0;
if (errno != ENOENT || !parentmode) return -1;
slash = strrchr(dirname, '/');
if (!slash || slash == dirname || slash-dirname+1 >= sizeof parentdir) return -1;
strlcpy(parentdir, dirname, slash-dirname+1);
if (apk_make_dirs(root_fd, parentdir, parentmode, parentmode) < 0) return -1;
return mkdirat(root_fd, dirname, dirmode);
}
ssize_t apk_write_fully(int fd, const void *ptr, size_t size) ssize_t apk_write_fully(int fd, const void *ptr, size_t size)
{ {
ssize_t i = 0, r; ssize_t i = 0, r;

19
src/package.c
View File

@ -768,21 +768,6 @@ int apk_ipkg_add_script(struct apk_installed_package *ipkg,
return apk_ipkg_assign_script(ipkg, type, apk_blob_from_istream(is, size)); return apk_ipkg_assign_script(ipkg, type, apk_blob_from_istream(is, size));
} }
static inline int make_dirs(int root_fd, const char *dirname, mode_t dirmode, mode_t parentmode)
{
char parentdir[PATH_MAX], *slash;
if (faccessat(root_fd, dirname, F_OK, 0) == 0) return 0;
if (mkdirat(root_fd, dirname, dirmode) == 0) return 0;
if (errno != ENOENT || !parentmode) return -1;
slash = strrchr(dirname, '/');
if (!slash || slash == dirname || slash-dirname+1 >= sizeof parentdir) return -1;
strlcpy(parentdir, dirname, slash-dirname+1);
if (make_dirs(root_fd, parentdir, parentmode, parentmode) < 0) return -1;
return mkdirat(root_fd, dirname, dirmode);
}
#ifdef __linux__ #ifdef __linux__
static inline int make_device_tree(struct apk_database *db) static inline int make_device_tree(struct apk_database *db)
{ {
@ -834,8 +819,8 @@ void apk_ipkg_run_script(struct apk_installed_package *ipkg,
return; return;
if (!db->script_dirs_checked) { if (!db->script_dirs_checked) {
if (make_dirs(root_fd, "tmp", 01777, 0) <0 || if (apk_make_dirs(root_fd, "tmp", 01777, 0) <0 ||
make_dirs(root_fd, script_exec_dir, 0700, 0755) < 0|| apk_make_dirs(root_fd, script_exec_dir, 0700, 0755) < 0||
make_device_tree(db) < 0) { make_device_tree(db) < 0) {
apk_err(out, "failed to prepare dirs for hook scripts: %s", apk_err(out, "failed to prepare dirs for hook scripts: %s",
apk_error_str(errno)); apk_error_str(errno));