below which can be used to return the value in a more useful form when
you know the type in advance.";
+ "node_struct_length", (RSize, [AHive; ANode "node"]),
+ "return the length of a node",
+ "\
+Return the length of the node data structure.";
+
+ "value_struct_length", (RSize, [AHive; AValue "val"]),
+ "return the length of a value data structure",
+ "\
+Return the length of the value data structure.";
+
"value_value", (RLenTypeVal, [AHive; AValue "val"]),
"return data length, data type and data of a value",
"\
generate_header CStyle LGPLv2plus;
pr "\
+#include <config.h>
+
#define PY_SSIZE_T_CLEAN 1
#include <Python.h>
get_value (PyObject *v, hive_set_value *ret)
{
PyObject *obj;
+#ifndef HAVE_PYSTRING_ASSTRING
+ PyObject *bytes;
+#endif
obj = PyDict_GetItemString (v, \"key\");
if (!obj) {
PyErr_SetString (PyExc_RuntimeError, \"no 'key' element in dictionary\");
return -1;
}
- if (!PyString_Check (obj)) {
- PyErr_SetString (PyExc_RuntimeError, \"'key' element is not a string\");
- return -1;
- }
+#ifdef HAVE_PYSTRING_ASSTRING
ret->key = PyString_AsString (obj);
+#else
+ bytes = PyUnicode_AsUTF8String (obj);
+ ret->key = PyBytes_AS_STRING (bytes);
+#endif
obj = PyDict_GetItemString (v, \"t\");
if (!obj) {
PyErr_SetString (PyExc_RuntimeError, \"no 't' element in dictionary\");
return -1;
}
- if (!PyInt_Check (obj)) {
- PyErr_SetString (PyExc_RuntimeError, \"'t' element is not an integer\");
- return -1;
- }
- ret->t = PyInt_AsLong (obj);
+ ret->t = PyLong_AsLong (obj);
obj = PyDict_GetItemString (v, \"value\");
if (!obj) {
PyErr_SetString (PyExc_RuntimeError, \"no 'value' element in dictionary\");
return -1;
}
- if (!PyString_Check (obj)) {
- PyErr_SetString (PyExc_RuntimeError, \"'value' element is not a string\");
- return -1;
- }
+#ifdef HAVE_PYSTRING_ASSTRING
ret->value = PyString_AsString (obj);
ret->len = PyString_Size (obj);
+#else
+ bytes = PyUnicode_AsUTF8String (obj);
+ ret->value = PyBytes_AS_STRING (bytes);
+ ret->len = PyBytes_GET_SIZE (bytes);
+#endif
return 0;
}
;
list = PyList_New (argc);
- for (i = 0; i < argc; ++i)
+ for (i = 0; i < argc; ++i) {
+#ifdef HAVE_PYSTRING_ASSTRING
PyList_SetItem (list, i, PyString_FromString (argv[i]));
+#else
+ PyList_SetItem (list, i, PyUnicode_FromString (argv[i]));
+#endif
+ }
return list;
}
put_len_type (size_t len, hive_type t)
{
PyObject *r = PyTuple_New (2);
- PyTuple_SetItem (r, 0, PyInt_FromLong ((long) t));
+ PyTuple_SetItem (r, 0, PyLong_FromLong ((long) t));
PyTuple_SetItem (r, 1, PyLong_FromLongLong ((long) len));
return r;
}
put_val_type (char *val, size_t len, hive_type t)
{
PyObject *r = PyTuple_New (2);
- PyTuple_SetItem (r, 0, PyInt_FromLong ((long) t));
+ PyTuple_SetItem (r, 0, PyLong_FromLong ((long) t));
+#ifdef HAVE_PYSTRING_ASSTRING
PyTuple_SetItem (r, 1, PyString_FromStringAndSize (val, len));
+#else
+ PyTuple_SetItem (r, 1, PyBytes_FromStringAndSize (val, len));
+#endif
return r;
}
| RValue ->
pr " py_r = PyLong_FromLongLong (r);\n"
| RString ->
+ pr "#ifdef HAVE_PYSTRING_ASSTRING\n";
pr " py_r = PyString_FromString (r);\n";
+ pr "#else\n";
+ pr " py_r = PyUnicode_FromString (r);\n";
+ pr "#endif\n";
pr " free (r);"
| RStringList ->
pr " py_r = put_string_list (r);\n";
pr " py_r = put_val_type (r, len, t);\n";
pr " free (r);\n"
| RInt32 ->
- pr " py_r = PyInt_FromLong ((long) r);\n"
+ pr " py_r = PyLong_FromLong ((long) r);\n"
| RInt64 ->
pr " py_r = PyLong_FromLongLong (r);\n"
);
(* Init function. *)
pr "\
+#if PY_MAJOR_VERSION >= 3
+static struct PyModuleDef moduledef = {
+ PyModuleDef_HEAD_INIT,
+ \"libhivexmod\", /* m_name */
+ \"hivex module\", /* m_doc */
+ -1, /* m_size */
+ methods, /* m_methods */
+ NULL, /* m_reload */
+ NULL, /* m_traverse */
+ NULL, /* m_clear */
+ NULL, /* m_free */
+};
+#endif
+
+static PyObject *
+moduleinit (void)
+{
+ PyObject *m;
+
+#if PY_MAJOR_VERSION >= 3
+ m = PyModule_Create (&moduledef);
+#else
+ m = Py_InitModule ((char *) \"libhivexmod\", methods);
+#endif
+
+ return m; /* m might be NULL if module init failed */
+}
+
+#if PY_MAJOR_VERSION >= 3
+PyMODINIT_FUNC
+PyInit_libhivexmod (void)
+{
+ return moduleinit ();
+}
+#else
void
initlibhivexmod (void)
{
- static int initialized = 0;
-
- if (initialized) return;
- Py_InitModule ((char *) \"libhivexmod\", methods);
- initialized = 1;
+ (void) moduleinit ();
}
+#endif
"
and generate_python_py () =
generate_header HashStyle LGPLv2plus;
pr "\
-u\"\"\"Python bindings for hivex
+\"\"\"Python bindings for hivex
import hivex
h = hivex.Hivex (filename)
pr " def %s (self" name;
List.iter (fun arg -> pr ", %s" (name_of_argt arg)) args;
pr "):\n";
- pr " u\"\"\"%s\"\"\"\n" shortdesc;
+ pr " \"\"\"%s\"\"\"\n" shortdesc;
pr " return libhivexmod.%s (self._o" name;
List.iter (
fun arg ->
#define RARRAY_LEN(r) (RARRAY((r))->len)
#endif
+#ifndef RSTRING_LEN
+#define RSTRING_LEN(r) (RSTRING((r))->len)
+#endif
+
+#ifndef RSTRING_PTR
+#define RSTRING_PTR(r) (RSTRING((r))->ptr)
+#endif
+
static VALUE m_hivex; /* hivex module */
static VALUE c_hivex; /* hive_h handle */
static VALUE e_Error; /* used for all errors */
val->key = StringValueCStr (key);
val->t = NUM2ULL (type);
- val->len = RSTRING (value)->len;
- val->value = RSTRING (value)->ptr;
+ val->len = RSTRING_LEN (value);
+ val->value = RSTRING_PTR (value);
}
static hive_set_value *
git.annexia.org / hivex.git / blobdiff