From 37d8fc8fedcb4a6d6ed66f4105f425a19c150b5a Mon Sep 17 00:00:00 2001
From: Anas Nashif <anas.nashif@intel.com>
Date: Sun, 24 Mar 2013 19:27:55 -0700
Subject: [PATCH] Rebase for iniparser 3.2

Change-Id: I825fe7baf6d7862dde3adafa12fa219fbdbf8da9
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
---
 Makefile                     |  2 +-
 packaging/iniparser.changes  |  6 ++++
 packaging/iniparser.manifest |  5 ++++
 packaging/iniparser.spec     | 68 ++++++++++++++++++++++++++++++++++++++++++++
 src/iniparser.c              | 18 ++++++------
 src/iniparser.h              |  5 ++--
 6 files changed, 91 insertions(+), 13 deletions(-)
 create mode 100644 packaging/iniparser.changes
 create mode 100644 packaging/iniparser.manifest
 create mode 100644 packaging/iniparser.spec

diff --git a/Makefile b/Makefile
index 04d333f..d103be3 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ ARFLAGS = rcv
 
 SHLD = ${CC} ${CFLAGS}
 LDSHFLAGS = -shared -Wl,-Bsymbolic
-LDFLAGS += -Wl,-rpath -Wl,/usr/lib -Wl,-rpath,/usr/lib
+LDFLAGS = 
 
 # Set RANLIB to ranlib on systems that require it (Sun OS < 4, Mac OSX)
 # RANLIB  = ranlib
diff --git a/packaging/iniparser.changes b/packaging/iniparser.changes
new file mode 100644
index 0000000..244901c
--- /dev/null
+++ b/packaging/iniparser.changes
@@ -0,0 +1,6 @@
+* Tue Jan 21 2014 Łukasz Stelmach <l.stelmach@samsung.com> upstream/3.1@6fd23e7
+- Import upstream version 3.1
+
+* Thu Apr 04 2013 Anas Nashif <anas.nashif@intel.com> upstream/2.17@9523f21
+- Initial import
+
diff --git a/packaging/iniparser.manifest b/packaging/iniparser.manifest
new file mode 100644
index 0000000..017d22d
--- /dev/null
+++ b/packaging/iniparser.manifest
@@ -0,0 +1,5 @@
+<manifest>
+ <request>
+    <domain name="_"/>
+ </request>
+</manifest>
diff --git a/packaging/iniparser.spec b/packaging/iniparser.spec
new file mode 100644
index 0000000..25dae67
--- /dev/null
+++ b/packaging/iniparser.spec
@@ -0,0 +1,68 @@
+Name:           iniparser
+Version:        4.0
+Release:        0
+License:        MIT
+Summary:        Stand-alone ini file parsing library
+Url:            http://ndevilla.free.fr/iniparser/
+Group:          System/Libraries
+Source:         http://ndevilla.free.fr/iniparser/iniparser-%{version}.tar.gz
+Source1001:     %{name}.manifest
+
+%description
+iniparser is a free stand-alone ini file parsing library.
+It is written in portable ANSI C and should compile anywhere.
+iniparser is distributed under an MIT license.
+
+%package devel
+Summary:        Development tools for stand-alone ini file parsing library
+Group:          Development/Libraries
+Requires:       %{name} = %{version}
+
+%description devel
+This package contains the header files and development documentation
+for %{name}. If you like to develop programs using %{name}, you will need
+to install %{name}-devel.
+
+%prep
+%setup -q -n iniparser
+cp %{SOURCE1001} .
+
+%build
+%__make prefix=%{_prefix}  %{?_smp_mflags} CFLAGS="%{optflags} -fPIC"
+
+%install
+
+mkdir -p %{buildroot}/%{_libdir}
+install -m 755 libiniparser.so.0 %{buildroot}/%{_libdir}
+ln -s libiniparser.so.0 %{buildroot}/%{_libdir}/libiniparser.so
+mkdir -p %{buildroot}/%{_includedir}
+install -m 644 src/*.h %{buildroot}/%{_includedir}
+install -m 644 src/*.h %{buildroot}/%{_includedir}
+mkdir -p %{buildroot}/%{_libdir}/pkgconfig
+cat > %{buildroot}/%{_libdir}/pkgconfig/%{name}.pc <<EOF
+prefix = %{_prefix}
+exec_prefix = %{_exec_prefix}
+libdir = %{_libdir}
+includedir = %{_includedir}
+
+Name : iniparser
+Description : a free stand-alone ini file parsing library.
+Version : %{version}
+Libs : -L\${libdir} -liniparser
+Cflags : -I\${includedir}
+
+EOF
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%manifest %{name}.manifest
+%license LICENSE
+%{_libdir}/*.so.*
+
+%files devel
+%manifest %{name}.manifest
+%{_includedir}/*.h
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
diff --git a/src/iniparser.c b/src/iniparser.c
index 0a8e4ba..b01614f 100644
--- a/src/iniparser.c
+++ b/src/iniparser.c
@@ -317,7 +317,7 @@ int iniparser_getsecnkeys(dictionary * d, char * s)
   This function returns NULL in case of error.
  */
 /*--------------------------------------------------------------------------*/
-char ** iniparser_getseckeys(dictionary * d, char * s)
+char ** iniparser_getseckeys(const dictionary * d, const char * s, const char ** keys)
 {
 
     char **keys;
@@ -349,9 +349,8 @@ char ** iniparser_getseckeys(dictionary * d, char * s)
             i++;
         }
     }
-    free(keym);
-    return keys;
 
+    return (char**)keys;
 }
 
 /*-------------------------------------------------------------------------*/
@@ -369,18 +368,17 @@ char ** iniparser_getseckeys(dictionary * d, char * s)
   the dictionary, do not free or modify it.
  */
 /*--------------------------------------------------------------------------*/
-char * iniparser_getstring(dictionary * d, const char * key, char * def)
+char * iniparser_getstring(const dictionary * d, const char * key, const char * def)
 {
-    char * lc_key ;
+    const char * lc_key ;
     char * sval ;
+    char tmp_str[ASCIILINESZ+1];
 
     if (d==NULL || key==NULL)
-        return def ;
+        return (char*)def ;
 
-    lc_key = xstrdup(key);
-    strlwc(lc_key);
-    sval = dictionary_get(d, lc_key, def);
-    free(lc_key);
+    lc_key = strlwc(key, tmp_str, sizeof(tmp_str));
+    sval = (char*)dictionary_get(d, lc_key, def);
     return sval ;
 }
 
diff --git a/src/iniparser.h b/src/iniparser.h
index 153ad07..11aa794 100644
--- a/src/iniparser.h
+++ b/src/iniparser.h
@@ -139,7 +139,8 @@ int iniparser_getsecnkeys(dictionary * d, char * s);
   This function returns NULL in case of error.
  */
 /*--------------------------------------------------------------------------*/
-char ** iniparser_getseckeys(dictionary * d, char * s);
+char ** iniparser_getseckeys(const dictionary * d, const char * s, const char ** keys);
+
 
 /*-------------------------------------------------------------------------*/
 /**
@@ -156,7 +157,7 @@ char ** iniparser_getseckeys(dictionary * d, char * s);
   the dictionary, do not free or modify it.
  */
 /*--------------------------------------------------------------------------*/
-char * iniparser_getstring(dictionary * d, const char * key, char * def);
+char * iniparser_getstring(const dictionary * d, const char * key, const char * def);
 
 /*-------------------------------------------------------------------------*/
 /**
-- 
2.7.4