Changeset 97655 in vbox for trunk/src/VBox/Main

Timestamp:

Nov 22, 2022 2:18:28 PM (2 years ago)

Author:

vboxsync

Message:

Guest Control/Main: Made (release) logging of paths a bit more uniform + some logging fixes.

File:

• trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp (modified) (35 diffs)

trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp

@@ -355 +355 @@
     LogFlowFunc(("strPath=%s, fMode=%RU32, fCreate=0x%x, fCanExist=%RTbool\n", strPath.c_str(), fMode, fCreate, fCanExist));
 
-    LogRel2(("Guest Control: Creating host directory '%s' ...\n", strPath.c_str()));
+    LogRel2(("Guest Control: Creating host directory \"%s\" ...\n", strPath.c_str()));
 
     int vrc = RTDirCreate(strPath.c_str(), fMode, fCreate);
@@ -609 +609 @@
             if (fFileCopyFlags & FileCopyFlag_NoReplace)
             {
-                LogRel2(("Guest Control: Host file \"%s\" already exists, skipping", strDst.c_str()));
+                LogRel2(("Guest Control: Host file \"%s\" already exists, skipping\n", strDst.c_str()));
                 vrc = VWRN_ALREADY_EXISTS;
                 fSkip = true;
@@ -621 +621 @@
                 if (RTTimeSpecCompare(&srcModificationTimeTS, &dstObjInfo.ModificationTime) <= 0)
                 {
-                    LogRel2(("Guest Control: Host file \"%s\" has same or newer modification date, skipping", strDst.c_str()));
+                    LogRel2(("Guest Control: Host file \"%s\" has same or newer modification date, skipping\n", strDst.c_str()));
                     vrc = VWRN_ALREADY_EXISTS;
                     fSkip = true;
@@ -681 +681 @@
         || vrc == VERR_FILE_NOT_FOUND)
     {
-        LogRel2(("Guest Control: Copying file '%s' from guest to '%s' on host ...\n", strSrc.c_str(), strDst.c_str()));
+        LogRel2(("Guest Control: Copying file \"%s\" from guest to \"%s\" on host ...\n", strSrc.c_str(), strDst.c_str()));
 
         RTFILE hDstFile;
@@ -688 +688 @@
         if (RT_SUCCESS(vrc))
         {
-            LogFlowThisFunc(("Copying '%s' to '%s' (%RI64 bytes) ...\n",
+            LogFlowThisFunc(("Copying \"%s\" to \"%s\" (%RI64 bytes) ...\n",
                              strSrc.c_str(), strDst.c_str(), srcObjData.mObjectSize));
 
@@ -758 +758 @@
         {
             setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                Utf8StrFmt(tr("Reading %RU32 bytes @ %RU64 from host file \"%s\" failed: %Rrc", "", cbChunk),
+                                Utf8StrFmt(tr("Reading %RU32 bytes @ %RU64 from host file \"%s\" failed: %Rrc"),
                                            cbChunk, cbWrittenTotal, strSrcFile.c_str(), vrc));
             break;
@@ -767 +767 @@
         {
             setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                Utf8StrFmt(tr("Writing %zu bytes to guest file \"%s\" failed: %Rrc", "", cbRead),
+                                Utf8StrFmt(tr("Writing %zu bytes to guest file \"%s\" failed: %Rrc"),
                                            cbRead, strDstFile.c_str(), vrc));
             break;
@@ -849 +849 @@
     {
         if (vrc == VERR_GSTCTL_GUEST_ERROR)
-            setProgressErrorMsg(VBOX_E_IPRT_ERROR, tr("Guest file could not be created or replaced"),
+            setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                Utf8StrFmt(tr("Guest file \"%s\" could not be created or replaced"), strDst.c_str()),
                                 GuestErrorInfo(GuestErrorInfo::Type_File, vrcGuest, strDst.c_str()));
         else
@@ -889 +890 @@
                         if (fFileCopyFlags & FileCopyFlag_NoReplace)
                         {
-                            LogRel2(("Guest Control: Guest file \"%s\" already exists, skipping", strDst.c_str()));
+                            LogRel2(("Guest Control: Guest file \"%s\" already exists, skipping\n", strDst.c_str()));
                             vrc = VWRN_ALREADY_EXISTS;
                             fSkip = true;
@@ -901 +902 @@
                             if (RTTimeSpecCompare(&dstModificationTimeTS, &srcObjInfo.ModificationTime) <= 0)
                             {
-                                LogRel2(("Guest Control: Guest file \"%s\" has same or newer modification date, skipping",
+                                LogRel2(("Guest Control: Guest file \"%s\" has same or newer modification date, skipping\n",
                                          strDst.c_str()));
                                 vrc = VWRN_ALREADY_EXISTS;
@@ -952 +953 @@
     if (RT_SUCCESS(vrc))
     {
-        LogRel2(("Guest Control: Copying file '%s' from host to '%s' on guest ...\n", strSrc.c_str(), strDst.c_str()));
+        LogRel2(("Guest Control: Copying file \"%s\" from host to \"%s\" on guest ...\n", strSrc.c_str(), strDst.c_str()));
 
         RTVFSFILE hSrcFile;
@@ -958 +959 @@
         if (RT_SUCCESS(vrc))
         {
-            LogFlowThisFunc(("Copying '%s' to '%s' (%RI64 bytes) ...\n",
+            LogFlowThisFunc(("Copying \"%s\" to \"%s\" (%RI64 bytes) ...\n",
                              szSrcReal, strDst.c_str(), srcObjInfo.cbObject));
 
@@ -990 +991 @@
 int FsList::AddEntryFromGuest(const Utf8Str &strFile, const GuestFsObjData &fsObjData)
 {
-    LogFlowFunc(("Adding '%s'\n", strFile.c_str()));
+    LogFlowFunc(("Adding \"%s\"\n", strFile.c_str()));
 
     FsEntry *pEntry = NULL;
@@ -1020 +1021 @@
 int FsList::AddEntryFromHost(const Utf8Str &strFile, PCRTFSOBJINFO pcObjInfo)
 {
-    LogFlowFunc(("Adding '%s'\n", strFile.c_str()));
+    LogFlowFunc(("Adding \"%s\"\n", strFile.c_str()));
 
     FsEntry *pEntry = NULL;
@@ -1137 +1138 @@
     strPathAbs += strPathSub;
 
-    LogFlowFunc(("Entering '%s' (sub '%s')\n", strPathAbs.c_str(), strPathSub.c_str()));
-
-    LogRel2(("Guest Control: Handling directory '%s' on guest ...\n", strPathAbs.c_str()));
+    LogFlowFunc(("Entering \"%s\" (sub \"%s\")\n", strPathAbs.c_str(), strPathSub.c_str()));
+
+    LogRel2(("Guest Control: Handling directory \"%s\" on guest ...\n", strPathAbs.c_str()));
 
     GuestDirectoryOpenInfo dirOpenInfo;
@@ -1191 +1192 @@
             Utf8Str strEntry = strPathSub + Utf8Str(bstrName);
 
-            LogFlowFunc(("Entry '%s'\n", strEntry.c_str()));
+            LogFlowFunc(("Entry \"%s\"\n", strEntry.c_str()));
 
             switch (enmObjType)
@@ -1203 +1204 @@
                     }
 
-                    LogRel2(("Guest Control: Directory '%s'\n", strEntry.c_str()));
+                    LogRel2(("Guest Control: Directory \"%s\"\n", strEntry.c_str()));
 
                     if (!(mSourceSpec.fDirCopyFlags & DirectoryCopyFlag_Recursive))
@@ -1219 +1220 @@
                         /** @todo Symlink handling from guest is not implemented yet.
                          *        See IGuestSession::symlinkRead(). */
-                        LogRel2(("Guest Control: Warning: Symlink support on guest side not available, skipping '%s'",
+                        LogRel2(("Guest Control: Warning: Symlink support on guest side not available, skipping \"%s\"\n",
                                  strEntry.c_str()));
                     }
@@ -1227 +1228 @@
                 case FsObjType_File:
                 {
-                    LogRel2(("Guest Control: File '%s'\n", strEntry.c_str()));
+                    LogRel2(("Guest Control: File \"%s\"\n", strEntry.c_str()));
 
                     vrc = AddEntryFromGuest(strEntry, fsObjInfo->i_getData());
@@ -1276 +1277 @@
     strPathAbs += strPathSub;
 
-    LogFlowFunc(("Entering '%s' (sub '%s')\n", strPathAbs.c_str(), strPathSub.c_str()));
-
-    LogRel2(("Guest Control: Handling directory '%s' on host ...\n", strPathAbs.c_str()));
+    LogFlowFunc(("Entering \"%s\" (sub \"%s\")\n", strPathAbs.c_str(), strPathSub.c_str()));
+
+    LogRel2(("Guest Control: Handling directory \"%s\" on host ...\n", strPathAbs.c_str()));
 
     RTFSOBJINFO objInfo;
@@ -1308 +1309 @@
                         Utf8Str strEntry = strPathSub + Utf8Str(pDirEntry->szName);
 
-                        LogFlowFunc(("Entry '%s'\n", strEntry.c_str()));
+                        LogFlowFunc(("Entry \"%s\"\n", strEntry.c_str()));
 
                         switch (pDirEntry->Info.Attr.fMode & RTFS_TYPE_MASK)
@@ -1318 +1319 @@
                                     break;
 
-                                LogRel2(("Guest Control: Directory '%s'\n", strEntry.c_str()));
+                                LogRel2(("Guest Control: Directory \"%s\"\n", strEntry.c_str()));
 
                                 if (!(mSourceSpec.fDirCopyFlags & DirectoryCopyFlag_Recursive))
@@ -1329 +1330 @@
                             case RTFS_TYPE_FILE:
                             {
-                                LogRel2(("Guest Control: File '%s'\n", strEntry.c_str()));
+                                LogRel2(("Guest Control: File \"%s\"\n", strEntry.c_str()));
 
                                 vrc = AddEntryFromHost(strEntry, &pDirEntry->Info);
@@ -1347 +1348 @@
                                         if (RTFS_IS_DIRECTORY(objInfo.Attr.fMode))
                                         {
-                                            LogRel2(("Guest Control: Symbolic link '%s' -> '%s' (directory)\n",
+                                            LogRel2(("Guest Control: Symbolic link \"%s\" -> \"%s\" (directory)\n",
                                                      strEntryAbs.c_str(), pszPathReal));
                                             if (mSourceSpec.fDirCopyFlags  & DirectoryCopyFlag_FollowLinks)
@@ -1354 +1355 @@
                                         else if (RTFS_IS_FILE(objInfo.Attr.fMode))
                                         {
-                                            LogRel2(("Guest Control: Symbolic link '%s' -> '%s' (file)\n",
+                                            LogRel2(("Guest Control: Symbolic link \"%s\" -> \"%s\" (file)\n",
                                                      strEntryAbs.c_str(), pszPathReal));
                                             if (mSourceSpec.fFileCopyFlags & FileCopyFlag_FollowLinks)
@@ -1364 +1365 @@
 
                                     if (RT_FAILURE(vrc))
-                                        LogRel2(("Guest Control: Unable to query symbolic link info for '%s', rc=%Rrc\n",
+                                        LogRel2(("Guest Control: Unable to query symbolic link info for \"%s\", rc=%Rrc\n",
                                                  pszPathReal, vrc));
                                 }
                                 else
                                 {
-                                    LogRel2(("Guest Control: Unable to resolve symlink for '%s', rc=%Rrc\n", strPathAbs.c_str(), vrc));
+                                    LogRel2(("Guest Control: Unable to resolve symlink for \"%s\", rc=%Rrc\n", strPathAbs.c_str(), vrc));
                                     if (vrc == VERR_FILE_NOT_FOUND) /* Broken symlink, skip. */
                                         vrc = VINF_SUCCESS;
@@ -1394 +1395 @@
     }
     else
-        LogFlowFunc(("Unable to query '%s', rc=%Rrc\n", strPathAbs.c_str(), vrc));
+        LogFlowFunc(("Unable to query \"%s\", rc=%Rrc\n", strPathAbs.c_str(), vrc));
 
     LogFlowFuncLeaveRC(vrc);
@@ -1593 +1594 @@
                 {
                     delete pFsList;
-                    strErrorInfo.printf(tr("Error adding guest source '%s' to list: %Rrc"),
+                    strErrorInfo.printf(tr("Error adding guest source \"%s\" to list: %Rrc"),
                                         strSrc.c_str(), vrc);
                     break;
@@ -1717 +1718 @@
                 if (RT_SUCCESS(vrc))
                 {
-                    LogRel2(("Guest Control: Host destination is a symbolic link '%s' -> '%s' (%s)\n",
+                    LogRel2(("Guest Control: Host destination is a symbolic link \"%s\" -> \"%s\" (%s)\n",
                              strDstRootAbs.c_str(), szPathReal,
                              GuestBase::fsObjTypeToStr(GuestBase::fileModeToFsObjType(dstFsObjInfo.Attr.fMode))));
@@ -2066 +2067 @@
                         if (RT_SUCCESS(vrc))
                         {
-                            LogRel2(("Guest Control: Host source is a symbolic link '%s' -> '%s' (%s)\n",
+                            LogRel2(("Guest Control: Host source is a symbolic link \"%s\" -> \"%s\" (%s)\n",
                                      strSrc.c_str(), szPathReal,
                                      GuestBase::fsObjTypeToStr(GuestBase::fileModeToFsObjType(srcFsObjInfo.Attr.fMode))));
@@ -2133 +2134 @@
                 {
                     delete pFsList;
-                    strErrorInfo.printf(tr("Error adding host source '%s' to list: %Rrc"),
+                    strErrorInfo.printf(tr("Error adding host source \"%s\" to list: %Rrc"),
                                         strSrc.c_str(), vrc);
                     break;
@@ -2264 +2265 @@
                     default:
                         setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                            Utf8StrFmt(tr("Querying information on guest for '%s' failed: %Rrc"),
+                                            Utf8StrFmt(tr("Querying information on guest for \"%s\" failed: %Rrc"),
                                             strDstRootAbs.c_str(), vrcGuest));
                         break;
@@ -2272 +2273 @@
             {
                 setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                    Utf8StrFmt(tr("Querying information on guest for '%s' failed: %Rrc"),
+                                    Utf8StrFmt(tr("Querying information on guest for \"%s\" failed: %Rrc"),
                                                strDstRootAbs.c_str(), vrc));
                 break;
@@ -2378 +2379 @@
                     case RTFS_TYPE_DIRECTORY:
                     {
-                        LogRel2(("Guest Control: Copying directory '%s' from host to '%s' on guest ...\n", strSrcAbs.c_str(), strDstAbs.c_str()));
+                        LogRel2(("Guest Control: Copying directory \"%s\" from host to \"%s\" on guest ...\n",
+                                 strSrcAbs.c_str(), strDstAbs.c_str()));
                         if (!pList->mSourceSpec.fDryRun)
                             vrc = directoryCreateOnGuest(strDstAbs, fDirMode, DirectoryCreateFlag_None,
@@ -2393 +2395 @@
 
                     default:
-                        LogRel2(("Guest Control: Warning: Host file system type 0x%x for '%s' is not supported, skipping\n",
+                        LogRel2(("Guest Control: Warning: Host file system type 0x%x for \"%s\" is not supported, skipping\n",
                                  pEntry->fMode & RTFS_TYPE_MASK, strSrcAbs.c_str()));
                         break;