Merge pull request #11 from mdanilov/master

tools: fixed errors

5 files changed, 527 insertions, 69 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..19ca9e1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,99 @@
+# Autotools.gitignore
+
+# http://www.gnu.org/software/automake
+
+Makefile.in
+/ar-lib
+/mdate-sh
+/py-compile
+/test-driver
+/ylwrap
+
+# http://www.gnu.org/software/autoconf
+
+/autom4te.cache
+/autoscan.log
+/autoscan-*.log
+/aclocal.m4
+/compile
+/config.guess
+/config.h.in
+/config.sub
+/configure
+/configure.scan
+/depcomp
+/install-sh
+/missing
+/stamp-h1
+
+# https://www.gnu.org/software/libtool/
+
+/ltmain.sh
+
+# http://www.gnu.org/software/texinfo
+
+/texinfo.tex
+
+# http://www.gnu.org/software/m4/
+
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+autom4te.cache
+
+# C.gitignore
+
+# Prerequisites
+*.d
+
+# Object files
+*.o
+*.ko
+*.obj
+*.elf
+
+# Linker output
+*.ilk
+*.map
+*.exp
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Libraries
+*.lib
+*.a
+*.la
+*.lo
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app
+*.i*86
+*.x86_64
+*.hex
+
+# Debug files
+*.dSYM/
+*.su
+*.idb
+*.pdb
+
+# Kernel Module Compile Results
+*.mod*
+*.cmd
+.tmp_versions/
+modules.order
+Module.symvers
+Mkfile.old
+dkms.conf
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..2099840
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,370 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
+Inc.
+
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
+
+Basic Installation
+==================
+
+   Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+   The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.
+
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package, generally using the just-built uninstalled binaries.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
+
+  6. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you can use GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
+
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+   By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
+Specifying the System Type
+==========================
+
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS
+     KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+   Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf limitation.  Until the limitation is lifted, you can use
+this workaround:
+
+     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+   `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+     Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
+
+`--no-create'
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
diff --git a/README.md b/README.md
index 80ef78a..b309dc5 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,7 @@ Execute the following steps in order to build the component
 * autoreconf –vi
 * configure, with the following options
   * --enable-tests to enable the build of the tests
+  * --enable-tools to enable the build of the tools
   * --enable-pasinterface enable the PAS interface (disabled by default)
   * --enable-appcheck, performs an application check if the using application is a valid/trusted one.
 * make 
