Changeset 3284

Timestamp:

Jul 9, 2014, 7:38:58 AM (9 years ago)

Author:

Peter

Message:

fixes #804

Location:

branches/0.12-stable

Files:

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

branches/0.12-stable/NEWS

@@ -9 +9 @@
   - Aligner(double, double) is now explicit (see r3207)
   - GetlineIterator(istream&, char) is now explicit (see r3148)
+  - rename(2) and remove(1) are now implemented (bug #804)
 
   A complete list of closed tickets can be found here [[br]]

branches/0.12-stable/test/utility.cc

@@ -58 +58 @@
 void test_fnmatch(test::Suite& suite);
 bool test_fnmatch(bool, std::string, std::string);
+void test_remove(test::Suite& suite);
+void test_rename(test::Suite& suite);
 void test_replace(test::Suite& suite);
 
@@ -218 +220 @@
   test_dirname(suite);
   test_fnmatch(suite);
+  test_remove(suite);
+  test_rename(suite);
   test_replace(suite);
 
@@ -648 +652 @@
 
 
+void test_remove(test::Suite& suite)
+{
+  // at least test linking
+  if (false)
+    utility::remove("foo");
+}
+
+
+void test_rename(test::Suite& suite)
+{
+  // at least test linking
+  if (false)
+    utility::rename("foo", "bar");
+}
+
+
 void test_replace(test::Suite& suite)
 {

branches/0.12-stable/yat/utility/utility.cc

@@ -183 +183 @@
     mkdir_p(dirname(dir), mode);
     mkdir(dir, mode);
+  }
+
+
+  void remove(const std::string& fn)
+  {
+    if (::remove(fn.c_str())) {
+      std::string msg("remove: ");
+      msg += fn;
+      throw errno_error(msg);
+    }
+  }
+
+
+  void rename(const std::string& from, const std::string& to)
+  {
+    if (::rename(from.c_str(), to.c_str())) {
+      std::stringstream ss;
+      ss << "rename" << from << " to " << to << ": ";
+      throw errno_error(ss.str());
+    }
   }
 

branches/0.12-stable/yat/utility/utility.h

@@ -361 +361 @@
      \see http://linux.die.net/man/3/remove
 
-     \since New in yat 0.10
+     \since New in yat 0.12
    */
   void remove(const std::string& fn);
@@ -371 +371 @@
      \see http://linux.die.net/man/3/rename
 
-     \since New in yat 0.10
-   */
-  void rename(const std::string& from, const std::string to);
+     \since New in yat 0.12
+   */
+  void rename(const std::string& from, const std::string& to);
 
   /**