Changeset 97305 in vbox
- Timestamp:
- Oct 26, 2022 2:40:10 PM (2 years ago)
- Location:
- trunk/src/VBox/Main
- Files:
-
- 2 edited
-
include/GuestSessionImpl.h (modified) (1 diff)
-
src-client/GuestSessionImpl.cpp (modified) (11 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/include/GuestSessionImpl.h
r96407 r97305 326 326 int i_onRemove(void); 327 327 int i_onSessionStatusChange(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, PVBOXGUESTCTRLHOSTCALLBACK pSvcCbData); 328 PathStyle_T i_getPathStyle(void); 328 PathStyle_T i_getGuestPathStyle(void); 329 static PathStyle_T i_getHostPathStyle(void); 329 330 int i_startSession(int *pGuestRc); 330 331 int i_startSessionAsync(void); -
trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp
r97151 r97305 528 528 HRESULT GuestSession::getPathStyle(PathStyle_T *aPathStyle) 529 529 { 530 *aPathStyle = i_get PathStyle();530 *aPathStyle = i_getGuestPathStyle(); 531 531 return S_OK; 532 532 } … … 766 766 return setError(E_INVALIDARG, tr("No destination specified")); 767 767 768 GuestSessionFsSourceSet::const_iterator itSrc = SourceSet.begin(); 769 while (itSrc != SourceSet.end()) 770 { 771 LogRel2(("Guest Control: Copying '%s' from guest to '%s' on the host (type: %s, filter: %s)\n", 772 itSrc->strSource.c_str(), strDestination.c_str(), GuestBase::fsObjTypeToStr(itSrc->enmType), itSrc->strFilter.c_str())); 773 ++itSrc; 774 } 775 768 776 /* Create a task and return the progress obejct for it. */ 769 777 GuestSessionTaskCopyFrom *pTask = NULL; … … 824 832 825 833 LogFlowThisFuncEnter(); 834 835 GuestSessionFsSourceSet::const_iterator itSrc = SourceSet.begin(); 836 while (itSrc != SourceSet.end()) 837 { 838 LogRel2(("Guest Control: Copying '%s' from host to '%s' on the guest (type: %s, filter: %s)\n", 839 itSrc->strSource.c_str(), strDestination.c_str(), GuestBase::fsObjTypeToStr(itSrc->enmType), itSrc->strFilter.c_str())); 840 ++itSrc; 841 } 826 842 827 843 /* Create a task and return the progress object for it. */ … … 2127 2143 * @returns Separation style used on the guest. 2128 2144 */ 2129 PathStyle_T GuestSession::i_get PathStyle(void)2145 PathStyle_T GuestSession::i_getGuestPathStyle(void) 2130 2146 { 2131 2147 PathStyle_T enmPathStyle; … … 2149 2165 2150 2166 return enmPathStyle; 2167 } 2168 2169 /** 2170 * Returns the path separation style used on the host. 2171 * 2172 * @returns Separation style used on the host. 2173 */ 2174 /* static */ 2175 PathStyle_T GuestSession::i_getHostPathStyle(void) 2176 { 2177 #if RTPATH_STYLE == RTPATH_STR_F_STYLE_DOS 2178 return PathStyle_DOS; 2179 #else 2180 return PathStyle_UNIX; 2181 #endif 2151 2182 } 2152 2183 … … 3432 3463 source.strSource = aSource; 3433 3464 source.enmType = FsObjType_File; 3434 source.enmPathStyle = i_get PathStyle();3465 source.enmPathStyle = i_getGuestPathStyle(); 3435 3466 source.fDryRun = false; /** @todo Implement support for a dry run. */ 3436 3467 source.Type.File.fCopyFlags = (FileCopyFlag_T)fFlags; … … 3460 3491 source.strSource = aSource; 3461 3492 source.enmType = FsObjType_File; 3462 source.enmPathStyle = i_getPathStyle();3493 source.enmPathStyle = GuestSession::i_getHostPathStyle(); 3463 3494 source.fDryRun = false; /** @todo Implement support for a dry run. */ 3464 3495 source.Type.File.fCopyFlags = (FileCopyFlag_T)fFlags; … … 3524 3555 source.strFilter = strFilter; 3525 3556 source.enmType = objData.mType; 3526 source.enmPathStyle = i_get PathStyle();3557 source.enmPathStyle = i_getGuestPathStyle(); 3527 3558 source.fDryRun = false; /** @todo Implement support for a dry run. */ 3528 3559 … … 3594 3625 source.strFilter = strFilter; 3595 3626 source.enmType = GuestBase::fileModeToFsObjType(objInfo.Attr.fMode); 3596 source.enmPathStyle = i_getPathStyle();3627 source.enmPathStyle = GuestSession::i_getHostPathStyle(); 3597 3628 source.fDryRun = false; /** @todo Implement support for a dry run. */ 3598 3629 … … 3650 3681 source.strSource = aSource; 3651 3682 source.enmType = FsObjType_Directory; 3652 source.enmPathStyle = i_get PathStyle();3683 source.enmPathStyle = i_getGuestPathStyle(); 3653 3684 source.fDryRun = false; /** @todo Implement support for a dry run. */ 3654 3685 source.Type.Dir.fCopyFlags = (DirectoryCopyFlag_T)fFlags; … … 3679 3710 source.strSource = aSource; 3680 3711 source.enmType = FsObjType_Directory; 3681 source.enmPathStyle = i_getPathStyle();3712 source.enmPathStyle = GuestSession::i_getHostPathStyle(); 3682 3713 source.fDryRun = false; /** @todo Implement support for a dry run. */ 3683 3714 source.Type.Dir.fCopyFlags = (DirectoryCopyFlag_T)fFlags;
Note:
See TracChangeset
for help on using the changeset viewer.

