Changeset 1790

Timestamp:

03/08/2007 00:29:31 (5 years ago)

Author:

chris

Message:

Convert most printf() and fprintf() calls to use logging framework
instead. (merges [1789])

Location:

box/chris/general

Files:

• bin/bbackupctl/bbackupctl.cpp (modified) (12 diffs)
• bin/bbackupquery/BackupQueries.cpp (modified) (54 diffs)
• bin/bbackupquery/bbackupquery.cpp (modified) (8 diffs)
• bin/bbstoreaccounts/bbstoreaccounts.cpp (modified) (20 diffs)
• lib/backupclient/BackupClientRestore.cpp (modified) (1 diff)
• lib/backupstore/BackupStoreCheck.cpp (modified) (23 diffs)
• lib/backupstore/BackupStoreCheck2.cpp (modified) (9 diffs)
• lib/common/DebugMemLeakFinder.cpp (modified) (1 diff)
• lib/common/Logging.cpp (modified) (2 diffs)
• lib/crypto/Random.cpp (modified) (1 diff)
• lib/raidfile/RaidFileController.cpp (modified) (1 diff)
• lib/server/SSLLib.cpp (modified) (1 diff)
• test/bbackupd/testfiles/extcheck1.pl.in (modified) (1 diff)
• test/bbackupd/testfiles/extcheck2.pl.in (modified) (1 diff)

box/chris/general/bin/bbackupctl/bbackupctl.cpp

@@ -110 +110 @@
 
         // Read in the configuration file
-        if(!quiet) printf("Using configuration file %s\n", 
-                configFilename.c_str());
+        if(!quiet) BOX_NOTICE("Using configuration file " << configFilename);
 
         std::string errs;
@@ -120 +119 @@
         if(config.get() == 0 || !errs.empty())
         {
-                printf("Invalid configuration file:\n%s", errs.c_str());
+                BOX_ERROR("Invalid configuration file: " << errs);
                 return 1;
         }
@@ -129 +128 @@
         if(!conf.KeyExists("CommandSocket"))
         {
-                printf("Daemon isn't using a control socket, "
+                BOX_ERROR("Daemon isn't using a control socket, "
                         "could not execute command.\n"
                         "Add a CommandSocket declaration to the "
-                        "bbackupd.conf file.\n");
+                        "bbackupd.conf file.");
                 return 1;
         }
@@ -154 +153 @@
         catch(...)
         {
-                printf("Failed to connect to daemon control socket.\n"
+                BOX_ERROR("Failed to connect to daemon control socket.\n"
                         "Possible causes:\n"
                         "  * Daemon not running\n"
                         "  * Daemon busy syncing with store server\n"
                         "  * Another bbackupctl process is communicating with the daemon\n"
-                        "  * Daemon is waiting to recover from an error\n"
+                        "  * Daemon is waiting to recover from an error"
                 );
-
-#if defined WIN32 && ! defined NDEBUG
-                BOX_ERROR("Failed to connect to the command socket");
-#endif
 
                 return 1;
@@ -194 +189 @@
                         &updateStoreInterval, &minimumFileAge, &maxUploadWait) != 4)
         {
-                printf("Config summary didn't decode\n");
+                BOX_ERROR("Config summary didn't decode.");
                 return 1;
         }
@@ -200 +195 @@
         if(!quiet)
         {
-                printf("Daemon configuration summary:\n"
-                        "  AutomaticBackup = %s\n"
-                        "  UpdateStoreInterval = %d seconds\n"
-                        "  MinimumFileAge = %d seconds\n"
-                        "  MaxUploadWait = %d seconds\n",
-                        autoBackup?"true":"false", updateStoreInterval, 
-                        minimumFileAge, maxUploadWait);
+                BOX_INFO("Daemon configuration summary:\n"
+                        "  AutomaticBackup = " << 
+                        (autoBackup?"true":"false") << "\n"
+                        "  UpdateStoreInterval = " << updateStoreInterval << 
+                        " seconds\n"
+                        "  MinimumFileAge = " << minimumFileAge << " seconds\n"
+                        "  MaxUploadWait = " << maxUploadWait << " seconds\n");
         }
 
@@ -267 +262 @@
                         if (currentState != 0)
                         {
-                                printf("Waiting for current sync/error state "
-                                        "to finish...\n");
+                                BOX_INFO("Waiting for current sync/error state "
+                                        "to finish...");
                         }
                 }
@@ -311 +306 @@
                                 if(line == "start-sync")
                                 {
-                                        if (!quiet) printf("Sync started...\n");
+                                        if (!quiet) BOX_INFO("Sync started...");
                                         syncIsRunning = true;
                                 }
@@ -318 +313 @@
                                         if (syncIsRunning)
                                         {
-                                                if (!quiet) printf("Sync finished.\n");
+                                                if (!quiet) BOX_INFO("Sync finished.\n");
                                                 // Send a quit command to finish nicely
                                                 connection.Write("quit\n", 5);
@@ -327 +322 @@
                                         else
                                         {
-                                                if (!quiet) printf("Previous sync finished.\n");
+                                                if (!quiet) BOX_INFO("Previous sync finished.");
                                         }
                                         // daemon must still be busy
@@ -341 +336 @@
                                         if(!quiet)
                                         {
-                                                printf("Succeeded.\n");
+                                                BOX_INFO("Succeeded.\n");
                                         }
                                         finished = true;
@@ -347 +342 @@
                                 else if(line == "error")
                                 {
-                                        printf("ERROR. (Check command spelling)\n");
+                                        BOX_ERROR("Check command spelling");
                                         returnCode = 1;
                                         finished = true;

box/chris/general/bin/bbackupquery/BackupQueries.cpp

@@ -182 +182 @@
                                 GetConsoleCP()))
                         {
-                                printf("Failed to convert encoding");
+                                BOX_ERROR("Failed to convert encoding");
                                 return;
                         }
@@ -256 +256 @@
                 if(alias[a] == 0)
                 {
-                        printf("Unrecognised command: %s\n", Command);
+                        BOX_ERROR("Unrecognised command: " << Command);
                         return;
                 }
@@ -276 +276 @@
                         if(::strchr(commands[cmd].opts, *c) == NULL)
                         {
-                                printf("Invalid option '%c' for command %s\n", 
-                                        *c, commands[cmd].name);
+                                BOX_ERROR("Invalid option '" << *c << "' for "
+                                        "command " << commands[cmd].name);
                                 return;
                         }
@@ -306 +306 @@
                 {
                         // Simple implementation, so do it here
-                        printf("%s (%08llx)\n", 
-                                GetCurrentDirectoryName().c_str(), 
-                                (long long)GetCurrentDirectoryID());
+                        BOX_INFO(GetCurrentDirectoryName() << " (" <<
+                                BOX_FORMAT_OBJECTID(GetCurrentDirectoryID()));
                 }
                 break;
@@ -321 +320 @@
                 
         case COMMAND_sh:
-                printf("The command to run must be specified as an argument.\n");
+                BOX_ERROR("The command to run must be specified as an argument.");
                 break;
                 
