xenstore: fix canonicalize for metanodes

Signed-off-by: Tim Deegan <Tim.Deegan@citrix.com>
xen-unstable changeset:   17418:506c21c5c55547b9445b4f97428e40b5abc7feaa
xen-unstable date:        Wed Apr 09 15:59:54 2008 +0100

diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c
index d4c4620f36f3357ff5e9bee5734fcce7fb9ca9b5..32af808ebb3bbce8c1e43038364b3e80e93e2078 100644 (file)
--- a/tools/xenstore/xenstored_core.c
+++ b/tools/xenstore/xenstored_core.c
@@ -690,7 +690,7 @@ char *canonicalize(struct connection *conn, const char *node)
 {
        const char *prefix;
 
-       if (!node || strstarts(node, "/"))
+       if (!node || (node[0] == '/') || (node[0] == '@'))
                return (char *)node;
        prefix = get_implicit_path(conn);
        if (prefix)

diff --git a/tools/xenstore/xenstored_watch.c b/tools/xenstore/xenstored_watch.c
index 5fa8bbbe226cf42ec2e14525b338767c8499323f..f5692f83e5763572559e4b5fdac50d3d450b51ad 100644 (file)
--- a/tools/xenstore/xenstored_watch.c
+++ b/tools/xenstore/xenstored_watch.c
@@ -170,7 +170,7 @@ void do_unwatch(struct connection *conn, struct buffered_data *in)
                return;
        }
 
-       node = strstarts(vec[0], "@") ? vec[0] : canonicalize(conn, vec[0]);
+       node = canonicalize(conn, vec[0]);
        list_for_each_entry(watch, &conn->watches, list) {
                if (streq(watch->node, node) && streq(watch->token, vec[1])) {
                        list_del(&watch->list);