namespace registration

Author: Frederick888

bencode.cc

@@ -547,11 +547,23 @@ static zend_function_entry bint_methods[] = {
 };
 
 /**** PHP ****/
+PHP_INI_BEGIN()
+PHP_INI_ENTRY("bencode.namespace", "0", PHP_INI_SYSTEM, NULL)
+PHP_INI_END()
+
 PHP_MINIT_FUNCTION(bencode)
 {
+    REGISTER_INI_ENTRIES();
+
+    char *ini_ns_key = zend_container::get_cstring("bencode.namespace");
+    zend_bool ini_ns = zend_ini_long(ini_ns_key, strlen(ini_ns_key), 0);
+    efree(ini_ns_key);
     do {
         zend_class_entry ce;
-        INIT_CLASS_ENTRY(ce, "bitem", bitem_methods);
+        if (ini_ns)
+            INIT_CLASS_ENTRY(ce, "bencode\\bitem", bitem_methods)
+        else
+            INIT_CLASS_ENTRY(ce, "bitem", bitem_methods);
         ce.ce_flags |= ZEND_ACC_EXPLICIT_ABSTRACT_CLASS;
         ce.ce_flags |= ZEND_ACC_IMPLICIT_ABSTRACT_CLASS;
         zend_container::bitem_ce = zend_register_internal_class(&ce TSRMLS_CC);
@@ -566,6 +578,12 @@ PHP_MINIT_FUNCTION(bencode)
     return SUCCESS;
 }
 
+PHP_MSHUTDOWN_FUNCTION(bencode)
+{
+    UNREGISTER_INI_ENTRIES();
+    return SUCCESS;
+}
+
 static zend_function_entry bencode_functions[] = {
     PHP_FE(bencode_hello, NULL)
     {NULL, NULL, NULL}
@@ -578,7 +596,7 @@ zend_module_entry bencode_module_entry = {
     PHP_BENCODE_EXTNAME,
     bencode_functions,          //FUNCTIONS
     PHP_MINIT(bencode),         //PHP_MINIT
-    NULL,                       //PHP_MSHUTDOWN(bencode),
+    PHP_MSHUTDOWN(bencode),     //PHP_MSHUTDOWN(bencode),
     NULL,                       //PHP_RINIT(bencode),
     NULL,                       //PHP_RSHUTDOWN
     NULL,                       //PHP_MINFO
@@ -596,5 +614,6 @@ ZEND_GET_MODULE(bencode)
 
 PHP_FUNCTION(bencode_hello)
 {
-    php_printf("Hello Bencode!\n");
+    php_printf("hello bencode!\n");
+    RETURN_TRUE;
 }

binit.h

@@ -36,16 +36,17 @@
         return &new_object->std;                                                                                \
     }
 
-#define BI_MINIT(bclass) do {                                                                   \
-    zend_class_entry ce;                                                                        \
-    INIT_CLASS_ENTRY(ce, #bclass, bclass##_methods);                                            \
-    ce.parent = zend_container::bitem_ce;                                                       \
-    zend_container::bclass##_ce = zend_register_internal_class(&ce TSRMLS_CC);                  \
-    zend_container::bclass##_ce->create_object = zend_container::bclass##_object_new;           \
-    memcpy(&zend_container::bclass##_object_handlers,                                           \
-            zend_get_std_object_handlers(), sizeof(zend_object_handlers));                      \
-    zend_container::bclass##_object_handlers.offset = XtOffsetOf(bclass##_object, std);         \
-    zend_container::bclass##_object_handlers.clone_obj = zend_container::bclass##_object_clone; \
+#define BI_MINIT(bclass) do {                                                                                   \
+    zend_class_entry ce;                                                                                        \
+    if (ini_ns) INIT_CLASS_ENTRY(ce, "bencode\\"#bclass, bclass##_methods)                                      \
+    else INIT_CLASS_ENTRY(ce, #bclass, bclass##_methods);                                                       \
+    ce.parent = zend_container::bitem_ce;                                                                       \
+    zend_container::bclass##_ce = zend_register_internal_class(&ce TSRMLS_CC);                                  \
+    zend_container::bclass##_ce->create_object = zend_container::bclass##_object_new;                           \
+    memcpy(&zend_container::bclass##_object_handlers,                                                           \
+            zend_get_std_object_handlers(), sizeof(zend_object_handlers));                                      \
+    zend_container::bclass##_object_handlers.offset = XtOffsetOf(bclass##_object, std);                         \
+    zend_container::bclass##_object_handlers.clone_obj = zend_container::bclass##_object_clone;                 \
     zend_container::bclass##_object_handlers.free_obj = zend_container::bclass##_free_storage; } while (0);
 
 #define Z_BITEM_OBJ_P(zv) zend_container::bitem_fetch_object(Z_OBJ_P(zv))

php_bencode.h

@@ -6,11 +6,14 @@
 
 extern "C" {
 #include "php.h"
+#include "php_ini.h"
 #ifdef ZTS
 #include "TSRM.h"
 #endif
 }
 
+PHP_MINIT_FUNCTION(bencode);
+PHP_MSHUTDOWN_FUNCTION(bencode);
 PHP_FUNCTION(bencode_hello);
 
 extern zend_module_entry bencode_module_entry;

zend_container.h

@@ -51,6 +51,11 @@ class zend_container {
         ZVAL_OBJ(new_object, Z_OBJ_P(object)->handlers->clone_obj(object));
         return Z_OBJ_P(new_object);
     }
+    static char * get_cstring(std::string cppstring) {
+        char *result = (char *)emalloc(cppstring.length());
+        strcpy(result, cppstring.c_str());
+        return result;
+    }
 };
 
 #endif