@@ -402 +401 @@
                 if(rootDir == 0)
                 {
-                        printf("Directory '%s' not found on store\n",
-                                args[0].c_str());
+                        BOX_ERROR("Directory '" << args[0] << "' not found "
+                                "on store.");
                         return;
                 }
@@ -748 +747 @@
         if(args.size() != 1 || args[0].size() == 0)
         {
-                printf("Incorrect usage.\ncd [-o] [-d] <directory>\n");
+                BOX_ERROR("Incorrect usage. cd [-o] [-d] <directory>");
                 return;
         }
@@ -765 +764 @@
         if(id == 0)
         {
-                printf("Directory '%s' not found\n", args[0].c_str());
+                BOX_ERROR("Directory '" << args[0] << "' not found.");
                 return;
         }
@@ -786 +785 @@
         if(args.size() != 1 || args[0].size() == 0)
         {
-                printf("Incorrect usage.\nlcd <local-directory>\n");
+                BOX_ERROR("Incorrect usage. lcd <local-directory>");
                 SetReturnCode(COMMAND_RETURN_ERROR);
                 return;
@@ -796 +795 @@
         if(!ConvertConsoleToUtf8(args[0].c_str(), dirName))
         {
-                printf("Failed to convert path from console encoding.\n");
+                BOX_ERROR("Failed to convert path from console encoding.");
                 SetReturnCode(COMMAND_RETURN_ERROR);
                 return;
@@ -806 +805 @@
         if(result != 0)
         {
-                printf((errno == ENOENT || errno == ENOTDIR)?"Directory '%s' does not exist\n":"Error changing dir to '%s'\n",
-                        args[0].c_str());
+                if(errno == ENOENT || errno == ENOTDIR)
+                {
+                        BOX_ERROR("Directory '" << args[0] << "' does not exist.");
+                }
+                else
+                {
+                        BOX_ERROR("Error changing to directory '" <<
+                                args[0] << ": " << strerror(errno));
+                }
+
                 SetReturnCode(COMMAND_RETURN_ERROR);
                 return;
@@ -816 +823 @@
         if(::getcwd(wd, PATH_MAX) == 0)
         {
-                printf("Error getting current directory\n");
+                BOX_ERROR("Error getting current directory: " <<
+                        strerror(errno));
                 SetReturnCode(COMMAND_RETURN_ERROR);
                 return;
@@ -824 +832 @@
         if(!ConvertUtf8ToConsole(wd, dirName))
         {
-                printf("Failed to convert new path from console encoding.\n");
+                BOX_ERROR("Failed to convert new path from console encoding.");
                 SetReturnCode(COMMAND_RETURN_ERROR);
                 return;
         }
-        printf("Local current directory is now '%s'\n", dirName.c_str());
+        BOX_INFO("Local current directory is now '" << dirName << "'.");
 #else
-        printf("Local current directory is now '%s'\n", wd);
+        BOX_INFO("Local current directory is now '" << wd << "'.");
 #endif
 }
@@ -848 +856 @@
         if(args.size() != 2)
         {
-                printf("Incorrect usage.\ngetobject <object-id> <local-filename>\n");
+                BOX_ERROR("Incorrect usage. getobject <object-id> "
+                        "<local-filename>");
                 return;
         }
@@ -855 +864 @@
         if(id == std::numeric_limits<long long>::min() || id == std::numeric_limits<long long>::max() || id == 0)
         {
-                printf("Not a valid object ID (specified in hex)\n");
+                BOX_ERROR("Not a valid object ID (specified in hex).");
                 return;
         }
@@ -863 +872 @@
         if(::stat(args[1].c_str(), &st) == 0 || errno != ENOENT)
         {
-                printf("The local file %s already exists\n", args[1].c_str());
+                BOX_ERROR("The local file '" << args[1] << " already exists.");
                 return;
         }
@@ -881 +890 @@
                         objectStream->CopyStreamTo(out);
                         
-                        printf("Object ID %08llx fetched successfully.\n", id);
+                        BOX_INFO("Object ID " << BOX_FORMAT_OBJECTID(id) <<
+                                " fetched successfully.");
                 }
                 else
                 {
-                        printf("Object does not exist on store.\n");
+                        BOX_ERROR("Object ID " << BOX_FORMAT_OBJECTID(id) <<
+                                " does not exist on store.");
                         ::unlink(args[1].c_str());
                 }
@@ -892 +903 @@
         {
                 ::unlink(args[1].c_str());
-                printf("Error occured fetching object.\n");
+                BOX_ERROR("Error occured fetching object.");
         }
 }
@@ -912 +923 @@
         if(args.size() < 1 || (opts['i'] && args.size() != 2) || args.size() > 2)
         {
-                printf("Incorrect usage.\n"
+                BOX_ERROR("Incorrect usage.\n"
                         "get <remote-filename> [<local-filename>] or\n"
-                        "get -i <object-id> <local-filename>\n");
+                        "get -i <object-id> <local-filename>");
                 return;
         }
@@ -932 +943 @@
                         if(!ConvertConsoleToUtf8(i->c_str(), out))
                         {
-                                fprintf(stderr, "failed to convert encoding\n");
+                                BOX_ERROR("Failed to convert encoding.");
                                 return;
                         }
@@ -953 +964 @@
                                 if(dirId == 0)
                                 {
-                                        printf("Directory '%s' not found\n", 
-                                                dirName.c_str());
+                                        BOX_ERROR("Directory '" << dirName <<
+                                                "' not found.");
                                         return;
                                 }
@@ -982 +993 @@
                                 fileId == 0)
                         {
-                                printf("Not a valid object ID (specified in hex)\n");
+                                BOX_ERROR("Not a valid object ID (specified in hex).");
                                 return;
                         }
@@ -989 +1000 @@
                         if(dir.FindEntryByID(fileId) == 0)
                         {
-                                printf("ID '%08llx' not found in current "
+                                BOX_ERROR("File ID " << 
+                                        BOX_FORMAT_OBJECTID(fileId) <<
+                                        " not found in current "
                                         "directory on store.\n"
-                                        "(You can only download objects by ID "
-                                        "from the current directory.)\n", 
-                                        fileId);
+                                        "(You can only download files by ID "
+                                        "from the current directory.)");
                                 return;
                         }
@@ -1008 +1020 @@
                         if(en == 0)
                         {
-                                printf("Filename '%s' not found in current "
+                                BOX_ERROR("Filename '" << args[0] << "' "
+                                        "not found in current "
                                         "directory on store.\n"
                                         "(Subdirectories in path not "
-                                        "searched.)\n", args[0].c_str());
+                                        "searched.)");
                                 return;
                         }
@@ -1028 +1041 @@
         if(::stat(localName.c_str(), &st) == 0 || errno != ENOENT)
         {
-                printf("The local file %s already exists, will not "
-                        "overwrite it.\n", localName.c_str());
+                BOX_ERROR("The local file " << localName << " already exists, "
+                        "will not overwrite it.");
                 SetReturnCode(COMMAND_RETURN_ERROR);
                 return;
@@ -1047 +1060 @@
 
                 // Done.
-                printf("Object ID %08llx fetched sucessfully.\n", fileId);
+                BOX_INFO("Object ID " << BOX_FORMAT_OBJECTID(fileId) <<
+                        " fetched successfully.");
         }
         catch (BoxException &e)
