Merge branch 'main' of https://git.matterlinux.xyz/Matter/libmp

Signed-off-by: ngn <ngn@ngn.tf>

.gitea/workflows/docker.yml

@@ -0,0 +1,28 @@
+name: Build docker image
+
+on:
+  push:
+    branches: ["main"]
+
+env:
+  REGISTRY: git.matterlinux.xyz
+  IMAGE: ${{gitea.repository}}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: "https://github.com/actions/checkout@v4"
+
+      - name: Login to container repo
+        uses: "https://github.com/docker/login-action@v1"
+        with:
+          registry: ${{env.REGISTRY}}
+          username: ${{gitea.actor}}
+          password: ${{secrets.PACKAGES_TOKEN}}
+
+      - name: Build image
+        run: |
+          docker build --tag ${{env.REGISTRY}}/${{env.IMAGE}}:latest .
+          docker push ${{env.REGISTRY}}/${{env.IMAGE}}:latest

README.md

@@ -1,4 +1,7 @@
 # libmp | MatterLinux package management library
+
+![](https://git.matterlinux.xyz/matter/libmp/actions/workflows/docker.yml/badge.svg)
+
 The core library for [`matt`](https://git.matterlinux.xyz/Matter/matt), it has
 components for transferring, installing, updating and removing packages.
 

examples/server/main.c

@@ -19,7 +19,12 @@ int main(int argc, char *argv[]) {
     goto end;
   }
 
-  if (lm_ctx_pool_add(&ctx, "test", "mptp://127.0.0.1:5858", "./examples/test") == NULL) {
+  if (lm_ctx_pool_add(&ctx, "test", "mptp://s.test.local", "./examples/test") == NULL) {
+    printf("failed to add pool: %s (%d)\n", lm_strerror(), lm_error());
+    goto end;
+  }
+
+  if (lm_ctx_pool_add(&ctx, "test", "mptp://n.test.local", "/tmp/test") == NULL) {
     printf("failed to add pool: %s (%d)\n", lm_strerror(), lm_error());
     goto end;
   }

include/all.h

@@ -22,7 +22,7 @@
 
 // clang-format on
 
-#define LM_VERSION "24.02"
+#define LM_VERSION "24.09"
 
 #include "ctx.h"
 #include "error.h"

include/ctx.h

@@ -93,7 +93,7 @@ bool lm_ctx_install(lm_ctx_t *ctx, lm_pkg_t *pkg, bool run_install, lm_ctx_insta
     void *data); // installs/updates a single package
 bool lm_ctx_check(
     lm_ctx_t *ctx, lm_entry_t *entry, lm_ctx_check_callback_t callback, void *data); // checks a single package
-size_t lm_ctx_sync(lm_ctx_t *ctx, bool do_update, lm_ctx_sync_callback_t callback, void *data); // syncs all the pools
+ssize_t lm_ctx_sync(lm_ctx_t *ctx, bool do_update, lm_ctx_sync_callback_t callback, void *data); // syncs all the pools
 void    lm_ctx_ping(lm_ctx_t *ctx, lm_ctx_ping_callback_t callback, void *data);                 // pings all the pools
 bool lm_ctx_serve(lm_ctx_t *ctx, char *addr, uint8_t threads, __sighandler_t handler, lm_ctx_serve_callback_t callback,
     void *data); // serves all the pools

include/database.h

@@ -4,39 +4,26 @@
 
 #include <sqlite3.h>
 #include <stdbool.h>
+#include <stdio.h>
 #include <sys/types.h>
 
 #define HASH_LEN 32
 
 enum lm_query_index {
-  QUERY_CREATE_ENTRY_TABLE    = 0,
-  QUERY_INSERT_ENTRY_SINGLE   = 1,
-  QUERY_SELECT_ENTRY_SINGLE_1 = 2,
-  QUERY_SELECT_ENTRY_SINGLE_2 = 3,
-  QUERY_DELETE_ENTRY_SINGLE   = 4,
-  QUERY_SELECT_ENTRY_ALL      = 5,
-
-  QUERY_CREATE_FILE_TABLE  = 6,
-  QUERY_INSERT_FILE_SINGLE = 7,
-  QUERY_DELETE_FILE_ALL    = 8,
-  QUERY_DELETE_FILE_SINGLE = 9,
-  QUERY_SELECT_FILE_ALL    = 10,
-  QUERY_SELECT_FILE_SINGLE = 11,
-  QUERY_UPDATE_FILE_1      = 12,
-  QUERY_UPDATE_FILE_2      = 13,
+  QUERY_CREATE_TABLE    = 0,
+  QUERY_INSERT_SINGLE   = 1,
+  QUERY_SELECT_SINGLE_1 = 2,
+  QUERY_SELECT_SINGLE_2 = 3,
+  QUERY_DELETE_SINGLE   = 4,
+  QUERY_SELECT_ALL      = 5,
 };
 
 enum lm_columns {
-  FILES_COLUMN_PATH  = 1,
-  FILES_COLUMN_HASH  = 2,
-  FILES_COLUMN_KEEP  = 3,
-  FILES_COLUMN_ENTRY = 4,
-
-  ENTRIES_COLUMN_NAME    = 1,
-  ENTRIES_COLUMN_VERSION = 2,
-  ENTRIES_COLUMN_DESC    = 3,
-  ENTRIES_COLUMN_SIZE    = 4,
-  ENTRIES_COLUMN_DEPENDS = 5,
+  COLUMN_NAME    = 1,
+  COLUMN_VERSION = 2,
+  COLUMN_DESC    = 3,
+  COLUMN_SIZE    = 4,
+  COLUMN_DEPENDS = 5,
 };
 
 extern char *queries[];
@@ -44,12 +31,9 @@ extern char *queries[];
 typedef lm_pkg_data_t lm_entry_t;
 
 typedef struct lm_database {
-  sqlite3      *entries_db;
-  sqlite3_stmt *entries_st;
-
-  sqlite3      *files_db;
-  sqlite3_stmt *files_st;
-
+  sqlite3      *sql;
+  sqlite3_stmt *st;
+  FILE         *filesp;
   char         *dir;
 } lm_database_t;
 
@@ -79,8 +63,9 @@ bool lm_database_files_next(
     lm_database_t *db, lm_entry_t *entry, char **path, char **hash, bool *keep); // gets the next file of the entry
 bool lm_database_files_add(
     lm_database_t *db, lm_entry_t *entry, char *path, char *hash); // adds a file to the files database
-bool lm_database_files_del(lm_database_t *db, lm_entry_t *entry);  // dels all files of belonging to a entry
-bool lm_database_files_del_single(lm_database_t *db, char *path);
+bool lm_database_files_del(
+    lm_database_t *db, lm_entry_t *entry); // dels files belonging to an entry that is not set as KEEP
+bool lm_database_files_del_all(lm_database_t *db, lm_entry_t *entry); // dels all files of belonging to an entry
 void lm_database_files_next_free(lm_database_t *db, lm_entry_t *entry, char **path, char **hash,
     bool *keep); // frees resources used for lm_database_files_next
 

include/error.h

@@ -81,7 +81,7 @@ typedef enum lm_error {
   LM_ERR_DbFilesOpenFail       = 80,
   LM_ERR_DbFilesDirFail        = 81,
   LM_ERR_DbFilesUnlinkFail     = 82,
-  LM_ERR_DbFilesWriteFail      = 83,
+  LM_ERR_DbFilesRenameFail     = 83,
   LM_ERR_DbKeepsNotFound       = 84,
   LM_ERR_DbKeepsOpenFail       = 85,
   LM_ERR_DbKeepsDirFail        = 86,
@@ -140,7 +140,7 @@ typedef enum lm_error {
   LM_ERR_InstallSaveFail       = 138,
   LM_ERR_FailMkdir             = 139,
   LM_ERR_NotDir                = 140,
-  LM_ERR_NoWrite               = 141,
+  LM_ERR_NoRead                = 141,
   LM_ERR_PoolListBadDir        = 142,
   LM_ERR_FileNotExist          = 143,
   LM_ERR_FileNotLink           = 144,
@@ -153,6 +153,11 @@ typedef enum lm_error {
   LM_ERR_PoolInfoBadName       = 151,
   LM_ERR_PoolInfoUnknown       = 152,
   LM_ERR_MPTPBadPath           = 153,
+  LM_ERR_UnknownThread         = 154,
+  LM_ERR_PkgBadVersion         = 155,
+  LM_ERR_PkgDataMissing        = 156,
+  LM_ERR_PoolListDataFail      = 157,
+  LM_ERR_PoolListAddFail       = 158,
 } lm_error_t;
 
 typedef struct lm_error_desc {
@@ -162,6 +167,7 @@ typedef struct lm_error_desc {
 
 void       lm_error_set(lm_error_t code, ...);
 void       lm_error_clear();
+void       lm_error_init();
 lm_error_t lm_error();
 char      *lm_strerror();
 

include/package.h

@@ -6,7 +6,7 @@
 #define PKG_DATA_DESC    "desc"
 #define PKG_DATA_VERSION "version"
 #define PKG_DATA_DEPENDS "depends"
-#define PKG_DATA_KEEPS   "keeps"
+#define PKG_DATA_KEEPS   "keep"
 
 #define DATA_FILE     "DATA"
 #define HASHES_FILE   "HASHES"

include/util.h

@@ -33,8 +33,9 @@ bool  rmrf(char *p);
 int   digits(int n);
 
 bool package_parse(char *package, char *name, char *version);
-bool package_version_valid(char *name);
-bool package_name_valid(char *name);
+bool __package_field_valid(char *field);
+#define package_version_valid(x) __package_field_valid(x)
+#define package_name_valid(x)    __package_field_valid(x)
 
 void pdebug(const char *func, const char *fmt, ...);
 void pdebug_binary(char *data, size_t len);
@@ -42,7 +43,7 @@ void pdebug_binary(char *data, size_t len);
 bool parse_host(char *addr, char *host, uint16_t *port);
 bool copy_blocks(struct archive *w, struct archive *r);
 bool extract_archive(char *dst, char *src);
-bool mkdir_ifnot(char *path);
+bool mkdir_ifnot(char *path, int mode);
 
 int   join_multiple(char *res, const char *base, const char *pth, const char *pth2);
 int   join(char *res, const char *base, const char *pth);

locale/tr/LC_MESSAGES/libmp.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-11 01:42+0300\n"
+"POT-Creation-Date: 2024-08-25 14:07+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,643 +17,667 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/error.c:19
+#: src/error.c:31
 msgid "no error"
 msgstr "hata yok"
 
-#: src/error.c:20
+#: src/error.c:32
 #, fuzzy
 msgid "URL contains an invalid character"
 msgstr "URL contains an invalid char"
 
-#: src/error.c:21
+#: src/error.c:33
 msgid "URL does not have a valid protocol field"
 msgstr "URL does not have a valid protocol field"
 
-#: src/error.c:22
+#: src/error.c:34
 msgid "URL is too large"
 msgstr "URL is too large"
 
-#: src/error.c:23
+#: src/error.c:35
 msgid "URL hostname is too large"
 msgstr "URL hostname is too large"
 
-#: src/error.c:24
+#: src/error.c:36
 msgid "URL path is too large"
 msgstr "URL path is too large"
 
-#: src/error.c:25
+#: src/error.c:37
 msgid "URL does not have a valid hostname"
 msgstr "URL does not have a valid hostname"
 
-#: src/error.c:26
+#: src/error.c:38
 #, fuzzy
 msgid "URL does not have a valid port number"
 msgstr "URL does not have a valid hostname"
 
-#: src/error.c:27
+#: src/error.c:39
 msgid "URL does not have a valid path"
 msgstr "URL does not have a valid path"
 
-#: src/error.c:28
+#: src/error.c:40
 #, fuzzy
 msgid "hostname does not contain a valid port number"
 msgstr "URL does not contain a hostname with a valid port number"
 
-#: src/error.c:29
+#: src/error.c:41
 #, fuzzy
 msgid "hostname is not valid"
 msgstr "URL hostname is too large"
 
-#: src/error.c:30
+#: src/error.c:42
 msgid "URL protocol port number is unknown"
 msgstr "URL protocol port number is unknown"
 
-#: src/error.c:31
+#: src/error.c:43
 msgid "URL is incomplete"
 msgstr "URL tamamlanmamış"
 
-#: src/error.c:32
+#: src/error.c:44
 msgid "pool does not support the specified protocol"
 msgstr "pool does not support the specified protocol"
 
-#: src/error.c:33
+#: src/error.c:45
 msgid "unsupported MPTP version"
 msgstr ""
 
-#: src/error.c:34
+#: src/error.c:46
 msgid "invalid MPTP request/response code"
 msgstr ""
 
-#: src/error.c:35
+#: src/error.c:47
 msgid "invalid MPTP URL"
 msgstr ""
 
-#: src/error.c:36
+#: src/error.c:48
 msgid "failed to resolve hostname for MPTP connection"
 msgstr ""
 
-#: src/error.c:37
+#: src/error.c:49
 msgid "failed to create a MPTP socket"
 msgstr ""
 
-#: src/error.c:38
+#: src/error.c:50
 msgid "failed to connect to the MPTP host"
 msgstr ""
 
-#: src/error.c:39
+#: src/error.c:51
 #, c-format
 msgid "failed receive MPTP data from host: %s"
 msgstr ""
 
-#: src/error.c:40
+#: src/error.c:52
 msgid "failed send MPTP data to host"
 msgstr ""
 
-#: src/error.c:41
+#: src/error.c:53
 #, fuzzy
 msgid "MPTP data size is invalid"
 msgstr "URL path is too large"
 
-#: src/error.c:42
+#: src/error.c:54
 #, fuzzy
 msgid "MPTP host size is invalid"
 msgstr "URL path is too large"
 
-#: src/error.c:43
+#: src/error.c:55
 #, fuzzy
 msgid "MPTP path size is invalid"
 msgstr "URL path is too large"
 
-#: src/error.c:44
+#: src/error.c:56
 msgid "failed to set MPTP socket options"
 msgstr ""
 
-#: src/error.c:45
+#: src/error.c:57
 msgid "MPTP connection timed out"
 msgstr ""
 
-#: src/error.c:46
+#: src/error.c:58
 #, c-format
 msgid "failed to bind MPTP socket: %s"
 msgstr ""
 
-#: src/error.c:47
+#: src/error.c:59
 msgid "required argument is a NULL pointer or 0"
 msgstr ""
 
-#: src/error.c:48
+#: src/error.c:60
 msgid "not a MPTP request"
 msgstr ""
 
-#: src/error.c:49
+#: src/error.c:61
 msgid "not a MPTP response"
 msgstr ""
 
-#: src/error.c:50 src/error.c:51
+#: src/error.c:62 src/error.c:63
 msgid "MPTP request last flag is not set"
 msgstr ""
 
-#: src/error.c:52
+#: src/error.c:64
 msgid "host port not specified"
 msgstr ""
 
-#: src/error.c:53
+#: src/error.c:65
 msgid "pool info is badly formatted or is not complete"
 msgstr ""
 
-#: src/error.c:54
+#: src/error.c:66
 msgid "failed to write block from archive"
 msgstr ""
 
-#: src/error.c:55
+#: src/error.c:67
 msgid "failed to read block from archive"
 msgstr ""
 
-#: src/error.c:56
+#: src/error.c:68
 msgid "failed to open archive"
 msgstr ""
 
-#: src/error.c:57
+#: src/error.c:69
 msgid "failed to write archive header"
 msgstr ""
 
-#: src/error.c:58
+#: src/error.c:70
 msgid "failed to finish writing the archive entry"
 msgstr ""
 
-#: src/error.c:59
+#: src/error.c:71
 msgid "failed to create new archive reader/writer"
 msgstr ""
 
-#: src/error.c:60
+#: src/error.c:72
 msgid "failed to resolve full path for archive file"
 msgstr ""
 
-#: src/error.c:61
+#: src/error.c:73
 msgid "failed to read the next header of the archive"
 msgstr ""
 
-#: src/error.c:62
+#: src/error.c:74
 msgid "failed to obtain current working directory"
 msgstr ""
 
-#: src/error.c:63
+#: src/error.c:75
 msgid "failed to open extracted pool list directory"
 msgstr ""
 
-#: src/error.c:64
-msgid "failed to read access the pool list file"
-msgstr ""
-
-#: src/error.c:65
-msgid "failed to read access the pool info file"
-msgstr ""
-
-#: src/error.c:66
-msgid "failed to parse package data"
-msgstr ""
-
-#: src/error.c:67
-#, fuzzy
-msgid "package name is invalid"
-msgstr "URL hostname is too large"
-
-#: src/error.c:68
-msgid "data path is not set with in the ctx"
-msgstr ""
-
-#: src/error.c:69
-msgid "temp path is not set with in the ctx"
-msgstr ""
-
-#: src/error.c:70
-msgid "root path is not set with in the ctx"
-msgstr ""
-
-#: src/error.c:71
-#, c-format
-msgid "failed to set the ctx temp director to %s: %s"
-msgstr ""
-
-#: src/error.c:72
-#, c-format
-msgid "failed to set the ctx root directory to %s: %s"
-msgstr ""
-
-#: src/error.c:73
-#, c-format
-msgid "failed to set the ctx data directory to %s: %s"
-msgstr ""
-
-#: src/error.c:74
-msgid "pool did not respond ping with pong"
-msgstr ""
-
-#: src/error.c:75
-msgid "package file and directory paths are empty"
-msgstr ""
-
 #: src/error.c:76
-msgid "failed to to open target file for sending"
+#, c-format
+msgid "failed to load \"%s\" data: %s"
 msgstr ""
 
 #: src/error.c:77
-msgid "failed to to delete target file for receiving"
+#, c-format
+msgid "failed add \"%s\" to the pool list: %s"
 msgstr ""
 
 #: src/error.c:78
-msgid "failed to to open target file for receiving"
+msgid "failed to read access the pool list file"
 msgstr ""
 
 #: src/error.c:79
-msgid "got a bad response code for receiving the target file"
+msgid "failed to read access the pool info file"
 msgstr ""
 
 #: src/error.c:80
-msgid "failed to write to the target file for receiving"
+msgid "failed to parse package data"
 msgstr ""
 
 #: src/error.c:81
 #, fuzzy
-msgid "package not found"
+msgid "package name is invalid"
 msgstr "URL hostname is too large"
 
 #: src/error.c:82
-msgid "failed to access to the database file/directory"
-msgstr ""
+#, fuzzy
+msgid "package version is invalid"
+msgstr "URL hostname is too large"
 
 #: src/error.c:83
-msgid "failed to open SQLite database"
+#, c-format
+msgid "package data has missing field: %s"
 msgstr ""
 
 #: src/error.c:84
-msgid "failed to create table in SQLite database"
+msgid "data path is not set with in the ctx"
 msgstr ""
 
 #: src/error.c:85
-msgid "failed to prepare statement for SQLite database"
+msgid "temp path is not set with in the ctx"
 msgstr ""
 
 #: src/error.c:86
-msgid "failed to insert to the table in SQLite database"
+msgid "root path is not set with in the ctx"
 msgstr ""
 
 #: src/error.c:87
-msgid "failed to select from the table in SQLite database"
+#, c-format
+msgid "failed to set the ctx temp director to %s: %s"
 msgstr ""
 
 #: src/error.c:88
-msgid "failed to delete from the table in SQLite database"
+#, c-format
+msgid "failed to set the ctx root directory to %s: %s"
 msgstr ""
 
 #: src/error.c:89
-msgid "failed to find entry in SQLite database"
+#, c-format
+msgid "failed to set the ctx data directory to %s: %s"
 msgstr ""
 
 #: src/error.c:90
-msgid "failed to init GPG for package verification"
+msgid "pool did not respond ping with pong"
 msgstr ""
 
 #: src/error.c:91
-msgid "failed to import signature to GPG for package verification"
+msgid "package file and directory paths are empty"
 msgstr ""
 
 #: src/error.c:92
-msgid "failed to import archive to GPG for package verification"
+msgid "failed to to open target file for sending"
 msgstr ""
 
 #: src/error.c:93
-msgid "package signature verification failed with zero matches"
+msgid "failed to to delete target file for receiving"
 msgstr ""
 
 #: src/error.c:94
-msgid "package signature verification failed with zero results"
+msgid "failed to to open target file for receiving"
 msgstr ""
 
 #: src/error.c:95
-msgid "pool file and directory paths are empty"
+msgid "got a bad response code for receiving the target file"
 msgstr ""
 
 #: src/error.c:96
-msgid "pool is not avaliable for connection"
+msgid "failed to write to the target file for receiving"
 msgstr ""
 
 #: src/error.c:97
-msgid "pool URL is empty or invalid"
-msgstr ""
+#, fuzzy
+msgid "package not found"
+msgstr "URL hostname is too large"
 
 #: src/error.c:98
-msgid "pool directory path is not accessible"
+msgid "failed to access to the database file/directory"
 msgstr ""
 
 #: src/error.c:99
-msgid "pool directory sub-paths are not accessible"
+msgid "failed to open SQLite database"
 msgstr ""
 
 #: src/error.c:100
-msgid "package file list not found in the database"
+msgid "failed to create table in SQLite database"
 msgstr ""
 
 #: src/error.c:101
-msgid "failed to open package file list in the database"
+msgid "failed to prepare statement for SQLite database"
 msgstr ""
 
 #: src/error.c:102
-msgid "failed to access package file list database directory"
+msgid "failed to insert to the table in SQLite database"
 msgstr ""
 
 #: src/error.c:103
-msgid "failed to remove package file list from the database"
+msgid "failed to select from the table in SQLite database"
 msgstr ""
 
 #: src/error.c:104
-msgid "failed to write to the file list in the database"
+msgid "failed to delete from the table in SQLite database"
 msgstr ""
 
 #: src/error.c:105
-msgid "package keep list not found in the database"
+msgid "failed to find entry in SQLite database"
 msgstr ""
 
 #: src/error.c:106
-msgid "failed to open package keep list in the database"
+msgid "failed to init GPG for package verification"
 msgstr ""
 
 #: src/error.c:107
-msgid "failed to access package keep list database directory"
+msgid "failed to import signature to GPG for package verification"
 msgstr ""
 
 #: src/error.c:108
-msgid "failed to remove package keep list from the database"
+msgid "failed to import archive to GPG for package verification"
 msgstr ""
 
 #: src/error.c:109
+msgid "package signature verification failed with zero matches"
+msgstr ""
+
+#: src/error.c:110
+msgid "package signature verification failed with zero results"
+msgstr ""
+
+#: src/error.c:111
+msgid "pool file and directory paths are empty"
+msgstr ""
+
+#: src/error.c:112
+msgid "pool is not avaliable for connection"
+msgstr ""
+
+#: src/error.c:113
+msgid "pool URL is empty or invalid"
+msgstr ""
+
+#: src/error.c:114
+msgid "pool directory path is not accessible"
+msgstr ""
+
+#: src/error.c:115
+msgid "pool directory sub-paths are not accessible"
+msgstr ""
+
+#: src/error.c:116
+msgid "file list not found for the package"
+msgstr ""
+
+#: src/error.c:117
+#, c-format
+msgid "failed to rename the file list for the package: %s"
+msgstr ""
+
+#: src/error.c:118
+#, c-format
+msgid "failed to open the package file list: %s"
+msgstr ""
+
+#: src/error.c:119
+#, c-format
+msgid "failed to open the database directory: %s"
+msgstr ""
+
+#: src/error.c:120
+#, c-format
+msgid "failed to remove package file list: %s"
+msgstr ""
+
+#: src/error.c:121
+msgid "package keep list not found in the database"
+msgstr ""
+
+#: src/error.c:122
+msgid "failed to open package keep list in the database"
+msgstr ""
+
+#: src/error.c:123
+msgid "failed to access package keep list database directory"
+msgstr ""
+
+#: src/error.c:124
+msgid "failed to remove package keep list from the database"
+msgstr ""
+
+#: src/error.c:125
 #, c-format
 msgid "failed to find %s (dependency of %s)"
 msgstr ""
 
-#: src/error.c:110
+#: src/error.c:126
 #, c-format
 msgid "failed to download %s for installation: %s"
 msgstr ""
 
-#: src/error.c:111
+#: src/error.c:127
 #, fuzzy
 msgid "package is not downloaded"
 msgstr "URL hostname is too large"
 
-#: src/error.c:112 src/error.c:113
+#: src/error.c:128 src/error.c:129
 msgid "failed to remove downloaded package"
 msgstr ""
 
-#: src/error.c:114
+#: src/error.c:130
 msgid "failed to open the destination file"
 msgstr ""
 
-#: src/error.c:115
+#: src/error.c:131
 msgid "failed to open the source file"
 msgstr ""
 
-#: src/error.c:116 src/error.c:117
+#: src/error.c:132 src/error.c:133
 msgid "failed to write to the destination file"
 msgstr ""
 
-#: src/error.c:118
+#: src/error.c:134
 msgid "package does not have associated pool"
 msgstr ""
 
-#: src/error.c:119
+#: src/error.c:135
 msgid "failed to create specified temp directory"
 msgstr ""
 
-#: src/error.c:120
+#: src/error.c:136
 msgid "package archive does not contain required files"
 msgstr ""
 
-#: src/error.c:121
-msgid "package data does not match with target package"
-msgstr ""
-
-#: src/error.c:122
-#, c-format
-msgid "failed to update changes file for package: %s"
-msgstr ""
-
-#: src/error.c:123
-msgid "failed to access package hashes file"
-msgstr ""
-
-#: src/error.c:124
-msgid "failed to remove package changes file from the database"
-msgstr ""
-
-#: src/error.c:125
-msgid "failed to stat target file for sending"
-msgstr ""
-
-#: src/error.c:126
-msgid "failed to format target file size for sending"
-msgstr ""
-
-#: src/error.c:127
-msgid "failed to read target file size for sending"
-msgstr ""
-
-#: src/error.c:128
-msgid "failed to parse target file size for receiving"
-msgstr ""
-
-#: src/error.c:129
-msgid "target file is not fully received"
-msgstr ""
-
-#: src/error.c:130
-msgid "failed to stat for target extract archive"
-msgstr ""
-
-#: src/error.c:131
-#, c-format
-msgid "failed to add package file (%s) to the database: %s"
-msgstr ""
-
-#: src/error.c:132
-#, c-format
-msgid "failed to extract package files: %s"
-msgstr ""
-
-#: src/error.c:133
-#, c-format
-msgid "failed to add package to the database: %s"
-msgstr ""
-
-#: src/error.c:134
-#, fuzzy
-msgid "package is already installed"
-msgstr "URL hostname is too large"
-
-#: src/error.c:135
-#, fuzzy
-msgid "package is not installed"
-msgstr "URL hostname is too large"
-
-#: src/error.c:136
-#, c-format
-msgid "failed to remove package file (%s): %s"
-msgstr ""
-
 #: src/error.c:137
-#, c-format
-msgid "failed to remove package from the database: %s"
+msgid "package data does not match with target package"
 msgstr ""
 
 #: src/error.c:138
 #, c-format
-msgid "failed to remove package files from the database: %s"
+msgid "failed to update changes file for package: %s"
 msgstr ""
 
 #: src/error.c:139
-#, c-format
-msgid "failed to remove changes file for package: %s"
+msgid "failed to access package hashes file"
 msgstr ""
 
 #: src/error.c:140
-msgid "failed to get current directory for running install"
+msgid "failed to remove package changes file from the database"
 msgstr ""
 
 #: src/error.c:141
-msgid "failed change directory to root for running install"
+msgid "failed to stat target file for sending"
 msgstr ""
 
 #: src/error.c:142
-msgid "failed run install spawn command"
+msgid "failed to format target file size for sending"
+msgstr ""
+
+#: src/error.c:143
+msgid "failed to read target file size for sending"
 msgstr ""
 
 #: src/error.c:144
-msgid "failed to change directory to old directory after running install"
+msgid "failed to parse target file size for receiving"
 msgstr ""
 
 #: src/error.c:145
-msgid "install script returned a bad status code"
+msgid "target file is not fully received"
 msgstr ""
 
 #: src/error.c:146
-#, c-format
-msgid "failed to run the package install script: %s"
+msgid "failed to stat for target extract archive"
 msgstr ""
 
 #: src/error.c:147
 #, c-format
-msgid "failed to save the package install script: %s"
+msgid "failed to add package file (%s) to the database: %s"
 msgstr ""
 
 #: src/error.c:148
 #, c-format
-msgid "removing package breaks %s"
+msgid "failed to extract package files: %s"
 msgstr ""
 
 #: src/error.c:149
-#, fuzzy
-msgid "package is already up-to-date"
-msgstr "URL hostname is too large"
+#, c-format
+msgid "failed to add package to the database: %s"
+msgstr ""
 
 #: src/error.c:150
-msgid "failed to open file for hashing"
-msgstr ""
+#, fuzzy
+msgid "package is already installed"
+msgstr "URL hostname is too large"
 
 #: src/error.c:151
-msgid "failed create digest for hashing"
-msgstr ""
+#, fuzzy
+msgid "package is not installed"
+msgstr "URL hostname is too large"
 
 #: src/error.c:152
 #, c-format
-msgid "failed to get hash of %s: %s"
+msgid "failed to remove package file (%s): %s"
 msgstr ""
 
 #: src/error.c:153
 #, c-format
-msgid "file hash does not match for %s"
+msgid "failed to remove package from the database: %s"
 msgstr ""
 
 #: src/error.c:154
-#, fuzzy
-msgid "pool info is not loaded"
-msgstr "URL hostname is too large"
+#, c-format
+msgid "failed to remove package files from the database: %s"
+msgstr ""
 
 #: src/error.c:155
-msgid "pool list is empty"
+#, c-format
+msgid "failed to remove changes file for package: %s"
 msgstr ""
 
 #: src/error.c:156
-msgid "package changes file not found in the database"
+msgid "failed to get current directory for running install"
 msgstr ""
 
 #: src/error.c:157
-msgid "failed to change mod of the changes file"
+msgid "failed change directory to root for running install"
 msgstr ""
 
 #: src/error.c:158
-msgid "failed to create install script save directory"
-msgstr ""
-
-#: src/error.c:159
-msgid "directory does not have write permissions"
+msgid "failed run install spawn command"
 msgstr ""
 
 #: src/error.c:160
-msgid "specified path is not a directory"
+msgid "failed to change directory to old directory after running install"
 msgstr ""
 
 #: src/error.c:161
-msgid "failed to create the specified directory"
+msgid "install script returned a bad status code"
 msgstr ""
 
 #: src/error.c:162
-msgid "specified list extraction directory is not accessible"
+#, c-format
+msgid "failed to run the package install script: %s"
 msgstr ""
 
 #: src/error.c:163
 #, c-format
-msgid "file does not exist: %s"
+msgid "failed to save the package install script: %s"
 msgstr ""
 
 #: src/error.c:164
 #, c-format
-msgid "file is a symbolic link: %s"
+msgid "removing package breaks %s"
 msgstr ""
 
 #: src/error.c:165
-msgid "failed to set the package archive"
-msgstr ""
+#, fuzzy
+msgid "package is already up-to-date"
+msgstr "URL hostname is too large"
 
 #: src/error.c:166
-#, c-format
-msgid "failed change directory: %s"
+msgid "failed to open file for hashing"
 msgstr ""
 
 #: src/error.c:167
-msgid "failed to change directory to root during extraction"
+msgid "failed create digest for hashing"
 msgstr ""
 
 #: src/error.c:168
-msgid "failed to change directory back from root during extraction"
+#, c-format
+msgid "failed to get hash of %s: %s"
 msgstr ""
 
 #: src/error.c:169
 #, c-format
-msgid "failed to accept the MPTP connection: %s"
+msgid "file hash does not match for %s"
 msgstr ""
 
 #: src/error.c:170
+#, fuzzy
+msgid "pool info is not loaded"
+msgstr "URL hostname is too large"
+
+#: src/error.c:171
+msgid "pool list is empty"
+msgstr ""
+
+#: src/error.c:172
+msgid "package changes file not found in the database"
+msgstr ""
+
+#: src/error.c:173
+msgid "failed to change mod of the changes file"
+msgstr ""
+
+#: src/error.c:174
+msgid "failed to create install script save directory"
+msgstr ""
+
+#: src/error.c:175
+msgid "directory does not have read permissions"
+msgstr ""
+
+#: src/error.c:176
+msgid "specified path is not a directory"
+msgstr ""
+
+#: src/error.c:177
+msgid "failed to create the specified directory"
+msgstr ""
+
+#: src/error.c:178
+msgid "specified list extraction directory is not accessible"
+msgstr ""
+
+#: src/error.c:179
+#, c-format
+msgid "file does not exist: %s"
+msgstr ""
+
+#: src/error.c:180
+#, c-format
+msgid "file is a symbolic link: %s"
+msgstr ""
+
+#: src/error.c:181
+msgid "failed to set the package archive"
+msgstr ""
+
+#: src/error.c:182
+#, c-format
+msgid "failed change directory: %s"
+msgstr ""
+
+#: src/error.c:183
+msgid "failed to change directory to root during extraction"
+msgstr ""
+
+#: src/error.c:184
+msgid "failed to change directory back from root during extraction"
+msgstr ""
+
+#: src/error.c:185
+#, c-format
+msgid "failed to accept the MPTP connection: %s"
+msgstr ""
+
+#: src/error.c:186
 #, c-format
 msgid "failed to listen the MPTP socket: %s"
 msgstr ""
 
-#: src/error.c:171
+#: src/error.c:187
 #, c-format
 msgid "pool name (%s) doesn't match with: %s"
 msgstr ""
 
-#: src/error.c:172
+#: src/error.c:188
 #, c-format
 msgid "unknown key in the configuration: %s"
 msgstr ""

src/ctx/check.c

@@ -47,7 +47,8 @@ bool lm_ctx_check(lm_ctx_t *ctx, lm_entry_t *entry, lm_ctx_check_callback_t call
     if(S_ISLNK(st.st_mode)){
       pdebug(__func__, "%s seems to be a link, no hash verification to do", fp);
 
-      if(hash[0] != '\0'){
+      // hashes for links are just "#" chars
+      if(hash[0] != '#'){
         lm_error_set(LM_ERR_FileNotLink, fp);
         goto end;
       }

src/ctx/ctx.c

@@ -3,15 +3,16 @@
 #include "../../include/ctx.h"
 
 #include <linux/limits.h>
+#include <strings.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <locale.h>
 #include <string.h>
 #include <stdio.h>
-#include <strings.h>
+#include <errno.h>
 
 bool __lm_ctx_init_checkdir(char *path){
-  if(!mkdir_ifnot(path)){
+  if(!mkdir_ifnot(path, 0755)){
     lm_error_set(LM_ERR_FailMkdir);
     return false;
   }
@@ -21,8 +22,8 @@ bool __lm_ctx_init_checkdir(char *path){
     return false;
   }
 
-  if(!can_write(path)){
-    lm_error_set(LM_ERR_NoWrite);
+  if(!can_read(path)){
+    lm_error_set(LM_ERR_NoRead);
     return false;
   }
 
@@ -40,7 +41,7 @@ bool lm_ctx_init(lm_ctx_t *ctx) {
 
   bzero(ctx, sizeof(lm_ctx_t));
   ctx->version = LM_VERSION;
-  lm_error_clear();
+  lm_error_init();
 
   return true;
 }
@@ -63,6 +64,12 @@ bool lm_ctx_new(lm_ctx_t *ctx, char *root_dir, char *temp_dir, char *data_dir) {
     goto end;
   }
 
+  if(root_dir != NULL && !can_write(root_dir)){
+    pdebug(__func__, "check failed for specified root directory: %s", lm_strerror());
+    lm_error_set(LM_ERR_CtxRootFail, root_dir, "directory is not writeable");
+    goto end;
+  }
+
   if(root_dir != NULL)
     ctx->root = realpath(root_dir, NULL);
 
@@ -94,6 +101,8 @@ end:
 
 void lm_ctx_free(lm_ctx_t *ctx) {
   lm_ctx_pool_clear(ctx);
+  lm_ctx_temp_clear(ctx);
+
   free(ctx->data);
   free(ctx->root);
   free(ctx->temp);

src/ctx/install.c

@@ -29,7 +29,7 @@ bool __lm_ctx_save_install(lm_ctx_t *ctx, lm_pkg_t *pkg, char *install_path){
   sprintf(script_name, "install_%s", pkg->data.name);
   join(script_dir, ctx->data, "scripts");
 
-  if(!mkdir_ifnot(script_dir)){
+  if(!mkdir_ifnot(script_dir, 0755)){
     lm_error_set(LM_ERR_InstallDirFail);
     return false;
   }
@@ -137,14 +137,14 @@ bool __lm_ctx_extract_files(lm_ctx_t *ctx, lm_pkg_t *pkg, char *files, lm_ctx_in
     current += archive_entry_size(entry);
     type = archive_entry_filetype(entry);
 
-    if(exists(entry_path, NULL) && lm_database_files_iskeep(ctx->db, entry_path)){
+    if(exists(entry_path, NULL) && lm_package_data_keep_contains(&pkg->data, entry_path)){
       pdebug(__func__, "not extracting %s, file is set as KEEP", entry_path);
       continue;
     }
 
     switch (type) {
     case AE_IFLNK:
-      if(!lm_database_files_add(ctx->db, &pkg->data, entry_path, "")){
+      if(!lm_database_files_add(ctx->db, &pkg->data, "################################", entry_path)){
         char *suberr = lm_strerror_dup();
         pdebug(__func__, "failed to add link to the database for %s: %s", pkg->data.name, suberr);
         lm_error_set(LM_ERR_PkgFilesAddFail, entry_path, suberr);
@@ -229,10 +229,8 @@ bool lm_ctx_install(lm_ctx_t *ctx, lm_pkg_t *pkg, bool run_install, lm_ctx_insta
     return false;
   }
 
-  if(!mkdir_ifnot(ctx->temp)){
-    lm_error_set(LM_ERR_CtxTempFailMkdir);
-    return false;
-  }
+  if(!lm_ctx_temp_clear(ctx))
+    return false; // error set by function
 
   if(!lm_ctx_database_init(ctx))
     return false; // error set by function
@@ -271,6 +269,8 @@ bool lm_ctx_install(lm_ctx_t *ctx, lm_pkg_t *pkg, bool run_install, lm_ctx_insta
     goto end;
   }
   
+  pdebug(__func__, "updating changes file for %s", pkg->data.name);
+
   if(!lm_database_changes_update(ctx->db, &pkg->data, files->changes_file)){
     char *suberr = lm_strerror_dup();
     pdebug(__func__, "failed to update changes file for %s: %s", pkg->data.name, suberr);
@@ -284,6 +284,13 @@ bool lm_ctx_install(lm_ctx_t *ctx, lm_pkg_t *pkg, bool run_install, lm_ctx_insta
     goto end;
   }
 
+  pdebug(__func__, "deleting file list for %s", pkg->data.name);
+
+  if(!lm_database_files_del_all(ctx->db, &pkg->data)){
+    pdebug(__func__, "failed to remove file list for %s: %s", pkg->data.name, lm_error());
+    goto end;
+  }
+
   while((line_len = getline(&line, (size_t*)&line_len, hashes)) > 0){
     if(NULL == line)
       goto next;
@@ -306,12 +313,7 @@ bool lm_ctx_install(lm_ctx_t *ctx, lm_pkg_t *pkg, bool run_install, lm_ctx_insta
 
     pdebug(__func__, "(%lu) %s => %s", line_len, file, hash);
 
-    if(!lm_database_files_del_single(ctx->db, file)){
-      pdebug(__func__, "failed to remove file from the database for %s: %s", pkg->data.name, lm_error());
-      goto end;
-    }
-
-    if(!lm_database_files_add(ctx->db, &pkg->data, file, hash)){
+    if(!lm_database_files_add(ctx->db, &pkg->data, hash, file)){
       char *suberr = lm_strerror_dup();
       pdebug(__func__, "failed to add file to the database for %s: %s", pkg->data.name, suberr);
       lm_error_set(LM_ERR_PkgFilesAddFail, file, suberr);
@@ -325,6 +327,8 @@ bool lm_ctx_install(lm_ctx_t *ctx, lm_pkg_t *pkg, bool run_install, lm_ctx_insta
     line_len = 0;
   }
   
+  pdebug(__func__, "extracting files for %s", pkg->data.name);
+
   if(!__lm_ctx_extract_files(ctx, pkg, files->files_archive, callback, data)){
     char *suberr = lm_strerror_dup();
     pdebug(__func__, "failed to extract the files archive for %s: %s", pkg->data.name, suberr);
@@ -333,6 +337,8 @@ bool lm_ctx_install(lm_ctx_t *ctx, lm_pkg_t *pkg, bool run_install, lm_ctx_insta
     goto end;
   }
   
+  pdebug(__func__, "adding an entry for %s", pkg->data.name);
+
   if(!lm_database_entry_add(ctx->db, &pkg->data)){
     char *suberr = lm_strerror_dup();
     pdebug(__func__, "failed to add %s to the database: %s", pkg->data.name, lm_strerror());
@@ -341,6 +347,11 @@ bool lm_ctx_install(lm_ctx_t *ctx, lm_pkg_t *pkg, bool run_install, lm_ctx_insta
     goto end;
   }
 
+  if(run_install)
+    pdebug(__func__, "running the install script for %s", pkg->data.name);
+  else
+    pdebug(__func__, "saving the install script for %s", pkg->data.name);
+
   if(run_install && !__lm_ctx_run_install(ctx->root, files->install_file)){
     char *suberr = lm_strerror_dup();
     pdebug(__func__, "failed to run install script: %s", lm_strerror());
@@ -373,7 +384,10 @@ end:
     lm_database_files_del(ctx->db, &pkg->data);
   }
 
+  if (pkg->pool != NULL){
     unlink(pkg->archive);
     unlink(pkg->signature);
+  }
+
   return ret;
 }

src/ctx/list.c

@@ -41,9 +41,14 @@ lm_pkg_t *lm_ctx_list_next(lm_ctx_list_t *list){
     return list->pkg;
   }
 
-  if((list->pkg = list->pkg->next) && NULL == list->pkg){
-    if((list->pool = list->pool->next) != NULL)
-      list->pkg = list->pool->pkg;
+  if((list->pkg = list->pkg->next) == NULL){
+  next_pool:
+    if((list->pool = list->pool->next) == NULL)
+      return list->pkg;
+
+    if((list->pkg = list->pool->pkg) == NULL)
+      goto next_pool;
+
     return list->pkg;
   }
 

src/ctx/remove.c

@@ -55,13 +55,16 @@ bool lm_ctx_remove(lm_ctx_t *ctx, lm_entry_t *entry, lm_ctx_remove_callback_t ca
   size_t total = 0, current = 0;
 
   total = lm_database_files_count(ctx->db, entry);
+  pdebug(__func__, "removing %lu files", total);
 
   while(lm_database_files_next(ctx->db, entry, &path, &hash, &in_keep)){
-    if(in_keep)
+    if(in_keep){
+      pdebug(__func__, "not removing file because it is set as keep: %s", path);
       goto next;
+    }
 
     fpath = join_alloc(ctx->root, path);
-    pdebug(__func__, "removing file %s (%s)", fpath, entry->name);
+    pdebug(__func__, "removing file %s (%s)", fpath, hash);
 
     if(!exists(fpath, NULL)){
       pdebug(__func__, "found file in database, but its not on the file system: %s", fpath);

src/ctx/resolve.c

@@ -20,18 +20,23 @@ bool __lm_ctx_resolve_contains(lm_pkg_t *pkg, lm_ctx_resolve_list_t *list){
 }
 
 bool __lm_ctx_resolve(lm_ctx_t *ctx, lm_ctx_resolve_list_t *list, lm_pkg_t *pkg, bool resolve_depends){
-  if(__lm_ctx_resolve_contains(pkg, list))
+  if(__lm_ctx_resolve_contains(pkg, list)){
+    pdebug(__func__, "%s is already in the list, skipping", pkg->data.name);
     return true;
+  }
 
   if(NULL == list->packages)
     list->packages = malloc(sizeof(lm_pkg_t *)*(++list->count));
   else
     list->packages = realloc(list->packages, sizeof(lm_pkg_t *)*(++list->count));
 
+  pdebug(__func__, "adding %s to the list", pkg->data.name);
   list->packages[list->count-1] = pkg;
 
-  if(!resolve_depends || NULL == pkg->data.depends)
+  if(!resolve_depends || NULL == pkg->data.depends){
+    pdebug(__func__, "skipping depend resolve for %s", pkg->data.name);
     return true;
+  }
   
   lm_pkg_t *depend = NULL;
 

src/ctx/serve.c

@@ -29,15 +29,14 @@ void __lm_ctx_serve_thread(void *_arg) {
   lm_mptp_t packet;
 
   lm_mptp_init(&packet);
-  lm_error_clear();
 
   if(!lm_mptp_server_recv(arg->sock, &packet)){
-    pdebug(__func__, "%x: failed to receive packet (%s)", arg->addr, lm_strerror());
+    pdebug(__func__, "%x: failed to receive packet", arg->addr);
     return lm_mptp_close(arg->sock);
   }
 
   if (!lm_mptp_server_verify(&packet)) {
-    pdebug(__func__, "%x: closing connection, failed to verify (%s)", arg->addr, lm_strerror());
+    pdebug(__func__, "%x: closing connection, failed to verify", arg->addr);
     return lm_mptp_close(arg->sock);
   }
 
@@ -45,12 +44,12 @@ void __lm_ctx_serve_thread(void *_arg) {
   char path[packet.header.path_size + 1], *ppath = path;
 
   if (!lm_mptp_get_host(&packet, hostname)) {
-    pdebug(__func__, "%x: closing connection, failed to get hostname (%s)", arg->addr, lm_strerror());
+    pdebug(__func__, "%x: closing connection, failed to get hostname", arg->addr);
     goto end;
   }
 
   if (!lm_mptp_get_path(&packet, path)) {
-    pdebug(__func__, "%x: closing connection, failed to get path (%s)", arg->addr, lm_strerror());
+    pdebug(__func__, "%x: closing connection, failed to get path", arg->addr);
     goto end;
   }
 
@@ -120,7 +119,7 @@ void __lm_ctx_serve_thread(void *_arg) {
 
     if(!lm_mptp_get_path(&packet, path)){
       // we should never be able to get here, if we do theres definetly a bug
-      pdebug(__func__, "PULL %s: skipping, failed to get path (%s)", pool->name, lm_strerror());
+      pdebug(__func__, "PULL %s: skipping, failed to get path", pool->name);
       break;
     }
 

src/ctx/sync.c

@@ -25,7 +25,7 @@ bool __lm_ctx_sync_callback(char *path, size_t current, size_t total, void *data
   return cbdata->callback(cbdata->ctx, cbdata->pool, cbdata->state, current, total, data);
 }
 
-size_t lm_ctx_sync(lm_ctx_t *ctx, bool do_update, lm_ctx_sync_callback_t callback, void *data){
+ssize_t lm_ctx_sync(lm_ctx_t *ctx, bool do_update, lm_ctx_sync_callback_t callback, void *data){
   if(NULL == ctx) {
     lm_error_set(LM_ERR_ArgNULL);
     return -1;

src/ctx/temp.c

@@ -19,7 +19,7 @@ char *lm_ctx_temp_dir(lm_ctx_t *ctx, char *dir){
   char td[strlen(ctx->temp)+strlen(dir)+10];
   join(td, ctx->temp, dir);
 
-  if(!mkdir_ifnot(td)){
+  if(!mkdir_ifnot(td, 0755)){
     lm_error_set(LM_ERR_CtxTempFailMkdir);
     return NULL;
   }
@@ -35,11 +35,10 @@ bool lm_ctx_temp_clear(lm_ctx_t *ctx) {
   
   rmrf(ctx->temp);
 
-  if(!mkdir_ifnot(ctx->temp)){
+  if(!mkdir_ifnot(ctx->temp, 0755)){
     lm_error_set(LM_ERR_CtxTempFailMkdir);
     return false;
   }
 
   return true;
 }
-

src/ctx/update.c

@@ -32,9 +32,15 @@ lm_ctx_update_list_t *lm_ctx_update_list(lm_ctx_t *ctx){
       list->entries = malloc(sizeof(lm_entry_t*)*(++list->count));
     else
       list->entries = realloc(list->entries, sizeof(lm_entry_t*)*(++list->count));
+
     list->entries[list->count-1] = cur;
+    cur = malloc(sizeof(lm_entry_t));
+    lm_entry_init(cur);
   }
 
+  lm_entry_free(cur);
+  free(cur);
+
   lm_ctx_database_next_free(ctx, NULL);
   return list;
 }
@@ -63,8 +69,10 @@ void lm_ctx_update_list_free(lm_ctx_update_list_t *list){
   }
 
   if(NULL != list->entries){
-    for(int i = 0; i < list->count; i++)
+    for(int i = 0; i < list->count; i++){
       lm_entry_free(list->entries[i]);
+      free(list->entries[i]);
+    }
     free(list->entries);
   }
  

src/database/changes.c

@@ -8,17 +8,30 @@
 #include <string.h>
 #include <unistd.h>
 
+size_t __lm_database_changes_get(lm_database_t *db, lm_entry_t *entry, char *path){
+  size_t changes_size = strlen(entry->name)+15;
+  size_t full_size = changes_size + strlen(db->dir);
+
+  if(NULL != path){
+    char changes_file[changes_size];
+    snprintf(changes_file, changes_size, "%s_changes", entry->name);
+    join(path, db->dir, changes_file);
+  }
+
+  return full_size;
+}
+
+#define __lm_changes_size() __lm_database_changes_get(db, entry, NULL)
+#define __lm_changes_path(p) __lm_database_changes_get(db, entry, p)
+
 bool lm_database_changes_update(lm_database_t *db, lm_entry_t *entry, char *file){
   if(NULL == db || NULL == entry || NULL == file){
     lm_error_set(LM_ERR_ArgNULL);
     return false;
   }
 
-  char changes_file[strlen(entry->name)+20];
-  sprintf(changes_file, "%s_changes", entry->name);
-
-  char changes_path[strlen(db->dir)+sizeof(changes_file)];
-  join(changes_path, db->dir, changes_file);
+  char changes_path[__lm_changes_size()];
+  __lm_changes_path(changes_path);
  
   if(!copy_file(changes_path, file))
     return false;
@@ -37,11 +50,8 @@ bool lm_database_changes_del(lm_database_t *db, lm_entry_t *entry){
     return false;
   }
 
-  char changes_file[strlen(entry->name)+20];
-  sprintf(changes_file, "%s_changes", entry->name);
-
-  char changes_path[strlen(db->dir)+sizeof(changes_file)];
-  join(changes_path, db->dir, changes_file);
+  char changes_path[__lm_changes_size()];
+  __lm_changes_path(changes_path);
 
   if(unlink(changes_path) < 0 && errno != ENOENT){
     lm_error_set(LM_ERR_DbChangesUnlinkFail);
@@ -52,15 +62,16 @@ bool lm_database_changes_del(lm_database_t *db, lm_entry_t *entry){
 }
 
 char *lm_database_changes_get(lm_database_t *db, lm_entry_t *entry){
-  char changes_file[strlen(entry->name)+20];
-  sprintf(changes_file, "%s_changes", entry->name);
+  if(NULL == db || NULL == entry){
+    lm_error_set(LM_ERR_ArgNULL);
+    return false;
+  }
 
-  char *changes_path = malloc(strlen(db->dir)+sizeof(changes_file));
-  join(changes_path, db->dir, changes_file);
+  char* changes_path = malloc(__lm_changes_size());
+  __lm_changes_path(changes_path);
 
   if(!exists(changes_path, NULL)){
     lm_error_set(LM_ERR_DbChangesNotExists);
-    free(changes_path);
     return NULL;
   }
 

src/database/database.c

@@ -31,34 +31,6 @@ char *queries[] = {
 
   // QUERY_SELECT_PACKAGE_ALL
   "SELECT * FROM packages",
-
-  // QUERY_CREATE_FILE_TABLE
-  "CREATE TABLE IF NOT EXISTS files (" \
-  "       path TEXT PRIMARY KEY NOT NULL," \
-  "       hash TEXT NOT NULL," \
-  "       keep INT NOT NULL," \
-  "       package TEXT NOT NULL);",
-
-  // QUERY_INSERT_FILE_SINGLE
-  "INSERT INTO files VALUES (?, ?, ?, ?)",
-
-  // QUERY_DELETE_FILE_ALL
-  "DELETE FROM files WHERE package = ? AND keep = 0",
-  
-  // QUERY_DELETE_FILE_SINGLE
-  "DELETE FROM files WHERE path = ?",
-  
-  // QUERY_SELECT_FILE_ALL 
-  "SELECT * FROM files WHERE package = ?",
-  
-  // QUERY_SELECT_FILE_SINGLE
-  "SELECT * FROM files WHERE path = ?",
-
-  // QUERY_UPDATE_FILE_1
-  "UPDATE files SET keep = 1 WHERE path = ?",
-
-  // QUERY_UPDATE_FILE_2
-  "UPDATE files SET keep = 0 WHERE path = ?",
 };
 
 lm_database_t *lm_database_new(char *path){
@@ -66,46 +38,31 @@ lm_database_t *lm_database_new(char *path){
   char *err = NULL;
   bzero(db, sizeof(lm_database_t));
 
-  if(exists(path, NULL) && (is_file(path) || !can_read(path) || !can_write(path))){
+  if(exists(path, NULL) && (is_file(path) || !can_read(path))){
     lm_error_set(LM_ERR_DbCantAccess);
     return NULL;
   }
 
-  if(!exists(path, NULL) && !mkdir_ifnot(path)){
+  if(!exists(path, NULL) && !mkdir_ifnot(path, 0755)){
     lm_error_set(LM_ERR_DbCantAccess);
     return NULL;
   }
 
   size_t pathlen = strlen(path);
-  char packagesdb[pathlen+20], filesdb[pathlen+20];
-
+  char packagesdb[pathlen+15];
   join(packagesdb, path, "packages.db");
-  join(filesdb, path, "files.db");
   
-  if(sqlite3_open(packagesdb, &db->entries_db)){
-    pdebug(__func__, "(%s) failed to open databse: %s", packagesdb, sqlite3_errmsg(db->entries_db));
+  if(sqlite3_open(packagesdb, &db->sql)){
+    pdebug(__func__, "(%s) failed to open databse: %s", packagesdb, sqlite3_errmsg(db->sql));
     lm_error_set(LM_ERR_DbSqlOpenFail);
     return NULL;
   }
 
-  if(sqlite3_open(filesdb, &db->files_db)){
-    pdebug(__func__, "(%s) failed to open databse: %s", filesdb, sqlite3_errmsg(db->files_db));
-    lm_error_set(LM_ERR_DbSqlOpenFail);
-    return NULL;
-  }
-  
-  if(sqlite3_exec(db->entries_db, queries[QUERY_CREATE_ENTRY_TABLE], NULL, 0, &err) != SQLITE_OK){
+  if(can_write(path) && sqlite3_exec(db->sql, queries[QUERY_CREATE_TABLE], NULL, 0, &err) != SQLITE_OK){
     pdebug(__func__, "(%s) failed to create packages table: %s", packagesdb, err);
     lm_error_set(LM_ERR_DbSqlCreateFail);
     sqlite3_free(err);
-    db->entries_db = NULL;
-  }
-
-  if(sqlite3_exec(db->files_db, queries[QUERY_CREATE_FILE_TABLE], NULL, 0, &err) != SQLITE_OK){
-    pdebug(__func__, "(%s) failed to create files table: %s", filesdb, err);
-    lm_error_set(LM_ERR_DbSqlCreateFail);
-    sqlite3_free(err);
-    db->files_db = NULL;
+    db->sql = NULL;
   }
 
   db->dir = strdup(path);
@@ -113,15 +70,13 @@ lm_database_t *lm_database_new(char *path){
 }
 
 void lm_database_free(lm_database_t *db){
-  if(NULL != db->entries_st)
-    sqlite3_finalize(db->entries_st);
+  if(NULL != db->st)
+    sqlite3_finalize(db->st);
 
-  if(NULL != db->files_st)
-    sqlite3_finalize(db->files_st);
-
-  sqlite3_close(db->entries_db);
-  sqlite3_close(db->files_db);
+  if(NULL != db->filesp)
+    fclose(db->filesp);
 
+  sqlite3_close(db->sql);
   free(db->dir);
   free(db);
 }

src/database/entry.c

@@ -28,35 +28,35 @@ bool lm_database_entry_add(lm_database_t *db, lm_entry_t *entry){
   char depends[lm_package_data_depend_strlen(entry)];
   bool ret = false;
 
-  if(sqlite3_prepare(db->entries_db, queries[QUERY_INSERT_ENTRY_SINGLE], strlen(queries[QUERY_INSERT_ENTRY_SINGLE]), &db->entries_st, NULL) != SQLITE_OK){
-    pdebug(__func__, "failed to prepare statement for inserting %s: %s", entry->name, sqlite3_errmsg(db->entries_db));
+  if(sqlite3_prepare(db->sql, queries[QUERY_INSERT_SINGLE], strlen(queries[QUERY_INSERT_SINGLE]), &db->st, NULL) != SQLITE_OK){
+    pdebug(__func__, "failed to prepare statement for inserting %s: %s", entry->name, sqlite3_errmsg(db->sql));
     lm_error_set(LM_ERR_DbSqlPrepareFail);
     goto end;
   }
 
-  sqlite3_bind_text(db->entries_st, ENTRIES_COLUMN_NAME, entry->name, strlen(entry->name), SQLITE_STATIC);
-  sqlite3_bind_text(db->entries_st, ENTRIES_COLUMN_DESC, entry->desc, strlen(entry->desc), SQLITE_STATIC);
-  sqlite3_bind_text(db->entries_st, ENTRIES_COLUMN_VERSION, entry->version, strlen(entry->version), SQLITE_STATIC);
-  sqlite3_bind_int64(db->entries_st, ENTRIES_COLUMN_SIZE, entry->size);
+  sqlite3_bind_text(db->st, COLUMN_NAME, entry->name, strlen(entry->name), SQLITE_STATIC);
+  sqlite3_bind_text(db->st, COLUMN_DESC, entry->desc, strlen(entry->desc), SQLITE_STATIC);
+  sqlite3_bind_text(db->st, COLUMN_VERSION, entry->version, strlen(entry->version), SQLITE_STATIC);
+  sqlite3_bind_int64(db->st, COLUMN_SIZE, entry->size);
 
   if(!lm_package_data_depend_tostr(entry, depends)){
     pdebug(__func__, "failed to convert depends to string for inserting %s: %s", entry->name, lm_strerror());
     goto end;
   }
   pdebug(__func__, "depend list for %s: %s", entry->name, depends);
-  sqlite3_bind_text(db->entries_st, ENTRIES_COLUMN_DEPENDS, depends, strlen(depends), SQLITE_STATIC);
+  sqlite3_bind_text(db->st, COLUMN_DEPENDS, depends, strlen(depends), SQLITE_STATIC);
 
-  if(!lm_database_step_all(db->entries_st)){
-    pdebug(__func__, "failed to execute insert statement for inserting %s: %s", entry->name, sqlite3_errmsg(db->entries_db));
+  if(!lm_database_step_all(db->st)){
+    pdebug(__func__, "failed to execute insert statement for inserting %s: %s", entry->name, sqlite3_errmsg(db->sql));
     lm_error_set(LM_ERR_DbSqlInsertFail);
     goto end;
   }
 
   ret = true;
 end:
-  if(NULL != db->entries_st){
-    sqlite3_finalize(db->entries_st);
-    db->entries_st = NULL;
+  if(NULL != db->st){
+    sqlite3_finalize(db->st);
+    db->st = NULL;
   }
   return ret;
 }
@@ -71,26 +71,26 @@ bool lm_database_entry_find(lm_database_t *db, lm_entry_t *entry, char *name, ch
   char *query = NULL;
 
   if(NULL == version)
-    query = queries[QUERY_SELECT_ENTRY_SINGLE_1];
+    query = queries[QUERY_SELECT_SINGLE_1];
   else
-    query = queries[QUERY_SELECT_ENTRY_SINGLE_2];
+    query = queries[QUERY_SELECT_SINGLE_2];
 
   // package pointer should already be free'd
   // we are initing it just in case the caller didn't
   if(NULL != entry)
     lm_entry_init(entry);
 
-  if(sqlite3_prepare(db->entries_db, query, strlen(query), &db->entries_st, NULL) != SQLITE_OK){
-    pdebug(__func__, "failed to prepare statement for finding %s: %s", name, sqlite3_errmsg(db->entries_db));
+  if(sqlite3_prepare(db->sql, query, strlen(query), &db->st, NULL) != SQLITE_OK){
+    pdebug(__func__, "failed to prepare statement for finding %s: %s", name, sqlite3_errmsg(db->sql));
     lm_error_set(LM_ERR_DbSqlPrepareFail);
     goto end;
   }
 
-  sqlite3_bind_text(db->entries_st, ENTRIES_COLUMN_NAME, name, strlen(name), SQLITE_STATIC);
+  sqlite3_bind_text(db->st, COLUMN_NAME, name, strlen(name), SQLITE_STATIC);
   if(NULL != version)
-    sqlite3_bind_text(db->entries_st, ENTRIES_COLUMN_VERSION, version, strlen(version), SQLITE_STATIC);
+    sqlite3_bind_text(db->st, COLUMN_VERSION, version, strlen(version), SQLITE_STATIC);
 
-  if(sqlite3_step(db->entries_st) != SQLITE_ROW){
+  if(sqlite3_step(db->st) != SQLITE_ROW){
     pdebug(__func__, "got no rows for %s", name);
     lm_error_set(LM_ERR_DbSqlNotFound);
     goto end;
@@ -101,12 +101,12 @@ bool lm_database_entry_find(lm_database_t *db, lm_entry_t *entry, char *name, ch
     goto end;
   }
 
-  entry->name = strdup((char*)sqlite3_column_text(db->entries_st, ENTRIES_COLUMN_NAME-1));
-  entry->desc = strdup((char*)sqlite3_column_text(db->entries_st, ENTRIES_COLUMN_DESC-1));
-  entry->version = strdup((char*)sqlite3_column_text(db->entries_st, ENTRIES_COLUMN_VERSION-1));
-  entry->size = sqlite3_column_int64(db->entries_st, ENTRIES_COLUMN_SIZE-1);
+  entry->name = strdup((char*)sqlite3_column_text(db->st, COLUMN_NAME-1));
+  entry->desc = strdup((char*)sqlite3_column_text(db->st, COLUMN_DESC-1));
+  entry->version = strdup((char*)sqlite3_column_text(db->st, COLUMN_VERSION-1));
+  entry->size = sqlite3_column_int64(db->st, COLUMN_SIZE-1);
 
-  char *depends = (char*)sqlite3_column_text(db->entries_st, ENTRIES_COLUMN_DEPENDS-1);
+  char *depends = (char*)sqlite3_column_text(db->st, COLUMN_DEPENDS-1);
   if(!lm_package_data_depend_fromstr(entry, depends)){
     pdebug(__func__, "failed to load depends for finding %s: %s", entry->name, lm_strerror());
     // error is set by the function
@@ -115,9 +115,9 @@ bool lm_database_entry_find(lm_database_t *db, lm_entry_t *entry, char *name, ch
 
   ret = true;
 end:
-  if(NULL != db->entries_st){
-    sqlite3_finalize(db->entries_st);
-    db->entries_st = NULL;
+  if(NULL != db->st){
+    sqlite3_finalize(db->st);
+    db->st = NULL;
   }
   return ret;
 }
@@ -130,25 +130,25 @@ bool lm_database_entry_del(lm_database_t *db, lm_entry_t *entry){
 
   bool ret = false;
 
-  if(sqlite3_prepare(db->entries_db, queries[QUERY_DELETE_ENTRY_SINGLE], strlen(queries[QUERY_DELETE_ENTRY_SINGLE]), &db->entries_st, NULL) != SQLITE_OK){
-    pdebug(__func__, "failed to prepare statement for deleting %s: %s", entry->name, sqlite3_errmsg(db->entries_db));
+  if(sqlite3_prepare(db->sql, queries[QUERY_DELETE_SINGLE], strlen(queries[QUERY_DELETE_SINGLE]), &db->st, NULL) != SQLITE_OK){
+    pdebug(__func__, "failed to prepare statement for deleting %s: %s", entry->name, sqlite3_errmsg(db->sql));
     lm_error_set(LM_ERR_DbSqlPrepareFail);
     goto end;
   }
 
-  sqlite3_bind_text(db->entries_st, ENTRIES_COLUMN_NAME, entry->name, strlen(entry->name), SQLITE_STATIC);
+  sqlite3_bind_text(db->st, COLUMN_NAME, entry->name, strlen(entry->name), SQLITE_STATIC);
 
-  if(sqlite3_step(db->entries_st) != SQLITE_DONE){
-    pdebug(__func__, "failed to execute delete statement for deleting %s: %s", entry->name, sqlite3_errmsg(db->entries_db));
+  if(sqlite3_step(db->st) != SQLITE_DONE){
+    pdebug(__func__, "failed to execute delete statement for deleting %s: %s", entry->name, sqlite3_errmsg(db->sql));
     lm_error_set(LM_ERR_DbSqlDeleteFail);
     goto end;
   }
 
   ret = true;
 end:
-  if(NULL != db->entries_st){
-    sqlite3_finalize(db->entries_st);
-    db->entries_st = NULL;
+  if(NULL != db->st){
+    sqlite3_finalize(db->st);
+    db->st = NULL;
   }
   return ret;
 }
@@ -159,33 +159,33 @@ bool lm_database_entry_next(lm_database_t *db, lm_entry_t *entry){
     return false;
   }
 
-  if(NULL != db->entries_st)
+  if(NULL != db->st)
     lm_entry_free(entry);
 
-  else if(NULL == db->entries_st &&
-     sqlite3_prepare(db->entries_db, queries[QUERY_SELECT_ENTRY_ALL], strlen(queries[QUERY_SELECT_ENTRY_ALL]), &db->entries_st, NULL) != SQLITE_OK){
-    pdebug(__func__, "failed to prepare statement for selecting all: %s", sqlite3_errmsg(db->entries_db));
+  else if(NULL == db->st &&
+     sqlite3_prepare(db->sql, queries[QUERY_SELECT_ALL], strlen(queries[QUERY_SELECT_ALL]), &db->st, NULL) != SQLITE_OK){
+    pdebug(__func__, "failed to prepare statement for selecting all: %s", sqlite3_errmsg(db->sql));
     lm_error_set(LM_ERR_DbSqlPrepareFail);
     return false;
   }
 
   lm_entry_init(entry);
 
-  if(sqlite3_step(db->entries_st) != SQLITE_ROW){
-    sqlite3_finalize(db->entries_st);
-    db->entries_st = NULL;
+  if(sqlite3_step(db->st) != SQLITE_ROW){
+    sqlite3_finalize(db->st);
+    db->st = NULL;
     return false;
   }
 
-  entry->name = strdup((char*)sqlite3_column_text(db->entries_st, ENTRIES_COLUMN_NAME-1));
-  entry->desc = strdup((char*)sqlite3_column_text(db->entries_st, ENTRIES_COLUMN_DESC-1));
-  entry->version = strdup((char*)sqlite3_column_text(db->entries_st, ENTRIES_COLUMN_VERSION-1));
-  entry->size = sqlite3_column_int64(db->entries_st, ENTRIES_COLUMN_SIZE-1);
+  entry->name = strdup((char*)sqlite3_column_text(db->st, COLUMN_NAME-1));
+  entry->desc = strdup((char*)sqlite3_column_text(db->st, COLUMN_DESC-1));
+  entry->version = strdup((char*)sqlite3_column_text(db->st, COLUMN_VERSION-1));
+  entry->size = sqlite3_column_int64(db->st, COLUMN_SIZE-1);
 
-  char *depends = (char*)sqlite3_column_text(db->entries_st, ENTRIES_COLUMN_DEPENDS-1);
+  char *depends = (char*)sqlite3_column_text(db->st, COLUMN_DEPENDS-1);
   if(!lm_package_data_depend_fromstr(entry, depends)){
     pdebug(__func__, "failed to load depends for finding %s: %s", entry->name, lm_strerror());
-    sqlite3_finalize(db->entries_st);
+    sqlite3_finalize(db->st);
     return false;
   }
 
@@ -198,9 +198,9 @@ void lm_database_entry_next_free(lm_database_t *db, lm_entry_t *entry){
     return;
   }
 
-  if(NULL != db->entries_st){
-    sqlite3_finalize(db->entries_st);
-    db->entries_st = NULL;
+  if(NULL != db->st){
+    sqlite3_finalize(db->st);
+    db->st = NULL;
   }
 
   if(NULL != entry)

src/database/files.c

@@ -4,238 +4,316 @@
 #include "../../include/util.h"
 
 #include <sqlite3.h>
-#include <stdio.h>
-#include <errno.h>
 #include <strings.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
+#include <dirent.h>
+#include <errno.h>
+#include <stdio.h>
 
-ssize_t lm_database_files_count(lm_database_t *db, lm_entry_t *entry){
-  ssize_t count = 0;
+#define LINE_MIN   36 // keep (1) + colon (1) + MD5 hash (32) + colon (1) + path (min 1)
+#define KEEP_INDEX 0
+#define HASH_INDEX 2
+#define PATH_INDEX 35
 
-  if(NULL == db || NULL == entry){
-    lm_error_set(LM_ERR_ArgNULL);
-    goto end;
+size_t __lm_database_files_get(lm_database_t *db, lm_entry_t *entry, char *path){
+  size_t name_size = strlen(entry->name)+20;
+  size_t full_size = name_size + strlen(db->dir);
+
+  if(NULL != path){
+    char files_name[name_size];
+    snprintf(files_name, name_size, "%s_files", entry->name);
+    join(path, db->dir, files_name);
   }
 
-  if(sqlite3_prepare(db->files_db, queries[QUERY_SELECT_FILE_ALL], strlen(queries[QUERY_SELECT_FILE_ALL]), &db->files_st, NULL) != SQLITE_OK){
-    pdebug(__func__, "failed to prepare statement for selecting all: %s", sqlite3_errmsg(db->files_db));
-    lm_error_set(LM_ERR_DbSqlPrepareFail);
+  return full_size;
+}
+
+#define __lm_files_size() __lm_database_files_get(db, entry, NULL)
+#define __lm_files_path(p) __lm_database_files_get(db, entry, p)
+
+FILE *__lm_database_files_open(lm_database_t *db, lm_entry_t *entry, char *perms){
+  if(NULL == db || NULL == entry){
+    lm_error_set(LM_ERR_ArgNULL);
     return false;
   }
  
-  sqlite3_bind_text(db->files_st, 1, entry->name, strlen(entry->name), SQLITE_STATIC);
+  char files_path[__lm_files_size()];
+  FILE *filesp = NULL;
 
-  while(sqlite3_step(db->files_st) == SQLITE_ROW)
-    count++;
-end:
-  if(NULL != db->files_st){
-    sqlite3_finalize(db->files_st);
-    db->files_st = NULL;
+  __lm_files_path(files_path);
+
+  if(!exists(files_path, NULL)){
+    lm_error_set(LM_ERR_DbFilesNotFound);
+    return NULL;
   }
+
+  if(NULL == (filesp = fopen(files_path, perms))){
+    lm_error_set(LM_ERR_DbFilesOpenFail, files_path);
+    return NULL;
+  }
+
+  return filesp;
+}
+
+char *__lm_database_files_line_single(FILE *filesp, char *path) {
+  ssize_t line_len = 0;
+  char *line = NULL;
+
+  while ((line_len = getline(&line, (size_t*)&line_len, filesp)) >= LINE_MIN) {
+    // keep : hash : path
+    // 1    : 32   : ?
+  
+    // ignore empty line
+    if(line[0] == 0)
+      goto next;
+
+    // remove newline
+    else if (line[line_len-1] == '\n')
+      line[line_len-1] = 0;
+
+    if(eq((line + PATH_INDEX), path))
+      return line;
+
+  next:
+    free(line);
+    line = NULL;
+    line_len = 0;
+  }
+
+  return line;
+}
+
+char *__lm_database_files_line_all(lm_database_t *db, char *path) {
+  size_t dirlen = strlen(db->dir);
+  struct dirent *ent = NULL;
+  FILE* filesp = NULL;
+  DIR *ddir = NULL;
+  char *ret = NULL;
+
+  if(NULL == (ddir = opendir(db->dir))){
+    lm_error_set(LM_ERR_DbFilesDirFail, db->dir);
+    goto end;
+  }
+
+  while(NULL != (ent = readdir(ddir))){
+    size_t entlen = strlen(ent->d_name);
+    char entpath[entlen+dirlen+10];
+
+    join(entpath, db->dir, ent->d_name);
+
+    if(NULL == (filesp = fopen(entpath, "r"))){
+      lm_error_set(LM_ERR_DbFilesOpenFail, entpath);
+      goto end;
+    }
+
+    if(NULL == (ret = __lm_database_files_line_single(filesp, path)))
+      goto end;
+  }
+
+end:
+  if(NULL != ddir)
+    closedir(ddir);
+
+  if(NULL != filesp)
+    fclose(filesp);
+
+  return ret;
+}
+
+ssize_t lm_database_files_count(lm_database_t *db, lm_entry_t *entry){
+  if(NULL == db || NULL == entry){
+    lm_error_set(LM_ERR_ArgNULL);
+    return 0;
+  }
+
+  FILE *filesp = NULL;
+  ssize_t count = 0;
+  char c = 0;
+
+  if((filesp = __lm_database_files_open(db, entry, "r")) == NULL)
+    return 0; // error set by function
+
+  while((c = fgetc(filesp)) != EOF)
+    if(c == '\n')
+      count ++;
+
+  fclose(filesp);
   return count;
 }
 
 bool lm_database_files_contains(lm_database_t *db, lm_entry_t *entry, char *path){
-  char *package = NULL;
+  if(NULL == db || NULL == entry || NULL == path){
+    lm_error_set(LM_ERR_ArgNULL);
+    return false;
+  }
+ 
+  FILE *filesp = NULL;
+  char *line = NULL;
   bool ret = false;
 
-  if(NULL == db || NULL == path){
-    lm_error_set(LM_ERR_ArgNULL);
-    goto end;
-  }
+  if((filesp = __lm_database_files_open(db, entry, "r")) == NULL)
+    return false; // error set by function
 
-  if(sqlite3_prepare(db->files_db, queries[QUERY_SELECT_FILE_SINGLE], strlen(queries[QUERY_SELECT_FILE_SINGLE]), &db->files_st, NULL) != SQLITE_OK){
-    pdebug(__func__, "failed to prepare statement for selecting %s: %s", path, sqlite3_errmsg(db->files_db));
-    lm_error_set(LM_ERR_DbSqlPrepareFail);
-    goto end;
-  }
+  if((line = __lm_database_files_line_single(filesp, path)) != NULL)
+    ret = true;
 
-  sqlite3_bind_text(db->files_st, FILES_COLUMN_PATH, path, strlen(path), SQLITE_STATIC);
+  free(line);
 
-  if(sqlite3_step(db->files_st) != SQLITE_ROW){
-    pdebug(__func__, "failed to execute select statement for selecting %s: %s", path, sqlite3_errmsg(db->files_db));
-    lm_error_set(LM_ERR_DbSqlSelectFail);
-    goto end;
-  }
+  if(NULL != filesp)
+    fclose(filesp);
 
-  package = (char*)sqlite3_column_text(db->files_st, FILES_COLUMN_ENTRY-1);
-  ret = eq(package, entry->name);
-end:
-  if(NULL != db->files_st){
-    sqlite3_finalize(db->files_st);
-    db->files_st = NULL;
-  }
   return ret;
 }
 
 bool lm_database_files_matches(lm_database_t *db, char *path, char *hash){
-  char *hashdb = NULL;
-  bool ret = false;
-
   if(NULL == db || NULL == path || NULL == hash){
     lm_error_set(LM_ERR_ArgNULL);
-    goto end;
+    return false;
   }
   
-  if(sqlite3_prepare(db->files_db, queries[QUERY_SELECT_FILE_SINGLE], strlen(queries[QUERY_SELECT_FILE_SINGLE]), &db->files_st, NULL) != SQLITE_OK){
-    pdebug(__func__, "failed to prepare statement for selecting %s: %s", path, sqlite3_errmsg(db->files_db));
-    lm_error_set(LM_ERR_DbSqlPrepareFail);
-    goto end;
-  }
+  char *line = NULL, *line_hash = NULL;
+  bool ret = false;
 
-  sqlite3_bind_text(db->files_st, 1, path, strlen(path), SQLITE_STATIC);
+  if(NULL == (line = __lm_database_files_line_all(db, path)))
+    return false;
 
-  if(sqlite3_step(db->files_st) != SQLITE_ROW){
-    pdebug(__func__, "failed to execute select statement for selecting %s: %s", path, sqlite3_errmsg(db->files_db));
-    lm_error_set(LM_ERR_DbSqlSelectFail);
-    goto end;
-  }
+  line_hash = line+2;
+  line[35] = 0;
 
-  hashdb = (char*)sqlite3_column_text(db->files_st, FILES_COLUMN_HASH-1);
-  ret = eq(hashdb, hash);
+  if(eq(line_hash, hash))
+    ret = true;
 
-end:
-  if(NULL != db->files_st){
-    sqlite3_finalize(db->files_st);
-    db->files_st = NULL;
-  }
+  free(line);
   return ret;
 }
 
 bool lm_database_files_iskeep(lm_database_t *db, char *path){
-  bool ret = false;
-  int iskeep = 0;
-
   if(NULL == db || NULL == path){
     lm_error_set(LM_ERR_ArgNULL);
-    goto end;
+    return false;
   }
 
-  if(sqlite3_prepare(db->files_db, queries[QUERY_SELECT_FILE_SINGLE], strlen(queries[QUERY_SELECT_FILE_SINGLE]), &db->files_st, NULL) != SQLITE_OK){
-    pdebug(__func__, "failed to prepare statement for selecting %s: %s", path, sqlite3_errmsg(db->files_db));
-    lm_error_set(LM_ERR_DbSqlPrepareFail);
-    goto end;
-  }
-  
-  sqlite3_bind_text(db->files_st, 1, path, strlen(path), SQLITE_STATIC);
-
-  if(!lm_database_step_all(db->files_st)){
-    pdebug(__func__, "failed to execute select statement for selecting %s: %s", path, sqlite3_errmsg(db->files_db));
-    lm_error_set(LM_ERR_DbSqlSelectFail);
-    goto end;
-  }
-
-  iskeep = sqlite3_column_int64(db->files_st, FILES_COLUMN_KEEP-1);
-  ret = iskeep == 1;
-
-end:
-  if(NULL != db->files_st){
-    sqlite3_finalize(db->files_st);
-    db->files_st = NULL;
-  }
-  return ret;
-
-}
-
-bool lm_database_files_add(lm_database_t *db, lm_entry_t *entry, char *path, char *hash){
+  char *line = NULL;
   bool ret = false;
 
-  if(NULL == db || NULL == entry || NULL == path || NULL == hash){
-    lm_error_set(LM_ERR_ArgNULL);
-    goto end;
-  }
-
-  if(sqlite3_prepare(db->files_db, queries[QUERY_INSERT_FILE_SINGLE], strlen(queries[QUERY_INSERT_FILE_SINGLE]), &db->files_st, NULL) != SQLITE_OK){
-    pdebug(__func__, "failed to prepare statement for inserting %s: %s", path, sqlite3_errmsg(db->files_db));
-    lm_error_set(LM_ERR_DbSqlPrepareFail);
-    goto end;
-  }
-
-  sqlite3_bind_text(db->files_st, FILES_COLUMN_PATH, path, strlen(path), SQLITE_STATIC);
-  sqlite3_bind_text(db->files_st, FILES_COLUMN_HASH, hash, strlen(hash), SQLITE_STATIC);
-  if(lm_package_data_keep_contains(entry, path))
-    sqlite3_bind_int(db->files_st, FILES_COLUMN_KEEP, 1);
-  else
-    sqlite3_bind_int(db->files_st, FILES_COLUMN_KEEP, 0);
-  sqlite3_bind_text(db->files_st, FILES_COLUMN_ENTRY, entry->name, strlen(entry->name), SQLITE_STATIC);
-
-  if(!lm_database_step_all(db->files_st)){
-    pdebug(__func__, "failed to execute insert statement for inserting %s: %s", entry->name, sqlite3_errmsg(db->files_db));
-    lm_error_set(LM_ERR_DbSqlInsertFail);
-    goto end;
-  }
+  if(NULL == (line = __lm_database_files_line_all(db, path)))
+    return false;
 
+  if(line[0] == '1')
     ret = true;
-end:
-  if(NULL != db->files_st){
-    sqlite3_finalize(db->files_st);
-    db->files_st = NULL;
-  }
+
+  free(line);
   return ret;
 }
 
+bool lm_database_files_add(lm_database_t *db, lm_entry_t *entry, char *hash, char *path){
+  if(NULL == db || NULL == entry || NULL == hash || NULL == path){
+    lm_error_set(LM_ERR_ArgNULL);
+    return false;
+  }
+  
+  char files_path[__lm_files_size()];
+  FILE *filesp = NULL;
+
+  __lm_files_path(files_path);
+
+  if(NULL == (filesp = fopen(files_path, "a"))){
+    lm_error_set(LM_ERR_DbFilesOpenFail, files_path);
+    return false;
+  }
+  
+  fwrite(lm_package_data_keep_contains(entry, path) ? "1:" : "0:", 1, 2, filesp);
+  fwrite(hash, 1, strlen(hash), filesp);
+  fwrite(":", 1, 1, filesp);
+  fwrite(path, 1, strlen(path), filesp);
+  fwrite("\n", 1, 1, filesp);
+
+  fclose(filesp);
+  return true;
+}
+
 bool lm_database_files_del(lm_database_t *db, lm_entry_t *entry){
   if(NULL == db || NULL == entry){
     lm_error_set(LM_ERR_ArgNULL);
     return false;
   }
 
-  bool ret = false;
+  FILE *original = NULL, *temp = NULL;
+  char temp_name[strlen(entry->name)+15];
+  char temp_path[__lm_files_size()+10];
+  char real_path[__lm_files_size()], *line = NULL;
+  bool ret = false, empty = true;
+  ssize_t line_len = 0;
 
-  if(sqlite3_prepare(db->files_db, queries[QUERY_DELETE_FILE_ALL], strlen(queries[QUERY_DELETE_FILE_ALL]), &db->files_st, NULL) != SQLITE_OK){
-    pdebug(__func__, "failed to prepare statement for deleting %s: %s", entry->name, sqlite3_errmsg(db->files_db));
-    lm_error_set(LM_ERR_DbSqlPrepareFail);
+  __lm_files_path(real_path);
+  sprintf(temp_name, "%s_files.temp", entry->name);
+  join(temp_path, db->dir, temp_name);
+
+  if(NULL == (original = fopen(real_path, "r"))){
+    lm_error_set(LM_ERR_DbFilesOpenFail, real_path);
     goto end;
   }
   
-  sqlite3_bind_text(db->files_st, 1, entry->name, strlen(entry->name), SQLITE_STATIC);
-
-  if(!lm_database_step_all(db->files_st)){
-    pdebug(__func__, "failed to execute delete statement for deleting %s: %s", entry->name, sqlite3_errmsg(db->files_db));
-    lm_error_set(LM_ERR_DbSqlDeleteFail);
+  if(NULL == (temp = fopen(temp_path, "a"))){
+    lm_error_set(LM_ERR_DbFilesOpenFail, temp_path);
     goto end;
   }
 
+  while ((line_len = getline(&line, (size_t*)&line_len, original)) >= LINE_MIN){
+    if(line[0] == '1'){
+      fwrite(line, 1, line_len, temp);
+      empty = false;
+    }
+
+    free(line);
+    line = NULL;
+    line_len = 0;
+  }
+
   ret = true;
 end:
-  if(NULL != db->files_st){
-    sqlite3_finalize(db->files_st);
-    db->files_st = NULL;
+  if(NULL != original)
+    fclose(original);
+
+  if(NULL != temp)
+    fclose(temp);
+
+  free(line);
+
+  if(ret && unlink(real_path) != 0){
+    lm_error_set(LM_ERR_DbFilesUnlinkFail, real_path);
+    ret = false;
   }
+
+  if(empty || !ret){
+    unlink(temp_path);
+  }
+
+  else if(ret && rename(temp_path, real_path) != 0){
+    lm_error_set(LM_ERR_DbFilesRenameFail, real_path);
+    ret = false;
+  }
+
   return ret;
 }
 
-bool lm_database_files_del_single(lm_database_t *db, char *path){
-  if(NULL == db || NULL == path){
+bool lm_database_files_del_all(lm_database_t *db, lm_entry_t *entry){
+  if(NULL == db || NULL == entry){
     lm_error_set(LM_ERR_ArgNULL);
     return false;
   }
  
-  bool ret = false;
+  char files_path[__lm_files_size()];
+  __lm_files_path(files_path);
 
-  if(sqlite3_prepare(db->files_db, queries[QUERY_DELETE_FILE_SINGLE], strlen(queries[QUERY_DELETE_FILE_SINGLE]), &db->files_st, NULL) != SQLITE_OK){
-    pdebug(__func__, "failed to prepare statement for deleting %s: %s", path, sqlite3_errmsg(db->files_db));
-    lm_error_set(LM_ERR_DbSqlPrepareFail);
-    goto end;
+  if(exists(files_path, NULL) && unlink(files_path) != 0){
+    lm_error_set(LM_ERR_DbFilesUnlinkFail, files_path);
+    return false;
   }
 
-  sqlite3_bind_text(db->files_st, 1, path, strlen(path), SQLITE_STATIC);
-
-  if(!lm_database_step_all(db->files_st)){
-    pdebug(__func__, "failed to execute delete statement for deleting %s: %s", path, sqlite3_errmsg(db->files_db));
-    lm_error_set(LM_ERR_DbSqlDeleteFail);
-    goto end;
-  }
-
-  ret = true;
-end:
-  if(NULL != db->files_st){
-    sqlite3_finalize(db->files_st);
-    db->files_st = NULL;
-  }
-  return ret;
+  return true;
 }
 
 bool lm_database_files_next(lm_database_t *db, lm_entry_t *entry, char **path, char **hash, bool *keep){
@@ -244,33 +322,38 @@ bool lm_database_files_next(lm_database_t *db, lm_entry_t *entry, char **path, c
     return false;
   }
 
-  if(NULL == db->files_st){
-    if(sqlite3_prepare(db->files_db, queries[QUERY_SELECT_FILE_ALL], strlen(queries[QUERY_SELECT_FILE_ALL]), &db->files_st, NULL) != SQLITE_OK){
-      pdebug(__func__, "failed to prepare statement for selecting all: %s", sqlite3_errmsg(db->files_db));
-      lm_error_set(LM_ERR_DbSqlPrepareFail);
-      return false;
-    }
-    sqlite3_bind_text(db->files_st, 1, entry->name, strlen(entry->name), SQLITE_STATIC);
-  }
+  if(NULL == db->filesp && NULL == (db->filesp = __lm_database_files_open(db, entry, "r")))
+    return false; // error set by function
 
-  else if(NULL != db->files_st){
-    free(*path);
-    free(*hash);
+  ssize_t line_len = 0;
+  char *line = NULL;
+
+  if(NULL != *hash)
+    free(*hash-HASH_INDEX);
+
+  if((line_len = getline(&line, (size_t*)&line_len, db->filesp)) <= LINE_MIN)
+    goto eof;
+
+  if(line[line_len-1] == '\n')
+    line[line_len-1] = 0; // replace newline with null terminator 
+  line[PATH_INDEX-1] = 0; // replace colon with null terminator
+
+  *keep = line[0] == '1';
+  *hash = line + HASH_INDEX;
+  *path = line + PATH_INDEX;
+
+  return true;
+
+eof:
+  fclose(db->filesp);
+  free(line);
+
+  db->filesp = NULL;
+  *keep = false;
   *path = NULL;
   *hash = NULL;
-    *keep = false;
-  }
 
-  if(sqlite3_step(db->files_st) != SQLITE_ROW){
-    sqlite3_finalize(db->files_st);
-    db->files_st = NULL;
   return false;
-  }
-
-  *path = strdup((char*)sqlite3_column_text(db->files_st, FILES_COLUMN_PATH-1));
-  *hash = strdup((char*)sqlite3_column_text(db->files_st, FILES_COLUMN_HASH-1));
-  *keep = sqlite3_column_int(db->files_st, FILES_COLUMN_KEEP-1) == 1;
-  return true;
 }
 
 void lm_database_files_next_free(lm_database_t *db, lm_entry_t *entry, char **path, char **hash, bool *keep){
@@ -279,16 +362,14 @@ void lm_database_files_next_free(lm_database_t *db, lm_entry_t *entry, char **pa
     return;
   }
 
-  if(NULL != db->files_st){
-    sqlite3_finalize(db->files_st);
-    db->files_st = NULL;
-  }
+  if(NULL != db->filesp)
+    fclose(db->filesp);
 
-  if(NULL != path)
-    free(*path);
-
-  if(NULL != hash)
-    free(*hash);
+  if(NULL != *hash)
+    free(*hash-HASH_INDEX);
 
+  db->filesp = NULL;
   *keep = false;
+  *path = NULL;
+  *hash = NULL;
 }

src/error.c

@@ -1,12 +1,14 @@
 #include "../include/error.h"
 #include "../include/util.h"
 
+#include <pthread.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-lm_error_t lm_error_code = LM_ERR_NoError;
-char      *lm_error_str  = NULL;
+lm_error_t lm_error_code   = LM_ERR_NoError; // error code
+char      *lm_error_str    = NULL;           // error string
+pthread_t  lm_error_thread = 0;              // thread that is using the error system
 
 void lm_error_clear() {
   free(lm_error_str);
@@ -14,7 +16,17 @@ void lm_error_clear() {
   lm_error_str  = NULL;
 }
 
+void lm_error_init() {
+  lm_error_clear();
+  lm_error_code   = LM_ERR_NoError;
+  lm_error_str    = NULL;
+  lm_error_thread = pthread_self();
+}
+
 void lm_error_set(lm_error_t code, ...) {
+  if (!pthread_equal(pthread_self(), lm_error_thread)) // ignore error_set outside the main thread
+    return;
+
   lm_error_desc_t errors[] = {
       {.code = LM_ERR_NoError,                 .desc = _("no error")                                                   },
       {.code = LM_ERR_URLBadChar,              .desc = _("URL contains an invalid character")                          },
@@ -61,10 +73,14 @@ void lm_error_set(lm_error_t code, ...) {
       {.code = LM_ERR_ArcNextHeaderFail,       .desc = _("failed to read the next header of the archive")              },
       {.code = LM_ERR_GetCwdFail,              .desc = _("failed to obtain current working directory")                 },
       {.code = LM_ERR_PoolListDirFail,         .desc = _("failed to open extracted pool list directory")               },
+      {.code = LM_ERR_PoolListDataFail,        .desc = _("failed to load \"%s\" data: %s")                             },
+      {.code = LM_ERR_PoolListAddFail,         .desc = _("failed add \"%s\" to the pool list: %s")                     },
       {.code = LM_ERR_PoolListCantRead,        .desc = _("failed to read access the pool list file")                   },
       {.code = LM_ERR_PoolInfoCantRead,        .desc = _("failed to read access the pool info file")                   },
       {.code = LM_ERR_PkgDataBad,              .desc = _("failed to parse package data")                               },
       {.code = LM_ERR_PkgBadName,              .desc = _("package name is invalid")                                    },
+      {.code = LM_ERR_PkgBadVersion,           .desc = _("package version is invalid")                                 },
+      {.code = LM_ERR_PkgDataMissing,          .desc = _("package data has missing field: %s")                         },
       {.code = LM_ERR_CtxDataNULL,             .desc = _("data path is not set with in the ctx")                       },
       {.code = LM_ERR_CtxTempNULL,             .desc = _("temp path is not set with in the ctx")                       },
       {.code = LM_ERR_CtxRootNULL,             .desc = _("root path is not set with in the ctx")                       },
@@ -97,11 +113,11 @@ void lm_error_set(lm_error_t code, ...) {
       {.code = LM_ERR_PoolUrlEmpty,            .desc = _("pool URL is empty or invalid")                               },
       {.code = LM_ERR_PoolBadDir,              .desc = _("pool directory path is not accessible")                      },
       {.code = LM_ERR_PoolBadPaths,            .desc = _("pool directory sub-paths are not accessible")                },
-      {.code = LM_ERR_DbFilesNotFound,         .desc = _("package file list not found in the database")                },
-      {.code = LM_ERR_DbFilesOpenFail,         .desc = _("failed to open package file list in the database")           },
-      {.code = LM_ERR_DbFilesDirFail,          .desc = _("failed to access package file list database directory")      },
-      {.code = LM_ERR_DbFilesUnlinkFail,       .desc = _("failed to remove package file list from the database")       },
-      {.code = LM_ERR_DbFilesWriteFail,        .desc = _("failed to write to the file list in the database")           },
+      {.code = LM_ERR_DbFilesNotFound,         .desc = _("file list not found for the package")                        },
+      {.code = LM_ERR_DbFilesRenameFail,       .desc = _("failed to rename the file list for the package: %s")         },
+      {.code = LM_ERR_DbFilesOpenFail,         .desc = _("failed to open the package file list: %s")                   },
+      {.code = LM_ERR_DbFilesDirFail,          .desc = _("failed to open the database directory: %s")                  },
+      {.code = LM_ERR_DbFilesUnlinkFail,       .desc = _("failed to remove package file list: %s")                     },
       {.code = LM_ERR_DbKeepsNotFound,         .desc = _("package keep list not found in the database")                },
       {.code = LM_ERR_DbKeepsOpenFail,         .desc = _("failed to open package keep list in the database")           },
       {.code = LM_ERR_DbKeepsDirFail,          .desc = _("failed to access package keep list database directory")      },
@@ -156,7 +172,7 @@ void lm_error_set(lm_error_t code, ...) {
       {.code = LM_ERR_DbChangesNotExists,      .desc = _("package changes file not found in the database")             },
       {.code = LM_ERR_DbChangesChmodFail,      .desc = _("failed to change mod of the changes file")                   },
       {.code = LM_ERR_InstallDirFail,          .desc = _("failed to create install script save directory")             },
-      {.code = LM_ERR_NoWrite,                 .desc = _("directory does not have write permissions")                  },
+      {.code = LM_ERR_NoRead,                  .desc = _("directory does not have read permissions")                   },
       {.code = LM_ERR_NotDir,                  .desc = _("specified path is not a directory")                          },
       {.code = LM_ERR_FailMkdir,               .desc = _("failed to create the specified directory")                   },
       {.code = LM_ERR_PoolListBadDir,          .desc = _("specified list extraction directory is not accessible")      },
@@ -203,9 +219,13 @@ void lm_error_set(lm_error_t code, ...) {
 }
 
 char *lm_strerror() {
+  if (!pthread_equal(pthread_self(), lm_error_thread))
+    return NULL;
   return lm_error_str;
 }
 
 lm_error_t lm_error() {
+  if (!pthread_equal(pthread_self(), lm_error_thread))
+    return LM_ERR_UnknownThread;
   return lm_error_code;
 }

src/package/data.c

@@ -12,8 +12,10 @@ int lm_package_data_handler(void *_data, const char *_section, const char *_key,
   lm_pkg_data_t *data = _data;
 
   if(NULL == data->name){
-    if(!package_name_valid(section))
+    if(!package_name_valid(section)){
+      lm_error_set(LM_ERR_PkgBadName);
       return 0;
+    }
     data->name = strdup(section);
   }
 
@@ -24,8 +26,10 @@ int lm_package_data_handler(void *_data, const char *_section, const char *_key,
     data->desc = strdup(value);
   
   else if(eq(key, PKG_DATA_VERSION)){
-    if(!package_version_valid(value))
+    if(!package_version_valid(value)){
+      lm_error_set(LM_ERR_PkgBadVersion);
       return 0;
+    }
     data->version = strdup(value);
   }
   
@@ -47,13 +51,26 @@ int lm_package_data_handler(void *_data, const char *_section, const char *_key,
 
 bool lm_package_data_load(lm_pkg_data_t *data, char *file){
   lm_package_data_free(data);
+  lm_error_clear();
 
   if (ini_parse(file, lm_package_data_handler, data) < 0) {
     lm_error_set(LM_ERR_PkgDataBad);
     return false;
   }
 
-  return true;
+  if(LM_ERR_NoError != lm_error())
+    return false;
+
+  if(NULL == data->name)
+    lm_error_set(LM_ERR_PkgDataMissing, "name");
+  else if(NULL == data->desc)
+    lm_error_set(LM_ERR_PkgDataMissing, "desc");
+  else if(NULL == data->version)
+    lm_error_set(LM_ERR_PkgDataMissing, "version");
+  else if(0 == data->size)
+    lm_error_set(LM_ERR_PkgDataMissing, "size");
+
+  return LM_ERR_NoError == lm_error();
 }
 
 void lm_package_data_free(lm_pkg_data_t *data){
@@ -62,5 +79,5 @@ void lm_package_data_free(lm_pkg_data_t *data){
   free(data->version);
   lm_package_data_depend_free(data);
   lm_package_data_keep_free(data);
-  bzero(&data, sizeof(lm_pkg_data_t));
+  bzero(data, sizeof(lm_pkg_data_t));
 }

src/pool/info.c

@@ -89,7 +89,7 @@ bool lm_pool_info_download(lm_pool_t *pool, lm_mptp_transfer_callback_t callback
     return false;
   }
 
-  if(!mkdir_ifnot(pool->dir)){
+  if(!mkdir_ifnot(pool->dir, 0755)){
     lm_error_set(LM_ERR_PoolBadDir);
     return false;
   }

src/pool/list.c

@@ -30,12 +30,12 @@ bool lm_pool_list_load(lm_pool_t *pool, char *dir){
 
   pdebug(__func__, "(%s) extracting pool to %s", pool->name, dir);
 
-  if(!mkdir_ifnot(pool->dir)){
+  if(!mkdir_ifnot(pool->dir, 0755)){
     lm_error_set(LM_ERR_PoolBadDir);
     return false;
   }
 
-  if(!mkdir_ifnot(dir)){
+  if(!mkdir_ifnot(dir, 0755)){
     lm_error_set(LM_ERR_PoolListBadDir);
     return false;
   }
@@ -64,15 +64,23 @@ bool lm_pool_list_load(lm_pool_t *pool, char *dir){
     lm_pkg_t *pkg = lm_package_new();
 
     if(!lm_package_data_load(&pkg->data, datap)){
-      pdebug(__func__, "(%s) failed to load new package from %s", pool->name, datap);
+      pdebug(__func__, "(%s) failed to load new package from %s: %s", pool->name, datap, lm_strerror());
+      if(NULL != pkg->data.name){
+        char *suberr = lm_strerror_dup();
+        lm_error_set(LM_ERR_PoolListDataFail, pkg->data.name, suberr);
+        free(suberr);
+      }
       lm_package_free(pkg);
-      continue;
+      goto end;
     }
 
     if(!lm_pool_package_add(pool, pkg)){
-      pdebug(__func__, "(%s) failed to add new package: %s", pool->name, pkg->data.name);
+      pdebug(__func__, "(%s) failed to add package %s: %s", pool->name, pkg->data.name, lm_strerror());
+      char *suberr = lm_strerror_dup();
+      lm_error_set(LM_ERR_PoolListAddFail, pkg->data.name, suberr);
+      free(suberr);
       lm_package_free(pkg);
-      continue;
+      goto end;
     }
 
     pdebug(__func__, "(%s) added new package: %s", pool->name, pkg->data.name);
@@ -102,7 +110,7 @@ bool lm_pool_list_download(lm_pool_t *pool, char *dir, lm_mptp_transfer_callback
     return false;
   }
 
-  if(!mkdir_ifnot(pool->dir)){
+  if(!mkdir_ifnot(pool->dir, 0755)){
     lm_error_set(LM_ERR_PoolBadDir);
     return false;
   }

src/pool/path.c

@@ -17,7 +17,7 @@ bool lm_pool_path_set_dir(lm_pool_t *pool, char *dir){
   if(NULL == dir)
     return true;
 
-  if(exists(dir, NULL) && (is_file(dir) || !can_read(dir) || !can_write(dir))){
+  if(exists(dir, NULL) && (is_file(dir) || !can_read(dir))){
     lm_error_set(LM_ERR_PoolBadDir);
     return false;
   }
@@ -26,12 +26,12 @@ bool lm_pool_path_set_dir(lm_pool_t *pool, char *dir){
   pool->info_file = join_alloc(dir, "INFO"); 
   pool->list_file = join_alloc(dir, "LIST"); 
   
-  if(exists(pool->info_file, NULL) && (!is_file(pool->info_file) || !can_read(pool->info_file) || !can_write(pool->info_file))){
+  if(exists(pool->info_file, NULL) && (!is_file(pool->info_file) || !can_read(pool->info_file))){
     lm_error_set(LM_ERR_PoolBadPaths);
     return false;
   }
   
-  if(exists(pool->list_file, NULL) && (!is_file(pool->list_file) || !can_read(pool->list_file) || !can_write(pool->list_file))){
+  if(exists(pool->list_file, NULL) && (!is_file(pool->list_file) || !can_read(pool->list_file))){
     lm_error_set(LM_ERR_PoolBadPaths);
     return false;
   }

src/util.c

@@ -278,20 +278,12 @@ bool can_write(char *path) {
   return access(path, W_OK) == 0;
 }
 
-bool mkdir_ifnot(char *path) {
-  return !(mkdir(path, 0700) < 0 && errno != EEXIST);
+bool mkdir_ifnot(char *path, int mode) {
+  return !(mkdir(path, mode) < 0 && errno != EEXIST);
 }
 
-bool package_name_valid(char *name) {
-  for (char *c = name; *c != 0; c++) {
-    if (!is_digit(*c) && !is_letter(*c) && *c != '-' && *c != '.')
-      return false;
-  }
-  return true;
-}
-
-bool package_version_valid(char *version) {
-  for (char *c = version; *c != 0; c++) {
+bool __package_field_valid(char *field) {
+  for (char *c = field; *c != 0; c++) {
     if (!is_digit(*c) && !is_letter(*c) && *c != '-' && *c != '+' && *c != '.')
       return false;
   }