Merge branch '0.5' of git://gitorious.org/mana/mana into 0.5

2 files changed, 5 insertions, 9 deletions

diff --git a/src/utils/mkdir.cpp b/src/utils/mkdir.cpp
index 43f5264e..bd9fd2b1 100644
--- a/src/utils/mkdir.cpp
+++ b/src/utils/mkdir.cpp
@@ -36,17 +36,13 @@
 
 #include "mkdir.h"
 
+/// Create a directory, making leading components first if necessary
 int mkdir_r(const char *pathname) {
-    char tmp[PATH_MAX];
+    size_t len = strlen(pathname);
+    char tmp[len+2];
     char *p;
 
-    if (strlen(pathname) >= PATH_MAX-2)
-        return -1;
-
-    strncpy(tmp, pathname, sizeof(tmp)-1);
-    tmp[PATH_MAX-1] = '\0';
-
-    int len=strlen(tmp);
+    strcpy(tmp, pathname);
 
     // terminate the pathname with '/'
     if (tmp[len-1] != '/') {
diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp
index 9835f88c..1970b062 100644
--- a/src/utils/xml.cpp
+++ b/src/utils/xml.cpp
@@ -149,7 +149,7 @@ namespace XML
             logger->log("Error in unknown xml file on line %d",
                         error->line);
 
-        logger->log(error->message);
+        logger->log("%s", error->message);
 
         // No need to keep errors around
         xmlCtxtResetLastError(error->ctxt);