@@ -1161 +1175 @@
                 else
                 {
-                        printf("Warning: couldn't determine the time of the last synchronisation -- checks not performed.\n");
+                        BOX_WARNING("Failed to determine the time of the last "
+                                "synchronisation -- checks not performed.");
                 }
         }
@@ -1168 +1183 @@
         if(params.mQuickCompare)
         {
-                printf("WARNING: Quick compare used -- file attributes are not checked.\n");
+                BOX_WARNING("Quick compare used -- file attributes are not "
+                        "checked.");
         }
         
@@ -1193 +1209 @@
                 if(!params.mIgnoreExcludes)
                 {
-                        printf("Cannot use excludes on directory to directory comparison -- use -E flag to specify ignored excludes\n");
+                        BOX_ERROR("Cannot use excludes on directory to directory comparison -- use -E flag to specify ignored excludes.");
                         return;
                 }
@@ -1204 +1220 @@
         else
         {
-                printf("Incorrect usage.\ncompare -a\n or compare -l <location-name>\n or compare <store-dir-name> <local-dir-name>\n");
+                BOX_ERROR("Incorrect usage.\ncompare -a\n or compare -l <location-name>\n or compare <store-dir-name> <local-dir-name>");
                 return;
         }
@@ -1210 +1226 @@
         if (!params.mQuietCompare)
         {       
-                printf("\n[ %d (of %d) differences probably due to file "
-                        "modifications after the last upload ]\n",
-                        params.mDifferencesExplainedByModTime, 
-                        params.mDifferences);
-        }
-
-        printf("Differences: %d (%d dirs excluded, %d files excluded, "
-                "%d files not checked)\n",
-                params.mDifferences, params.mExcludedDirs, 
-                params.mExcludedFiles, params.mUncheckedFiles);
+                BOX_INFO("[ " <<
+                        params.mDifferencesExplainedByModTime << " (of " <<
+                        params.mDifferences << ") differences probably "
+                        "due to file modifications after the last upload ]");
+        }
+
+        BOX_INFO("Differences: " << params.mDifferences << " (" <<
+                params.mExcludedDirs   << " dirs excluded, " <<
+                params.mExcludedFiles  << " files excluded, " <<
+                params.mUncheckedFiles << " files not checked)");
         
         // Set return code?
@@ -1254 +1270 @@
         if(!locations.SubConfigurationExists(rLocation.c_str()))
         {
-                printf("Location %s does not exist.\n", rLocation.c_str());
+                BOX_ERROR("Location " << rLocation << " does not exist.");
                 return;
         }
@@ -1265 +1281 @@
                         DIRECTORY_SEPARATOR_ASCHAR)
                 {
-                        fprintf(stderr, "Warning: location '%s' path ends "
-                                "with '%s', compare may fail!",
-                                rLocation.c_str(), DIRECTORY_SEPARATOR);
+                        BOX_WARNING("Location '" << rLocation << "' path ends "
+                                "with '" DIRECTORY_SEPARATOR "', "
+                                "compare may fail!");
                 }
         }
@@ -1320 +1336 @@
         if(dirID == 0)
         {
-                printf("Local directory '%s' exists, but "
-                        "server directory '%s' does not exist\n", 
-                        rLocalDir.c_str(), rStoreDir.c_str());          
+                BOX_WARNING("Local directory '" << rLocalDir << "' exists, "
+                        "but server directory '" << rStoreDir << "' does not "
+                        "exist.");
                 rParams.mDifferences ++;
                 return;
@@ -1370 +1386 @@
                 if(errno == ENOTDIR)
                 {
-                        printf("Local object '%s' is a file, "
-                                "server object '%s' is a directory\n", 
-                                localDirDisplay.c_str(), 
-                                storeDirDisplay.c_str());
+                        BOX_WARNING("Local object '" << localDirDisplay << "' "
+                                "is a file, server object '" << 
+                                storeDirDisplay << "' is a directory.");
                         rParams.mDifferences ++;
                 }
                 else if(errno == ENOENT)
                 {
-                        printf("Local directory '%s' does not exist "
-                                "(compared to server directory '%s')\n",
-                                localDirDisplay.c_str(), 
-                                storeDirDisplay.c_str());
+                        BOX_WARNING("Local directory '" << localDirDisplay <<
+                                "' does not exist (compared to server "
+                                "directory '" << storeDirDisplay << "').");
                         rParams.mDifferences ++;
                 }
                 else
                 {
-                        printf("ERROR: stat on local dir '%s'\n", 
-                                localDirDisplay.c_str());
+                        BOX_WARNING("Failed to access local directory '" <<
+                                localDirDisplay << ": " << strerror(errno) <<
+                                "'.");
                         rParams.mUncheckedFiles ++;
                 }
@@ -1408 +1423 @@
         if(!dir.HasAttributes())
         {
-                printf("Store directory '%s' doesn't have attributes.\n", 
-                        storeDirDisplay.c_str());
+                BOX_WARNING("Store directory '" << storeDirDisplay << "' "
+                        "doesn't have attributes.");
         }
         else
@@ -1424 +1439 @@
                 if(!(attr.Compare(localAttr, true, true /* ignore modification times */)))
                 {
-                        printf("Local directory '%s' has different attributes "
-                                "to store directory '%s'.\n",
-                                localDirDisplay.c_str(), 
-                                storeDirDisplay.c_str());
+                        BOX_WARNING("Local directory '" << localDirDisplay <<
+                                "' has different attributes to store "
+                                "directory '" << storeDirDisplay << "'.");
                         rParams.mDifferences ++;
                 }
@@ -1436 +1450 @@
         if(dirhandle == 0)
         {
-                printf("ERROR: opendir on local dir '%s'\n", 
-                        localDirDisplay.c_str());
+                BOX_WARNING("Failed to open local directory '" << 
+                        localDirDisplay << "': " << strerror(errno));
                 rParams.mUncheckedFiles ++;
                 return;
@@ -1458 +1472 @@
                                 if (localDirEn->d_type != DT_DIR)
                                 {
-                                        fprintf(stderr, "ERROR: d_type does "
-                                                "not really work on your "
-                                                "platform. Reconfigure Box!\n");
+                                        BOX_ERROR("d_type does not really "
+                                                "work on your platform. "
+                                                "Reconfigure Box!");
                                         return;
                                 }
@@ -1505 +1519 @@
                 if(::closedir(dirhandle) != 0)
                 {
-                        printf("ERROR: closedir on local dir '%s'\n", 
-                                localDirDisplay.c_str());
+                        BOX_ERROR("Failed to close local directory '" <<
+                                localDirDisplay << "': " << strerror(errno));
                 }
                 dirhandle = 0;
@@ -1566 +1580 @@
                         {
                                 // Not found -- report
-                                printf("Local file '%s' does not exist, "
-                                        "but store file '%s' does.\n",
-                                        localPathDisplay.c_str(),
-                                        storePathDisplay.c_str());
+                                BOX_WARNING("Local file '" << 
+                                        localDirDisplay << "' does not exist, "
+                                        "but store file '" <<
+                                        storePathDisplay << "' does.");
                                 rParams.mDifferences ++;
                         }
@@ -1644 +1658 @@
                                                                 fileOnServerStream->IsSymLink() /* ignore modification time if it's a symlink */))
                                                 {
-                                                        printf("Local file '%s' "
-                                                                "has different attributes "
-                                                                "to store file '%s'.\n",
-                                                                localPathDisplay.c_str(), 
-                                                                storePathDisplay.c_str());                                              
+                                                        BOX_WARNING("Local file '" <<
+                                                                localPathDisplay <<
+                                                                "' has different attributes "
+                                                                "to store file '" <<
+                                                                storePathDisplay <<
+                                                                "'.");
                                                         rParams.mDifferences ++;
                                                         if(modifiedAfterLastSync)
                                                         {
                                                                 rParams.mDifferencesExplainedByModTime ++;
-                                                                printf("(the file above was modified after the last sync time -- might be reason for difference)\n");
+                                                                BOX_INFO("(the file above was modified after the last sync time -- might be reason for difference)");
                                                         }
                                                         else if(i->second->HasAttributes())
                                                         {
-                                                                printf("(the file above has had new attributes applied)\n");
+                                                                BOX_INFO("(the file above has had new attributes applied)\n");
                                                         }
                                                 }
