From ca6dd8e7ac91c7f8e3b4d55206d4f39791ab7149 Mon Sep 17 00:00:00 2001
From: Pavel Březina <pbrezina@redhat.com>
Date: Tue, 16 Dec 2014 15:25:38 +0100
Subject: sbus: add sbus_opath_get_object_name()

This function assumes that the last component of the object path
is an object name. It will return the part unescaped.

Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
---
 src/responder/ifp/ifp_components.c | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

(limited to 'src/responder/ifp/ifp_components.c')

diff --git a/src/responder/ifp/ifp_components.c b/src/responder/ifp/ifp_components.c
index 5847a767d..fbccc7e4b 100644
--- a/src/responder/ifp/ifp_components.c
+++ b/src/responder/ifp/ifp_components.c
@@ -85,8 +85,7 @@ static errno_t check_and_get_component_from_path(TALLOC_CTX *mem_ctx,
                                                  char **_name)
 {
     enum component_type type;
-    const char *name = NULL;
-    char *safe_name = NULL;
+    char *name = NULL;
     errno_t ret;
 
     if (confdb == NULL || path == NULL) {
@@ -95,13 +94,17 @@ static errno_t check_and_get_component_from_path(TALLOC_CTX *mem_ctx,
 
     if (strcmp(path, PATH_MONITOR) == 0) {
         type = COMPONENT_MONITOR;
-        name = "monitor";
+        name = talloc_strdup(mem_ctx, "monitor");
+        if (name == NULL) {
+            ret = ENOMEM;
+            goto done;
+        }
     } else {
-        name = sbus_opath_strip_prefix(path, PATH_RESPONDERS "/");
+        name = sbus_opath_get_object_name(mem_ctx, path, PATH_RESPONDERS);
         if (name != NULL) {
             type = COMPONENT_RESPONDER;
         } else {
-            name = sbus_opath_strip_prefix(path, PATH_BACKENDS "/");
+            name = sbus_opath_get_object_name(mem_ctx, path, PATH_BACKENDS);
             if (name != NULL) {
                 type = COMPONENT_BACKEND;
             } else {
@@ -116,24 +119,18 @@ static errno_t check_and_get_component_from_path(TALLOC_CTX *mem_ctx,
         goto done;
     }
 
-    safe_name = sbus_opath_unescape_part(mem_ctx, name);
-    if (safe_name == NULL) {
-        ret = ENOMEM;
-        goto done;
-    }
-
     switch (type) {
     case COMPONENT_MONITOR:
         /* noop */
         break;
     case COMPONENT_RESPONDER:
-        if (!responder_exists(safe_name)) {
+        if (!responder_exists(name)) {
             ret = ENOENT;
             goto done;
         }
         break;
     case COMPONENT_BACKEND:
-        if (!backend_exists(confdb, safe_name)) {
+        if (!backend_exists(confdb, name)) {
             ret = ENOENT;
             goto done;
         }
@@ -145,7 +142,7 @@ static errno_t check_and_get_component_from_path(TALLOC_CTX *mem_ctx,
     }
 
     if (_name != NULL) {
-        *_name = safe_name;
+        *_name = name;
     }
 
     ret = EOK;
-- 
cgit