Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
apk-tools
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
59
Issues
59
List
Boards
Labels
Service Desk
Milestones
Merge Requests
13
Merge Requests
13
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
alpine
apk-tools
Commits
92764088
Commit
92764088
authored
Jun 17, 2013
by
Timo Teräs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
db, cache: do not use cache/tmp for downloads
instead use prefix for temporary files.
parent
557d360c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
25 deletions
+28
-25
src/apk_database.h
src/apk_database.h
+1
-1
src/cache.c
src/cache.c
+5
-2
src/database.c
src/database.c
+22
-22
No files found.
src/apk_database.h
View file @
92764088
...
...
@@ -129,7 +129,7 @@ struct apk_repository_tag {
struct
apk_database
{
char
*
root
;
int
root_fd
,
lock_fd
,
cache_fd
,
cachetmp_fd
,
keys_fd
,
progress_fd
;
int
root_fd
,
lock_fd
,
cache_fd
,
keys_fd
,
progress_fd
;
unsigned
num_repos
,
num_repo_tags
;
const
char
*
cache_dir
;
char
*
cache_remount_dir
;
...
...
src/cache.c
View file @
92764088
...
...
@@ -9,6 +9,7 @@
* by the Free Software Foundation. See http://www.gnu.org/ for details.
*/
#include <fcntl.h>
#include <errno.h>
#include <stdio.h>
#include <dirent.h>
...
...
@@ -78,8 +79,10 @@ static void cache_clean_item(struct apk_database *db, int dirfd, const char *nam
if
(
apk_verbosity
>=
2
)
apk_message
(
"deleting %s"
,
name
);
if
(
!
(
apk_flags
&
APK_SIMULATE
))
unlinkat
(
dirfd
,
name
,
0
);
if
(
!
(
apk_flags
&
APK_SIMULATE
))
{
if
(
unlinkat
(
dirfd
,
name
,
0
)
<
0
&&
errno
==
EISDIR
)
unlinkat
(
dirfd
,
name
,
AT_REMOVEDIR
);
}
}
static
int
cache_clean
(
struct
apk_database
*
db
)
...
...
src/database.c
View file @
92764088
...
...
@@ -46,6 +46,8 @@ enum {
int
apk_verbosity
=
1
;
unsigned
int
apk_flags
=
0
;
static
apk_blob_t
tmpprefix
=
{
.
len
=
8
,
.
ptr
=
".apknew."
};
static
const
char
*
const
apkindex_tar_gz
=
"APKINDEX.tar.gz"
;
static
const
char
*
const
apk_static_cache_dir
=
"var/cache/apk"
;
...
...
@@ -624,16 +626,19 @@ int apk_repo_format_item(struct apk_database *db, struct apk_repository *repo, s
int
apk_cache_download
(
struct
apk_database
*
db
,
struct
apk_repository
*
repo
,
struct
apk_package
*
pkg
,
int
verify
)
{
char
cacheitem
[
128
],
url
[
PATH_MAX
];
struct
apk_istream
*
is
;
struct
apk_bstream
*
bs
;
struct
apk_sign_ctx
sctx
;
char
url
[
PATH_MAX
];
char
tmpcacheitem
[
128
],
*
cacheitem
=
&
tmpcacheitem
[
tmpprefix
.
len
];
apk_blob_t
b
=
APK_BLOB_BUF
(
tmpcacheitem
);
int
r
,
fd
;
apk_blob_push_blob
(
&
b
,
tmpprefix
);
if
(
pkg
!=
NULL
)
r
=
apk_pkg_format_cache_pkg
(
APK_BLOB_BUF
(
cacheitem
)
,
pkg
);
r
=
apk_pkg_format_cache_pkg
(
b
,
pkg
);
else
r
=
apk_repo_format_cache_index
(
APK_BLOB_BUF
(
cacheitem
)
,
repo
);
r
=
apk_repo_format_cache_index
(
b
,
repo
);
if
(
r
<
0
)
return
r
;
...
...
@@ -649,13 +654,13 @@ int apk_cache_download(struct apk_database *db, struct apk_repository *repo,
if
(
verify
!=
APK_SIGN_NONE
)
{
apk_sign_ctx_init
(
&
sctx
,
APK_SIGN_VERIFY
,
NULL
,
db
->
keys_fd
);
bs
=
apk_bstream_from_url
(
url
);
bs
=
apk_bstream_tee
(
bs
,
db
->
cache
tmp_fd
,
cacheitem
);
bs
=
apk_bstream_tee
(
bs
,
db
->
cache
_fd
,
tmp
cacheitem
);
is
=
apk_bstream_gunzip_mpart
(
bs
,
apk_sign_ctx_mpart_cb
,
&
sctx
);
r
=
apk_tar_parse
(
is
,
apk_sign_ctx_verify_tar
,
&
sctx
,
FALSE
,
&
db
->
id_cache
);
apk_sign_ctx_free
(
&
sctx
);
}
else
{
is
=
apk_istream_from_url
(
url
);
fd
=
openat
(
db
->
cache
tmp_fd
,
cacheitem
,
O_RDWR
|
O_CREAT
|
O_TRUNC
|
O_CLOEXEC
,
0644
);
fd
=
openat
(
db
->
cache
_fd
,
tmp
cacheitem
,
O_RDWR
|
O_CREAT
|
O_TRUNC
|
O_CLOEXEC
,
0644
);
if
(
fd
>=
0
)
{
r
=
apk_istream_splice
(
is
,
fd
,
APK_SPLICE_ALL
,
NULL
,
NULL
);
close
(
fd
);
...
...
@@ -665,14 +670,12 @@ int apk_cache_download(struct apk_database *db, struct apk_repository *repo,
}
is
->
close
(
is
);
if
(
r
<
0
)
{
unlinkat
(
db
->
cache
tmp_fd
,
cacheitem
,
0
);
unlinkat
(
db
->
cache
_fd
,
tmp
cacheitem
,
0
);
return
r
;
}
if
(
db
->
cachetmp_fd
!=
db
->
cache_fd
)
{
if
(
renameat
(
db
->
cachetmp_fd
,
cacheitem
,
db
->
cache_fd
,
cacheitem
)
<
0
)
return
-
errno
;
}
if
(
renameat
(
db
->
cache_fd
,
tmpcacheitem
,
db
->
cache_fd
,
cacheitem
)
<
0
)
return
-
errno
;
return
0
;
}
...
...
@@ -1445,6 +1448,7 @@ int apk_db_open(struct apk_database *db, struct apk_db_options *dbopts)
struct
apk_repository_list
*
repo
=
NULL
;
struct
apk_bstream
*
bs
;
struct
statfs
stfs
;
struct
statvfs
stvfs
;
apk_blob_t
blob
;
int
r
,
fd
,
write_arch
=
FALSE
;
...
...
@@ -1553,8 +1557,6 @@ int apk_db_open(struct apk_database *db, struct apk_db_options *dbopts)
/* figure out where to have the cache */
fd
=
openat
(
db
->
root_fd
,
apk_linked_cache_dir
,
O_RDONLY
|
O_CLOEXEC
);
if
(
fd
>=
0
&&
fstatfs
(
fd
,
&
stfs
)
==
0
&&
stfs
.
f_type
!=
0x01021994
/* TMPFS_MAGIC */
)
{
struct
statvfs
stvfs
;
db
->
cache_dir
=
apk_linked_cache_dir
;
db
->
cache_fd
=
fd
;
if
((
dbopts
->
open_flags
&
(
APK_OPENF_WRITE
|
APK_OPENF_CACHE_WRITE
))
&&
...
...
@@ -1571,14 +1573,11 @@ int apk_db_open(struct apk_database *db, struct apk_db_options *dbopts)
goto
ret_r
;
}
}
mkdirat
(
db
->
cache_fd
,
"tmp"
,
0644
);
db
->
cachetmp_fd
=
openat
(
db
->
cache_fd
,
"tmp"
,
O_RDONLY
|
O_CLOEXEC
);
}
else
{
if
(
fd
>=
0
)
close
(
fd
);
db
->
cache_dir
=
apk_static_cache_dir
;
db
->
cache_fd
=
openat
(
db
->
root_fd
,
db
->
cache_dir
,
O_RDONLY
|
O_CLOEXEC
);
db
->
cachetmp_fd
=
db
->
cache_fd
;
}
db
->
keys_fd
=
openat
(
db
->
root_fd
,
...
...
@@ -1757,8 +1756,6 @@ void apk_db_close(struct apk_database *db)
if
(
db
->
keys_fd
)
close
(
db
->
keys_fd
);
if
(
db
->
cachetmp_fd
&&
db
->
cachetmp_fd
!=
db
->
cache_fd
)
close
(
db
->
cachetmp_fd
);
if
(
db
->
cache_fd
)
close
(
db
->
cache_fd
);
if
(
db
->
root_fd
)
...
...
@@ -2540,7 +2537,8 @@ static int apk_db_unpack_pkg(struct apk_database *db,
struct
apk_repository
*
repo
;
struct
apk_package
*
pkg
=
ipkg
->
pkg
;
const
char
*
action
=
""
;
char
file
[
PATH_MAX
],
item
[
128
];
char
file
[
PATH_MAX
];
char
tmpcacheitem
[
128
],
*
cacheitem
=
&
tmpcacheitem
[
tmpprefix
.
len
];
int
r
,
filefd
=
AT_FDCWD
,
need_copy
=
FALSE
;
if
(
pkg
->
filename
==
NULL
)
{
...
...
@@ -2568,8 +2566,10 @@ static int apk_db_unpack_pkg(struct apk_database *db,
goto
err_msg
;
}
if
(
need_copy
)
{
apk_pkg_format_cache_pkg
(
APK_BLOB_BUF
(
item
),
pkg
);
bs
=
apk_bstream_tee
(
bs
,
db
->
cachetmp_fd
,
item
);
apk_blob_t
b
=
APK_BLOB_BUF
(
tmpcacheitem
);
apk_blob_push_blob
(
&
b
,
tmpprefix
);
apk_pkg_format_cache_pkg
(
b
,
pkg
);
bs
=
apk_bstream_tee
(
bs
,
db
->
cache_fd
,
tmpcacheitem
);
if
(
bs
==
NULL
)
{
action
=
"unable cache package: "
;
r
=
-
errno
;
...
...
@@ -2595,10 +2595,10 @@ static int apk_db_unpack_pkg(struct apk_database *db,
if
(
need_copy
)
{
if
(
r
==
0
)
{
renameat
(
db
->
cache
tmp_fd
,
item
,
db
->
cache_fd
,
item
);
renameat
(
db
->
cache
_fd
,
tmpcacheitem
,
db
->
cache_fd
,
cache
item
);
pkg
->
repos
|=
BIT
(
APK_REPOSITORY_CACHED
);
}
else
{
unlinkat
(
db
->
cache
tmp_fd
,
item
,
0
);
unlinkat
(
db
->
cache
_fd
,
tmpcache
item
,
0
);
}
}
if
(
r
!=
0
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment