Changeset 3803

Timestamp:

May 12, 2019, 7:35:25 AM (4 years ago)

Author:

Peter

Message:

implement wrapper function around getcwd. closes #921.

Location:

trunk

Files:

• test/utility.cc (modified) (3 diffs)
• yat/utility/utility.cc (modified) (1 diff)
• yat/utility/utility.h (modified) (1 diff)

trunk/test/utility.cc

@@ -60 +60 @@
 void test_fnmatch(test::Suite& suite);
 bool test_fnmatch(bool, std::string, std::string);
+void test_getcwd(test::Suite& suite);
 void test_remove(test::Suite& suite);
 void test_rename(test::Suite& suite);
@@ -236 +237 @@
   test_dirname(suite);
   test_fnmatch(suite);
+  test_getcwd(suite);
   test_remove(suite);
   test_rename(suite);
@@ -760 +762 @@
 
 
+void test_getcwd(test::Suite& suite)
+{
+  std::string cwd = utility::getcwd();
+  suite.out() << "cwd: " << cwd << "\n";
+  if (cwd.find("/test/testSubDir/") == std::string::npos) {
+    suite.add(false);
+    suite.err() << "error: cwd: expect path to contain 'test/testSubDir/'\n";
+  }
+}
+
+
 void test_remove(test::Suite& suite)
 {

trunk/yat/utility/utility.cc

@@ -127 +127 @@
     }
     return false;
+  }
+
+
+  std::string getcwd(void)
+  {
+    char buffer[256];
+    if (::getcwd(buffer, 256))
+      return std::string(buffer);
+    if (errno == ERANGE) {
+      char buffer2[4096];
+      if (::getcwd(buffer2, 4096))
+        return std::string(buffer2);
+    }
+    throw errno_error("getcwd failed: ");
+    return "";
   }
 

trunk/yat/utility/utility.h

@@ -191 +191 @@
   bool fnmatch(const std::string& pattern, const std::string& str,
                int flags=0);
+
+  /**
+     \brief current directory
+
+     \see ​https://linux.die.net/man/3/getcwd
+
+     \since New in yat 0.17
+   */
+  std::string getcwd(void);
 
   /**