Imported Upstream version 3.3.3

[debian/amanda] / perl / amglue / ghashtable.c

diff --git a/perl/amglue/ghashtable.c b/perl/amglue/ghashtable.c
index 6ef2e94a45f058bf565266cd657efea527ec6779..155446feb35696892c8b1af74301caed9080abd0 100644 (file)
--- a/perl/amglue/ghashtable.c
+++ b/perl/amglue/ghashtable.c
@@ -1,9 +1,10 @@
 /*
- * Copyright (c) 2007,2008,2009 Zmanda, Inc.  All Rights Reserved.
+ * Copyright (c) 2007-2012 Zmanda, Inc.  All Rights Reserved.
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
+ * This program 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 2
+ * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -21,6 +22,11 @@
 #include "amglue.h"
 #include "conffile.h"
 
+/* PERL_MAGIC_tied is not defined in perl 5.6 */
+#if !defined PERL_MAGIC_tied
+#define PERL_MAGIC_tied 'P'
+#endif
+
 static void 
 foreach_fn(gpointer key_p, gpointer value_p, gpointer user_data_p)
 {
@@ -75,6 +81,7 @@ foreach_fn_property(gpointer key_p, gpointer value_p, gpointer user_data_p)
     HV         *hv = user_data_p;
     AV         *list = newAV();
     HV         *property_hv = newHV();
+    SV         *val;
 
     hv_store(property_hv, "append", strlen("append"), newSViv(property->append), 0);
     hv_store(property_hv, "priority", strlen("priority"), newSViv(property->priority), 0);
@@ -83,14 +90,26 @@ foreach_fn_property(gpointer key_p, gpointer value_p, gpointer user_data_p)
     }
     hv_store(property_hv, "values", strlen("values"), newRV_noinc((SV*)list), 0);
 
-    hv_store(hv, key, strlen(key), newRV_noinc((SV*)property_hv), 0);
+    val = newRV_noinc((SV*)property_hv);
+    hv_store(hv, key, strlen(key), val, 0);
+    mg_set(val);
+    SvREFCNT_dec(val);
 }
 
 SV *
 g_hash_table_to_hashref_property(GHashTable *hash)
 {
-    HV *hv = (HV *)sv_2mortal((SV *)newHV());
+    HV *hv;
+    HV *stash;
+    SV *tie;
+
+    hv = newHV();
+    tie = newRV_noinc((SV*)newHV());
+    stash = gv_stashpv("Amanda::Config::FoldingHash", GV_ADD);
+    sv_bless(tie, stash);
+    hv_magic(hv, (GV*)tie, PERL_MAGIC_tied);
 
+    hv = (HV *)sv_2mortal((SV *)hv);
     g_hash_table_foreach(hash, foreach_fn_property, hv);
 
     return newRV((SV *)hv);