@@ -1723 +1738 @@
                                         if(!equal)
                                         {
-                                                printf("Local file '%s' "
+                                                BOX_WARNING("Local file '" <<
+                                                        localPathDisplay << "' "
                                                         "has different contents "
-                                                        "to store file '%s'.\n",
-                                                        localPathDisplay.c_str(), 
-                                                        storePathDisplay.c_str());
+                                                        "to store file '" <<
+                                                        storePathDisplay <<
+                                                        "'.");
                                                 rParams.mDifferences ++;
                                                 if(modifiedAfterLastSync)
                                                 {
                                                         rParams.mDifferencesExplainedByModTime ++;
-                                                        printf("(the file above was modified after the last sync time -- might be reason for difference)\n");
+                                                        BOX_INFO("(the file above was modified after the last sync time -- might be reason for difference)");
                                                 }
                                                 else if(i->second->HasAttributes())
                                                 {
-                                                        printf("(the file above has had new attributes applied)\n");
+                                                        BOX_INFO("(the file above has had new attributes applied)\n");
                                                 }
                                         }
@@ -1795 +1811 @@
                                 !(rParams.mpExcludeFiles->IsExcluded(localPath)))
                         {
-                                printf("Local file '%s' exists, "
-                                        "but store file '%s' "
-                                        "does not exist.\n",
-                                        localPathDisplay.c_str(),
-                                        storePathDisplay.c_str());
+                                BOX_WARNING("Local file '" << 
+                                        localPathDisplay <<
+                                        "' exists, but store file '" <<
+                                        storePathDisplay <<
+                                        "' does not.");
                                 rParams.mDifferences ++;
                                 
@@ -1810 +1826 @@
                                                 {
                                                         rParams.mDifferencesExplainedByModTime ++;
-                                                        printf("(the file above was modified after the last sync time -- might be reason for difference)\n");
+                                                        BOX_INFO("(the file above was modified after the last sync time -- might be reason for difference)");
                                                 }
                                         }
@@ -1853 +1869 @@
                         {
                                 // Not found -- report
-                                printf("Local directory '%s' is excluded, but "
-                                        "store directory '%s' still exists.\n",
-                                        localPathDisplay.c_str(),
-                                        storePathDisplay.c_str());
+                                BOX_WARNING("Local directory '" <<
+                                        localPathDisplay << "' is excluded, "
+                                        "but store directory '" <<
+                                        storePathDisplay << "' still exists.");
                                 rParams.mDifferences ++;
                         }
@@ -1862 +1878 @@
                         {
                                 // Not found -- report
-                                printf("Local directory '%s' does not exist, "
-                                        "but store directory '%s' does.\n",
-                                        localPathDisplay.c_str(),
-                                        storePathDisplay.c_str());
+                                BOX_WARNING("Local directory '" <<
+                                        localPathDisplay << "' does not exist, "
+                                        "but store directory '" <<
+                                        storePathDisplay << "' does.");
                                 rParams.mDifferences ++;
                         }
@@ -1909 +1925 @@
                         if(rParams.mpExcludeDirs == 0 || !(rParams.mpExcludeDirs->IsExcluded(localPath)))
                         {
-                                printf("Local directory '%s' exists, but "
-                                        "store directory '%s' does not exist.\n",
-                                        localPathDisplay.c_str(),
-                                        storePathDisplay.c_str());
+                                BOX_WARNING("Local directory '" <<
+                                        localPathDisplay << "' exists, but "
+                                        "store directory '" <<
+                                        storePathDisplay << "' does not.");
                                 rParams.mDifferences ++;
                         }
@@ -1945 +1961 @@
         if(args.size() != 2)
         {
-                printf("Incorrect usage.\nrestore [-d] [-r] [-i] <directory-name> <local-directory-name>\n");
+                BOX_ERROR("Incorrect usage. restore [-d] [-r] [-i] <remote-name> <local-name>");
                 return;
         }
@@ -1960 +1976 @@
                 if(dirID == std::numeric_limits<long long>::min() || dirID == std::numeric_limits<long long>::max() || dirID == 0)
                 {
-                        printf("Not a valid object ID (specified in hex)\n");
+                        BOX_ERROR("Not a valid object ID (specified in hex)");
                         return;
                 }
@@ -1983 +1999 @@
         if(dirID == 0)
         {
-                printf("Directory '%s' not found on server\n", args[0].c_str());
+                BOX_ERROR("Directory '" << args[0] << "' not found on server");
                 return;
         }
         if(dirID == BackupProtocolClientListDirectory::RootDirectory)
         {
-                printf("Cannot restore the root directory -- restore locations individually.\n");
+                BOX_ERROR("Cannot restore the root directory -- restore locations individually.");
                 return;
         }
@@ -2024 +2040 @@
         {
         case Restore_Complete:
-                printf("Restore complete\n");
+                BOX_INFO("Restore complete.");
                 break;
         
         case Restore_ResumePossible:
-                printf("Resume possible -- repeat command with -r flag to resume\n");
+                BOX_ERROR("Resume possible -- repeat command with -r flag to resume");
                 break;
         
         case Restore_TargetExists:
-                printf("The target directory exists. You cannot restore over an existing directory.\n");
+                BOX_ERROR("The target directory exists. You cannot restore over an existing directory.");
                 break;
                 
         #ifdef WIN32
         case Restore_TargetPathNotFound:
-                printf("The target directory path does not exist.\n"
+                BOX_ERROR("The target directory path does not exist.\n"
                         "To restore to a directory whose parent "
-                        "does not exist, create the parent first.\n");
+                        "does not exist, create the parent first.");
                 break;
         #endif
 
         case Restore_UnknownError:
-                printf("Unknown error during restore.\n");
+                BOX_ERROR("Unknown error during restore.");
                 break;
 
         default:
-                printf("ERROR: Unknown restore result %d.\n", result);
+                BOX_ERROR("Unknown restore result " << result << ".");
                 break;
         }
