From 4a8ae4e27f549b9bef61fd1e32a1e24314407413 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Thu, 12 Apr 2012 14:51:23 -0400
Subject: [PATCH] * #9782: use fstreams instead of fscanf

Does type checking.
---
 daemon/src/fileutils.cpp | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/daemon/src/fileutils.cpp b/daemon/src/fileutils.cpp
index bed4d2ea3..93829c7ed 100644
--- a/daemon/src/fileutils.cpp
+++ b/daemon/src/fileutils.cpp
@@ -31,13 +31,13 @@
 #include <libgen.h>
 #include <dirent.h>
 #include <sys/stat.h>
-#include <cstdio>
+#include <fstream>
 #include <cstdlib>
 #include <signal.h>
 #include <string>
 #include <sstream>
+#include <iostream>
 #include "fileutils.h"
-#include "logger.h"
 
 namespace {
 // returns true if directory exists
@@ -84,38 +84,30 @@ bool create_pidfile()
         return false;
 
     std::string pidfile = path + "/" PIDFILE;
-    FILE *fp = fopen(pidfile.c_str(),"r");
+    std::ifstream is(pidfile.c_str());
 
-    if (fp) {
+    if (is) {
         // PID file exists. Check if the former process is still alive or
         // not. If alive, give user a hint.
         int oldPid;
-
-        if (fscanf(fp, "%d", &oldPid) != 1) {
-            ERROR("Couldn't read pidfile %s", pidfile.c_str());
-            return false;
-        }
-
-        fclose(fp);
+        is >> oldPid;
 
         if (kill(oldPid, 0) == 0) {
-            ERROR("There is already a sflphoned daemon running in the system. Starting Failed.");
+            // Use cerr because logging has not been initialized
+            std::cerr << "There is already a sflphoned daemon running in " <<
+                "the system. Starting Failed." << std::endl;
             return false;
         }
     }
 
     // write pid file
-    fp = fopen(pidfile.c_str(),"w");
+    std::ofstream os(pidfile.c_str());
 
-    if (!fp) {
+    if (!os) {
         perror(pidfile.c_str());
         return false;
     } else {
-        std::ostringstream pidstr;
-        pidstr << getpid();
-
-        fputs(pidstr.str().c_str(), fp);
-        fclose(fp);
+        os << getpid();
     }
 
     return true;
-- 
GitLab