From d6ea53ff4a9f4d69d04561eeea41841886a4e838 Mon Sep 17 00:00:00 2001
From: Volker Birk <vb@pep.foundation>
Date: Sun, 7 Aug 2016 18:16:31 +0200
Subject: [PATCH] stringlist converters

---
 src/str_attr.cc | 39 +++++++++++++++++++++++++++++++++++++--
 src/str_attr.hh |  3 +++
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/src/str_attr.cc b/src/str_attr.cc
index 10ec6ed..3421532 100644
--- a/src/str_attr.cc
+++ b/src/str_attr.cc
@@ -76,6 +76,7 @@ namespace pEp {
                     free_stringlist(_sl);
                 }
                 string s = extract_string();
+                s = normalize(s, norm_nfc);
                 _s = stringlist_add(_s, s.c_str());
                 if (!_s) {
                     free_stringlist(_sl);
@@ -120,8 +121,10 @@ namespace pEp {
                     free_stringpair_list(_spl);
 
                 string key = extract_key();
-                string value = extract_value();
-                stringpair_t *pair = new_stringpair(key.c_str(), value.c_str());
+                key = normalize(key, norm_nfc);
+                string _value = extract_value();
+                _value = normalize(_value, norm_nfc);
+                stringpair_t *pair = new_stringpair(key.c_str(), _value.c_str());
                 if (!pair) {
                     free_stringpair_list(_spl);
                     throw bad_alloc();
@@ -136,6 +139,38 @@ namespace pEp {
             free_stringpair_list(spl);
             spl = _spl;
         }
+
+        stringlist_t *to_stringlist(list l)
+        {
+            stringlist_t *result = new_stringlist(NULL);
+            if (!result)
+                throw bad_alloc();
+
+            stringlist_t *_s = result;
+            for (int i=0; i<len(l); i++) {
+                extract< string > extract_string(l[i]);
+                if (!extract_string.check())
+                    free_stringlist(result);
+                string s = extract_string();
+                _s = stringlist_add(_s, s.c_str());
+                if (!_s) {
+                    free_stringlist(result);
+                    throw bad_alloc();
+                }
+            }
+
+            return result;
+        }
+
+        list from_stringlist(stringlist_t *sl)
+        {
+            list result;
+            for (stringlist_t *_sl = sl; _sl && _sl->value; _sl = _sl->next) {
+                string s = _sl->value;
+                result.append(s);
+            }
+            return result;
+        }
     }
 }
 
diff --git a/src/str_attr.hh b/src/str_attr.hh
index 77fd18b..0fa01c9 100644
--- a/src/str_attr.hh
+++ b/src/str_attr.hh
@@ -25,6 +25,9 @@ namespace pEp {
 
         dict strdict_attr(stringpair_list_t *&spl);
         void strdict_attr(stringpair_list_t *&spl, dict value);
+
+        stringlist_t *to_stringlist(list l);
+        list from_stringlist(stringlist_t *sl);
     }
 }