@@ -2168 +2184 @@
         if(args.size() != 1)
         {
-                printf("Incorrect usage.\nundelete <directory-name>\n");
+                BOX_ERROR("Incorrect usage. undelete <directory-name>");
                 return;
         }
@@ -2186 +2202 @@
         if(dirID == 0)
         {
-                printf("Directory '%s' not found on server\n", args[0].c_str());
+                BOX_ERROR("Directory '" << args[0] << "' not found on server.");
                 return;
         }
         if(dirID == BackupProtocolClientListDirectory::RootDirectory)
         {
-                printf("Cannot undelete the root directory.\n");
+                BOX_ERROR("Cannot undelete the root directory.");
                 return;
         }

box/chris/general/bin/bbackupquery/bbackupquery.cpp

@@ -13 +13 @@
         #include <unistd.h>
 #endif
+
+#include <errno.h>
 #include <stdio.h>
-#include <sys/types.h>
+
+#ifdef HAVE_SYS_TYPES_H
+        #include <sys/types.h>
+#endif
+
 #ifdef HAVE_LIBREADLINE
         #ifdef HAVE_READLINE_READLINE_H
@@ -169 +175 @@
                         if(logFile == 0)
                         {
-                                printf("Can't open log file '%s'\n", optarg);
+                                BOX_ERROR("Failed to open log file '" <<
+                                        optarg << "': " << strerror(errno));
                         }
                         break;
@@ -202 +209 @@
                 if (!SetConsoleCP(CP_UTF8))
                 {
-                        fprintf(stderr, "Failed to set input codepage: "
-                                "error %d\n", GetLastError());
+                        BOX_ERROR("Failed to set input codepage: " <<
+                                GetErrorMessage(GetLastError()));
                 }
 
                 if (!SetConsoleOutputCP(CP_UTF8))
                 {
-                        fprintf(stderr, "Failed to set output codepage: "
-                                "error %d\n", GetLastError());
+                        BOX_ERROR("Failed to set output codepage: " <<
+                                GetErrorMessage(GetLastError()));
                 }
 
@@ -223 +230 @@
 
         // Read in the configuration file
-        if(!quiet) printf("Using configuration file %s\n", 
-                configFilename.c_str());
+        if(!quiet) BOX_INFO("Using configuration file " << configFilename);
 
         std::string errs;
@@ -233 +239 @@
         if(config.get() == 0 || !errs.empty())
         {
-                printf("Invalid configuration file:\n%s", errs.c_str());
+                BOX_FATAL("Invalid configuration file: " << errs);
                 return 1;
         }
@@ -253 +259 @@
 
         // 2. Connect to server
-        if(!quiet) printf("Connecting to store...\n");
+        if(!quiet) BOX_INFO("Connecting to store...");
         SocketStreamTLS socket;
         socket.Open(tlsContext, Socket::TypeINET, conf.GetKeyValue("StoreHostname").c_str(), BOX_PORT_BBSTORED);
         
         // 3. Make a protocol, and handshake
-        if(!quiet) printf("Handshake with store...\n");
+        if(!quiet) BOX_INFO("Handshake with store...");
         BackupProtocolClient connection(socket);
         connection.Handshake();
@@ -269 +275 @@
         
         // 4. Log in to server
-        if(!quiet) printf("Login to store...\n");
+        if(!quiet) BOX_INFO("Login to store...");
         // Check the version of the server
         {
@@ -346 +352 @@
         
         // Done... stop nicely
-        if(!quiet) printf("Logging off...\n");
+        if(!quiet) BOX_INFO("Logging off...");
         connection.QueryFinished();
-        if(!quiet) printf("Session finished.\n");
+        if(!quiet) BOX_INFO("Session finished.");
         
         // Return code

box/chris/general/bin/bbstoreaccounts/bbstoreaccounts.cpp

@@ -38 +38 @@
         if(SoftLimit >= HardLimit)
         {
-                printf("ERROR: Soft limit must be less than the hard limit.\n");
+                BOX_FATAL("Soft limit must be less than the hard limit.");
                 exit(1);
         }
         if(SoftLimit > ((HardLimit * MAX_SOFT_LIMIT_SIZE) / 100))
         {
-                printf("ERROR: Soft limit must be no more than %d%% of the hard limit.\n", MAX_SOFT_LIMIT_SIZE);
+                BOX_FATAL("Soft limit must be no more than " << 
+                        MAX_SOFT_LIMIT_SIZE << "% of the hard limit.");
                 exit(1);
         }
@@ -54 +55 @@
         if(DiscSet < 0 || DiscSet >= controller.GetNumDiscSets())
         {
-                printf("Disc set %d does not exist\n", DiscSet);
+                BOX_FATAL("Disc set " << DiscSet << " does not exist.");
                 exit(1);
         }
@@ -90 +91 @@
         if(endptr == string || number == LONG_MIN || number == LONG_MAX)
         {
-                printf("%s is an invalid number\n", string);
+                BOX_FATAL("'" << string << "' is not a valid number.");
                 exit(1);
         }
@@ -117 +118 @@
         
         default:
-                printf("%s has an invalid units specifier\nUse B for blocks, M for Mb, G for Gb, eg 2Gb\n", string);
+                BOX_FATAL(string << " has an invalid units specifier "
+                        "(use B for blocks, M for Mb, G for Gb, eg 2Gb)");
                 exit(1);
                 break;          
@@ -144 +146 @@
         {
                 // Couldn't lock the account -- just stop now
-                printf("Couldn't lock the account -- did not change the limits\nTry again later.\n");
+                BOX_ERROR("Failed to lock the account, did not change limits. "
+                        "Try again later.");
                 return 1;
         }
@@ -169 +172 @@
         if(!db->EntryExists(ID))
         {
-                printf("Account %x does not exist\n", ID);
+                BOX_ERROR("Account " << BOX_FORMAT_ACCOUNT(ID) << 
+                        " does not exist.");
                 return 1;
         }
@@ -199 +203 @@
         info->Save();
 
-        printf("Limits on account 0x%08x changed to %lld soft, %lld hard\n", ID, softlimit, hardlimit);
+        BOX_NOTICE("Limits on account " << BOX_FORMAT_ACCOUNT(ID) <<
+                " changed to " << softlimit << " soft, " <<
+                hardlimit << " hard.");
 
         return 0;
@@ -212 +218 @@
         if(!db->EntryExists(ID))
         {
-                printf("Account %x does not exist\n", ID);
+                BOX_ERROR("Account " << BOX_FORMAT_ACCOUNT(ID) << 
+                        " does not exist.");
                 return 1;
         }
@@ -242 +249 @@
         if(AskForConfirmation)
         {
-                ::printf("Really delete account %08x?\n(type 'yes' to confirm)\n", ID);
+                BOX_WARNING("Really delete account " << 
+                        BOX_FORMAT_ACCOUNT(ID) << "? (type 'yes' to confirm)");
                 char response[256];
                 if(::fgets(response, sizeof(response), stdin) == 0 || ::strcmp(response, "yes\n") != 0)
                 {
-                        printf("Deletion cancelled\n");
+                        BOX_NOTICE("Deletion cancelled.");
                         return 0;
                 }
@@ -257 +265 @@
         if(!db->EntryExists(ID))
         {
-                printf("Account %x does not exist\n", ID);
+                BOX_ERROR("Account " << BOX_FORMAT_ACCOUNT(ID) << 
+                        " does not exist.");
                 return 1;
         }
@@ -319 +328 @@
                 }
         }
