Replace sprintf() with snprintf(), fixes compile warnings on OpenBSD.

And compile errors on recent MinGW.

8 files changed, 32 insertions, 29 deletions

diff --git a/bin/bbackupd/BackupDaemon.cpp b/bin/bbackupd/BackupDaemon.cpp
index 32b7b2d6..bd2c179b 100644
--- a/bin/bbackupd/BackupDaemon.cpp
+++ b/bin/bbackupd/BackupDaemon.cpp
@@ -2047,14 +2047,18 @@ void BackupDaemon::WaitOnCommandSocket(box_time_t RequiredDelay, bool &DoSyncFla
 					
 					// Send a header line summarising the configuration and current state
 					const Configuration &conf(GetConfiguration());
-					char summary[256];
-					int summarySize = sprintf(summary, "bbackupd: %d %d %d %d\nstate %d\n",
-						conf.GetKeyValueBool("AutomaticBackup"),
-						conf.GetKeyValueInt("UpdateStoreInterval"),
-						conf.GetKeyValueInt("MinimumFileAge"),
-						conf.GetKeyValueInt("MaxUploadWait"),
-						mState);
-					mapCommandSocketInfo->mpConnectedSocket->Write(summary, summarySize);
+					std::ostringstream hello;
+					hello << "bbackupd: " << 
+						(conf.GetKeyValueBool("AutomaticBackup") ? 1 : 0) 
+						<< " " <<
+						conf.GetKeyValueInt("UpdateStoreInterval") 
+						<< " " <<
+						conf.GetKeyValueInt("MinimumFileAge") 
+						<< " " <<
+						conf.GetKeyValueInt("MaxUploadWait") 
+						<< "\nstate " << mState << "\n";
+					mapCommandSocketInfo->mpConnectedSocket->Write(
+						hello.str());
 					
 					// Set the timeout to something very small, so we don't wait too long on waiting
 					// for any incoming data
@@ -2965,11 +2969,8 @@ void BackupDaemon::SetState(int State)
 	// If there's a command socket connected, then inform it -- disconnecting from the
 	// command socket if there's an error
 
-	char newState[64];
-	sprintf(newState, "state %d", State);
-	std::string message = newState;
-
-	message += "\n";
+	std::ostringstream msg;
+	msg << "state " << State << "\n";
 
 	if(!mapCommandSocketInfo.get())
 	{
@@ -2984,8 +2985,7 @@ void BackupDaemon::SetState(int State)
 	// Something connected to the command socket, tell it about the new state
 	try
 	{
-		mapCommandSocketInfo->mpConnectedSocket->Write(message.c_str(),
-			message.length());
+		mapCommandSocketInfo->mpConnectedSocket->Write(msg.str());
 	}
 	catch(ConnectionException &ce)
 	{
diff --git a/lib/backupstore/BackupStoreAccountDatabase.cpp b/lib/backupstore/BackupStoreAccountDatabase.cpp
index 201491a3..c5f012fc 100644
--- a/lib/backupstore/BackupStoreAccountDatabase.cpp
+++ b/lib/backupstore/BackupStoreAccountDatabase.cpp
@@ -247,7 +247,8 @@ void BackupStoreAccountDatabase::Write()
 		{
 			// Write out the entry
 			char line[256];	// more than enough for a couple of integers in string form
-			int s = ::sprintf(line, "%x:%d\n", i->second.GetID(), i->second.GetDiscSet());
+			int s = ::snprintf(line, sizeof(line), "%x:%d\n", 
+				i->second.GetID(), i->second.GetDiscSet());
 			if(::write(file, line, s) != s)
 			{
 				THROW_EXCEPTION(CommonException, OSFileError)
diff --git a/lib/backupstore/BackupStoreAccounts.cpp b/lib/backupstore/BackupStoreAccounts.cpp
index 22628017..7bfa029d 100644
--- a/lib/backupstore/BackupStoreAccounts.cpp
+++ b/lib/backupstore/BackupStoreAccounts.cpp
@@ -158,9 +158,9 @@ void BackupStoreAccounts::GetAccountRoot(int32_t ID, std::string &rRootDirOut, i
 std::string BackupStoreAccounts::MakeAccountRootDir(int32_t ID, int DiscSet)
 {
 	char accid[64];	// big enough!
-	::sprintf(accid, "%08x" DIRECTORY_SEPARATOR, ID);
-	return std::string(std::string(BOX_RAIDFILE_ROOT_BBSTORED 
-		DIRECTORY_SEPARATOR) + accid);
+	::snprintf(accid, sizeof(accid) - 1, "%08x" DIRECTORY_SEPARATOR, ID);
+	return std::string(BOX_RAIDFILE_ROOT_BBSTORED DIRECTORY_SEPARATOR) + 
+		accid;
 }
 
 
diff --git a/lib/backupstore/BackupStoreCheck.cpp b/lib/backupstore/BackupStoreCheck.cpp
index 33660ffc..5f1b90d1 100644
--- a/lib/backupstore/BackupStoreCheck.cpp
+++ b/lib/backupstore/BackupStoreCheck.cpp
@@ -474,7 +474,8 @@ void BackupStoreCheck::CheckObjectsDir(int64_t StartID)
 		{
 			// Check the object is OK, and add entry
 			char leaf[8];
-			::sprintf(leaf, DIRECTORY_SEPARATOR "o%02x", i);
+			::snprintf(leaf, sizeof(leaf),
+				DIRECTORY_SEPARATOR "o%02x", i);
 			if(!CheckAndAddObject(StartID | i, dirName + leaf))
 			{
 				// File was bad, delete it
diff --git a/lib/backupstore/BackupStoreCheck2.cpp b/lib/backupstore/BackupStoreCheck2.cpp
index e5728fa9..13831a09 100644
--- a/lib/backupstore/BackupStoreCheck2.cpp
+++ b/lib/backupstore/BackupStoreCheck2.cpp
@@ -356,7 +356,7 @@ void BackupStoreDirectoryFixer::InsertObject(int64_t ObjectID, bool IsDirectory,
 	{
 		// Directory -- simply generate a name for it.
 		char name[32];
-		::sprintf(name, "dir%08x", lostDirNameSerial);
+		::snprintf(name, sizeof(name), "dir%08x", lostDirNameSerial);
 		objectStoreFilename.SetAsClearFilename(name);
 	}
 	else
@@ -447,7 +447,7 @@ int64_t BackupStoreCheck::GetLostAndFoundDirID()
 	while(true)
 	{
 		char name[32];
-		::sprintf(name, "lost+found%d", n++);
+		::snprintf(name, sizeof(name), "lost+found%d", n++);
 		lostAndFound.SetAsClearFilename(name);
 		if(!dir.NameInUse(lostAndFound))
 		{
diff --git a/lib/backupstore/BackupStoreContext.cpp b/lib/backupstore/BackupStoreContext.cpp
index 3769344b..22239532 100644
--- a/lib/backupstore/BackupStoreContext.cpp
+++ b/lib/backupstore/BackupStoreContext.cpp
@@ -165,7 +165,7 @@ bool BackupStoreContext::AttemptToGetWriteLock()
 	{
 		// The housekeeping process might have the thing open -- ask it to stop
 		char msg[256];
-		int msgLen = sprintf(msg, "r%x\n", mClientID);
+		int msgLen = snprintf(msg, sizeof(msg), "r%x\n", mClientID);
 		// Send message
 		mpHousekeeping->SendMessageToHousekeepingProcess(msg, msgLen);
 
diff --git a/lib/backupstore/BackupStoreFileDiff.cpp b/lib/backupstore/BackupStoreFileDiff.cpp
index fd186e7c..1d83d854 100644
--- a/lib/backupstore/BackupStoreFileDiff.cpp
+++ b/lib/backupstore/BackupStoreFileDiff.cpp
@@ -1042,9 +1042,11 @@ static void GenerateRecipe(BackupStoreFileEncodeStream::Recipe &rRecipe, BlocksA
 			{
 				char b[64];
 #ifdef WIN32
-				sprintf(b, "%8I64d", (int64_t)(rRecipe[e].mpStartBlock - pIndex));
+				snprintf(b, sizeof(b), "%8I64d", (int64_t)
+					(rRecipe[e].mpStartBlock - pIndex));
 #else
-				sprintf(b, "%8lld", (int64_t)(rRecipe[e].mpStartBlock - pIndex));
+				snprintf(b, sizeof(b), "%8lld", (int64_t)
+					(rRecipe[e].mpStartBlock - pIndex));
 #endif
 				BOX_TRACE(std::setw(8) <<
 					rRecipe[e].mSpaceBefore <<
diff --git a/lib/server/Daemon.cpp b/lib/server/Daemon.cpp
index 521787f8..4715befa 100644
--- a/lib/server/Daemon.cpp
+++ b/lib/server/Daemon.cpp
@@ -567,7 +567,7 @@ int Daemon::Main(const std::string &rConfigFileName)
 		// Write PID to file
 		char pid[32];
 
-		int pidsize = sprintf(pid, "%d", (int)getpid());
+		int pidsize = snprintf(pid, sizeof(pid), "%d", (int)getpid());
 
 		if(::write(pidFile, pid, pidsize) != pidsize)
 		{
@@ -579,9 +579,8 @@ int Daemon::Main(const std::string &rConfigFileName)
 		// Set up memory leak reporting
 		#ifdef BOX_MEMORY_LEAK_TESTING
 		{
-			char filename[256];
-			sprintf(filename, "%s.memleaks", DaemonName());
-			memleakfinder_setup_exit_report(filename, DaemonName());
+			memleakfinder_setup_exit_report(std::string(DaemonName()) +
+				".memleaks", DaemonName());
 		}
 		#endif // BOX_MEMORY_LEAK_TESTING