Fixed TC-1693. Added missing slash for vconf dirs

Change-Id: I223451b8449dd2f7b973519244c5e8b6944c01dd
Signed-off-by: John L. Whiteman <john.l.whiteman@intel.com>

diff --git a/packaging/vconf.changes b/packaging/vconf.changes
index f2806d01ab78d5e2dd92dc48ffe3df9602a2e329..8c96ecb995f7f912a3ee3a2a23a03276f96f3a45 100644 (file)
--- a/packaging/vconf.changes
+++ b/packaging/vconf.changes
@@ -1,4 +1,7 @@
-* Wed Sep 25 2013 Chengwei Yang <chengwei.yang@intel.com>
+* Tue Sep 23 2014 John L. Whiteman <john.l.whiteman@intel.com> accepted/tizen/ivi/20140701.103253-1-gc0a0af7
+- Fixed TC-1693.  Added missing slash for vconf dirs
+
+* Wed Sep 25 2013 Chengwei Yang <chengwei.yang@intel.com> None
 - Fix can not write memory backend key at image creation stage
 
 * Fri Sep 20 2013 Anas Nashif <anas.nashif@intel.com> accepted/tizen/20130913.063407@c8eb1a2

diff --git a/vconf.c b/vconf.c
index 382861f4bd273358f013bbcff6f346857413a8ca..6c5f1f9bd69f3bd32183369859708a5b271aa674 100755 (executable)
--- a/vconf.c
+++ b/vconf.c
@@ -605,9 +605,9 @@ int _vconf_get_key_prefix(const char *keyname, int *prefix)
 int _vconf_get_key_path(const char *keyname, char *path)
 {
        if (strncmp(keyname, BACKEND_DB_PREFIX, strlen(BACKEND_DB_PREFIX)) == 0) {
-               snprintf(path, VCONF_KEY_PATH_LEN, "%s%s", BACKEND_SYSTEM_DIR, keyname);
+               snprintf(path, VCONF_KEY_PATH_LEN, "%s/%s", BACKEND_SYSTEM_DIR, keyname);
        } else if (0 == strncmp(keyname, BACKEND_FILE_PREFIX, strlen(BACKEND_FILE_PREFIX))) {
-               snprintf(path, VCONF_KEY_PATH_LEN, "%s%s", BACKEND_SYSTEM_DIR, keyname);
+               snprintf(path, VCONF_KEY_PATH_LEN, "%s/%s", BACKEND_SYSTEM_DIR, keyname);
        } else if (0 == strncmp(keyname, BACKEND_MEMORY_PREFIX, strlen(BACKEND_MEMORY_PREFIX))) {
                snprintf(path, VCONF_KEY_PATH_LEN, "%s%s", BACKEND_MEMORY_DIR, keyname);
        } else {
@@ -631,7 +631,7 @@ int _vconf_get_backup_path(const char *keyname, char *path)
                        key_buf[i] = keyname[i];
        }
 
-       snprintf(path, VCONF_KEY_PATH_LEN, "%s%s%s%s", BACKEND_SYSTEM_DIR, BACKEND_DB_PREFIX, ".backup/", key_buf);
+       snprintf(path, VCONF_KEY_PATH_LEN, "%s/%s%s%s", BACKEND_SYSTEM_DIR, BACKEND_DB_PREFIX, ".backup/", key_buf);
 
        return VCONF_OK;
 }