-        
+
+        int retcode = 0;
+
         // Thirdly, delete the directories...
         for(std::vector<std::string>::const_iterator d(toDelete.begin()); d != toDelete.end(); ++d)
         {
-                ::printf("Deleting store directory %s...\n", (*d).c_str());
+                BOX_NOTICE("Deleting store directory " << (*d) << "...");
                 // Just use the rm command to delete the files
                 std::string cmd("rm -rf ");
@@ -330 +341 @@
                 if(::system(cmd.c_str()) != 0)
                 {
-                        ::printf("ERROR: Deletion of %s failed.\n(when cleaning up, remember to delete all raid directories)\n", (*d).c_str());
-                        return 1;
+                        BOX_ERROR("Failed to delete files in " << (*d) <<
+                                ", delete them manually.");
+                        retcode = 1;
                 }
         }
         
         // Success!
-        return 0;
+        return retcode;
 }
 
@@ -347 +359 @@
         if(!db->EntryExists(ID))
         {
-                printf("Account %x does not exist\n", ID);
+                BOX_ERROR("Account " << BOX_FORMAT_ACCOUNT(ID) << 
+                        " does not exist.");
                 return 1;
         }
@@ -382 +395 @@
         if(db->EntryExists(ID))
         {
-                printf("Account %x already exists\n", ID);
+                BOX_ERROR("Account " << BOX_FORMAT_ACCOUNT(ID) << 
+                        " already exists.");
                 return 1;
         }
@@ -390 +404 @@
         acc.Create(ID, DiscNumber, SoftLimit, HardLimit, rUsername);
         
-        printf("Account %x created\n", ID);
+        BOX_NOTICE("Account " << BOX_FORMAT_ACCOUNT(ID) << " created.");
 
         return 0;
@@ -445 +459 @@
         if(config.get() == 0 || !errs.empty())
         {
-                printf("Invalid configuration file:\n%s", errs.c_str());
+                BOX_ERROR("Invalid configuration file " << configFilename <<
+                        ":" << errs);
         }
         
@@ -485 +500 @@
                         || ::sscanf(argv[2], "%d", &discnum) != 1)
                 {
-                        printf("create requires raid file disc number, soft and hard limits\n");
+                        BOX_ERROR("create requires raid file disc number, "
+                                "soft and hard limits.");
                         return 1;
                 }
@@ -507 +523 @@
                 if(argc < 4)
                 {
-                        printf("setlimit requires soft and hard limits\n");
+                        BOX_ERROR("setlimit requires soft and hard limits.");
                         return 1;
                 }
@@ -541 +557 @@
                         else
                         {
-                                ::printf("Unknown option %s.\n", argv[o]);
+                                BOX_ERROR("Unknown option " << argv[o] << ".");
                                 return 2;
                         }
@@ -551 +567 @@
         else
         {
-                printf("Unknown command '%s'\n", argv[0]);
+                BOX_ERROR("Unknown command '" << argv[0] << "'.");
                 return 1;
         }

box/chris/general/lib/backupclient/BackupClientRestore.cpp

