Computed relative and absolute paths.

5 files changed, 250 insertions, 2 deletions

diff --git a/plugins/pychrysa/common/Makefile.am b/plugins/pychrysa/common/Makefile.am
index 38d1697..93d92ac 100644
--- a/plugins/pychrysa/common/Makefile.am
+++ b/plugins/pychrysa/common/Makefile.am
@@ -3,7 +3,8 @@ noinst_LTLIBRARIES = libpychrysacommon.la
 
 libpychrysacommon_la_SOURCES =			\
 	fnv1a.h fnv1a.c						\
-	module.h module.c
+	module.h module.c					\
+	pathname.h pathname.c
 
 
 libpychrysacommon_la_LDFLAGS = 
diff --git a/plugins/pychrysa/common/fnv1a.c b/plugins/pychrysa/common/fnv1a.c
index 2befcbe..99d06fc 100644
--- a/plugins/pychrysa/common/fnv1a.c
+++ b/plugins/pychrysa/common/fnv1a.c
@@ -40,7 +40,7 @@ static PyObject *py_fnv1a_hash(PyObject *, PyObject *);
 /******************************************************************************
 *                                                                             *
 *  Paramètres  : self = NULL car méthode statique.                            *
-*                args = non utilisé ici.                                      *
+*                args = arguments fournis lors de l'appel à la fonction.      *
 *                                                                             *
 *  Description : Détermine l'empreinte FNV1a d'une chaîne de caractères.      *
 *                                                                             *
diff --git a/plugins/pychrysa/common/module.c b/plugins/pychrysa/common/module.c
index bb4d47f..21781b5 100644
--- a/plugins/pychrysa/common/module.c
+++ b/plugins/pychrysa/common/module.c
@@ -26,6 +26,7 @@
 
 
 #include "fnv1a.h"
+#include "pathname.h"
 
 
 
@@ -76,6 +77,7 @@ bool add_common_module_to_python_module(PyObject *super)
     result = true;
 
     result &= register_python_fnv1a(module);
+    result &= register_python_pathname(module);
 
  acmtpm_exit:
 
diff --git a/plugins/pychrysa/common/pathname.c b/plugins/pychrysa/common/pathname.c
new file mode 100644
index 0000000..4b36675
--- /dev/null
+++ b/plugins/pychrysa/common/pathname.c
@@ -0,0 +1,203 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * pathname.c - équivalent Python du fichier "common/pathname.c"
+ *
+ * Copyright (C) 2015 Cyrille Bagard
+ *
+ *  This file is part of Chrysalide.
+ *
+ *  OpenIDA is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  OpenIDA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+
+#include "pathname.h"
+
+
+#include <malloc.h>
+#include <pygobject.h>
+
+
+#include <i18n.h>
+
+
+#include <common/pathname.h>
+
+
+
+/* Calcule le chemin relatif entre deux fichiers donnés. */
+static PyObject *py_build_relative_filename(PyObject *, PyObject *);
+
+/* Calcule le chemin absolu d'un fichier par rapport à un autre. */
+static PyObject *py_build_absolute_filename(PyObject *, PyObject *);
+
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : self = NULL car méthode statique.                            *
+*                args = arguments fournis lors de l'appel à la fonction.      *
+*                                                                             *
+*  Description : Calcule le chemin relatif entre deux fichiers donnés.        *
+*                                                                             *
+*  Retour      : Chemin relatif obtenu.                                       *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static PyObject *py_build_relative_filename(PyObject *self, PyObject *args)
+{
+    PyObject *result;                       /* Instance à retourner        */
+    const char *ref;                        /* Fichier de référence        */
+    const char *target;                     /* Fichier à cibler            */
+    int ret;                                /* Bilan de lecture des args.  */
+    char *relative;                         /* Chemin d'accès construit    */
+
+    ret = PyArg_ParseTuple(args, "ss", &ref, &target);
+    if (!ret) Py_RETURN_NONE;
+
+    relative = build_relative_filename(ref, target);
+
+    result = PyUnicode_FromString(relative);
+
+    free(relative);
+
+    return result;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : self = NULL car méthode statique.                            *
+*                args = arguments fournis lors de l'appel à la fonction.      *
+*                                                                             *
+*  Description : Calcule le chemin absolu d'un fichier par rapport à un autre.*
+*                                                                             *
+*  Retour      : Chemin absolu obtenu.                                        *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static PyObject *py_build_absolute_filename(PyObject *self, PyObject *args)
+{
+    PyObject *result;                       /* Instance à retourner        */
+    const char *ref;                        /* Fichier de référence        */
+    const char *target;                     /* Fichier à cibler            */
+    int ret;                                /* Bilan de lecture des args.  */
+    char *relative;                         /* Chemin d'accès construit    */
+
+    ret = PyArg_ParseTuple(args, "ss", &ref, &target);
+    if (!ret) Py_RETURN_NONE;
+
+    relative = build_absolute_filename(ref, target);
+
+    if (relative == NULL)
+    {
+        PyErr_SetString(PyExc_ValueError, _("Relative path is too deep."));
+        result = NULL;
+    }
+    else
+    {
+        result = PyUnicode_FromString(relative);
+
+        free(relative);
+
+    }
+
+    return result;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : -                                                            *
+*                                                                             *
+*  Description : Fournit un accès à une définition de type à diffuser.        *
+*                                                                             *
+*  Retour      : Définition d'objet pour Python.                              *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+PyTypeObject *get_python_pathname_type(void)
+{
+    static PyMethodDef py_pathname_methods[] = {
+
+        { "build_relative_filename", py_build_relative_filename,
+          METH_VARARGS | METH_STATIC,
+          "build_relative_filename(ref, target, /)\n--\n\nCompute the relative path between two files."
+        },
+        { "build_absolute_filename", py_build_absolute_filename,
+          METH_VARARGS | METH_STATIC,
+          "build_absolute_filename(ref, target, /)\n--\n\nCompute the absolute path for a file."
+        },
+        { NULL }
+
+    };
+
+    static PyTypeObject py_pathname_type = {
+
+        PyVarObject_HEAD_INIT(NULL, 0)
+
+        .tp_name = "pychrysalide.core.pathname",
+        .tp_basicsize = sizeof(PyObject),
+
+        .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_IS_ABSTRACT,
+
+        .tp_doc = "Path manipulations in Python for Chrysalide.",
+
+        .tp_methods =  py_pathname_methods
+
+    };
+
+    return &py_pathname_type;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : module = module dont la définition est à compléter.          *
+*                                                                             *
+*  Description : Prend en charge l'objet 'pychrysalide.core.pathname'.        *
+*                                                                             *
+*  Retour      : Bilan de l'opération.                                        *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+bool register_python_pathname(PyObject *module)
+{
+    PyTypeObject *py_pathname_type;         /* Type Python pour 'pathname' */
+    int ret;                                /* Bilan d'un appel            */
+
+    py_pathname_type = get_python_pathname_type();
+
+    //py_pathname_type->tp_new = PyType_GenericNew;
+
+    if (PyType_Ready(py_pathname_type) != 0)
+        return false;
+
+    Py_INCREF(py_pathname_type);
+    ret = PyModule_AddObject(module, "pathname", (PyObject *)py_pathname_type);
+
+    return (ret == 0);
+
+}
diff --git a/plugins/pychrysa/common/pathname.h b/plugins/pychrysa/common/pathname.h
new file mode 100644
index 0000000..fe9bc1b
--- /dev/null
+++ b/plugins/pychrysa/common/pathname.h
@@ -0,0 +1,42 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * pathname.h - prototypes pour l'équivalent Python du fichier "common/pathname.c"
+ *
+ * Copyright (C) 2015 Cyrille Bagard
+ *
+ *  This file is part of Chrysalide.
+ *
+ *  OpenIDA is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  OpenIDA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+
+#ifndef _PLUGINS_PYCHRYSALIDE_COMMON_PATHNAME_H
+#define _PLUGINS_PYCHRYSALIDE_COMMON_PATHNAME_H
+
+
+#include <Python.h>
+#include <stdbool.h>
+
+
+
+/* Fournit un accès à une définition de type à diffuser. */
+PyTypeObject *get_python_pathname_type(void);
+
+/* Prend en charge l'objet 'pychrysalide.common.pathname'. */
+bool register_python_pathname(PyObject *);
+
+
+
+#endif  /* _PLUGINS_PYCHRYSALIDE_COMMON_PATHNAME_H */