chg: introduce std::make_shared where appropriate

[cassiopeia.git] / src / util.cpp

diff --git a/src/util.cpp b/src/util.cpp
index f3d95c0ad522f3933ab1e7e57bf94d445a28d715..c16ba1c6c8d541164fc5ff7fd540aadb74d1e7fa 100644 (file)
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -14,6 +14,8 @@ void writeFile( const std::string& name, const std::string& content ) {
     file.open( name );
     file << content;
     file.close();
+
+    //! \FIXME: Error checking
 }
 
 std::string readFile( const std::string& name ) {
@@ -25,10 +27,28 @@ std::string readFile( const std::string& name ) {
 }
 
 std::string writeBackFile( const std::string& serial, const std::string& cert, const std::string& keydir ) {
+    errno = 0;
+
     std::string filename = keydir;
-    mkdir( filename.c_str(), 0755 );
+
+    if( 0 != mkdir( filename.c_str(), 0755 ) ) {
+        if( EEXIST != errno ) {
+            return "";
+        }
+
+        //! \FIXME: Check this is a directory
+    }
+
     filename += "/crt";
-    mkdir( filename.c_str(), 0755 );
+
+    if( 0 != mkdir( filename.c_str(), 0755 ) ) {
+        if( EEXIST != errno ) {
+            return "";
+        }
+
+        //! \FIXME: Check this is a directory
+    }
+
     std::string first;
 
     if( serial.length() < 3 ) {
@@ -38,12 +58,21 @@ std::string writeBackFile( const std::string& serial, const std::string& cert, c
     }
 
     filename += "/" + first;
-    mkdir( filename.c_str(), 0755 );
+
+    if( 0 != mkdir( filename.c_str(), 0755 ) ) {
+        if( EEXIST != errno ) {
+            return "";
+        }
+
+        //! \FIXME: Check this is a directory
+    }
+
     filename += "/" + serial + ".crt";
     writeFile( filename, cert );
 
     return filename;
 }
+
 bool isDigit( char c ) {
     return ( c >= '0' ) && ( c <= '9' );
 }
@@ -78,7 +107,7 @@ std::pair<bool, time_t> parseDate( const std::string& date ) {
     std::size_t siz = strftime( check, 11, "%Y-%m-%d", &t );
 
     if( siz != 10 ) {
-        return std::pair<bool, time_t>( false, 0 );
+        return std::pair<bool, time_t>( false, 0 ); // NO-COVERAGE (by contract of strftime)
     }
 
     std::string checkS( check, siz );
@@ -152,3 +181,21 @@ std::pair<bool, time_t> parseYearInterval( std::time_t t, const std::string& dat
         return std::pair<bool, time_t>( false, 0 );
     }
 }
+
+std::shared_ptr<std::ofstream> openLogfile( const std::string name) {
+    struct stat buffer;
+    std::string tname = name;
+    int ctr = 2;
+    while(stat (tname.c_str(), &buffer) == 0) {
+        tname = name + "_" + std::to_string(ctr++);
+    }
+    auto res = std::shared_ptr<std::ofstream>(new std::ofstream( tname ),
+        [](std::ofstream *p){
+            p->close();
+            delete p;
+        });
+    if(! res->good() ){
+        throw std::string("Failed to open file for logging: ") + name;
+    }
+    return res;
+}