@@ -261 +261 @@
                         {
                                 // File exists with this name, which is fun. Get rid of it.
-                                ::printf("WARNING: File present with name '%s', removing out of the way of restored directory. Use specific restore with ID to restore this object.", rLocalDirectoryName.c_str());
+                                BOX_WARNING("File present with name '" <<
+                                        rLocalDirectoryName << "', removing " <<
+                                        "out of the way of restored directory. "
+                                        "Use specific restore with ID to "
+                                        "restore this object.");
                                 if(::unlink(rLocalDirectoryName.c_str()) != 0)
                                 {

box/chris/general/lib/backupstore/BackupStoreCheck.cpp

@@ -103 +103 @@
                         if(!mQuiet)
                         {
-                                ::printf("Couldn't lock the account -- did not check.\nTry again later after the client has disconnected.\nAlternatively, forcibly kill the server.\n");
+                                BOX_ERROR("Failed to lock the account -- did not check.\nTry again later after the client has disconnected.\nAlternatively, forcibly kill the server.");
                         }
                         THROW_EXCEPTION(BackupStoreException, CouldNotLockStoreAccount)
@@ -111 +111 @@
         if(!mQuiet && mFixErrors)
         {
-                ::printf("NOTE: Will fix errors encountered during checking.\n");
+                BOX_NOTICE("Will fix errors encountered during checking.");
         }
 
@@ -117 +117 @@
         if(!mQuiet)
         {
-                ::printf("Check store account ID %08x\nPhase 1, check objects...\n", mAccountID);
+                BOX_INFO("Checking store account ID " <<
+                        BOX_FORMAT_ACCOUNT(mAccountID) << "...");
+                BOX_INFO("Phase 1, check objects...");
         }
         CheckObjects();
@@ -124 +126 @@
         if(!mQuiet)
         {
-                ::printf("Phase 2, check directories...\n");
+                BOX_INFO("Phase 2, check directories...");
         }
         CheckDirectories();
@@ -131 +133 @@
         if(!mQuiet)
         {
-                ::printf("Phase 3, check root...\n");
+                BOX_INFO("Phase 3, check root...");
         }
         CheckRoot();
@@ -138 +140 @@
         if(!mQuiet)
         {
-                ::printf("Phase 4, fix unattached objects...\n");
+                BOX_INFO("Phase 4, fix unattached objects...");
         }
         CheckUnattachedObjects();
@@ -145 +147 @@
         if(!mQuiet)
         {
-                ::printf("Phase 5, fix unrecovered inconsistencies...\n");
+                BOX_INFO("Phase 5, fix unrecovered inconsistencies...");
         }
         FixDirsWithWrongContainerID();
@@ -153 +155 @@
         if(!mQuiet)
         {
-                ::printf("Phase 6, regenerate store info...\n");
+                BOX_INFO("Phase 6, regenerate store info...");
         }
         WriteNewStoreInfo();
@@ -161 +163 @@
         if(mNumberErrorsFound > 0)
         {
-                ::printf("%lld errors found\n", mNumberErrorsFound);
+                BOX_WARNING("Finished checking store account ID " <<
+                        BOX_FORMAT_ACCOUNT(mAccountID) << ": " <<
+                        mNumberErrorsFound << " errors found");
                 if(!mFixErrors)
                 {
-                        ::printf("NOTE: No changes to the store account have been made.\n");
+                        BOX_WARNING("No changes to the store account "
+                                "have been made.");
                 }
                 if(!mFixErrors && mNumberErrorsFound > 0)
                 {
-                        ::printf("Run again with fix option to fix these errors\n");
-                }
-                if(mNumberErrorsFound > 0)
-                {
-                        ::printf("You should now use bbackupquery on the client machine to examine the store.\n");
+                        BOX_WARNING("Run again with fix option to "
+                                "fix these errors");
+                }
+                if(mFixErrors && mNumberErrorsFound > 0)
+                {
+                        BOX_WARNING("You should now use bbackupquery "
+                                "on the client machine to examine the store.");
                         if(mLostAndFoundDirectoryID != 0)
                         {
-                                ::printf("A lost+found directory was created in the account root.\n"\
-                                        "This contains files and directories which could not be matched to existing directories.\n"\
-                                        "bbackupd will delete this directory in a few days time.\n");
+                                BOX_WARNING("A lost+found directory was "
+                                        "created in the account root.\n"
+                                        "This contains files and directories "
+                                        "which could not be matched to "
+                                        "existing directories.\n"\
+                                        "bbackupd will delete this directory "
+                                        "in a few days time.");
                         }
                 }
@@ -183 +194 @@
         else
         {
-                ::printf("Store account checked, no errors found.\n");
+                BOX_NOTICE("Finished checking store account ID " <<
+                        BOX_FORMAT_ACCOUNT(mAccountID) << ": "
+                        "no errors found");
         }
 }
@@ -305 +318 @@
                         else
                         {
-                                ::printf("Spurious or invalid directory %s/%s found%s -- delete manually\n", rDirName.c_str(), (*i).c_str(), mFixErrors?", deleting":"");
+                                BOX_WARNING("Spurious or invalid directory " <<
+                                        rDirName << DIRECTORY_SEPARATOR << 
+                                        (*i) << " found, " <<
+                                        (mFixErrors?"deleting":"delete manually"));
                                 ++mNumberErrorsFound;
                         }
@@ -337 +353 @@
         if(!RaidFileRead::DirectoryExists(mDiscSetNumber, dirName))
         {
-                TRACE1("RaidFile dir %s does not exist\n", dirName.c_str());
+                BOX_WARNING("RaidFile dir " << dirName << " does not exist");
                 return;
         }
@@ -379 +395 @@
                 {
                         // Unexpected or bad file, delete it
-                        ::printf("Spurious file %s" DIRECTORY_SEPARATOR "%s "
-                                "found%s\n", dirName.c_str(), (*i).c_str(), 
-                                mFixErrors?", deleting":"");
+                        BOX_WARNING("Spurious file " << dirName << 
+                                DIRECTORY_SEPARATOR << (*i) << " found" <<
+                                (mFixErrors?", deleting":""));
                         ++mNumberErrorsFound;
                         if(mFixErrors)
@@ -402 +418 @@
                         {
                                 // File was bad, delete it
-                                ::printf("Corrupted file %s%s found%s\n", dirName.c_str(), leaf, mFixErrors?", deleting":"");
+                                BOX_WARNING("Corrupted file " << dirName <<
+                                        leaf << " found" <<
+                                        (mFixErrors?", deleting":""));
                                 ++mNumberErrorsFound;
                                 if(mFixErrors)
@@ -510 +528 @@
         {
                 // Get that dodgy thing deleted!
-                ::printf("Have file as root directory. This is bad.\n");
+                BOX_ERROR("Have file as root directory. This is bad.");
                 return -1;
         }
@@ -597 +615 @@
                                 {
                                         // Wasn't quite right, and has been modified
-                                        ::printf("Directory ID %llx has bad structure\n", pblock->mID[e]);
+                                        BOX_WARNING("Directory ID " <<
+                                                BOX_FORMAT_OBJECTID(pblock->mID[e]) <<
+                                                " has bad structure");
                                         ++mNumberErrorsFound;
                                         isModified = true;
@@ -623 +643 @@
                                                 {
                                                         // Entry is of wrong type
-                                                        ::printf("Directory ID %llx references object %llx which has a different type than expected.\n", pblock->mID[e], en->GetObjectID());
+                                                        BOX_WARNING("Directory ID " <<
+                                                                BOX_FORMAT_OBJECTID(pblock->mID[e]) <<
+                                                                " references object " <<
+                                                                BOX_FORMAT_OBJECTID(en->GetObjectID()) <<
+                                                                " which has a different type than expected.");
                                                         badEntry = true;
                                                 }
@@ -631 +655 @@
                                                         if(iflags & Flags_IsContained)
                                                         {
+                                                                BOX_WARNING("Directory ID " <<
+                                                                        BOX_FORMAT_OBJECTID(pblock->mID[e]) <<
+                                                                        " references object " <<
+                                                                        BOX_FORMAT_OBJECTID(en->GetObjectID()) <<
+                                                                        " which is already contained.");
                                                                 badEntry = true;
-                                                                ::printf("Directory ID %llx references object %llx which is already contained.\n", pblock->mID[e], en->GetObjectID());
                                                         }
                                                         else
@@ -646 +674 @@
                                                                         {
                                                                                 // Add to will fix later list
-                                                                                ::printf("Directory ID %llx has wrong container ID.\n", en->GetObjectID());
+                                                                                BOX_WARNING("Directory ID " << BOX_FORMAT_OBJECTID(en->GetObjectID()) << " has wrong container ID.");
                                                                                 mDirsWithWrongContainerID.push_back(en->GetObjectID());
                                                                         }
@@ -652 +680 @@
                                                                         {
                                                                                 // This is OK for files, they might move
-                                                                                ::printf("File ID %llx has different container ID, probably moved\n", en->GetObjectID());
+                                                                                BOX_WARNING("File ID " << BOX_FORMAT_OBJECTID(en->GetObjectID()) << " has different container ID, probably moved");
                                                                         }
                                                                         
@@ -671 +699 @@
                                                                 isModified = true;
                                                                 // Tell user
-                                                                ::printf("Directory ID %llx has wrong size for object %llx\n", pblock->mID[e], en->GetObjectID());
+                                                                BOX_WARNING("Directory ID " << BOX_FORMAT_OBJECTID(pblock->mID[e]) << " has wrong size for object " << BOX_FORMAT_OBJECTID(en->GetObjectID()));
                                                         }
                                                 }
@@ -687 +715 @@
                                                         // Just remove the entry
                                                         badEntry = true;
-                                                        ::printf("Directory ID %llx references object %llx which does not exist.\n", pblock->mID[e], en->GetObjectID());
+                                                        BOX_WARNING("Directory ID " << BOX_FORMAT_OBJECTID(pblock->mID[e]) << " references object " << BOX_FORMAT_OBJECTID(en->GetObjectID()) << " which does not exist.");
                                                 }
                                         }
@@ -730 +758 @@
                                 if(isModified && mFixErrors)
                                 {       
-                                        ::printf("Fixing directory ID %llx\n", pblock->mID[e]);
+                                        BOX_WARNING("Fixing directory ID " << BOX_FORMAT_OBJECTID(pblock->mID[e]));
 
                                         // Save back to disc

box/chris/general/lib/backupstore/BackupStoreCheck2.cpp

@@ -48 +48 @@
         else
         {
-                ::printf("Root directory doesn't exist\n");
+                BOX_WARNING("Root directory doesn't exist");
                 
                 ++mNumberErrorsFound;
@@ -119 +119 @@
                         {
                                 // Unattached object...
-                                ::printf("Object %llx is unattached.\n", pblock->mID[e]);
+                                BOX_WARNING("Object " << BOX_FORMAT_OBJECTID(pblock->mID[e]) << " is unattached.");
                                 ++mNumberErrorsFound;
 
@@ -148 +148 @@
                                                 if(diffFromObjectID != 0)
                                                 {
-                                                        ::printf("Object %llx is unattached, and is a patch. Deleting, cannot reliably recover.\n", pblock->mID[e]);
+                                                        BOX_WARNING("Object " << BOX_FORMAT_OBJECTID(pblock->mID[e]) << " is unattached, and is a patch. Deleting, cannot reliably recover.");
                                                 
                                                         // Delete this object instead
@@ -230 +230 @@
         if(!mFixErrors)
         {
-                ::printf("Missing directory %llx could be recreated\n", MissingDirectoryID);
+                BOX_WARNING("Missing directory " << 
+                        BOX_FORMAT_OBJECTID(MissingDirectoryID) <<
+                        " could be recreated.");
                 mDirsAdded.insert(MissingDirectoryID);
                 return true;
         }
-        ::printf("Recreating missing directory %llx\n", MissingDirectoryID);
+
+        BOX_WARNING("Recreating missing directory " << 
+                BOX_FORMAT_OBJECTID(MissingDirectoryID));
         
         // Create a blank directory
@@ -301 +305 @@
                 {
                         // Found a name which can be used
-                        ::printf("Lost and found dir has name %s\n", name);
+                        BOX_WARNING("Lost and found dir has name " << name);
                         break;
                 }
@@ -525 +529 @@
         catch(...)
         {
-                ::printf("Load of existing store info failed, regenerating.\n");
+                BOX_WARNING("Load of existing store info failed, regenerating.");
                 ++mNumberErrorsFound;
         }
@@ -552 +556 @@
         else
         {
-                ::printf("NOTE: Soft limit for account changed to ensure housekeeping doesn't delete files on next run\n");
+                BOX_WARNING("Soft limit for account changed to ensure housekeeping doesn't delete files on next run.");
         }
         if(poldInfo.get() != 0 && poldInfo->GetBlocksHardLimit() > minHard)
@@ -560 +564 @@
         else
         {
-                ::printf("NOTE: Hard limit for account changed to ensure housekeeping doesn't delete files on next run\n");
+                BOX_WARNING("Hard limit for account changed to ensure housekeeping doesn't delete files on next run.");
         }
         
@@ -587 +591 @@
         {
                 info->Save();
-                ::printf("New store info file written successfully.\n");
+                BOX_NOTICE("New store info file written successfully.");
         }
 }

box/chris/general/lib/common/DebugMemLeakFinder.cpp

@@ -375 +375 @@
         else
         {
-                printf("WARNING: Couldn't open memory leak results file %s for appending\n", filename);
+                BOX_WARNING("Couldn't open memory leak results file " <<
+                        filename << " for appending");
         }
 }

box/chris/general/lib/common/Logging.cpp

@@ -244 +244 @@
                 msg += "[" + sTag + "] ";
         }
+
+        if (level <= Log::FATAL)
+        {
+                msg += "FATAL: ";
+        }
+        else if (level <= Log::ERROR)
+        {
+                msg += "ERROR: ";
+        }
+        else if (level <= Log::WARNING)
+        {
+                msg += "WARNING: ";
+        }
+        else if (level <= Log::NOTICE)
+        {
+                msg += "NOTICE: ";
+        }
         
         msg += rMessage;
@@ -273 +290 @@
                 case Log::EVERYTHING: syslogLevel = LOG_DEBUG;   break;
         }
-                
-        syslog(syslogLevel, "%s", rMessage.c_str());
+
+        std::string msg;
+
+        if (level <= Log::FATAL)
+        {
+                msg = "FATAL: ";
+        }
+        else if (level <= Log::ERROR)
+        {
+                msg = "ERROR: ";
+        }
+        else if (level <= Log::WARNING)
+        {
+                msg = "WARNING: ";
+        }
+        else if (level <= Log::NOTICE)
+        {
+                msg = "NOTICE: ";
+        }
+
+        msg += rMessage;
+
+        syslog(syslogLevel, "%s", msg.c_str());
         
         return true;

box/chris/general/lib/crypto/Random.cpp

@@ -35 +35 @@
         }
 #else
