Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
apk-tools
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Hassan Albahri
apk-tools
Commits
6b2b9d30
Commit
6b2b9d30
authored
16 years ago
by
Timo Teräs
Browse files
Options
Downloads
Patches
Plain Diff
db: restructure in-memory organization
parent
354b6e46
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/apk_database.h
+12
-6
12 additions, 6 deletions
src/apk_database.h
src/apk_package.h
+1
-1
1 addition, 1 deletion
src/apk_package.h
src/database.c
+182
-133
182 additions, 133 deletions
src/database.c
with
195 additions
and
140 deletions
src/apk_database.h
+
12
−
6
View file @
6b2b9d30
...
@@ -21,10 +21,9 @@
...
@@ -21,10 +21,9 @@
struct
apk_db_file
{
struct
apk_db_file
{
struct
hlist_node
dir_files_list
;
struct
hlist_node
dir_files_list
;
struct
hlist_node
pkg
_files_list
;
struct
hlist_node
diri
_files_list
;
struct
apk_db_dir
*
dir
;
struct
apk_db_dir_instance
*
diri
;
struct
apk_package
*
owner
;
csum_t
csum
;
csum_t
csum
;
char
filename
[];
char
filename
[];
};
};
...
@@ -37,12 +36,19 @@ struct apk_db_dir {
...
@@ -37,12 +36,19 @@ struct apk_db_dir {
struct
hlist_head
files
;
struct
hlist_head
files
;
struct
apk_db_dir
*
parent
;
struct
apk_db_dir
*
parent
;
unsigned
refs
;
unsigned
short
refs
;
unsigned
short
flags
;
char
dirname
[];
};
struct
apk_db_dir_instance
{
struct
hlist_node
pkg_dirs_list
;
struct
hlist_head
owned_files
;
struct
apk_package
*
pkg
;
struct
apk_db_dir
*
dir
;
mode_t
mode
;
mode_t
mode
;
uid_t
uid
;
uid_t
uid
;
gid_t
gid
;
gid_t
gid
;
unsigned
flags
;
char
dirname
[];
};
};
struct
apk_name
{
struct
apk_name
{
...
...
This diff is collapsed.
Click to expand it.
src/apk_package.h
+
1
−
1
View file @
6b2b9d30
...
@@ -59,7 +59,7 @@ struct apk_package {
...
@@ -59,7 +59,7 @@ struct apk_package {
/* for installed packages only */
/* for installed packages only */
struct
list_head
installed_pkgs_list
;
struct
list_head
installed_pkgs_list
;
struct
hlist_head
owned_
file
s
;
struct
hlist_head
owned_
dir
s
;
struct
hlist_head
scripts
;
struct
hlist_head
scripts
;
};
};
APK_ARRAY
(
apk_package_array
,
struct
apk_package
*
);
APK_ARRAY
(
apk_package_array
,
struct
apk_package
*
);
...
...
This diff is collapsed.
Click to expand it.
src/database.c
+
182
−
133
View file @
6b2b9d30
...
@@ -28,9 +28,11 @@ struct install_ctx {
...
@@ -28,9 +28,11 @@ struct install_ctx {
struct
apk_package
*
pkg
;
struct
apk_package
*
pkg
;
int
script
;
int
script
;
struct
apk_db_dir
*
dircache
;
struct
apk_db_dir_instance
*
diri
;
struct
hlist_node
**
diri_node
;
struct
hlist_node
**
file_dir_node
;
struct
hlist_node
**
file_dir_node
;
struct
hlist_node
**
file_
pkg
_node
;
struct
hlist_node
**
file_
diri
_node
;
};
};
static
apk_blob_t
pkg_name_get_key
(
apk_hash_item
item
)
static
apk_blob_t
pkg_name_get_key
(
apk_hash_item
item
)
...
@@ -103,25 +105,7 @@ void apk_name_free(struct apk_name *name)
...
@@ -103,25 +105,7 @@ void apk_name_free(struct apk_name *name)
free
(
name
);
free
(
name
);
}
}
static
struct
apk_db_dir
*
apk_db_dir_ref
(
struct
apk_database
*
db
,
static
void
apk_db_dir_put
(
struct
apk_database
*
db
,
struct
apk_db_dir
*
dir
)
struct
apk_db_dir
*
dir
,
int
create_dir
)
{
if
(
dir
->
refs
==
0
)
{
if
(
dir
->
parent
!=
NULL
)
apk_db_dir_ref
(
db
,
dir
->
parent
,
create_dir
);
db
->
installed
.
stats
.
dirs
++
;
if
(
create_dir
&&
dir
->
mode
)
{
mkdir
(
dir
->
dirname
,
dir
->
mode
);
chown
(
dir
->
dirname
,
dir
->
uid
,
dir
->
gid
);
}
}
dir
->
refs
++
;
return
dir
;
}
static
void
apk_db_dir_unref
(
struct
apk_database
*
db
,
struct
apk_db_dir
*
dir
)
{
{
dir
->
refs
--
;
dir
->
refs
--
;
if
(
dir
->
refs
>
0
)
if
(
dir
->
refs
>
0
)
...
@@ -131,11 +115,17 @@ static void apk_db_dir_unref(struct apk_database *db, struct apk_db_dir *dir)
...
@@ -131,11 +115,17 @@ static void apk_db_dir_unref(struct apk_database *db, struct apk_db_dir *dir)
rmdir
(
dir
->
dirname
);
rmdir
(
dir
->
dirname
);
if
(
dir
->
parent
!=
NULL
)
if
(
dir
->
parent
!=
NULL
)
apk_db_dir_
unref
(
db
,
dir
->
parent
);
apk_db_dir_
put
(
db
,
dir
->
parent
);
}
}
static
struct
apk_db_dir
*
apk_db_dir_get
(
struct
apk_database
*
db
,
static
struct
apk_db_dir
*
apk_db_dir_get
(
struct
apk_db_dir
*
dir
)
apk_blob_t
name
)
{
dir
->
refs
++
;
return
dir
;
}
static
struct
apk_db_dir
*
apk_db_dir_get_db
(
struct
apk_database
*
db
,
apk_blob_t
name
)
{
{
struct
apk_db_dir
*
dir
;
struct
apk_db_dir
*
dir
;
apk_blob_t
bparent
;
apk_blob_t
bparent
;
...
@@ -146,9 +136,11 @@ static struct apk_db_dir *apk_db_dir_get(struct apk_database *db,
...
@@ -146,9 +136,11 @@ static struct apk_db_dir *apk_db_dir_get(struct apk_database *db,
dir
=
(
struct
apk_db_dir
*
)
apk_hash_get
(
&
db
->
installed
.
dirs
,
name
);
dir
=
(
struct
apk_db_dir
*
)
apk_hash_get
(
&
db
->
installed
.
dirs
,
name
);
if
(
dir
!=
NULL
)
if
(
dir
!=
NULL
)
return
dir
;
return
apk_db_dir_get
(
dir
)
;
db
->
installed
.
stats
.
dirs
++
;
dir
=
calloc
(
1
,
sizeof
(
*
dir
)
+
name
.
len
+
1
);
dir
=
calloc
(
1
,
sizeof
(
*
dir
)
+
name
.
len
+
1
);
dir
->
refs
=
1
;
memcpy
(
dir
->
dirname
,
name
.
ptr
,
name
.
len
);
memcpy
(
dir
->
dirname
,
name
.
ptr
,
name
.
len
);
dir
->
dirname
[
name
.
len
]
=
0
;
dir
->
dirname
[
name
.
len
]
=
0
;
apk_hash_insert
(
&
db
->
installed
.
dirs
,
dir
);
apk_hash_insert
(
&
db
->
installed
.
dirs
,
dir
);
...
@@ -156,9 +148,9 @@ static struct apk_db_dir *apk_db_dir_get(struct apk_database *db,
...
@@ -156,9 +148,9 @@ static struct apk_db_dir *apk_db_dir_get(struct apk_database *db,
if
(
name
.
len
==
0
)
if
(
name
.
len
==
0
)
dir
->
parent
=
NULL
;
dir
->
parent
=
NULL
;
else
if
(
apk_blob_rsplit
(
name
,
'/'
,
&
bparent
,
NULL
))
else
if
(
apk_blob_rsplit
(
name
,
'/'
,
&
bparent
,
NULL
))
dir
->
parent
=
apk_db_dir_get
(
db
,
bparent
);
dir
->
parent
=
apk_db_dir_get
_db
(
db
,
bparent
);
else
else
dir
->
parent
=
apk_db_dir_get
(
db
,
APK_BLOB_NULL
);
dir
->
parent
=
apk_db_dir_get
_db
(
db
,
APK_BLOB_NULL
);
if
(
dir
->
parent
!=
NULL
)
if
(
dir
->
parent
!=
NULL
)
dir
->
flags
=
dir
->
parent
->
flags
;
dir
->
flags
=
dir
->
parent
->
flags
;
...
@@ -174,6 +166,37 @@ static struct apk_db_dir *apk_db_dir_get(struct apk_database *db,
...
@@ -174,6 +166,37 @@ static struct apk_db_dir *apk_db_dir_get(struct apk_database *db,
return
dir
;
return
dir
;
}
}
static
struct
apk_db_dir_instance
*
apk_db_diri_new
(
struct
apk_database
*
db
,
struct
apk_package
*
pkg
,
apk_blob_t
name
,
struct
hlist_node
**
after
)
{
struct
apk_db_dir_instance
*
diri
;
diri
=
calloc
(
1
,
sizeof
(
struct
apk_db_dir_instance
));
hlist_add_after
(
&
diri
->
pkg_dirs_list
,
after
);
diri
->
dir
=
apk_db_dir_get_db
(
db
,
name
);
diri
->
pkg
=
pkg
;
return
diri
;
}
static
void
apk_db_diri_set
(
struct
apk_db_dir_instance
*
diri
,
mode_t
mode
,
uid_t
uid
,
gid_t
gid
)
{
diri
->
mode
=
mode
;
diri
->
uid
=
uid
;
diri
->
gid
=
gid
;
}
static
void
apk_db_diri_create
(
struct
apk_db_dir_instance
*
diri
)
{
if
(
diri
->
dir
->
refs
==
1
)
{
mkdir
(
diri
->
dir
->
dirname
,
diri
->
mode
);
chown
(
diri
->
dir
->
dirname
,
diri
->
uid
,
diri
->
gid
);
}
}
static
struct
apk_db_file
*
apk_db_file_new
(
struct
apk_db_dir
*
dir
,
static
struct
apk_db_file
*
apk_db_file_new
(
struct
apk_db_dir
*
dir
,
apk_blob_t
name
,
apk_blob_t
name
,
struct
hlist_node
**
after
)
struct
hlist_node
**
after
)
...
@@ -182,7 +205,6 @@ static struct apk_db_file *apk_db_file_new(struct apk_db_dir *dir,
...
@@ -182,7 +205,6 @@ static struct apk_db_file *apk_db_file_new(struct apk_db_dir *dir,
file
=
calloc
(
1
,
sizeof
(
*
file
)
+
name
.
len
+
1
);
file
=
calloc
(
1
,
sizeof
(
*
file
)
+
name
.
len
+
1
);
hlist_add_after
(
&
file
->
dir_files_list
,
after
);
hlist_add_after
(
&
file
->
dir_files_list
,
after
);
file
->
dir
=
dir
;
memcpy
(
file
->
filename
,
name
.
ptr
,
name
.
len
);
memcpy
(
file
->
filename
,
name
.
ptr
,
name
.
len
);
file
->
filename
[
name
.
len
]
=
0
;
file
->
filename
[
name
.
len
]
=
0
;
...
@@ -191,45 +213,27 @@ static struct apk_db_file *apk_db_file_new(struct apk_db_dir *dir,
...
@@ -191,45 +213,27 @@ static struct apk_db_file *apk_db_file_new(struct apk_db_dir *dir,
static
void
apk_db_file_set_owner
(
struct
apk_database
*
db
,
static
void
apk_db_file_set_owner
(
struct
apk_database
*
db
,
struct
apk_db_file
*
file
,
struct
apk_db_file
*
file
,
struct
apk_package
*
owner
,
struct
apk_db_dir_instance
*
diri
,
int
create_dir
,
struct
hlist_node
**
after
)
struct
hlist_node
**
after
)
{
{
if
(
file
->
owner
!=
NULL
)
{
if
(
file
->
diri
!=
NULL
)
{
hlist_del
(
&
file
->
pkg
_files_list
,
&
file
->
owner
->
owned_files
);
hlist_del
(
&
file
->
diri
_files_list
,
&
file
->
diri
->
owned_files
);
}
else
{
}
else
{
db
->
installed
.
stats
.
files
++
;
db
->
installed
.
stats
.
files
++
;
}
}
file
->
dir
=
apk_db_dir_ref
(
db
,
file
->
dir
,
create_dir
);
file
->
diri
=
diri
;
file
->
owner
=
owner
;
hlist_add_after
(
&
file
->
diri_files_list
,
after
);
hlist_add_after
(
&
file
->
pkg_files_list
,
after
);
}
}
static
struct
apk_db_file
*
apk_db_file_get
(
struct
apk_database
*
db
,
static
struct
apk_db_file
*
apk_db_file_get
(
struct
apk_database
*
db
,
apk_blob_t
nam
e
,
apk_blob_t
bfil
e
,
struct
install_ctx
*
ctx
)
struct
install_ctx
*
ctx
)
{
{
struct
apk_db_dir
*
dir
;
struct
apk_db_dir
*
dir
;
struct
apk_db_file
*
file
;
struct
apk_db_file
*
file
;
struct
hlist_node
*
cur
;
struct
hlist_node
*
cur
;
apk_blob_t
bdir
,
bfile
;
dir
=
ctx
->
diri
->
dir
;
dir
=
NULL
;
if
(
!
apk_blob_rsplit
(
name
,
'/'
,
&
bdir
,
&
bfile
))
{
dir
=
apk_db_dir_get
(
db
,
APK_BLOB_NULL
);
bfile
=
name
;
}
else
if
(
ctx
!=
NULL
&&
ctx
->
dircache
!=
NULL
)
{
dir
=
ctx
->
dircache
;
if
(
strncmp
(
dir
->
dirname
,
bdir
.
ptr
,
bdir
.
len
)
!=
0
||
dir
->
dirname
[
bdir
.
len
]
!=
0
)
dir
=
NULL
;
}
if
(
dir
==
NULL
)
dir
=
apk_db_dir_get
(
db
,
bdir
);
if
(
ctx
!=
NULL
&&
dir
!=
ctx
->
dircache
)
{
ctx
->
dircache
=
dir
;
ctx
->
file_dir_node
=
hlist_tail_ptr
(
&
dir
->
files
);
}
hlist_for_each_entry
(
file
,
cur
,
&
dir
->
files
,
dir_files_list
)
{
hlist_for_each_entry
(
file
,
cur
,
&
dir
->
files
,
dir_files_list
)
{
if
(
strncmp
(
file
->
filename
,
bfile
.
ptr
,
bfile
.
len
)
==
0
&&
if
(
strncmp
(
file
->
filename
,
bfile
.
ptr
,
bfile
.
len
)
==
0
&&
...
@@ -237,6 +241,8 @@ static struct apk_db_file *apk_db_file_get(struct apk_database *db,
...
@@ -237,6 +241,8 @@ static struct apk_db_file *apk_db_file_get(struct apk_database *db,
return
file
;
return
file
;
}
}
if
(
ctx
->
file_dir_node
==
NULL
)
ctx
->
file_dir_node
=
hlist_tail_ptr
(
&
dir
->
files
);
file
=
apk_db_file_new
(
dir
,
bfile
,
ctx
->
file_dir_node
);
file
=
apk_db_file_new
(
dir
,
bfile
,
ctx
->
file_dir_node
);
ctx
->
file_dir_node
=
&
file
->
dir_files_list
.
next
;
ctx
->
file_dir_node
=
&
file
->
dir_files_list
.
next
;
...
@@ -263,15 +269,17 @@ static struct apk_package *apk_db_pkg_add(struct apk_database *db, struct apk_pa
...
@@ -263,15 +269,17 @@ static struct apk_package *apk_db_pkg_add(struct apk_database *db, struct apk_pa
static
int
apk_db_index_read
(
struct
apk_database
*
db
,
struct
apk_istream
*
is
,
int
repo
)
static
int
apk_db_index_read
(
struct
apk_database
*
db
,
struct
apk_istream
*
is
,
int
repo
)
{
{
struct
apk_package
*
pkg
=
NULL
;
struct
apk_package
*
pkg
=
NULL
;
struct
apk_db_dir
*
dir
=
NULL
;
struct
apk_db_dir
_instance
*
dir
i
=
NULL
;
struct
apk_db_file
*
file
=
NULL
;
struct
apk_db_file
*
file
=
NULL
;
struct
hlist_node
**
diri_node
=
NULL
;
struct
hlist_node
**
file_dir_node
=
NULL
;
struct
hlist_node
**
file_dir_node
=
NULL
;
struct
hlist_node
**
file_
pkg
_node
=
NULL
;
struct
hlist_node
**
file_
diri
_node
=
NULL
;
char
buf
[
1024
];
char
buf
[
1024
];
apk_blob_t
l
,
r
;
apk_blob_t
l
,
r
;
int
n
,
field
;
int
n
,
field
,
ret
;
ret
=
-
1
;
r
=
APK_BLOB_PTR_LEN
(
buf
,
0
);
r
=
APK_BLOB_PTR_LEN
(
buf
,
0
);
while
(
1
)
{
while
(
1
)
{
n
=
is
->
read
(
is
,
&
r
.
ptr
[
r
.
len
],
sizeof
(
buf
)
-
r
.
len
);
n
=
is
->
read
(
is
,
&
r
.
ptr
[
r
.
len
],
sizeof
(
buf
)
-
r
.
len
);
...
@@ -305,9 +313,10 @@ static int apk_db_index_read(struct apk_database *db, struct apk_istream *is, in
...
@@ -305,9 +313,10 @@ static int apk_db_index_read(struct apk_database *db, struct apk_istream *is, in
/* If no package, create new */
/* If no package, create new */
if
(
pkg
==
NULL
)
{
if
(
pkg
==
NULL
)
{
pkg
=
apk_pkg_new
();
pkg
=
apk_pkg_new
();
dir
=
NULL
;
diri
=
NULL
;
diri_node
=
&
pkg
->
owned_dirs
.
first
;
file_dir_node
=
NULL
;
file_dir_node
=
NULL
;
file_
pkg
_node
=
hlist_tail_ptr
(
&
pkg
->
owned_files
)
;
file_
diri
_node
=
NULL
;
}
}
/* Standard index line? */
/* Standard index line? */
...
@@ -326,25 +335,28 @@ static int apk_db_index_read(struct apk_database *db, struct apk_istream *is, in
...
@@ -326,25 +335,28 @@ static int apk_db_index_read(struct apk_database *db, struct apk_istream *is, in
apk_error
(
"FDB directory entry before package entry"
);
apk_error
(
"FDB directory entry before package entry"
);
return
-
1
;
return
-
1
;
}
}
dir
=
apk_db_dir_get
(
db
,
l
);
diri
=
apk_db_diri_new
(
db
,
pkg
,
l
,
diri_node
);
file_dir_node
=
hlist_tail_ptr
(
&
dir
->
files
);
diri_node
=
&
diri
->
pkg_dirs_list
.
next
;
file_dir_node
=
hlist_tail_ptr
(
&
diri
->
dir
->
files
);
file_diri_node
=
&
diri
->
owned_files
.
first
;
break
;
break
;
case
'M'
:
case
'M'
:
if
(
dir
==
NULL
)
{
if
(
dir
i
==
NULL
)
{
apk_error
(
"FDB directory metadata entry before directory entry"
);
apk_error
(
"FDB directory metadata entry before directory entry"
);
return
-
1
;
return
-
1
;
}
}
sscanf
(
l
.
ptr
,
"%d:%d:%o"
,
&
dir
->
uid
,
&
dir
->
gid
,
&
dir
->
mode
);
sscanf
(
l
.
ptr
,
"%d:%d:%o"
,
&
diri
->
uid
,
&
diri
->
gid
,
&
diri
->
mode
);
break
;
break
;
case
'R'
:
case
'R'
:
if
(
dir
==
NULL
)
{
if
(
dir
i
==
NULL
)
{
apk_error
(
"FDB file entry before directory entry"
);
apk_error
(
"FDB file entry before directory entry"
);
return
-
1
;
return
-
1
;
}
}
file
=
apk_db_file_new
(
dir
,
l
,
file_dir_node
);
file
=
apk_db_file_new
(
diri
->
dir
,
l
,
file_dir_node
);
apk_db_file_set_owner
(
db
,
file
,
pkg
,
FALSE
,
file_pkg_node
);
file_dir_node
=
&
file
->
dir_files_list
.
next
;
file_dir_node
=
&
file
->
dir_files_list
.
next
;
file_pkg_node
=
&
file
->
pkg_files_list
.
next
;
apk_db_file_set_owner
(
db
,
file
,
diri
,
file_diri_node
);
file_diri_node
=
&
file
->
diri_files_list
.
next
;
break
;
break
;
case
'Z'
:
case
'Z'
:
if
(
file
==
NULL
)
{
if
(
file
==
NULL
)
{
...
@@ -365,52 +377,48 @@ static int apk_db_index_read(struct apk_database *db, struct apk_istream *is, in
...
@@ -365,52 +377,48 @@ static int apk_db_index_read(struct apk_database *db, struct apk_istream *is, in
memcpy
(
&
buf
[
0
],
r
.
ptr
,
r
.
len
);
memcpy
(
&
buf
[
0
],
r
.
ptr
,
r
.
len
);
r
=
APK_BLOB_PTR_LEN
(
buf
,
r
.
len
);
r
=
APK_BLOB_PTR_LEN
(
buf
,
r
.
len
);
}
}
ret
=
0
;
return
0
;
return
ret
;
}
}
static
int
apk_db_write_fdb
(
struct
apk_database
*
db
,
struct
apk_ostream
*
os
)
static
int
apk_db_write_fdb
(
struct
apk_database
*
db
,
struct
apk_ostream
*
os
)
{
{
struct
apk_package
*
pkg
;
struct
apk_package
*
pkg
;
struct
apk_db_dir
*
dir
;
struct
apk_db_dir
_instance
*
dir
i
;
struct
apk_db_file
*
file
;
struct
apk_db_file
*
file
;
struct
hlist_node
*
c2
;
struct
hlist_node
*
c1
,
*
c2
;
char
buf
[
1024
];
char
buf
[
1024
];
apk_blob_t
blob
;
apk_blob_t
blob
;
int
n
;
int
n
=
0
;
list_for_each_entry
(
pkg
,
&
db
->
installed
.
packages
,
installed_pkgs_list
)
{
list_for_each_entry
(
pkg
,
&
db
->
installed
.
packages
,
installed_pkgs_list
)
{
blob
=
apk_pkg_format_index_entry
(
pkg
,
sizeof
(
buf
),
buf
);
blob
=
apk_pkg_format_index_entry
(
pkg
,
sizeof
(
buf
),
buf
);
if
(
blob
.
ptr
)
if
(
blob
.
ptr
)
os
->
write
(
os
,
blob
.
ptr
,
blob
.
len
-
1
);
os
->
write
(
os
,
blob
.
ptr
,
blob
.
len
-
1
);
dir
=
NULL
;
hlist_for_each_entry
(
diri
,
c1
,
&
pkg
->
owned_dirs
,
pkg_dirs_list
)
{
hlist_for_each_entry
(
file
,
c2
,
&
pkg
->
owned_files
,
pkg_files_list
)
{
n
+=
snprintf
(
&
buf
[
n
],
sizeof
(
buf
)
-
n
,
if
(
file
->
owner
==
NULL
)
"F:%s
\n
"
continue
;
"M:%d:%d:%o
\n
"
,
diri
->
dir
->
dirname
,
diri
->
uid
,
diri
->
gid
,
diri
->
mode
);
n
=
0
;
hlist_for_each_entry
(
file
,
c2
,
&
diri
->
owned_files
,
diri_files_list
)
{
if
(
dir
!=
file
->
dir
)
{
dir
=
file
->
dir
;
n
+=
snprintf
(
&
buf
[
n
],
sizeof
(
buf
)
-
n
,
n
+=
snprintf
(
&
buf
[
n
],
sizeof
(
buf
)
-
n
,
"F:%s
\n
"
"R:%s
\n
"
,
"M:%d:%d:%o
\n
"
,
file
->
filename
);
dir
->
dirname
,
if
(
csum_valid
(
file
->
csum
))
{
dir
->
uid
,
dir
->
gid
,
dir
->
mode
);
n
+=
snprintf
(
&
buf
[
n
],
sizeof
(
buf
)
-
n
,
"Z:"
);
}
n
+=
apk_hexdump_format
(
sizeof
(
buf
)
-
n
,
&
buf
[
n
],
APK_BLOB_BUF
(
file
->
csum
));
n
+=
snprintf
(
&
buf
[
n
],
sizeof
(
buf
)
-
n
,
"
\n
"
);
}
n
+=
snprintf
(
&
buf
[
n
],
sizeof
(
buf
)
-
n
,
if
(
os
->
write
(
os
,
buf
,
n
)
!=
n
)
"R:%s
\n
"
,
return
-
1
;
file
->
filename
);
n
=
0
;
if
(
csum_valid
(
file
->
csum
))
{
n
+=
snprintf
(
&
buf
[
n
],
sizeof
(
buf
)
-
n
,
"Z:"
);
n
+=
apk_hexdump_format
(
sizeof
(
buf
)
-
n
,
&
buf
[
n
],
APK_BLOB_BUF
(
file
->
csum
));
n
+=
snprintf
(
&
buf
[
n
],
sizeof
(
buf
)
-
n
,
"
\n
"
);
}
}
if
(
os
->
write
(
os
,
buf
,
n
)
!=
n
)
return
-
1
;
}
}
os
->
write
(
os
,
"
\n
"
,
1
);
os
->
write
(
os
,
"
\n
"
,
1
);
}
}
...
@@ -721,9 +729,9 @@ static int apk_db_install_archive_entry(void *_ctx,
...
@@ -721,9 +729,9 @@ static int apk_db_install_archive_entry(void *_ctx,
{
{
struct
install_ctx
*
ctx
=
(
struct
install_ctx
*
)
_ctx
;
struct
install_ctx
*
ctx
=
(
struct
install_ctx
*
)
_ctx
;
struct
apk_database
*
db
=
ctx
->
db
;
struct
apk_database
*
db
=
ctx
->
db
;
struct
apk_package
*
pkg
=
ctx
->
pkg
;
struct
apk_package
*
pkg
=
ctx
->
pkg
,
*
opkg
;
apk_blob_t
name
=
APK_BLOB_STR
(
ae
->
name
);
apk_blob_t
name
=
APK_BLOB_STR
(
ae
->
name
)
,
bdir
,
bfile
;
struct
apk_db_dir
*
dir
;
struct
apk_db_dir
_instance
*
diri
=
ctx
->
diri
;
struct
apk_db_file
*
file
;
struct
apk_db_file
*
file
;
struct
apk_file_info
fi
;
struct
apk_file_info
fi
;
char
alt_name
[
PATH_MAX
];
char
alt_name
[
PATH_MAX
];
...
@@ -767,30 +775,59 @@ static int apk_db_install_archive_entry(void *_ctx,
...
@@ -767,30 +775,59 @@ static int apk_db_install_archive_entry(void *_ctx,
}
}
/* Installable entry */
/* Installable entry */
if
(
ctx
->
file_pkg_node
==
NULL
)
ctx
->
file_pkg_node
=
hlist_tail_ptr
(
&
pkg
->
owned_files
);
if
(
!
S_ISDIR
(
ae
->
mode
))
{
if
(
!
S_ISDIR
(
ae
->
mode
))
{
file
=
apk_db_file_get
(
db
,
name
,
ctx
);
if
(
!
apk_blob_rsplit
(
name
,
'/'
,
&
bdir
,
&
bfile
))
if
(
file
==
NULL
)
return
0
;
return
-
1
;
if
(
bfile
.
len
>
6
&&
memcmp
(
bfile
.
ptr
,
".keep_"
,
6
)
==
0
)
return
0
;
r
=
strlen
(
diri
->
dir
->
dirname
);
r
=
strlen
(
bdir
.
ptr
);
r
=
0
;
/* Make sure the file is part of the cached directory tree */
if
(
diri
==
NULL
||
strncmp
(
diri
->
dir
->
dirname
,
bdir
.
ptr
,
bdir
.
len
)
!=
0
||
diri
->
dir
->
dirname
[
bdir
.
len
]
!=
0
)
{
struct
hlist_node
*
n
;
if
(
file
->
owner
!=
NULL
&&
hlist_for_each_entry
(
diri
,
n
,
&
pkg
->
owned_dirs
,
pkg_dirs_list
)
{
file
->
owner
->
name
!=
pkg
->
name
&&
if
(
strncmp
(
diri
->
dir
->
dirname
,
bdir
.
ptr
,
bdir
.
len
)
==
0
&&
strcmp
(
file
->
owner
->
name
->
name
,
"busybox"
)
!=
0
)
{
diri
->
dir
->
dirname
[
bdir
.
len
]
==
0
)
apk_error
(
"%s: Trying to overwrite %s owned by %s.
\n
"
,
break
;
pkg
->
name
->
name
,
ae
->
name
,
}
file
->
owner
->
name
->
name
);
if
(
diri
==
NULL
)
{
apk_error
(
"%s: File '%*s' entry without directory entry.
\n
"
,
pkg
->
name
->
name
,
name
.
len
,
name
.
ptr
);
return
-
1
;
}
ctx
->
diri
=
diri
;
}
file
=
apk_db_file_get
(
db
,
name
,
ctx
);
if
(
file
==
NULL
)
{
apk_error
(
"%s: Failed to create fdb entry for '%*s'
\n
"
,
pkg
->
name
->
name
,
name
.
len
,
name
.
ptr
);
return
-
1
;
return
-
1
;
}
}
apk_db_file_set_owner
(
db
,
file
,
pkg
,
TRUE
,
ctx
->
file_pkg_node
);
if
(
file
->
diri
!=
NULL
)
{
ctx
->
file_pkg_node
=
&
file
->
pkg_files_list
.
next
;
opkg
=
file
->
diri
->
pkg
;
if
(
opkg
->
name
!=
pkg
->
name
&&
strcmp
(
opkg
->
name
->
name
,
"busybox"
)
!=
0
)
{
apk_error
(
"%s: Trying to overwrite %s owned by %s.
\n
"
,
pkg
->
name
->
name
,
ae
->
name
,
opkg
->
name
->
name
);
return
-
1
;
}
}
if
(
strncmp
(
file
->
filename
,
".keep_"
,
6
)
==
0
)
if
(
ctx
->
file_diri_node
==
NULL
)
return
0
;
ctx
->
file_diri_node
=
hlist_tail_ptr
(
&
diri
->
owned_files
);
apk_db_file_set_owner
(
db
,
file
,
diri
,
ctx
->
file_diri_node
);
ctx
->
file_diri_node
=
&
file
->
diri_files_list
.
next
;
if
((
file
->
dir
->
flags
&
APK_DBDIRF_PROTECTED
)
&&
if
((
diri
->
dir
->
flags
&
APK_DBDIRF_PROTECTED
)
&&
csum_valid
(
file
->
csum
)
&&
csum_valid
(
file
->
csum
)
&&
apk_file_get_info
(
ae
->
name
,
&
fi
)
==
0
&&
apk_file_get_info
(
ae
->
name
,
&
fi
)
==
0
&&
memcmp
(
file
->
csum
,
fi
.
csum
,
sizeof
(
csum_t
))
!=
0
)
{
memcmp
(
file
->
csum
,
fi
.
csum
,
sizeof
(
csum_t
))
!=
0
)
{
...
@@ -798,7 +835,7 @@ static int apk_db_install_archive_entry(void *_ctx,
...
@@ -798,7 +835,7 @@ static int apk_db_install_archive_entry(void *_ctx,
* Extract to separate place */
* Extract to separate place */
snprintf
(
alt_name
,
sizeof
(
alt_name
),
snprintf
(
alt_name
,
sizeof
(
alt_name
),
"%s/%s.apk-new"
,
"%s/%s.apk-new"
,
dir
->
dirname
,
file
->
filename
);
diri
->
dir
->
dirname
,
file
->
filename
);
r
=
apk_archive_entry_extract
(
ae
,
is
,
alt_name
);
r
=
apk_archive_entry_extract
(
ae
,
is
,
alt_name
);
}
else
{
}
else
{
r
=
apk_archive_entry_extract
(
ae
,
is
,
NULL
);
r
=
apk_archive_entry_extract
(
ae
,
is
,
NULL
);
...
@@ -807,10 +844,19 @@ static int apk_db_install_archive_entry(void *_ctx,
...
@@ -807,10 +844,19 @@ static int apk_db_install_archive_entry(void *_ctx,
}
else
{
}
else
{
if
(
name
.
ptr
[
name
.
len
-
1
]
==
'/'
)
if
(
name
.
ptr
[
name
.
len
-
1
]
==
'/'
)
name
.
len
--
;
name
.
len
--
;
dir
=
apk_db_dir_get
(
db
,
name
);
dir
->
mode
=
ae
->
mode
&
07777
;
printf
(
"%s: %*s
\n
"
,
pkg
->
name
->
name
,
name
.
len
,
name
.
ptr
);
dir
->
uid
=
ae
->
uid
;
dir
->
gid
=
ae
->
gid
;
if
(
ctx
->
diri_node
==
NULL
)
ctx
->
diri_node
=
hlist_tail_ptr
(
&
pkg
->
owned_dirs
);
ctx
->
diri
=
diri
=
apk_db_diri_new
(
db
,
pkg
,
name
,
ctx
->
diri_node
);
ctx
->
diri_node
=
&
diri
->
pkg_dirs_list
.
next
;
ctx
->
file_dir_node
=
NULL
;
ctx
->
file_diri_node
=
NULL
;
apk_db_diri_set
(
diri
,
ae
->
mode
&
0777
,
ae
->
uid
,
ae
->
gid
);
apk_db_diri_create
(
diri
);
}
}
return
r
;
return
r
;
...
@@ -819,21 +865,24 @@ static int apk_db_install_archive_entry(void *_ctx,
...
@@ -819,21 +865,24 @@ static int apk_db_install_archive_entry(void *_ctx,
static
void
apk_db_purge_pkg
(
struct
apk_database
*
db
,
static
void
apk_db_purge_pkg
(
struct
apk_database
*
db
,
struct
apk_package
*
pkg
)
struct
apk_package
*
pkg
)
{
{
struct
apk_db_dir_instance
*
diri
;
struct
apk_db_file
*
file
;
struct
apk_db_file
*
file
;
struct
hlist_node
*
c
,
*
n
;
struct
hlist_node
*
dc
,
*
dn
,
*
fc
,
*
fn
;
char
fn
[
1024
];
char
name
[
1024
];
hlist_for_each_entry_safe
(
file
,
c
,
n
,
&
pkg
->
owned_files
,
pkg_files_list
)
{
hlist_for_each_entry_safe
(
diri
,
dc
,
dn
,
&
pkg
->
owned_dirs
,
pkg_dirs_list
)
{
file
->
owner
=
NULL
;
hlist_for_each_entry_safe
(
file
,
fc
,
fn
,
&
diri
->
owned_files
,
diri_files_list
)
{
snprintf
(
fn
,
sizeof
(
fn
),
"%s/%s"
,
file
->
diri
=
NULL
;
file
->
dir
->
dirname
,
snprintf
(
name
,
sizeof
(
name
),
"%s/%s"
,
file
->
filename
);
diri
->
dir
->
dirname
,
unlink
(
fn
);
file
->
filename
);
unlink
(
name
);
apk_db_dir_unref
(
db
,
file
->
dir
);
__hlist_del
(
fc
,
&
diri
->
owned_files
.
first
);
__hlist_del
(
c
,
&
pkg
->
owned_files
.
first
);
db
->
installed
.
stats
.
files
--
;
db
->
installed
.
stats
.
files
--
;
}
apk_db_dir_put
(
db
,
diri
->
dir
);
__hlist_del
(
dc
,
&
pkg
->
owned_dirs
.
first
);
}
}
apk_pkg_set_state
(
db
,
pkg
,
APK_STATE_NO_INSTALL
);
apk_pkg_set_state
(
db
,
pkg
,
APK_STATE_NO_INSTALL
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment