X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fdatamap.cc;h=ee7de5121a5bbcc0afd9e9f61890f6b6e743b8da;hp=19aaf44c95e788ef85f42fe753dd708810d55c5a;hb=72b941af07bbf2673539ad4eea073e68d3bcbbfc;hpb=572bf1ef8d54ef5a7cba7cdf38515cb16c4c312c

diff --git a/src/datamap.cc b/src/datamap.cc
index 19aaf44..ee7de51 100644
--- a/src/datamap.cc
+++ b/src/datamap.cc
@@ -112,7 +112,7 @@ int datamap_lookup(const char *in, char *buf, int bsz)
 		res = it->second;
 	} else {
 		// try matching with the available mappings
-		res = std::string(in);
+		res = root.empty() ? std::string(in) : root + "/" + std::string(in);
 
 		int num = dmap.size();
 		for(int i=0; i<num; i++) {
@@ -130,7 +130,7 @@ int datamap_lookup(const char *in, char *buf, int bsz)
 	if(buf) {
 		int n = std::min(bsz - 1, (int)res.length());
 		memcpy(buf, res.c_str(), n);
-		buf[bsz - 1] = 0; // make sure it's null-terminated even if it got truncated
+		buf[n] = 0; // make sure it's null-terminated even if it got truncated
 	}
 	return res.length() + 1;
 }