-        ::fprintf(stderr, "No random device -- additional seeding of random number generator not performed.\n");
+        BOX_ERROR("No random device -- additional seeding of random number "
+                "generator not performed.");
 #endif
 }

box/chris/general/lib/raidfile/RaidFileController.cpp

@@ -103 +103 @@
         if(pconfig.get() == 0 || !err.empty())
         {
-                fprintf(stderr, "RaidFile configuation file errors:\n%s",
-                        err.c_str());
+                BOX_ERROR("RaidFile configuration file errors: " << err);
                 THROW_EXCEPTION(RaidFileException, BadConfigFile)
         }

box/chris/general/lib/server/SSLLib.cpp

@@ -50 +50 @@
         }
 #else
-        ::fprintf(stderr, "No random device -- additional seeding of random number generator not performed.\n");
+        BOX_WARNING("No random device -- additional seeding of "
+                "random number generator not performed.");
 #endif
 }

box/chris/general/test/bbackupd/testfiles/extcheck1.pl.in

@@ -4 +4 @@
 my $flags = $ARGV[0] or "";
 
-unless(open IN,"../../bin/bbackupquery/bbackupquery -q -c testfiles/bbackupd.conf -l testfiles/query4.log \"compare -ac$flags\" quit|")
+unless(open IN,"../../bin/bbackupquery/bbackupquery -q -c testfiles/bbackupd.conf -l testfiles/query4.log \"compare -ac$flags\" quit 2>&1 |")
 {
         print "Couldn't open compare utility\n";

box/chris/general/test/bbackupd/testfiles/extcheck2.pl.in

@@ -4 +4 @@
 my $flags = $ARGV[0] or "";
 
-unless(open IN,"../../bin/bbackupquery/bbackupquery -q -c testfiles/bbackupd.conf -l testfiles/query4.log \"compare -ac$flags\" quit|")
+unless(open IN,"../../bin/bbackupquery/bbackupquery -q -c testfiles/bbackupd.conf -l testfiles/query4.log \"compare -ac$flags\" quit 2>&1 |")
 {
         print "Couldn't open compare utility\n";