diff --git a/tools/persistence_client_tool.c b/tools/persistence_client_tool.c
index 93662d5..f92cf85 100644
--- a/tools/persistence_client_tool.c
+++ b/tools/persistence_client_tool.c
@@ -82,11 +82,11 @@ int readKey(const char * resource_id, unsigned int user, unsigned int seat, unsi
    int numPerRow = 8;
 
    printf("- %s - User: %u - Seat: %u - ldbid: 0x%x\n\n", __FUNCTION__,  user, seat, ldbid);
-   printf("   ResourceID: \"%s\" \n", resource_id);
+   printf("   ResourceID: \"%s\"\n", resource_id);
 
    rval = pclKeyReadData(ldbid, resource_id, user, seat, buffer, size);
    if(rval >=0)
-      printf("   Data      : \"%s \"\n", buffer);
+      printf("   Data      : \"%s\"\n", buffer);
    else
       printf("Failed to read: %d\n", rval);
 
@@ -109,8 +109,8 @@ int writeKey(const char * resource_id, unsigned int user, unsigned int seat, uns
    int numPerRow = 8;
 
    printf("- %s - User: %u - Seat: %u - ldbid: 0x%x\n\n", __FUNCTION__,  user, seat, ldbid);
-   printf("   ResourceID: \"%s\" \n", resource_id);
-   printf("   Data      : \"%s \"\n", buffer);
+   printf("   ResourceID: \"%s\"\n", resource_id);
+   printf("   Data      : \"%s\"\n", buffer);
 
    size = pclKeyWriteData(ldbid, resource_id, user, seat, buffer, (int)strlen((char*)buffer));
 
@@ -148,7 +148,7 @@ int getkeysize(char * resource_id, unsigned int user, unsigned int seat, unsigne
    int rval = 0;
 
    printf("- %s - User: %u - Seat: %u - ldbid: 0x%x\n\n", __FUNCTION__,  user, seat, ldbid);
-   printf("   ResourceID: \"%s\" \n", resource_id);
+   printf("   ResourceID: \"%s\"\n", resource_id);
 
    rval = pclKeyGetSize(ldbid, resource_id,user, seat);
    printf("   KeySize: %d\n", rval);
@@ -291,10 +291,10 @@ int main(int argc, char *argv[])
 		   case 'a':   // application name
 		   {
 		      size_t len = strlen(optarg);
-            appName = malloc(len);
+            appName = malloc(len + 1);
             if(appName != NULL)
             {
-               memset(appName, 0, len);
+               memset(appName, 0, len + 1);
                strncpy(appName, optarg, len);
             }
 		   }
@@ -302,10 +302,10 @@ int main(int argc, char *argv[])
 		   case 'r':   // resource ID
          {
             size_t len = strlen(optarg);
-            resourceID = malloc(len);
+            resourceID = malloc(len + 1);
             if(resourceID != NULL)
             {
-               memset(resourceID, 0, len);
+               memset(resourceID, 0, len + 1);
                strncpy(resourceID, optarg, len);
             }
          }
@@ -313,10 +313,10 @@ int main(int argc, char *argv[])
          case 'p':   // payload to write
          {
             size_t len = strlen(optarg);
-            payloadBuffer = malloc(len);
+            payloadBuffer = malloc(len + 1);
             if(payloadBuffer != NULL)
             {
-               memset(payloadBuffer, 0, len);
+               memset(payloadBuffer, 0, len + 1);
                strncpy(payloadBuffer, optarg, len);
             }
          }
@@ -324,10 +324,10 @@ int main(int argc, char *argv[])
          case 'f':   // filename to read data from, write data to
          {
             size_t len = strlen(optarg);
-            fileName = malloc(len);
+            fileName = malloc(len + 1);
             if(fileName != NULL)
             {
-               memset(fileName, 0, len);
+               memset(fileName, 0, len + 1);
                strncpy(fileName, optarg, len);
             }
          }
@@ -370,14 +370,14 @@ int main(int argc, char *argv[])
          case modeReadKey:
          {
             unsigned char* buffer = NULL;
-            int keysize = pclKeyGetSize(ldbid, resourceID,user_no, seat_no);
+            int keysize = pclKeyGetSize(ldbid, resourceID, user_no, seat_no);
 
             if(keysize > 0)
             {
-               buffer = malloc((size_t)keysize);
+               buffer = malloc((size_t)keysize + 1);
                if(buffer != NULL)
                {
-                  memset(buffer, 0, (size_t)(keysize-1));
+                  memset(buffer, 0, (size_t)(keysize + 1));
                   readKey(resourceID, user_no, seat_no, ldbid, doHexdump, buffer, keysize);
 
                   if(fileName != NULL)
@@ -493,4 +493,3 @@ void printSynopsis()
 	printf("6.) Delete a key:\n");
 	printf("    persistence_client_tool -o deletekey -a MyApplication -r MyKey                 optional parameters: [-l 0xFF -u 0 -s 0]\n");
 }
-
diff --git a/tools/persistence_db_viewer.c b/tools/persistence_db_viewer.c
index 15f20df..40ab828 100644
--- a/tools/persistence_db_viewer.c
+++ b/tools/persistence_db_viewer.c
@@ -8,11 +8,10 @@
  * Mozilla Public License, v. 2.0. If a  copy of the MPL was not distributed
  * with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 ******************************************************************************/
- /**
+/**
  * @file           persistence_db_viewer.c
  * @ingroup        Persistence client library tools
  * @author         Ingo Huerner
-
  *
  * @see
  */
@@ -60,21 +59,21 @@ typedef enum dbType_
 
 
 unsigned int gDbMaskArray[] = {
-      dbTypeNone,
-      dbTypeCached,
-      dbTypeWriteThrough,
-      dbTypeDefault,
-      dbTypeConfDefault,
-      dbTypeRCT
+   dbTypeNone,
+   dbTypeCached,
+   dbTypeWriteThrough,
+   dbTypeDefault,
+   dbTypeConfDefault,
+   dbTypeRCT
 };
 
 const char* gDbNameArray[] = {
-      "none",
-      "cached",
-      "wt",
-      "default",
-      "confDefault",
-      "RCT"
+   "none",
+   "cached",
+   "wt",
+   "default",
+   "confDefault",
+   "RCT"
 };
 
 
@@ -102,15 +101,14 @@ void printDBcontent(const char* appname, dbType type)
    int handle = 0,  listSize = 0, ret = 0;
 
    char* resourceList = NULL;
-   char filename[512] = {0};
+   char filename[512] = { 0 };
 
    static const char* nameTemplate = "/Data/mnt-c/%s/%s";
    static const char* cache   = "cached.itz";
    static const char* wt      = "wt.itz";
    static const char* def     = "default-data.itz";
    static const char* confDef = "configurable-default-data.itz";
-
-   memset(filename, 0, 512-1);
+   static const size_t bufSize = 8192;
 
    printf("---------------------------------------------------------------------\n");
    if(type == dbTypeCached)
@@ -144,40 +142,38 @@ void printDBcontent(const char* appname, dbType type)
    if(handle >= 0)
    {
       listSize = persComDbGetSizeKeysList(handle);
-      if(listSize > 0 && listSize < 2048)
+      if(listSize > 0)
       {
-         resourceList = (char*)malloc((size_t)listSize+4);
-         memset(resourceList, 0, (size_t)listSize+4-1);
+         resourceList = (char*)malloc((size_t)listSize);
+         memset(resourceList, 0, (size_t)listSize);
 
          if(resourceList != NULL)
          {
-            int i = 0, idx = 0, numResources = 0;
-            int resourceStartIdx[256] = {0};
-            char buffer[2048] = {0};
-
-            memset(resourceStartIdx, 0, 256-1);
             ret = persComDbGetKeysList(handle, resourceList, listSize);
-
             if(ret != 0)
             {
-               resourceStartIdx[idx] = 0; // initial start
+               int i = 0, idx = 0, numResources = 0;
+               int resourceStartIdx[256] = { 0 };
+               char buffer[bufSize];
 
-               for(i=1; i<listSize; i++ )
+               for(i = 1; i < listSize; ++i)
                {
-                 if(resourceList[i]  == '\0')
-                 {
-                    numResources++;
-                    resourceStartIdx[idx++] = i+1;
-                 }
+                  if(resourceList[i] == '\0')
+                  {
+                     numResources++;
+                     resourceStartIdx[++idx] = i + 1;
+                  }
                }
 
                printf("NumOf resources: %d \n", numResources);
 
-               for(i=0; i<=numResources; i++)
+               for(i = 0; i < numResources; ++i)
                {
-                  memset(buffer, 0, 1024);
                   printf("Key[%d]: %s\n", i, &resourceList[resourceStartIdx[i]]);
-                  persComDbReadKey(handle,  &resourceList[resourceStartIdx[i]], buffer, 1024);
+
+                  memset(buffer, 0, sizeof(buffer));
+                  persComDbReadKey(handle,  &resourceList[resourceStartIdx[i]], buffer, (int)sizeof(buffer));
+
                   printf(" value: %s\n\n", buffer);
                }
             }
@@ -203,7 +199,6 @@ void printDBcontent(const char* appname, dbType type)
 
 
 
-
 void printRCTcontent(const char* appname, int full)
 {
    int handle = -1, listSize = 0, ret = 0;
@@ -220,29 +215,25 @@ void printRCTcontent(const char* appname, int full)
    if(handle >= 0)
    {
       listSize = persComRctGetSizeResourcesList(handle);
-      if(listSize > 0 && listSize < 2048)
+      if(listSize > 0)
       {
-         resourceList = (char*)malloc((size_t)listSize+4);
-         memset(resourceList, 0, (size_t)listSize+4-1);
+         resourceList = (char*)malloc((size_t)listSize);
+         memset(resourceList, 0, (size_t)listSize);
 
          if(resourceList != NULL)
          {
-            int i = 0, idx = 1, numResources = 0;
-            int resourceStartIdx[256] = {0};
-
-            memset(resourceStartIdx, 0, 256-1);
             ret = persComRctGetResourcesList(handle, resourceList, listSize);
-
             if(ret != 0)
             {
-               resourceStartIdx[idx] = 0; // initial start
+               int i = 0, idx = 0, numResources = 0;
+               int resourceStartIdx[256] = { 0 };
 
-               for(i=1; i<listSize; i++ )
+               for(i = 1; i < listSize; ++i)
                {
                   if(resourceList[i]  == '\0')
                   {
                      numResources++;
-                     resourceStartIdx[idx++] = i+1;
+                     resourceStartIdx[++idx] = i + 1;
                   }
                }
 
@@ -250,7 +241,7 @@ void printRCTcontent(const char* appname, int full)
                printf("RCT keys [%d]: %s \n", numResources, filename);
                printf("---------------------------------------------------------------------\n");
 
-               for(i=0; i<numResources; i++)
+               for(i = 0; i < numResources; ++i)
                {
                   PersistenceConfigurationKey_s psConfig_out;
                   printf("RCT[%d]                    : \"%s\"\n", i, &resourceList[resourceStartIdx[i]]);
@@ -398,6 +389,7 @@ void printAvailableApplication(const char* thePath)
 }
 
 
+
 int main(int argc, char *argv[])
 {
    int ret = 0, opt = 0, printAllAppsContent = -1, listAllApps = -1;
@@ -460,13 +452,11 @@ int main(int argc, char *argv[])
       printAppManual();
    }
 
-
    if(listAllApps == 1)
    {
       printAvailableApplication(persPath);
    }
 
-
    if(printAllAppsContent == 1)
    {
       printAllApplicationDBs(persPath, dbTypeAccum);
@@ -476,7 +466,6 @@ int main(int argc, char *argv[])
       printSingleApplicationDBs(singleAppName, persPath, dbTypeAccum);
    }
 
-
    // unregister debug log and trace
    DLT_UNREGISTER_APP();