pakfire: Check if path exists

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/_pakfire/pakfire.c b/src/_pakfire/pakfire.c
index 6c107a757976c48728854127ec097b0fe98f9a9d..7a7db1db3027408c41d28bee080856dc608cd8a8 100644 (file)
--- a/src/_pakfire/pakfire.c
+++ b/src/_pakfire/pakfire.c
@@ -61,6 +61,12 @@ static int Pakfire_init(PakfireObject* self, PyObject* args, PyObject* kwds) {
                                PyErr_SetString(PyExc_ValueError, "Invalid architecture");
                                break;
 
+                       // path does not exist
+                       case -ENOENT:
+                               PyErr_Format(PyExc_FileNotFoundError,
+                                       "%s does not exist or is not a directory", path);
+                               break;
+
                        // Anything else
                        default:
                                PyErr_SetNone(PyExc_OSError);

diff --git a/src/libpakfire/include/pakfire/util.h b/src/libpakfire/include/pakfire/util.h
index 8c2a16a1d110a641e839f3971998b734bbd00ce0..83c62af01acba979ecf616bd688121a7ebd9bbda 100644 (file)
--- a/src/libpakfire/include/pakfire/util.h
+++ b/src/libpakfire/include/pakfire/util.h
@@ -44,6 +44,7 @@ char* pakfire_format_date(time_t t);
 
 char* pakfire_path_join(const char* first, const char* second);
 const char* pakfire_path_relpath(const char* root, const char* path);
+int pakfire_path_isdir(const char* path);
 
 char* pakfire_basename(const char* path);
 char* pakfire_dirname(const char* path);

diff --git a/src/libpakfire/libpakfire.sym b/src/libpakfire/libpakfire.sym
index 2455e7a0f8832aebd3fdccd735bcc473fa7f83e4..4dfae478d7e8a97992c3a1cc80ba238d56e59eed 100644 (file)
--- a/src/libpakfire/libpakfire.sym
+++ b/src/libpakfire/libpakfire.sym
@@ -373,6 +373,7 @@ global:
        pakfire_free;
        pakfire_get_errno;
        pakfire_partition_string;
+       pakfire_path_isdir;
        pakfire_path_join;
        pakfire_path_relpath;
        pakfire_read_file_into_buffer;

diff --git a/src/libpakfire/pakfire.c b/src/libpakfire/pakfire.c
index 4dfbdcfd735679dcedc878cc8afb3ded33921bb9..ed89ac4c8f0a572a2fb940fbd746aec27d22af8e 100644 (file)
--- a/src/libpakfire/pakfire.c
+++ b/src/libpakfire/pakfire.c
@@ -92,6 +92,12 @@ PAKFIRE_EXPORT Pakfire pakfire_create(const char* path, const char* arch) {
                return NULL;
        }
 
+       // Check if path exists
+       if (!pakfire_path_isdir(path)) {
+               errno = -ENOENT;
+               return NULL;
+       }
+
        Pakfire pakfire = pakfire_calloc(1, sizeof(*pakfire));
        if (pakfire) {
                pakfire->nrefs = 1;

diff --git a/src/libpakfire/util.c b/src/libpakfire/util.c
index 24b0f9db529d1b7b2a6fc196676f07c885c5e3d4..38d9d5ec0d7f9179c9e81a867da6cd4b6168c4b8 100644 (file)
--- a/src/libpakfire/util.c
+++ b/src/libpakfire/util.c
@@ -155,6 +155,20 @@ PAKFIRE_EXPORT const char* pakfire_path_relpath(const char* root, const char* pa
        return NULL;
 }
 
+PAKFIRE_EXPORT int pakfire_path_isdir(const char* path) {
+       struct stat s;
+
+       if (stat(path, &s) != 0) {
+               // Does not seem to exist
+               return 0;
+       }
+
+       if (S_ISDIR(s.st_mode))
+               return 1;
+
+       return 0;
+}
+
 PAKFIRE_EXPORT char* pakfire_basename(const char* path) {
        char* name = pakfire_strdup(path);