]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
logging: fix normalize_relative
authorColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Wed, 8 Dec 2010 02:41:23 +0000 (18:41 -0800)
committerColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Wed, 8 Dec 2010 02:41:23 +0000 (18:41 -0800)
Signed-off-by: Colin McCabe <colinm@hq.newdream.net>
src/common/DoutStreambuf.cc

index d7cbf99ba76971a14c95eade5589da5a6e83b211..4420fdebeaa10b66b5690902ad7ef8f5409d019d 100644 (file)
@@ -58,9 +58,10 @@ static std::string normalize_relative(const char *from)
   if (from[0] == '/')
     return string(from);
 
-  std::auto_ptr <char> cwd(get_current_dir_name());
+  char c[512];
+  char *cwd = getcwd(c, sizeof(c));
   ostringstream oss;
-  oss << "/" << *cwd << "/" << from;
+  oss << cwd << "/" << from;
   return oss.str();
 }