X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali-toolkit%2Finternal%2Fbuilder%2Fbuilder-filesystem.h;h=2222d1bd7f430700aff45964ff3a6885a01b43cd;hb=HEAD;hp=75e9d286091b7e4e977bb2b6ca8a3b89c5e64eb0;hpb=acbe10c62c46a30c58e08d8971a736f04e68dbf8;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/builder/builder-filesystem.h b/dali-toolkit/internal/builder/builder-filesystem.h
old mode 100755
new mode 100644
index 75e9d28..5e032a0
--- a/dali-toolkit/internal/builder/builder-filesystem.h
+++ b/dali-toolkit/internal/builder/builder-filesystem.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_BUILDER_FILESYSTEM_H
 
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,43 +19,24 @@
  */
 
 // EXTERNAL INCLUDES
-#include <string>
 #include <fstream>
 #include <sstream>
+#include <string>
 
-#include <wordexp.h>
 #include <stdio.h>
-#include <unistd.h>
 
-inline std::string ExpandPath(const std::string &name)
+#include <dali/devel-api/adaptor-framework/file-loader.h>
+
+inline std::string GetFileContents(const std::string& fn)
 {
-  wordexp_t p;
-  char** w;
-  wordexp( name.c_str(), &p, 0 );
-  w = p.we_wordv;
-  std::stringstream s;
-  for (size_t i=0; i<p.we_wordc;i++ )
+  std::streampos     bufferSize = 0;
+  Dali::Vector<char> fileBuffer;
+  if(!Dali::FileLoader::ReadFile(fn, bufferSize, fileBuffer, Dali::FileLoader::FileType::BINARY))
   {
-    s << w[i];
+    return std::string();
   }
-  wordfree( &p );
-  return s.str();
-}
-
 
-inline std::string ExePath(void)
-{
-  char buf[256];
-  ssize_t len = readlink("/proc/self/exe", buf, sizeof(buf) - 1);
-  len = len > 0 ? len : 0;
-  buf[len] = '\0';
-  return std::string(buf);
-}
-
-inline std::string GetFileContents(const std::string &fn)
-{
-  std::ifstream t(fn.c_str());
-  return std::string((std::istreambuf_iterator<char>(t)), std::istreambuf_iterator<char>());
+  return std::string(&fileBuffer[0], bufferSize);
 }
 
 #endif // DALI_TOOLKIT_INTERNAL_BUILDER_FILESYSTEM_H