Changed the Python bindings source directory and updated code.

7 files changed, 0 insertions, 557 deletions

diff --git a/plugins/pychrysa/analysis/contents/Makefile.am b/plugins/pychrysa/analysis/contents/Makefile.am
deleted file mode 100644
index 3cd00a6..0000000
--- a/plugins/pychrysa/analysis/contents/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-
-noinst_LTLIBRARIES = libpychrysaanalysiscontents.la
-
-libpychrysaanalysiscontents_la_SOURCES = \
-	file.h file.c						\
-	module.h module.c					\
-	restricted.h restricted.c
-
-libpychrysaanalysiscontents_la_LDFLAGS = 
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
-	-I../../../../src
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
diff --git a/plugins/pychrysa/analysis/contents/file.c b/plugins/pychrysa/analysis/contents/file.c
deleted file mode 100644
index b033611..0000000
--- a/plugins/pychrysa/analysis/contents/file.c
+++ /dev/null
@@ -1,149 +0,0 @@
-
-/* Chrysalide - Outil d'analyse de fichiers binaires
- * file.c - prototypes pour l'équivalent Python du fichier "analysis/contents/file.c"
- *
- * Copyright (C) 2015-2017 Cyrille Bagard
- *
- *  This file is part of Chrysalide.
- *
- *  Chrysalide 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.
- *
- *  Chrysalide 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 "file.h"
-
-
-#include <pygobject.h>
-
-
-#include <analysis/contents/file.h>
-
-
-#include "../../helpers.h"
-
-
-
-/* Crée un nouvel objet Python de type 'BinContent'. */
-static PyObject *py_file_content_new(PyTypeObject *, PyObject *, PyObject *);
-
-
-
-/******************************************************************************
-*                                                                             *
-*  Paramètres  : type = type de l'objet à instancier.                         *
-*                args = arguments fournis à l'appel.                          *
-*                kwds = arguments de type key=val fournis.                    *
-*                                                                             *
-*  Description : Crée un nouvel objet Python de type 'BinContent'.            *
-*                                                                             *
-*  Retour      : Instance Python mise en place.                               *
-*                                                                             *
-*  Remarques   : -                                                            *
-*                                                                             *
-******************************************************************************/
-
-static PyObject *py_file_content_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
-{
-    PyObject *result;                       /* Instance à retourner        */
-    const char *filename;                   /* Nom du fichier à charger    */
-    int ret;                                /* Bilan de lecture des args.  */
-    GBinContent *content;                   /* Version GLib du contenu     */
-
-    ret = PyArg_ParseTuple(args, "s", &filename);
-    if (!ret) Py_RETURN_NONE;
-
-    content = g_file_content_new(filename);
-
-    result = pygobject_new(G_OBJECT(content));
-
-    if (content != NULL)
-        g_object_unref(content);
-
-    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_file_content_type(void)
-{
-    static PyMethodDef py_file_content_methods[] = {
-        { NULL }
-    };
-
-    static PyGetSetDef py_file_content_getseters[] = {
-        { NULL }
-    };
-
-    static PyTypeObject py_file_content_type = {
-
-        PyVarObject_HEAD_INIT(NULL, 0)
-
-        .tp_name        = "pychrysalide.analysis.contents.FileContent",
-        .tp_basicsize   = sizeof(PyGObject),
-
-        .tp_flags       = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
-
-        .tp_doc         = "PyChrysalide binary file content",
-
-        .tp_methods     = py_file_content_methods,
-        .tp_getset      = py_file_content_getseters,
-        .tp_new         = (newfunc)py_file_content_new
-
-    };
-
-    return &py_file_content_type;
-
-}
-
-
-/******************************************************************************
-*                                                                             *
-*  Paramètres  : module = module dont la définition est à compléter.          *
-*                                                                             *
-*  Description : Prend en charge l'objet 'pychrysalide.....FileContent'.      *
-*                                                                             *
-*  Retour      : Bilan de l'opération.                                        *
-*                                                                             *
-*  Remarques   : -                                                            *
-*                                                                             *
-******************************************************************************/
-
-bool register_python_file_content(PyObject *module)
-{
-    PyTypeObject *py_file_content_type;     /* Type Python 'FileContent'   */
-    PyObject *dict;                         /* Dictionnaire du module      */
-
-    py_file_content_type = get_python_file_content_type();
-
-    dict = PyModule_GetDict(module);
-
-    if (!register_class_for_pygobject(dict, G_TYPE_FILE_CONTENT, py_file_content_type, &PyGObject_Type))
-        return false;
-
-    return true;
-
-}
diff --git a/plugins/pychrysa/analysis/contents/file.h b/plugins/pychrysa/analysis/contents/file.h
deleted file mode 100644
index 25e11dc..0000000
--- a/plugins/pychrysa/analysis/contents/file.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-/* Chrysalide - Outil d'analyse de fichiers binaires
- * file.h - prototypes pour l'équivalent Python du fichier "analysis/contents/file.h"
- *
- * Copyright (C) 2015-2017 Cyrille Bagard
- *
- *  This file is part of Chrysalide.
- *
- *  Chrysalide 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.
- *
- *  Chrysalide 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_PYCHRYSA_ANALYSIS_CONTENTS_FILE_H
-#define _PLUGINS_PYCHRYSA_ANALYSIS_CONTENTS_FILE_H
-
-
-#include <Python.h>
-#include <stdbool.h>
-
-
-
-/* Fournit un accès à une définition de type à diffuser. */
-PyTypeObject *get_python_file_content_type(void);
-
-/* Prend en charge l'objet 'pychrysalide.analysis.contents.FileContent'. */
-bool register_python_file_content(PyObject *);
-
-
-
-#endif  /* _PLUGINS_PYCHRYSA_ANALYSIS_CONTENTS_FILE_H */
diff --git a/plugins/pychrysa/analysis/contents/module.c b/plugins/pychrysa/analysis/contents/module.c
deleted file mode 100644
index 2daa62c..0000000
--- a/plugins/pychrysa/analysis/contents/module.c
+++ /dev/null
@@ -1,97 +0,0 @@
-
-/* Chrysalide - Outil d'analyse de fichiers binaires
- * module.c - intégration du répertoire contents en tant que module
- *
- * Copyright (C) 2015-2017 Cyrille Bagard
- *
- *  This file is part of Chrysalide.
- *
- *  Chrysalide 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.
- *
- *  Chrysalide 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 "module.h"
-
-
-#include <assert.h>
-
-
-#include "file.h"
-#include "restricted.h"
-#include "../../access.h"
-
-
-
-/******************************************************************************
-*                                                                             *
-*  Paramètres  : module = module dont la définition est à compléter.          *
-*                                                                             *
-*  Description : Ajoute le module 'contents' au module Python.                *
-*                                                                             *
-*  Retour      : -                                                            *
-*                                                                             *
-*  Remarques   : -                                                            *
-*                                                                             *
-******************************************************************************/
-#include "../content.h"
-bool add_analysis_contents_module_to_python_module(PyObject *super)
-{
-    bool result;                            /* Bilan à retourner           */
-    PyObject *module;                       /* Sous-module mis en place    */
-    int ret;                                /* Bilan d'un appel            */
-
-    static PyModuleDef py_chrysalide_contents_module = {
-
-        .m_base = PyModuleDef_HEAD_INIT,
-
-        .m_name = "pychrysalide.analysis.contents",
-        .m_doc = "Python module for Chrysalide.analysis.contents",
-
-        .m_size = -1,
-
-    };
-
-    result = false;
-
-    module = PyModule_Create(&py_chrysalide_contents_module);
-    if (module == NULL) return false;
-
-    ret = PyState_AddModule(super, &py_chrysalide_contents_module);
-    if (ret != 0) goto loading_failed;
-
-    ret = _PyImport_FixupBuiltin(module, "pychrysalide.analysis.contents");
-    if (ret != 0) goto loading_failed;
-
-    Py_INCREF(module);
-    ret = PyModule_AddObject(super, "contents", module);
-    if (ret != 0) goto loading_failed;
-
-    result = true;
-
-    result &= register_python_binary_content(module);
-
-    result &= register_python_file_content(module);
-    result &= register_python_restricted_content(module);
-
-    if (result)
-        register_access_to_python_module("pychrysalide.analysis.contents", module);
-
- loading_failed:
-
-    assert(result);
-
-    return result;
-
-}
diff --git a/plugins/pychrysa/analysis/contents/module.h b/plugins/pychrysa/analysis/contents/module.h
deleted file mode 100644
index 1b6adfa..0000000
--- a/plugins/pychrysa/analysis/contents/module.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-/* Chrysalide - Outil d'analyse de fichiers binaires
- * module.h - prototypes pour l'intégration du répertoire contents en tant que module
- *
- * Copyright (C) 2015-2017 Cyrille Bagard
- *
- *  This file is part of Chrysalide.
- *
- *  Chrysalide 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.
- *
- *  Chrysalide 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_PYOIDA_ANALYSIS_CONTENTS_MODULE_H
-#define _PLUGINS_PYOIDA_ANALYSIS_CONTENTS_MODULE_H
-
-
-#include <Python.h>
-#include <stdbool.h>
-
-
-
-/* Ajoute le module 'contents' au module Python. */
-bool add_analysis_contents_module_to_python_module(PyObject *);
-
-
-
-#endif  /* _PLUGINS_PYOIDA_ANALYSIS_CONTENTS_MODULE_H */
diff --git a/plugins/pychrysa/analysis/contents/restricted.c b/plugins/pychrysa/analysis/contents/restricted.c
deleted file mode 100644
index f8b0b98..0000000
--- a/plugins/pychrysa/analysis/contents/restricted.c
+++ /dev/null
@@ -1,173 +0,0 @@
-
-/* Chrysalide - Outil d'analyse de fichiers binaires
- * restricted.c - prototypes pour l'équivalent Python du fichier "analysis/contents/restricted.c"
- *
- * Copyright (C) 2015-2017 Cyrille Bagard
- *
- *  This file is part of Chrysalide.
- *
- *  Chrysalide 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.
- *
- *  Chrysalide 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 "restricted.h"
-
-
-#include <pygobject.h>
-
-
-#include <i18n.h>
-
-
-#include <analysis/contents/restricted.h>
-
-
-#include "../content.h"
-#include "../../helpers.h"
-#include "../../arch/vmpa.h"
-
-
-
-/* Crée un nouvel objet Python de type 'BinContent'. */
-static PyObject *py_restricted_content_new(PyTypeObject *, PyObject *, PyObject *);
-
-
-
-/******************************************************************************
-*                                                                             *
-*  Paramètres  : type = type de l'objet à instancier.                         *
-*                args = arguments fournis à l'appel.                          *
-*                kwds = arguments de type key=val fournis.                    *
-*                                                                             *
-*  Description : Crée un nouvel objet Python de type 'BinContent'.            *
-*                                                                             *
-*  Retour      : Instance Python mise en place.                               *
-*                                                                             *
-*  Remarques   : -                                                            *
-*                                                                             *
-******************************************************************************/
-
-static PyObject *py_restricted_content_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
-{
-    PyObject *result;                       /* Instance à retourner        */
-    PyObject *content_obj;                  /* Objet pour le contenu       */
-    PyObject *range_obj;                    /* Objet pour la restriction   */
-    int ret;                                /* Bilan de lecture des args.  */
-    GBinContent *content;                   /* Instance GLib correspondante*/
-    mrange_t *range;                        /* Restriction à appliquer     */
-    GBinContent *restricted;                /* Création GLib à transmettre */
-
-    ret = PyArg_ParseTuple(args, "OO", &content_obj, &range_obj);
-    if (!ret) return NULL;
-
-    ret = PyObject_IsInstance(content_obj, (PyObject *)get_python_binary_content_type());
-    if (!ret)
-    {
-        PyErr_SetString(PyExc_TypeError, _("The first argument must be an instance of BinContent."));
-        return NULL;
-    }
-
-    ret = PyObject_IsInstance(range_obj, (PyObject *)get_python_mrange_type());
-    if (!ret)
-    {
-        PyErr_SetString(PyExc_TypeError, _("The second argument must be an instance of mrange."));
-        return NULL;
-    }
-
-    content = G_BIN_CONTENT(pygobject_get(content_obj));
-
-    range = get_internal_mrange(range_obj);
-
-    restricted = g_restricted_content_new(content, range);
-
-    result = pygobject_new(G_OBJECT(restricted));
-
-    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_restricted_content_type(void)
-{
-    static PyMethodDef py_restricted_content_methods[] = {
-        { NULL }
-    };
-
-    static PyGetSetDef py_restricted_content_getseters[] = {
-        { NULL }
-    };
-
-    static PyTypeObject py_restricted_content_type = {
-
-        PyVarObject_HEAD_INIT(NULL, 0)
-
-        .tp_name        = "pychrysalide.analysis.contents.RestrictedContent",
-        .tp_basicsize   = sizeof(PyGObject),
-
-        .tp_flags       = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
-
-        .tp_doc         = "PyChrysalide binary restricted content",
-
-        .tp_methods     = py_restricted_content_methods,
-        .tp_getset      = py_restricted_content_getseters,
-        .tp_new         = (newfunc)py_restricted_content_new
-
-    };
-
-    return &py_restricted_content_type;
-
-}
-
-
-/******************************************************************************
-*                                                                             *
-*  Paramètres  : module = module dont la définition est à compléter.          *
-*                                                                             *
-*  Description : Prend en charge l'objet 'pychrysalide.....RestrictedContent'.*
-*                                                                             *
-*  Retour      : Bilan de l'opération.                                        *
-*                                                                             *
-*  Remarques   : -                                                            *
-*                                                                             *
-******************************************************************************/
-
-bool register_python_restricted_content(PyObject *module)
-{
-    PyTypeObject *py_restricted_content_type;/* Type Python 'BinContent'   */
-    PyObject *dict;                         /* Dictionnaire du module      */
-
-    py_restricted_content_type = get_python_restricted_content_type();
-
-    dict = PyModule_GetDict(module);
-
-    if (!register_class_for_pygobject(dict, G_TYPE_RESTRICTED_CONTENT,
-                                      py_restricted_content_type, &PyGObject_Type))
-        return false;
-
-    return true;
-
-}
diff --git a/plugins/pychrysa/analysis/contents/restricted.h b/plugins/pychrysa/analysis/contents/restricted.h
deleted file mode 100644
index baf4bb2..0000000
--- a/plugins/pychrysa/analysis/contents/restricted.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-/* Chrysalide - Outil d'analyse de fichiers binaires
- * restricted.h - prototypes pour l'équivalent Python du fichier "analysis/contents/restricted.h"
- *
- * Copyright (C) 2015-2017 Cyrille Bagard
- *
- *  This file is part of Chrysalide.
- *
- *  Chrysalide 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.
- *
- *  Chrysalide 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_PYCHRYSA_ANALYSIS_CONTENTS_RESTRICTED_H
-#define _PLUGINS_PYCHRYSA_ANALYSIS_CONTENTS_RESTRICTED_H
-
-
-#include <Python.h>
-#include <stdbool.h>
-
-
-
-/* Fournit un accès à une définition de type à diffuser. */
-PyTypeObject *get_python_restricted_content_type(void);
-
-/* Prend en charge l'objet 'pychrysalide.analysis.contents.RestrictedContent'. */
-bool register_python_restricted_content(PyObject *);
-
-
-
-#endif  /* _PLUGINS_PYCHRYSA_ANALYSIS_CONTENTS_RESTRICTED_H */