Index: /trunk/doc/manual/en_US/SDKRef.xml =================================================================== --- /trunk/doc/manual/en_US/SDKRef.xml (revision 55630) +++ /trunk/doc/manual/en_US/SDKRef.xml (revision 55631) @@ -4295,8 +4295,6 @@ , - and - are not + IGuestSession::symlinkRemoveDirectory() and + IGuestSession::symlinkRemoveFile() are not implemented yet. @@ -4306,8 +4304,6 @@ , - and - are not + IGuestSession::directoryRename() and + IGuestSession::directorySetACL() are not implemented yet. Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (revision 55630) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (revision 55631) @@ -1722,4 +1722,16 @@ +/** bird: This is just a code conversion tool, flags are better defined by + * the preprocessor, in general. But the code was using obsoleted + * main flags for internal purposes (in a uint32_t) without passing them + * along, or it seemed that way. Enum means compiler checks types. */ +enum gctlCopyFlags +{ + kGctlCopyFlags_None = 0, + kGctlCopyFlags_Recursive = RT_BIT(1), + kGctlCopyFlags_FollowLinks = RT_BIT(2) +}; + + /** * Creates a copy context structure which then can be used with various @@ -1977,9 +1989,9 @@ { BOOL fDirExists = FALSE; - HRESULT rc = pContext->pCmdCtx->pGuestSession->DirectoryExists(Bstr(pszDir).raw(), &fDirExists); - if (FAILED(rc)) + HRESULT rc = pContext->pCmdCtx->pGuestSession->DirectoryExists(Bstr(pszDir).raw(), FALSE /*followSymlinks*/, &fDirExists); + if (SUCCEEDED(rc)) + *fExists = fDirExists != FALSE; + else vrc = gctlPrintError(pContext->pCmdCtx->pGuestSession, COM_IIDOF(IGuestSession)); - else - *fExists = fDirExists ? true : false; } else @@ -2044,9 +2056,9 @@ { BOOL fFileExists = FALSE; - HRESULT rc = pContext->pCmdCtx->pGuestSession->FileExists(Bstr(pszFile).raw(), &fFileExists); - if (FAILED(rc)) + HRESULT rc = pContext->pCmdCtx->pGuestSession->FileExists(Bstr(pszFile).raw(), FALSE /*followSymlinks*/, &fFileExists); + if (SUCCEEDED(rc)) + *fExists = fFileExists != FALSE; + else vrc = gctlPrintError(pContext->pCmdCtx->pGuestSession, COM_IIDOF(IGuestSession)); - else - *fExists = fFileExists ? true : false; } else @@ -2096,14 +2108,14 @@ * @param pszFileSource Source file to copy to the destination. * @param pszFileDest Name of copied file on the destination. - * @param fFlags Copy flags. No supported at the moment and needs - * to be set to 0. + * @param enmFlags Copy flags. No supported at the moment and + * needs to be set to 0. */ static int gctlCopyFileToDest(PCOPYCONTEXT pContext, const char *pszFileSource, - const char *pszFileDest, uint32_t fFlags) + const char *pszFileDest, gctlCopyFlags enmFlags) { AssertPtrReturn(pContext, VERR_INVALID_POINTER); AssertPtrReturn(pszFileSource, VERR_INVALID_POINTER); AssertPtrReturn(pszFileDest, VERR_INVALID_POINTER); - AssertReturn(!fFlags, VERR_INVALID_POINTER); /* No flags supported yet. */ + AssertReturn(enmFlags == kGctlCopyFlags_None, VERR_INVALID_PARAMETER); /* No flags supported yet. */ if (pContext->pCmdCtx->cVerbose > 1) @@ -2119,15 +2131,15 @@ if (pContext->fHostToGuest) { - SafeArray copyFlags; - rc = pContext->pCmdCtx->pGuestSession->CopyTo(Bstr(pszFileSource).raw(), Bstr(pszFileDest).raw(), - ComSafeArrayAsInParam(copyFlags), - pProgress.asOutParam()); + SafeArray copyFlags; + rc = pContext->pCmdCtx->pGuestSession->FileCopyToGuest(Bstr(pszFileSource).raw(), Bstr(pszFileDest).raw(), + ComSafeArrayAsInParam(copyFlags), + pProgress.asOutParam()); } else { - SafeArray copyFlags; - rc = pContext->pCmdCtx->pGuestSession->CopyFrom(Bstr(pszFileSource).raw(), Bstr(pszFileDest).raw(), - ComSafeArrayAsInParam(copyFlags), - pProgress.asOutParam()); + SafeArray copyFlags; + rc = pContext->pCmdCtx->pGuestSession->FileCopyFromGuest(Bstr(pszFileSource).raw(), Bstr(pszFileDest).raw(), + ComSafeArrayAsInParam(copyFlags), + pProgress.asOutParam()); } @@ -2158,5 +2170,5 @@ * @param pszFilter DOS-style wildcard filter (?, *). Optional. * @param pszDest Destination directory on the guest. - * @param fFlags Copy flags, such as recursive copying. + * @param enmFlags Copy flags, such as recursive copying. * @param pszSubDir Current sub directory to handle. Needs to NULL and only * is needed for recursion. @@ -2164,5 +2176,5 @@ static int gctlCopyDirToGuest(PCOPYCONTEXT pContext, const char *pszSource, const char *pszFilter, - const char *pszDest, uint32_t fFlags, + const char *pszDest, enum gctlCopyFlags enmFlags, const char *pszSubDir /* For recursion. */) { @@ -2229,5 +2241,5 @@ RTPrintf("Directory: %s\n", DirEntry.szName); - if (fFlags & CopyFileFlag_Recursive) + if (enmFlags & kGctlCopyFlags_Recursive) { char *pszNewSub = NULL; @@ -2244,5 +2256,5 @@ vrc = gctlCopyDirToGuest(pContext, pszSource, pszFilter, - pszDest, fFlags, pszNewSub); + pszDest, enmFlags, pszNewSub); RTStrFree(pszNewSub); } @@ -2254,6 +2266,6 @@ case RTDIRENTRYTYPE_SYMLINK: - if ( (fFlags & CopyFileFlag_Recursive) - && (fFlags & CopyFileFlag_FollowLinks)) + if ( (enmFlags & kGctlCopyFlags_Recursive) + && (enmFlags & kGctlCopyFlags_FollowLinks)) { /* Fall through to next case is intentional. */ @@ -2298,5 +2310,5 @@ { vrc = gctlCopyFileToDest(pContext, pszFileSource, - pszFileDest, 0 /* Flags */); + pszFileDest, kGctlCopyFlags_None); RTStrFree(pszFileDest); } @@ -2327,5 +2339,5 @@ * @param pszFilter DOS-style wildcard filter (?, *). Optional. * @param pszDest Destination directory on the host. - * @param fFlags Copy flags, such as recursive copying. + * @param enmFlags Copy flags, such as recursive copying. * @param pszSubDir Current sub directory to handle. Needs to NULL and only * is needed for recursion. @@ -2333,5 +2345,5 @@ static int gctlCopyDirToHost(PCOPYCONTEXT pContext, const char *pszSource, const char *pszFilter, - const char *pszDest, uint32_t fFlags, + const char *pszDest, gctlCopyFlags enmFlags, const char *pszSubDir /* For recursion. */) { @@ -2396,5 +2408,5 @@ } - if (fFlags & CopyFileFlag_Recursive) + if (enmFlags & kGctlCopyFlags_Recursive) { Utf8Str strDir(strName); @@ -2411,5 +2423,5 @@ vrc = gctlCopyDirToHost(pContext, pszSource, pszFilter, - pszDest, fFlags, pszNewSub); + pszDest, enmFlags, pszNewSub); RTStrFree(pszNewSub); } @@ -2421,6 +2433,6 @@ case FsObjType_Symlink: - if ( (fFlags & CopyFileFlag_Recursive) - && (fFlags & CopyFileFlag_FollowLinks)) + if ( (enmFlags & kGctlCopyFlags_Recursive) + && (enmFlags & kGctlCopyFlags_FollowLinks)) { /* Fall through to next case is intentional. */ @@ -2468,5 +2480,5 @@ { vrc = gctlCopyFileToDest(pContext, pszFileSource, - pszFileDest, 0 /* Flags */); + pszFileDest, kGctlCopyFlags_None); RTStrFree(pszFileDest); } @@ -2533,15 +2545,15 @@ * @param pszDest Destination directory where to copy in the source * source directory. - * @param fFlags Copy flags, such as recursive copying. + * @param enmFlags Copy flags, such as recursive copying. */ static int gctlCopyDirToDest(PCOPYCONTEXT pContext, const char *pszSource, const char *pszFilter, - const char *pszDest, uint32_t fFlags) + const char *pszDest, enum gctlCopyFlags enmFlags) { if (pContext->fHostToGuest) return gctlCopyDirToGuest(pContext, pszSource, pszFilter, - pszDest, fFlags, NULL /* Sub directory, only for recursion. */); + pszDest, enmFlags, NULL /* Sub directory, only for recursion. */); return gctlCopyDirToHost(pContext, pszSource, pszFilter, - pszDest, fFlags, NULL /* Sub directory, only for recursion. */); + pszDest, enmFlags, NULL /* Sub directory, only for recursion. */); } @@ -2643,5 +2655,5 @@ Utf8Str strSource; const char *pszDst = NULL; - uint32_t fFlags = CopyFileFlag_None; + enum gctlCopyFlags enmFlags = kGctlCopyFlags_None; bool fCopyRecursive = false; bool fDryRun = false; @@ -2663,9 +2675,9 @@ case GETOPTDEF_COPY_FOLLOW: - fFlags |= CopyFileFlag_FollowLinks; + enmFlags = (enum gctlCopyFlags)((uint32_t)enmFlags | kGctlCopyFlags_FollowLinks); break; case 'R': /* Recursive processing */ - fFlags |= CopyFileFlag_Recursive; + enmFlags = (enum gctlCopyFlags)((uint32_t)enmFlags | kGctlCopyFlags_Recursive); break; @@ -2827,5 +2839,5 @@ if (RT_SUCCESS(vrc)) { - vrc = gctlCopyFileToDest(pContext, pszSource, pszDstFile, 0 /* Flags */); + vrc = gctlCopyFileToDest(pContext, pszSource, pszDstFile, kGctlCopyFlags_None); RTStrFree(pszDstFile); } @@ -2836,5 +2848,5 @@ { /* Directory (with filter?). */ - vrc = gctlCopyDirToDest(pContext, pszSource, pszFilter, pszDst, fFlags); + vrc = gctlCopyDirToDest(pContext, pszSource, pszFilter, pszDst, enmFlags); } } @@ -3138,8 +3150,8 @@ try { - /** @todo How does IGuestSession::FileRemove work with read-only files? Do we + /** @todo How does IGuestSession::FsObjRemove work with read-only files? Do we * need to do some chmod or whatever to better emulate the --force flag? */ HRESULT rc; - CHECK_ERROR(pCtx->pGuestSession, FileRemove(Bstr(ValueUnion.psz).raw())); + CHECK_ERROR(pCtx->pGuestSession, FsObjRemove(Bstr(ValueUnion.psz).raw())); if (FAILED(rc) && !fForce) return RTEXITCODE_FAILURE; @@ -3180,10 +3192,10 @@ std::vector< Utf8Str > vecSources; const char *pszDst = NULL; - com::SafeArray aRenameFlags; + com::SafeArray aRenameFlags; try { /** @todo Make flags configurable. */ - aRenameFlags.push_back(PathRenameFlag_NoReplace); + aRenameFlags.push_back(FsObjRenameFlag_NoReplace); while ( (ch = RTGetOpt(&GetState, &ValueUnion)) @@ -3236,7 +3248,7 @@ if (cSources > 1) { - ComPtr pFsObjInfo; - rc = pCtx->pGuestSession->DirectoryQueryInfo(Bstr(pszDst).raw(), pFsObjInfo.asOutParam()); - if (FAILED(rc)) + BOOL fExists = FALSE; + rc = pCtx->pGuestSession->DirectoryExists(Bstr(pszDst).raw(), FALSE /*followSymlinks*/, &fExists); + if (FAILED(rc) || !fExists) return RTMsgErrorExit(RTEXITCODE_FAILURE, "Destination must be a directory when specifying multiple sources\n"); } @@ -3252,19 +3264,11 @@ && !g_fGuestCtrlCanceled) { - bool fSourceIsDirectory = false; Utf8Str strCurSource = (*it); - /** @todo Slooooow, but works for now. */ - /** @todo r=bird: Need an interface for querying info on a file system - * object, not just files or directories exclusively. You also may - * want to take symbolic links into account somewhere along the line, - * though preferrably on the guest end of things... */ ComPtr pFsObjInfo; - rc = pCtx->pGuestSession->FileQueryInfo(Bstr(strCurSource).raw(), pFsObjInfo.asOutParam()); - if (FAILED(rc)) - { - rc = pCtx->pGuestSession->DirectoryQueryInfo(Bstr(strCurSource).raw(), pFsObjInfo.asOutParam()); - fSourceIsDirectory = SUCCEEDED(rc); - } + FsObjType enmObjType; + rc = pCtx->pGuestSession->FsObjQueryInfo(Bstr(strCurSource).raw(), FALSE /*followSymlinks*/, pFsObjInfo.asOutParam()); + if (SUCCEEDED(rc)) + rc = pFsObjInfo->COMGETTER(Type)(&enmObjType); if (FAILED(rc)) { @@ -3278,14 +3282,14 @@ if (pCtx->cVerbose > 1) RTPrintf("Renaming %s \"%s\" to \"%s\" ...\n", - fSourceIsDirectory ? "directory" : "file", + enmObjType == FsObjType_Directory ? "directory" : "file", strCurSource.c_str(), pszDst); if (!fDryrun) { - if (fSourceIsDirectory) - { - CHECK_ERROR_BREAK(pCtx->pGuestSession, DirectoryRename(Bstr(strCurSource).raw(), - Bstr(pszDst).raw(), - ComSafeArrayAsInParam(aRenameFlags))); + if (enmObjType == FsObjType_Directory) + { + CHECK_ERROR_BREAK(pCtx->pGuestSession, FsObjRename(Bstr(strCurSource).raw(), + Bstr(pszDst).raw(), + ComSafeArrayAsInParam(aRenameFlags))); /* Break here, since it makes no sense to rename mroe than one source to @@ -3300,7 +3304,7 @@ } else - CHECK_ERROR_BREAK(pCtx->pGuestSession, FileRename(Bstr(strCurSource).raw(), - Bstr(pszDst).raw(), - ComSafeArrayAsInParam(aRenameFlags))); + CHECK_ERROR_BREAK(pCtx->pGuestSession, FsObjRename(Bstr(strCurSource).raw(), + Bstr(pszDst).raw(), + ComSafeArrayAsInParam(aRenameFlags))); } @@ -3498,8 +3502,5 @@ ComPtr pFsObjInfo; - rc = pCtx->pGuestSession->FileQueryInfo(Bstr(it->first).raw(), pFsObjInfo.asOutParam()); - if (FAILED(rc)) - rc = pCtx->pGuestSession->DirectoryQueryInfo(Bstr(it->first).raw(), pFsObjInfo.asOutParam()); - + rc = pCtx->pGuestSession->FsObjQueryInfo(Bstr(it->first).raw(), FALSE /*followSymlinks*/, pFsObjInfo.asOutParam()); if (FAILED(rc)) { @@ -3514,5 +3515,5 @@ { FsObjType_T objType; - pFsObjInfo->COMGETTER(Type)(&objType); + pFsObjInfo->COMGETTER(Type)(&objType); /** @todo What about error checking? */ switch (objType) { Index: /trunk/src/VBox/Main/idl/VirtualBox.xidl =================================================================== --- /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 55630) +++ /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 55631) @@ -9980,9 +9980,9 @@ - File seeking types. + What a file seek () is relative to. @@ -9992,4 +9992,8 @@ Seek from the current file position. + + + Seek relative to the end of the file. To seek to the position two + bytes from the end of the file, specify -2 as the seek offset. @@ -10115,24 +10119,65 @@ File copying flags. + Not flags are implemented yet. No flag set. - - Copy directories recursively. - This flag is not implemented yet. - - - Only copy when the source file is newer than the destination file - or when the destination file is missing. This flag is not implemented - yet. - - - Follow symbolic links. This flag is not implemented yet. + + + + Do not replace the destination file if it exists. + This flag is not implemented yet. + + + + + Follow symbolic links. + This flag is not implemented yet. + + + + + Only copy when the source file is newer than the destination file + or when the destination file is missing. + This flag is not implemented yet. + + + + + + + File moving flags. + + + No flag set. + + + + Replace the destination file, symlink, etc if it exists, however this + does not allow replacing any directories. + + + + + Follow symbolic links in the final components or not (only applied to + the given source and target paths, not to anything else). + + + + + Allow moving directories accross file system boundraries. Because it + is could be a big undertaking, we require extra assurance that we + should do it when requested. + @@ -10154,4 +10199,21 @@ + + Directory copying flags. + Not flags are implemented yet. + + + No flag set. + + + Allow copying into an existing destination directory. + + + + + Directory recursive removement flags. + + WARNING!! THE FLAGS ARE CURRENTLY IGNORED. THE METHOD APPLIES + REGARDLESS + OF THE INPUT. + @@ -10173,22 +10240,18 @@ - Path renaming flags. - - - - No flag set. - - - Do not replace anything. - - - This will replace attempt any target which isn't a directory. - - - Don't allow symbolic links as part of the path. + Flags for use when renaming file system objects (files, directories, + symlink, etc), see . + + + + Do not replace any destination object. + + + This will attempt to replace any destination object other except + directories. (The default is to fail if the destination exists.) @@ -10266,5 +10329,6 @@ > - Symbolic link types. + Symbolic link types. This is significant when creating links on the + Windows platform, ignored elsewhere. @@ -10276,5 +10340,5 @@ - The link targets a file (or whatever else). + The link targets a file (or whatever else except directories). @@ -10387,4 +10451,108 @@ aren't active yet. + + + + + + File open access mode for use with + and . + + + Open the file only with read access. + + + Open the file only with write access. + + + Open the file with both read and write access. + + + Open the file for appending only, no read or seek access. + Not yet implemented. + + + + Open the file for appending and read. Writes always goes to the + end of the file while reads are done at the current or specified file + position. + Not yet implemented. + + + + + + + What action and + should take whether the file being opened exists or not. + + + Opens an existing file, fails if no file exists. (Was "oe".) + + + Opens an existing file, creates a new one if no file exists. (Was "oc".) + + + Creates a new file is no file exists, fails if there is a file there already. (Was "ce".) + + + + Creates a new file, replace any existing file. (Was "ca".) + + Currently undefined whether we will inherit mode and ACLs from the + existing file or replace them. + + + + + Opens and truncate an existing file, fails if no file exists. (Was "ot".) + + + Opens an existing file and places the file pointer at the end of + the file, creates the file if it does not exist. This action implies + write access. (Was "ca".) + + + Deprecated. Only here for historical reasons. Do not use! + + + + + + + + File sharing mode for . + + + Only share read access to the file. + + + Only share write access to the file. + + + Share both read and write access to the file, but deny deletion. + + + Only share delete access, denying read and write. + + + Share read and delete access to the file, denying writing. + + + Share write and delete access to the file, denying reading. + + + Share all access, i.e. read, write and delete, to the file. @@ -10497,4 +10665,5 @@ Don't allow symbolic links as part of the path. + @@ -10799,5 +10968,5 @@ @@ -10866,5 +11035,5 @@ Returns the session timeout (in ms). - The method is not implemented yet. + This attribute is not implemented yet. @@ -10918,4 +11087,12 @@ + + + The current directory of the session. Guest path style. + + This attribute is not implemented yet. + + + @@ -10943,45 +11120,77 @@ - - - Copies a file from guest to the host. - - - Error starting the copy operation. + + + + + Recursively copies a directory from one guest location to another. + + + Not yet implemented. - Source file in the guest to copy to the host. - - - Destination file name on the host. - - - Copy flags; see for more information. + The path to the directory to copy (in the guest). Guest path style. + + + The path to the target directory (in the guest). Unless the + flag is given, the + directory shall not already exist. Guest path style. + + + Zero or more values. - Progress object to track the operation completion. - - - - - - Copies a file from host to the guest. - - - Error starting the copy operation. + Progress object to track the operation to completion. + + + + + + Recursively copies a directory from the guest to the host. + + + Not yet implemented. - Source file on the host to copy to the guest. - - - Destination file name in the guest. - - - Copy flags; see for more information. + Path to the directory on the guest side that should be copied to + the host. Guest path style. + + + Where to put the directory on the host. Unless the + flag is given, the + directory shall not already exist. Host path style. + + + Zero or more values. - Progress object to track the operation completion. + Progress object to track the operation to completion. + + + + + + Recursively copies a directory from the host to the guest. + + + Not yet implemented. + + + + Path to the directory on the host side that should be copied to + the guest. Host path style. + + + Where to put the file in the guest. Unless the + flag is given, the + directory shall not already exist. Guest style path. + + + Zero or more values. + + + Progress object to track the operation to completion. @@ -10989,5 +11198,5 @@ - Create a directory in the guest. + Creates a directory in the guest. @@ -10996,11 +11205,16 @@ - Full path of directory to create. + Path to the directory directory to be created. Guest path style. - File creation mode. + + The UNIX-style access mode mask to create the directory with. + Whether/how all three access groups and associated access rights are + realized is guest OS dependent. The API does the best it can on each + OS. + - Creation flags; see for more information. + Zero or more flags. @@ -11008,5 +11222,5 @@ - Create a temporary directory in the guest. + Creates a temporary directory in the guest. @@ -11031,21 +11245,30 @@ - The mode of the directory to create. Use 0700 unless there are - reasons not to. This parameter is ignored if "secure" is specified. - + + The UNIX-style access mode mask to create the directory with. + Whether/how all three access groups and associated access rights are + realized is guest OS dependent. The API does the best it can on each + OS. + + This parameter is ignore if the @a secure parameter is set to @c true. + It is strongly recommended to use 0700. + - The absolute path to create the temporary directory in. + The path to the directory in which the temporary directory should + be created. Guest path style. - Whether to fail if the directory can not be securely created. + + Whether to fail if the directory can not be securely created. Currently this means that another unprivileged user cannot manipulate the path specified or remove the temporary directory after it has been created. Also causes the mode specified to be - ignored. May not be supported on all guest types. + ignored. May not be supported on all guest types. + - On success this will contain the name of the directory created - with full path. + On success this will contain the full path to the created + directory. Guest path style. @@ -11060,5 +11283,13 @@ - Directory to check existence for. + Path to the directory to check if exists. Guest path style. + + + + If @c true, symbolic links in the final component will be followed + and the existance of the symlink target made the question for this method. + If @c false, a symbolic link in the final component will make the + method return @c false (because a symlink isn't a directory). + @@ -11069,6 +11300,9 @@ - Opens a directory and creates a object that - can be used for further operations. + Opens a directory in the guest and creates a + object that can be used for further operations. + + This method follows symbolic links by default at the moment, this + may change in the future. @@ -11080,11 +11314,12 @@ - Full path to file to open. + Path to the directory to open. Guest path style. - Open filter to apply. This can include wildcards like ? and *. + Optional directory listing filter to apply. This uses the DOS/NT + style wildcard characters '?' and '*'. - Open flags; see for more information. + Zero or more flags. @@ -11093,41 +11328,43 @@ - - - Queries information about a directory in the guest. - - - Directory to query information for was not found. - - - Error querying information. - + + + Removes a guest directory if empty. + + Symbolic links in the final component will not be followed, + instead an not-a-directory error is reported. - Directory to query information for. - - - object containing the queried information. - - - - - - Removes a guest directory if not empty. + Path to the directory that should be removed. Guest path style. + + + + + + Removes a guest directory recursively. + + + + WARNING!! THE FLAGS ARE NOT CURRENTLY IMPLEMENTED. THE IMPLEMENTATION + WORKS AS IF FLAGS WAS SET TO . + + + If the final path component is a symbolic link, this method will + fail as it can only be applied to directories. - Full path of directory to remove. - - - - - - Removes a guest directory recursively. - - - Full path of directory to remove recursively. + Path of the directory that is to be removed recursively. Guest + path style. - Remove flags; see for more information. + Zero or more flags. + WARNING! SPECIFYING IS + MANDATORY AT THE MOMENT!! + @@ -11137,34 +11374,5 @@ - - - Renames a directory in the guest. - - - Source directory to rename. - - - Destination directory to rename the source to. - - - Rename flags; see for more information. - - - - - - Sets the ACL (Access Control List) of a guest directory. - - - The method is not implemented yet. - - - - Full path of directory to set the ACL for. - - - Actual ACL string to set. Must comply with the guest OS. - - + @@ -11239,4 +11447,86 @@ + + + + + Copies a file from one guest location to another. + + Will overwrite the destination file unless + is specified. + + + Not yet implemented. + + + + The path to the file to copy (in the guest). Guest path style. + + + The path to the target file (in the guest). This cannot be a + directory. Guest path style. + + + Zero or more values. + + + Progress object to track the operation to completion. + + + + + + Copies a file from the guest to the host. + + Will overwrite the destination file unless + is specified. + + + Error starting the copy operation. + + + + Path to the file on the guest side that should be copied to the + host. Guest path style. + + + Where to put the file on the host (file, not directory). Host + path style. + + + Zero or more values. + + + Progress object to track the operation to completion. + + + + + + Copies a file from the host to the guest. + + Will overwrite the destination file unless + is specified. + + + Error starting the copy operation. + + + + Path to the file on the host side that should be copied to the + guest. Host path style. + + + Where to put the file in the guest (file, not directory). Guest + style path. + + + Zero or more values. + + + Progress object to track the operation to completion. + + + @@ -11245,5 +11535,5 @@ The operation is not possible as requested on this particular - guest type. + guest OS. @@ -11265,10 +11555,17 @@ - The mode of the file to create. Use 0700 unless there are - reasons not to. This parameter is ignored if "secure" is specified. - + + The UNIX-style access mode mask to create the file with. + Whether/how all three access groups and associated access rights are + realized is guest OS dependent. The API does the best it can on each + OS. + + This parameter is ignore if the @a secure parameter is set to @c true. + It is strongly recommended to use 0600. + - The absolute path to create the temporary file in. + The path to the directory in which the temporary file should be + created. @@ -11288,5 +11585,5 @@ - Checks whether a file exists in the guest or not. + Checks whether a regular file exists in the guest or not. @@ -11295,5 +11592,153 @@ - File to check existence for. + Path to the alleged regular file. Guest path style. + + + + If @c true, symbolic links in the final component will be followed + and the existance of the symlink target made the question for this method. + If @c false, a symbolic link in the final component will make the + method return @c false (because a symlink isn't a regular file). + + + + Returns @c true if the file exists, @c false if not. @c false is + also return if this @a path does not point to a file object. + + + + + + Opens a file and creates a object that + can be used for further operations. + + + File to open was not found. + + + Error while opening the file. + + + + Path to file to open. Guest path style. + + + The file access mode (read, write and/or append). + See for details. + + + What action to take depending on whether the file exists or not. + See for details. + + + + The UNIX-style access mode mask to create the file with if @a openAction + requested the file to be created (otherwise ignored). Whether/how all + three access groups and associated access rights are realized is guest + OS dependent. The API does the best it can on each OS. + + + + object representing the opened file. + + + + + + Opens a file and creates a object that + can be used for further operations, extended version. + + + File to open was not found. + + + Error while opening the file. + + + + Path to file to open. Guest path style. + + + The file access mode (read, write and/or append). + See for details. + + + What action to take depending on whether the file exists or not. + See for details. + + + The file sharing mode in the guest. This parameter is currently + ignore for all guest OSes. It will in the future be implemented for + Windows, OS/2 and maybe Solaris guests only, the others will ignore it. + Use . + + + + + The UNIX-style access mode mask to create the file with if @a openAction + requested the file to be created (otherwise ignored). Whether/how all + three access groups and associated access rights are realized is guest + OS dependent. The API does the best it can on each OS. + + + + + The initial read/write offset (in bytes). + + + object representing the opened file. + + + + + + Queries the size of a regular file in the guest. + + + File to was not found. + + + Error querying file size. + + + + Path to the file which size is requested. Guest path style. + + + + It @c true, symbolic links in the final path component will be + followed to their target, and the size of the target is returned. + If @c false, symbolic links in the final path component will make + the method call fail (symblink is not a regular file). + + + + Queried file size. + + + + + + + + Checks whether a file system object (file, directory, etc) exists in + the guest or not. + + + Error while checking existence of the file specified. + + + + Path to the file system object to check the existance of. Guest + path style. + + + + If @c true, symbolic links in the final component will be followed + and the method will instead check if the target exists. + If @c false, symbolic links in the final component will satisfy the + method and it will return @c true in @a exists. + @@ -11302,221 +11747,5 @@ - - - Removes a single file in the guest. - - - File to remove was not found. - - - Error while removing the file. - - - - Path to the file to remove. - - - - - - Opens a file and creates a object that - can be used for further operations. - - - File to open was not found. - - - Error while opening the file. - - - - Full path to file to open. - - - The file opening mode. This describes the wanted access to a file, whereas - the parameter must be one of the following: -
    -
  • "r": Opens a file for reading.
    • -
  • "r+": Opens a file for reading and writing.
    • -
  • "w": Opens a file for writing.
    • -
  • "w+": Opens a file for writing and reading.
    • -
- - - - The file disposition. This describes the action to take in case a - file exists or does not exist, whereas the parameter must be one of the - following: -
    -
  • "ca": Creates a new file, always. Overwrites an existing file.
    • -
  • "ce": Creates a new file if it does not exist. Fail if exist.
    • -
  • "oa": Opens an existing file and places the file pointer at the - end of the file, if opened with write access. Create the file if it does not exist.
    • -
  • "oc": Opens an existing file or create it if it does not exist.
    • -
  • "oe": Opens an existing file or fail if it does not exist.
    • -
  • "ot": Opens and truncate an existing file or fail if it does not exist.
    • -
- - - - The mode to create the file with. Must be a three-digit octal number which - represents the access rights for the file. - - - object representing the opened file. - - - - - - Opens a file and creates a object that - can be used for further operations, extended version. - - - File to open was not found. - - - Error while opening the file. - - - - Full path to file to open. - - - The file opening mode. This describes the wanted access to a file, whereas - the parameter must be one of the following: -
    -
  • "r": Opens a file for reading.
    • -
  • "r+": Opens a file for reading and writing.
    • -
  • "w": Opens a file for writing.
    • -
  • "w+": Opens a file for writing and reading.
    • -
- - - - The file disposition. This describes the action to take in case a - file exists or does not exist, whereas the parameter must be one of the - following: -
    -
  • "ca": Creates a new file, always. Overwrites an existing file.
    • -
  • "ce": Creates a new file if it does not exist. Fail if exist.
    • -
  • "oa": Opens an existing file and places the file pointer at the - end of the file, if opened with write access. Create the file if it does not exist.
    • -
  • "oc": Opens an existing file or create it if it does not exist.
    • -
  • "oe": Opens an existing file or fail if it does not exist.
    • -
  • "ot": Opens and truncate an existing file or fail if it does not exist.
    • -
- - - - The file sharing mode in the guest. This parameter - is not implemented yet. Pass an empty string here. - - - The mode to create the file with. Must be a three-digit octal number which - represents the access rights for the file. - - - The initial read/write offset (in bytes). - - - object representing the opened file. - - - - - - Queries information about a file in the guest. - - - File to query information for was not found. - - - Error querying information. - - - - File to query information for. - - - object containing the queried information. - - - - - - Queries the size of a file in the guest. - - - File to rename was not found. - - - Error querying file size. - - - - File to query the size for. - - - Queried file size. - - - - - - Renames a file in the guest. - - - Source file to rename. - - - Destination file to rename the source to. - - - Rename flags; see for more information. - - - - - - Sets the ACL (Access Control List) of a file in the guest. - - - The method is not implemented yet. - - - - Full path of file to set the ACL for. - - - Actual ACL string to set. Must comply with the guest OS. - - - - - - Checks whether a file system object (file, directory, etc) exists in - the guest or not. - - - Error while checking existence of the file specified. - - - - Path to the file system object to check the existance of. - - - - If @c true symbolic links will be followed and the target must - exists and be accessible, otherwise, if @c false we'll be happy - with a dangling symbolic link. - - - - Returns @c true if the file exists, @c false if not. - - - - + Queries information about a file system object (file, directory, etc) @@ -11531,5 +11760,6 @@ - Path to the file system object to gather information about + Path to the file system object to gather information about. + Guest path style. @@ -11544,4 +11774,112 @@ + + + + Removes a file system object (file, symlink, etc) in the guest. Will + not work on directories, use + to remove directories. + + This method will remove symbolic links in the final path + component, not follow them. + + + The method has not been implemented yet. + + + The file system object was not found. + + + For most other errors. We know this is unhelpful, will fix shortly... + + + + Path to the file system object to remove. Guest style path. + + + + + + Renames a file system object (file, directory, symlink, etc) in the + guest. + + + The file system object was not found. + + + For most other errors. We know this is unhelpful, will fix shortly... + + + + The current path to the object. Guest path style. + + + The new path to the object. Guest path style. + + + Zero or more values. + + + + + + Moves a file system object (file, directory, symlink, etc) from one + guest location to another. + + This differs from in that it + can move accross file system boundraries. In that case it will + perform a copy and then delete the original. For directories, this + can take a while and is subject to races. + + + Not yet implemented. + + + + Path to the file to move. Guest path style. + + + Where to move the file to (file, not directory). Guest path + style. + + + Zero or more values. + + + Progress object to track the operation to completion. + + + + + + Sets the access control list (ACL) of a file system object (file, + directory, etc) in the guest. + + + The method is not implemented yet. + + + + Full path of the file system object which ACL to set + + + + If @c true symbolic links in the final component will be followed, + otherwise, if @c false, the method will work directly on a symbolic + link in the final component. + + + + The ACL specification string. To-be-defined. + + + UNIX-style mode mask to use if @a acl is empty. As mention in + this is realized on + a best effort basis and the exact behavior depends on the Guest OS. + + + + + @@ -11708,4 +12046,6 @@ + + @@ -11716,14 +12056,19 @@ - - The name of the symbolic link. + + Path to the symbolic link that should be created. Guest path + style. - The path to the symbolic link target. + + The path to the symbolic link target. If not an absolute, this will + be relative to the @a symlink location at access time. Guest path + style. + - The symbolic link type; - see for more information. + The symbolic link type (mainly for Windows). See + for more information. @@ -11739,8 +12084,13 @@ - Symbolic link to check existence for. + Path to the alleged symbolic link. Guest path style. - Returns @c true if the symbolic link exists, @c false if not. + + Returns @c true if the symbolic link exists. Returns @c false if it + does not exist, if the file system object identified by the path is + not a symbolic link, or if the object type is inaccessible to the + user, or if the @a symlink argument is empty. + @@ -11748,5 +12098,5 @@ - Reads a symbolic link in the guest. + Reads the target value of a symbolic link in the guest. @@ -11755,43 +12105,15 @@ - Full path to symbolic link to read. + Path to the symbolic link to read. - - Read flags; see for more information. - + Zero or more values. - - Target of the symbolic link pointing to, if found. - - - - - - - Removes a symbolic link in the guest if it's a directory. - - - The method is not implemented yet. - - - - Symbolic link to remove. - - - - - - Removes a symbolic link in the guest if it's a file. - - - The method is not implemented yet. - - - - Symbolic link to remove. - - + Target value of the symbolic link. Guest path style. + + + + @@ -12057,13 +12379,9 @@ - - Full path of directory. - + The path specified when opening the directory. - - The open filter. - + Directory listing filter to (specified when opening the directory). @@ -12087,4 +12405,9 @@ + + + @@ -12103,5 +12426,5 @@ @@ -12109,48 +12432,57 @@ Abstract parent interface for files handled by VirtualBox. + + + + Event source for file events. + + + + + The ID VirtualBox internally assigned to the open file. + + + + + The initial size in bytes when opened. + + + + + The current file position. + + The file current position always applies to the + method, which updates it upon return. Same goes for the + method except when is + or , where it will always write + to the end of the file and will leave this attribute unchanged. + + The is used to change this attribute without + transfering any file data like read and write does. + + + + + Current file status. + + + + + + Full path of the actual file name of this file. + + + - - The creation mode. - - - - - The disposition mode. - - - - - Event source for file events. - - - - - Full path of the actual file name of this file. - - - - - The file's ID. - - - - - The initial size in bytes when opened. - - - - - The open mode. - - - - - Current read/write offset in bytes. - - - - - Current file status. - + The UNIX-style creation mode specified when opening the file. + + + The opening action specified when opening the file. + + + The file access mode. @@ -12176,7 +12508,11 @@ - - - Reads data from this file. + + + + Queries the current file size. @@ -12184,4 +12520,17 @@ + + Queried file size. + + + + + + Reads data from this file. + + + The method is not implemented yet. + + Number of bytes to read. @@ -12225,5 +12574,27 @@ - Changes the read and write position of this file. + Changes the current file position of this file. + + The file current position always applies to the + method. Same for the method it except when + the is + or . + + + Offset to seek relative to the position specified by @a whence. + + + + One of the seek starting points. + + + + The new file offset after the seek operation. + + + + + + Sets the ACL of this file. @@ -12231,17 +12602,18 @@ - - Offset to seek. - - - - Seek mode; see for more information. - - - - - - - Sets the ACL of this file. + + The ACL specification string. To-be-defined. + + + UNIX-style mode mask to use if @a acl is empty. As mention in + this is realized on + a best effort basis and the exact behavior depends on the Guest OS. + + + + + + + Changes the file size. @@ -12249,6 +12621,6 @@ - - ACL string to set. + + The new file size. @@ -12307,5 +12679,5 @@ Index: /trunk/src/VBox/Main/include/GuestCtrlImplPrivate.h =================================================================== --- /trunk/src/VBox/Main/include/GuestCtrlImplPrivate.h (revision 55630) +++ /trunk/src/VBox/Main/include/GuestCtrlImplPrivate.h (revision 55631) @@ -599,11 +599,14 @@ /** The filename. */ Utf8Str mFileName; - /** Then file's opening mode. */ - Utf8Str mOpenMode; - /** The file's disposition mode. */ - Utf8Str mDisposition; - /** The file's sharing mode. - **@todo Not implemented yet.*/ - Utf8Str mSharingMode; + /** The file access mode. */ + FileAccessMode_T mAccessMode; + /** String translation of mFileAccessMode for the GAs. */ + const char *mpszAccessMode; + /** The file open action. */ + FileOpenAction_T mOpenAction; + /** String translation of mOpenAction for the GAs. */ + const char *mpszOpenAction; + /** The file sharing mode. */ + FileSharingMode_T mSharingMode; /** Octal creation mode. */ uint32_t mCreationMode; Index: /trunk/src/VBox/Main/include/GuestFileImpl.h =================================================================== --- /trunk/src/VBox/Main/include/GuestFileImpl.h (revision 55630) +++ /trunk/src/VBox/Main/include/GuestFileImpl.h (revision 55631) @@ -72,21 +72,22 @@ private: - /** Wrapped @name IGuestFile properties. + /** @name Wrapped IGuestFile properties. * @{ */ HRESULT getCreationMode(ULONG *aCreationMode); - HRESULT getDisposition(com::Utf8Str &aDisposition); HRESULT getEventSource(ComPtr &aEventSource); - HRESULT getFileName(com::Utf8Str &aFileName); HRESULT getId(ULONG *aId); HRESULT getInitialSize(LONG64 *aInitialSize); - HRESULT getOpenMode(com::Utf8Str &aOpenMode); HRESULT getOffset(LONG64 *aOffset); HRESULT getStatus(FileStatus_T *aStatus); + HRESULT getFileName(com::Utf8Str &aFileName); + HRESULT getAccessMode(FileAccessMode_T *aAccessMode); + HRESULT getOpenAction(FileOpenAction_T *aOpenAction); /** @} */ - /** Wrapped @name IGuestFile methods. + /** @name Wrapped IGuestFile methods. * @{ */ HRESULT close(); HRESULT queryInfo(ComPtr &aObjInfo); + HRESULT querySize(LONG64 *aSize); HRESULT read(ULONG aToRead, ULONG aTimeoutMS, @@ -97,6 +98,9 @@ std::vector &aData); HRESULT seek(LONG64 aOffset, - FileSeekType_T aWhence); - HRESULT setACL(const com::Utf8Str &aAcl); + FileSeekOrigin_T aWhence, + LONG64 *aNewOffset); + HRESULT setACL(const com::Utf8Str &aAcl, + ULONG aMode); + HRESULT setSize(LONG64 aSize); HRESULT write(const std::vector &aData, ULONG aTimeoutMS, Index: /trunk/src/VBox/Main/include/GuestSessionImpl.h =================================================================== --- /trunk/src/VBox/Main/include/GuestSessionImpl.h (revision 55630) +++ /trunk/src/VBox/Main/include/GuestSessionImpl.h (revision 55631) @@ -273,4 +273,6 @@ HRESULT getProcesses(std::vector > &aProcesses); HRESULT getPathStyle(PathStyle_T *aPathStyle); + HRESULT getCurrentDirectory(com::Utf8Str &aCurrentDirectory); + HRESULT setCurrentDirectory(const com::Utf8Str &aCurrentDirectory); HRESULT getDirectories(std::vector > &aDirectories); HRESULT getFiles(std::vector > &aFiles); @@ -281,12 +283,17 @@ * @{ */ HRESULT close(); - HRESULT copyFrom(const com::Utf8Str &aSource, - const com::Utf8Str &aDest, - const std::vector &aFlags, - ComPtr &aProgress); - HRESULT copyTo(const com::Utf8Str &aSource, - const com::Utf8Str &aDest, - const std::vector &aFlags, - ComPtr &aProgress); + + HRESULT directoryCopy(const com::Utf8Str &aSource, + const com::Utf8Str &aDestination, + const std::vector &aFlags, + ComPtr &aProgress); + HRESULT directoryCopyFromGuest(const com::Utf8Str &aSource, + const com::Utf8Str &aDestination, + const std::vector &aFlags, + ComPtr &aProgress); + HRESULT directoryCopyToGuest(const com::Utf8Str &aSource, + const com::Utf8Str &aDestination, + const std::vector &aFlags, + ComPtr &aProgress); HRESULT directoryCreate(const com::Utf8Str &aPath, ULONG aMode, @@ -298,4 +305,5 @@ com::Utf8Str &aDirectory); HRESULT directoryExists(const com::Utf8Str &aPath, + BOOL aFollowSymlinks, BOOL *aExists); HRESULT directoryOpen(const com::Utf8Str &aPath, @@ -303,15 +311,8 @@ const std::vector &aFlags, ComPtr &aDirectory); - HRESULT directoryQueryInfo(const com::Utf8Str &aPath, - ComPtr &aInfo); HRESULT directoryRemove(const com::Utf8Str &aPath); HRESULT directoryRemoveRecursive(const com::Utf8Str &aPath, const std::vector &aFlags, ComPtr &aProgress); - HRESULT directoryRename(const com::Utf8Str &aSource, - const com::Utf8Str &aDest, - const std::vector &aFlags); - HRESULT directorySetACL(const com::Utf8Str &aPath, - const com::Utf8Str &aAcl); HRESULT environmentScheduleSet(const com::Utf8Str &aName, const com::Utf8Str &aValue); @@ -321,4 +322,17 @@ HRESULT environmentDoesBaseVariableExist(const com::Utf8Str &aName, BOOL *aExists); + + HRESULT fileCopy(const com::Utf8Str &aSource, + const com::Utf8Str &aDestination, + const std::vector &aFlags, + ComPtr &aProgress); + HRESULT fileCopyToGuest(const com::Utf8Str &aSource, + const com::Utf8Str &aDestination, + const std::vector &aFlags, + ComPtr &aProgress); + HRESULT fileCopyFromGuest(const com::Utf8Str &aSource, + const com::Utf8Str &aDestination, + const std::vector &aFlags, + ComPtr &aProgress); HRESULT fileCreateTemp(const com::Utf8Str &aTemplateName, ULONG aMode, @@ -327,33 +341,39 @@ ComPtr &aFile); HRESULT fileExists(const com::Utf8Str &aPath, + BOOL aFollowSymlinks, BOOL *aExists); - HRESULT fileRemove(const com::Utf8Str &aPath); HRESULT fileOpen(const com::Utf8Str &aPath, - const com::Utf8Str &aOpenMode, - const com::Utf8Str &aDisposition, + FileAccessMode_T aAccessMode, + FileOpenAction_T aOpenAction, ULONG aCreationMode, ComPtr &aFile); HRESULT fileOpenEx(const com::Utf8Str &aPath, - const com::Utf8Str &aOpenMode, - const com::Utf8Str &aDisposition, - const com::Utf8Str &aSharingMode, + FileAccessMode_T aAccessMode, + FileOpenAction_T aOpenAction, + FileSharingMode_T aSharingMode, ULONG aCreationMode, LONG64 aOffset, ComPtr &aFile); - HRESULT fileQueryInfo(const com::Utf8Str &aPath, - ComPtr &aInfo); HRESULT fileQuerySize(const com::Utf8Str &aPath, + BOOL aFollowSymlinks, LONG64 *aSize); - HRESULT fileRename(const com::Utf8Str &aSource, - const com::Utf8Str &aDest, - const std::vector &aFlags); - HRESULT fileSetACL(const com::Utf8Str &aFile, - const com::Utf8Str &aAcl); - HRESULT fsExists(const com::Utf8Str &aPath, - BOOL aFollowSymlinks, - BOOL *pfExists); - HRESULT fsQueryInfo(const com::Utf8Str &aPath, + HRESULT fsObjExists(const com::Utf8Str &aPath, BOOL aFollowSymlinks, - ComPtr &aInfo); + BOOL *pfExists); + HRESULT fsObjQueryInfo(const com::Utf8Str &aPath, + BOOL aFollowSymlinks, + ComPtr &aInfo); + HRESULT fsObjRemove(const com::Utf8Str &aPath); + HRESULT fsObjRename(const com::Utf8Str &aOldPath, + const com::Utf8Str &aNewPath, + const std::vector &aFlags); + HRESULT fsObjMove(const com::Utf8Str &aSource, + const com::Utf8Str &aDestination, + const std::vector &aFlags, + ComPtr &aProgress); + HRESULT fsObjSetACL(const com::Utf8Str &aPath, + BOOL aFollowSymlinks, + const com::Utf8Str &aAcl, + ULONG aMode); HRESULT processCreate(const com::Utf8Str &aCommand, const std::vector &aArguments, @@ -380,6 +400,4 @@ const std::vector &aFlags, com::Utf8Str &aTarget); - HRESULT symlinkRemoveDirectory(const com::Utf8Str &aPath); - HRESULT symlinkRemoveFile(const com::Utf8Str &aFile); HRESULT waitFor(ULONG aWaitFor, ULONG aTimeoutMS, @@ -422,5 +440,5 @@ int i_fileOpenInternal(const GuestFileOpenInfo &openInfo, ComObjPtr &pFile, int *pGuestRc); int i_fileQueryInfoInternal(const Utf8Str &strPath, bool fFollowSymlinks, GuestFsObjData &objData, int *pGuestRc); - int i_fileQuerySizeInternal(const Utf8Str &strPath, int64_t *pllSize, int *pGuestRc); + int i_fileQuerySizeInternal(const Utf8Str &strPath, bool fFollowSymlinks, int64_t *pllSize, int *pGuestRc); int i_fsQueryInfoInternal(const Utf8Str &strPath, bool fFollowSymlinks, GuestFsObjData &objData, int *pGuestRc); const GuestCredentials &i_getCredentials(void); Index: /trunk/src/VBox/Main/src-client/GuestFileImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/GuestFileImpl.cpp (revision 55630) +++ /trunk/src/VBox/Main/src-client/GuestFileImpl.cpp (revision 55631) @@ -254,5 +254,5 @@ } -HRESULT GuestFile::getDisposition(com::Utf8Str &aDisposition) +HRESULT GuestFile::getOpenAction(FileOpenAction_T *aOpenAction) { #ifndef VBOX_WITH_GUEST_CONTROL @@ -261,5 +261,5 @@ AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); - aDisposition = mData.mOpenInfo.mDisposition; + *aOpenAction = mData.mOpenInfo.mOpenAction; return S_OK; @@ -331,5 +331,5 @@ } -HRESULT GuestFile::getOpenMode(com::Utf8Str &aOpenMode) +HRESULT GuestFile::getAccessMode(FileAccessMode_T *aAccessMode) { #ifndef VBOX_WITH_GUEST_CONTROL @@ -338,5 +338,5 @@ AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); - aOpenMode = mData.mOpenInfo.mOpenMode; + *aAccessMode = mData.mOpenInfo.mAccessMode; return S_OK; @@ -694,7 +694,8 @@ AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); - LogFlowThisFunc(("strFile=%s, strOpenMode=%s, strDisposition=%s, uCreationMode=%RU32, uOffset=%RU64\n", - mData.mOpenInfo.mFileName.c_str(), mData.mOpenInfo.mOpenMode.c_str(), - mData.mOpenInfo.mDisposition.c_str(), mData.mOpenInfo.mCreationMode, mData.mOpenInfo.mInitialOffset)); + LogFlowThisFunc(("strFile=%s, enmAccessMode=%d (%s) enmOpenAction=%d (%s) uCreationMode=%RU32, uOffset=%RU64\n", + mData.mOpenInfo.mFileName.c_str(), mData.mOpenInfo.mAccessMode, mData.mOpenInfo.mpszAccessMode, + mData.mOpenInfo.mOpenAction, mData.mOpenInfo.mpszOpenAction, mData.mOpenInfo.mCreationMode, + mData.mOpenInfo.mInitialOffset)); int vrc; @@ -721,10 +722,7 @@ paParms[i++].setPointer((void*)mData.mOpenInfo.mFileName.c_str(), (ULONG)mData.mOpenInfo.mFileName.length() + 1); - paParms[i++].setPointer((void*)mData.mOpenInfo.mOpenMode.c_str(), - (ULONG)mData.mOpenInfo.mOpenMode.length() + 1); - paParms[i++].setPointer((void*)mData.mOpenInfo.mDisposition.c_str(), - (ULONG)mData.mOpenInfo.mDisposition.length() + 1); - paParms[i++].setPointer((void*)mData.mOpenInfo.mSharingMode.c_str(), - (ULONG)mData.mOpenInfo.mSharingMode.length() + 1); + paParms[i++].setString(mData.mOpenInfo.mpszAccessMode); + paParms[i++].setString(mData.mOpenInfo.mpszOpenAction); + paParms[i++].setString(""); /** @todo sharing mode. */ paParms[i++].setUInt32(mData.mOpenInfo.mCreationMode); paParms[i++].setUInt64(mData.mOpenInfo.mInitialOffset); @@ -1265,4 +1263,13 @@ } +HRESULT GuestFile::querySize(LONG64 *aSize) +{ +#ifndef VBOX_WITH_GUEST_CONTROL + ReturnComNotImplemented(); +#else + ReturnComNotImplemented(); +#endif /* VBOX_WITH_GUEST_CONTROL */ +} + HRESULT GuestFile::read(ULONG aToRead, ULONG aTimeoutMS, std::vector &aData) { @@ -1344,5 +1351,5 @@ } -HRESULT GuestFile::seek(LONG64 aOffset, FileSeekType_T aWhence) +HRESULT GuestFile::seek(LONG64 aOffset, FileSeekOrigin_T aWhence, LONG64 *aNewOffset) { #ifndef VBOX_WITH_GUEST_CONTROL @@ -1356,10 +1363,14 @@ switch (aWhence) { - case FileSeekType_Set: + case FileSeekOrigin_Set: eSeekType = GUEST_FILE_SEEKTYPE_BEGIN; break; - case FileSeekType_Current: + case FileSeekOrigin_Current: eSeekType = GUEST_FILE_SEEKTYPE_CURRENT; + break; + + case FileSeekOrigin_End: + eSeekType = GUEST_FILE_SEEKTYPE_END; break; @@ -1369,7 +1380,10 @@ } + uint64_t uNewOffset; int vrc = i_seekAt(aOffset, eSeekType, - 30 * 1000 /* 30s timeout */, NULL /* puOffset */); - if (RT_FAILURE(vrc)) + 30 * 1000 /* 30s timeout */, &uNewOffset); + if (RT_SUCCESS(vrc)) + *aNewOffset = RT_MIN(uNewOffset, (uint64_t)INT64_MAX); + else { switch (vrc) @@ -1388,5 +1402,14 @@ } -HRESULT GuestFile::setACL(const com::Utf8Str &aAcl) +HRESULT GuestFile::setACL(const com::Utf8Str &aAcl, ULONG aMode) +{ +#ifndef VBOX_WITH_GUEST_CONTROL + ReturnComNotImplemented(); +#else + ReturnComNotImplemented(); +#endif /* VBOX_WITH_GUEST_CONTROL */ +} + +HRESULT GuestFile::setSize(LONG64 aSize) { #ifndef VBOX_WITH_GUEST_CONTROL Index: /trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp (revision 55630) +++ /trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp (revision 55631) @@ -574,4 +574,14 @@ } +HRESULT GuestSession::getCurrentDirectory(com::Utf8Str &aCurrentDirectory) +{ + ReturnComNotImplemented(); +} + +HRESULT GuestSession::setCurrentDirectory(const com::Utf8Str &aCurrentDirectory) +{ + ReturnComNotImplemented(); +} + HRESULT GuestSession::getDirectories(std::vector > &aDirectories) { @@ -1290,7 +1300,7 @@ ComObjPtr &pFile, int *pGuestRc) { - LogFlowThisFunc(("strPath=%s, strOpenMode=%s, strDisposition=%s, uCreationMode=%x, uOffset=%RU64\n", - openInfo.mFileName.c_str(), openInfo.mOpenMode.c_str(), openInfo.mDisposition.c_str(), - openInfo.mCreationMode, openInfo.mInitialOffset)); + LogFlowThisFunc(("strFile=%s, enmAccessMode=%d (%s) enmOpenAction=%d (%s) uCreationMode=%RU32, uOffset=%RU64\n", + openInfo.mFileName.c_str(), openInfo.mAccessMode, openInfo.mpszAccessMode, + openInfo.mOpenAction, openInfo.mpszOpenAction, openInfo.mCreationMode, openInfo.mInitialOffset)); AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -1404,10 +1414,10 @@ } -int GuestSession::i_fileQuerySizeInternal(const Utf8Str &strPath, int64_t *pllSize, int *pGuestRc) +int GuestSession::i_fileQuerySizeInternal(const Utf8Str &strPath, bool fFollowSymlinks, int64_t *pllSize, int *pGuestRc) { AssertPtrReturn(pllSize, VERR_INVALID_POINTER); GuestFsObjData objData; - int vrc = i_fileQueryInfoInternal(strPath, false /*fFollowSymlinks*/, objData, pGuestRc); + int vrc = i_fileQueryInfoInternal(strPath, fFollowSymlinks, objData, pGuestRc); if (RT_SUCCESS(vrc)) *pllSize = objData.mObjectSize; @@ -2486,7 +2496,13 @@ } -HRESULT GuestSession::copyFrom(const com::Utf8Str &aSource, const com::Utf8Str &aDest, - const std::vector &aFlags, - ComPtr &aProgress) +HRESULT GuestSession::fileCopy(const com::Utf8Str &aSource, const com::Utf8Str &aDestination, + const std::vector &aFlags, ComPtr &aProgress) +{ + ReturnComNotImplemented(); +} + +HRESULT GuestSession::fileCopyFromGuest(const com::Utf8Str &aSource, const com::Utf8Str &aDest, + const std::vector &aFlags, + ComPtr &aProgress) { #ifndef VBOX_WITH_GUEST_CONTROL @@ -2501,5 +2517,5 @@ return setError(E_INVALIDARG, tr("No destination specified")); - uint32_t fFlags = CopyFileFlag_None; + uint32_t fFlags = FileCopyFlag_None; if (aFlags.size()) { @@ -2507,4 +2523,5 @@ fFlags |= aFlags[i]; } +/** @todo r=bird: fend off flags we don't implement here! */ AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -2535,6 +2552,6 @@ } -HRESULT GuestSession::copyTo(const com::Utf8Str &aSource, const com::Utf8Str &aDest, const std::vector &aFlags, - ComPtr &aProgress) +HRESULT GuestSession::fileCopyToGuest(const com::Utf8Str &aSource, const com::Utf8Str &aDest, + const std::vector &aFlags, ComPtr &aProgress) { #ifndef VBOX_WITH_GUEST_CONTROL @@ -2549,5 +2566,5 @@ return setError(E_INVALIDARG, tr("No destination specified")); - uint32_t fFlags = CopyFileFlag_None; + uint32_t fFlags = FileCopyFlag_None; if (aFlags.size()) { @@ -2555,4 +2572,5 @@ fFlags |= aFlags[i]; } +/** @todo r=bird: fend off flags we don't implement here! */ AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -2586,4 +2604,22 @@ } +HRESULT GuestSession::directoryCopy(const com::Utf8Str &aSource, const com::Utf8Str &aDestination, + const std::vector &aFlags, ComPtr &aProgress) +{ + ReturnComNotImplemented(); +} + +HRESULT GuestSession::directoryCopyFromGuest(const com::Utf8Str &aSource, const com::Utf8Str &aDestination, + const std::vector &aFlags, ComPtr &aProgress) +{ + ReturnComNotImplemented(); +} + +HRESULT GuestSession::directoryCopyToGuest(const com::Utf8Str &aSource, const com::Utf8Str &aDestination, + const std::vector &aFlags, ComPtr &aProgress) +{ + ReturnComNotImplemented(); +} + HRESULT GuestSession::directoryCreate(const com::Utf8Str &aPath, ULONG aMode, const std::vector &aFlags) @@ -2677,5 +2713,5 @@ } -HRESULT GuestSession::directoryExists(const com::Utf8Str &aPath, BOOL *aExists) +HRESULT GuestSession::directoryExists(const com::Utf8Str &aPath, BOOL aFollowSymlinks, BOOL *aExists) { #ifndef VBOX_WITH_GUEST_CONTROL @@ -2690,9 +2726,11 @@ GuestFsObjData objData; int guestRc; - int rc = i_directoryQueryInfoInternal(aPath, false /*fFollowSymlinks*/, objData, &guestRc); + int rc = i_directoryQueryInfoInternal(aPath, aFollowSymlinks != FALSE, objData, &guestRc); if (RT_SUCCESS(rc)) *aExists = objData.mType == FsObjType_Directory; else { + /** @todo r=bird: Looks like this code raises errors if the directory doesn't + * exist... That's of course not right. */ switch (rc) { @@ -2773,59 +2811,4 @@ } -HRESULT GuestSession::directoryQueryInfo(const com::Utf8Str &aPath, ComPtr &aInfo) -{ -#ifndef VBOX_WITH_GUEST_CONTROL - ReturnComNotImplemented(); -#else - LogFlowThisFuncEnter(); - - if (RT_UNLIKELY((aPath.c_str()) == NULL || *(aPath.c_str()) == '\0')) - return setError(E_INVALIDARG, tr("No directory to query information for specified")); - - HRESULT hr = S_OK; - - GuestFsObjData objData; int guestRc; - int vrc = i_directoryQueryInfoInternal(aPath, false /*fFollowSymlinks*/, objData, &guestRc); - if (RT_SUCCESS(vrc)) - { - if (objData.mType == FsObjType_Directory) - { - ComObjPtr pFsObjInfo; - hr = pFsObjInfo.createObject(); - if (FAILED(hr)) return hr; - - vrc = pFsObjInfo->init(objData); - if (RT_SUCCESS(vrc)) - { - hr = pFsObjInfo.queryInterfaceTo(aInfo.asOutParam()); - if (FAILED(hr)) return hr; - } - } - } - - if (RT_FAILURE(vrc)) - { - switch (vrc) - { - case VERR_GSTCTL_GUEST_ERROR: - hr = GuestProcess::i_setErrorExternal(this, guestRc); - break; - - case VERR_NOT_A_DIRECTORY: - hr = setError(VBOX_E_IPRT_ERROR, tr("Element \"%s\" exists but is not a directory"), - aPath.c_str()); - break; - - default: - hr = setError(VBOX_E_IPRT_ERROR, tr("Querying directory information for \"%s\" failed: %Rrc"), - aPath.c_str(), vrc); - break; - } - } - - return hr; -#endif /* VBOX_WITH_GUEST_CONTROL */ -} - HRESULT GuestSession::directoryRemove(const com::Utf8Str &aPath) { @@ -2881,4 +2864,7 @@ if (RT_UNLIKELY((aPath.c_str()) == NULL || *(aPath.c_str()) == '\0')) return setError(E_INVALIDARG, tr("No directory to remove recursively specified")); + +/** @todo r=bird: Must check that the flags matches the hardcoded behavior + * further down!! */ HRESULT hr = i_isReadyExternal(); @@ -2933,64 +2919,4 @@ return hr; -#endif /* VBOX_WITH_GUEST_CONTROL */ -} - -HRESULT GuestSession::directoryRename(const com::Utf8Str &aSource, - const com::Utf8Str &aDest, - const std::vector &aFlags) -{ -#ifndef VBOX_WITH_GUEST_CONTROL - ReturnComNotImplemented(); -#else - LogFlowThisFuncEnter(); - - if (RT_UNLIKELY((aSource.c_str()) == NULL || *(aSource.c_str()) == '\0')) - return setError(E_INVALIDARG, tr("No source directory to rename specified")); - - if (RT_UNLIKELY((aDest.c_str()) == NULL || *(aDest.c_str()) == '\0')) - return setError(E_INVALIDARG, tr("No destination directory to rename the source to specified")); - - HRESULT hr = i_isReadyExternal(); - if (FAILED(hr)) - return hr; - - /* No flags; only remove the directory when empty. */ - uint32_t uFlags = 0; - - int guestRc; - int vrc = i_pathRenameInternal(aSource, aDest, uFlags, &guestRc); - if (RT_FAILURE(vrc)) - { - switch (vrc) - { - case VERR_NOT_SUPPORTED: - hr = setError(VBOX_E_IPRT_ERROR, - tr("Handling renaming guest directories not supported by installed Guest Additions")); - break; - - case VERR_GSTCTL_GUEST_ERROR: - hr = setError(VBOX_E_IPRT_ERROR, - tr("Renaming guest directory failed: %Rrc"), guestRc); - break; - - default: - hr = setError(VBOX_E_IPRT_ERROR, tr("Renaming guest directory \"%s\" failed: %Rrc"), - aSource.c_str(), vrc); - break; - } - } - - return hr; -#endif /* VBOX_WITH_GUEST_CONTROL */ -} - -HRESULT GuestSession::directorySetACL(const com::Utf8Str &aPath, const com::Utf8Str &aAcl) -{ -#ifndef VBOX_WITH_GUEST_CONTROL - ReturnComNotImplemented(); -#else - LogFlowThisFuncEnter(); - - ReturnComNotImplemented(); #endif /* VBOX_WITH_GUEST_CONTROL */ } @@ -3138,16 +3064,17 @@ } -HRESULT GuestSession::fileExists(const com::Utf8Str &aPath, BOOL *aExists) -{ -#ifndef VBOX_WITH_GUEST_CONTROL - ReturnComNotImplemented(); -#else - LogFlowThisFuncEnter(); - +HRESULT GuestSession::fileExists(const com::Utf8Str &aPath, BOOL aFollowSymlinks, BOOL *aExists) +{ +#ifndef VBOX_WITH_GUEST_CONTROL + ReturnComNotImplemented(); +#else + LogFlowThisFuncEnter(); + +/** @todo r=bird: Treat empty file with a FALSE return. */ if (RT_UNLIKELY((aPath.c_str()) == NULL || *(aPath.c_str()) == '\0')) return setError(E_INVALIDARG, tr("No file to check existence for specified")); GuestFsObjData objData; int guestRc; - int vrc = i_fileQueryInfoInternal(aPath, false /*fFollowSymlinks*/, objData, &guestRc); + int vrc = i_fileQueryInfoInternal(aPath, aFollowSymlinks != FALSE, objData, &guestRc); if (RT_SUCCESS(vrc)) { @@ -3164,4 +3091,6 @@ break; +/** @todo r=bird: what about VERR_PATH_NOT_FOUND and VERR_FILE_NOT_FOUND? + * Where does that get converted to *aExists = FALSE? */ case VERR_NOT_A_FILE: *aExists = FALSE; @@ -3178,38 +3107,5 @@ } -HRESULT GuestSession::fileRemove(const com::Utf8Str &aPath) -{ -#ifndef VBOX_WITH_GUEST_CONTROL - ReturnComNotImplemented(); -#else - LogFlowThisFuncEnter(); - - if (RT_UNLIKELY((aPath.c_str()) == NULL || *(aPath.c_str()) == '\0')) - return setError(E_INVALIDARG, tr("No file to remove specified")); - - HRESULT hr = S_OK; - - int guestRc; - int vrc = i_fileRemoveInternal(aPath, &guestRc); - if (RT_FAILURE(vrc)) - { - switch (vrc) - { - case VERR_GSTCTL_GUEST_ERROR: - hr = GuestProcess::i_setErrorExternal(this, guestRc); - break; - - default: - hr = setError(VBOX_E_IPRT_ERROR, tr("Removing file \"%s\" failed: %Rrc"), - aPath.c_str(), vrc); - break; - } - } - - return hr; -#endif /* VBOX_WITH_GUEST_CONTROL */ -} - -HRESULT GuestSession::fileOpen(const com::Utf8Str &aPath, const com::Utf8Str &aOpenMode, const com::Utf8Str &aDisposition, +HRESULT GuestSession::fileOpen(const com::Utf8Str &aPath, FileAccessMode_T aAccessMode, FileOpenAction_T aOpenAction, ULONG aCreationMode, ComPtr &aFile) { @@ -3218,16 +3114,10 @@ #else LogFlowThisFuncEnter(); - - Utf8Str strSharingMode = ""; /* Sharing mode is ignored. */ - - return fileOpenEx(aPath, aOpenMode, aDisposition, strSharingMode, aCreationMode, - 0 /* aOffset */, aFile); -#endif /* VBOX_WITH_GUEST_CONTROL */ -} - -HRESULT GuestSession::fileOpenEx(const com::Utf8Str &aPath, const com::Utf8Str &aOpenMode, const com::Utf8Str &aDisposition, - const com::Utf8Str &aSharingMode, ULONG aCreationMode, LONG64 aOffset, - ComPtr &aFile) - + return fileOpenEx(aPath, aAccessMode, aOpenAction, FileSharingMode_All, aCreationMode, 0 /* aOffset */, aFile); +#endif /* VBOX_WITH_GUEST_CONTROL */ +} + +HRESULT GuestSession::fileOpenEx(const com::Utf8Str &aPath, FileAccessMode_T aAccessMode, FileOpenAction_T aOpenAction, + FileSharingMode_T aSharingMode, ULONG aCreationMode, LONG64 aOffset, ComPtr &aFile) { #ifndef VBOX_WITH_GUEST_CONTROL @@ -3238,9 +3128,4 @@ if (RT_UNLIKELY((aPath.c_str()) == NULL || *(aPath.c_str()) == '\0')) return setError(E_INVALIDARG, tr("No file to open specified")); - if (RT_UNLIKELY((aOpenMode.c_str()) == NULL || *(aOpenMode.c_str()) == '\0')) - return setError(E_INVALIDARG, tr("No open mode specified")); - if (RT_UNLIKELY((aDisposition.c_str()) == NULL || *(aDisposition.c_str()) == '\0')) - return setError(E_INVALIDARG, tr("No disposition mode specified")); - /* aSharingMode is optional. */ HRESULT hr = i_isReadyExternal(); @@ -3248,25 +3133,60 @@ return hr; - /** @todo Validate creation mode. */ - uint32_t uCreationMode = 0; - GuestFileOpenInfo openInfo; openInfo.mFileName = aPath; - openInfo.mOpenMode = aOpenMode; - openInfo.mDisposition = aDisposition; - openInfo.mSharingMode = aSharingMode; openInfo.mCreationMode = aCreationMode; openInfo.mInitialOffset = aOffset; - uint64_t uFlagsIgnored; - int vrc = RTFileModeToFlagsEx(openInfo.mOpenMode.c_str(), - openInfo.mDisposition.c_str(), - openInfo.mSharingMode.c_str(), - &uFlagsIgnored); - if (RT_FAILURE(vrc)) - return setError(E_INVALIDARG, tr("Invalid open mode / disposition / sharing mode specified")); - - ComObjPtr pFile; int guestRc; - vrc = i_fileOpenInternal(openInfo, pFile, &guestRc); + /* convert + validate aAccessMode to the old format. */ + openInfo.mAccessMode = aAccessMode; + switch (aAccessMode) + { + case (FileAccessMode_T)FileAccessMode_ReadOnly: openInfo.mpszAccessMode = "r"; break; + case (FileAccessMode_T)FileAccessMode_WriteOnly: openInfo.mpszAccessMode = "w"; break; + case (FileAccessMode_T)FileAccessMode_ReadWrite: openInfo.mpszAccessMode = "r+"; break; + case (FileAccessMode_T)FileAccessMode_AppendOnly: + /* fall thru */ + case (FileAccessMode_T)FileAccessMode_AppendRead: + return setError(E_NOTIMPL, tr("Append access modes are not yet implemented")); + default: + return setError(E_INVALIDARG, tr("Unknown FileAccessMode value %u (%#x)"), aAccessMode, aAccessMode); + } + + /* convert + validate aOpenAction to the old format. */ + openInfo.mOpenAction = aOpenAction; + switch (aOpenAction) + { + case (FileOpenAction_T)FileOpenAction_OpenExisting: openInfo.mpszOpenAction = "oe"; break; + case (FileOpenAction_T)FileOpenAction_OpenOrCreate: openInfo.mpszOpenAction = "oc"; break; + case (FileOpenAction_T)FileOpenAction_CreateNew: openInfo.mpszOpenAction = "ce"; break; + case (FileOpenAction_T)FileOpenAction_CreateOrReplace: openInfo.mpszOpenAction = "ca"; break; + case (FileOpenAction_T)FileOpenAction_OpenExistingTruncated: openInfo.mpszOpenAction = "ot"; break; + case (FileOpenAction_T)FileOpenAction_AppendOrCreate: + openInfo.mpszOpenAction = "ca"; /** @todo get rid of this one and implement AppendOnly/AppendRead. */ + break; + default: + return setError(E_INVALIDARG, tr("Unknown FileOpenAction value %u (%#x)"), aAccessMode, aAccessMode); + } + + /* validate aSharingMode */ + openInfo.mSharingMode = aSharingMode; + switch (aSharingMode) + { + case (FileSharingMode_T)FileSharingMode_All: /* OK */ break; + case (FileSharingMode_T)FileSharingMode_Read: + case (FileSharingMode_T)FileSharingMode_Write: + case (FileSharingMode_T)FileSharingMode_ReadWrite: + case (FileSharingMode_T)FileSharingMode_Delete: + case (FileSharingMode_T)FileSharingMode_ReadDelete: + case (FileSharingMode_T)FileSharingMode_WriteDelete: + return setError(E_NOTIMPL, tr("Only FileSharingMode_All is currently implemented")); + + default: + return setError(E_INVALIDARG, tr("Unknown FileOpenAction value %u (%#x)"), aAccessMode, aAccessMode); + } + + ComObjPtr pFile; + int guestRc; + int vrc = i_fileOpenInternal(openInfo, pFile, &guestRc); if (RT_SUCCESS(vrc)) /* Return directory object to the caller. */ @@ -3296,56 +3216,5 @@ } -HRESULT GuestSession::fileQueryInfo(const com::Utf8Str &aPath, ComPtr &aInfo) - -{ -#ifndef VBOX_WITH_GUEST_CONTROL - ReturnComNotImplemented(); -#else - LogFlowThisFuncEnter(); - - if (RT_UNLIKELY((aPath.c_str()) == NULL || *(aPath.c_str()) == '\0')) - return setError(E_INVALIDARG, tr("No file to query information for specified")); - - HRESULT hr = S_OK; - - GuestFsObjData objData; int guestRc; - int vrc = i_fileQueryInfoInternal(aPath, false /*fFollowSymlinks*/, objData, &guestRc); - if (RT_SUCCESS(vrc)) - { - ComObjPtr pFsObjInfo; - hr = pFsObjInfo.createObject(); - if (FAILED(hr)) return hr; - - vrc = pFsObjInfo->init(objData); - if (RT_SUCCESS(vrc)) - { - hr = pFsObjInfo.queryInterfaceTo(aInfo.asOutParam()); - if (FAILED(hr)) return hr; - } - } - - if (RT_FAILURE(vrc)) - { - switch (vrc) - { - case VERR_GSTCTL_GUEST_ERROR: - hr = GuestProcess::i_setErrorExternal(this, guestRc); - break; - - case VERR_NOT_A_FILE: - hr = setError(VBOX_E_IPRT_ERROR, tr("Element exists but is not a file")); - break; - - default: - hr = setError(VBOX_E_IPRT_ERROR, tr("Querying file information failed: %Rrc"), vrc); - break; - } - } - - return hr; -#endif /* VBOX_WITH_GUEST_CONTROL */ -} - -HRESULT GuestSession::fileQuerySize(const com::Utf8Str &aPath, LONG64 *aSize) +HRESULT GuestSession::fileQuerySize(const com::Utf8Str &aPath, BOOL aFollowSymlinks, LONG64 *aSize) { #ifndef VBOX_WITH_GUEST_CONTROL @@ -3360,5 +3229,5 @@ int64_t llSize; int guestRc; - int vrc = i_fileQuerySizeInternal(aPath, &llSize, &guestRc); + int vrc = i_fileQuerySizeInternal(aPath, aFollowSymlinks != FALSE, &llSize, &guestRc); if (RT_SUCCESS(vrc)) *aSize = llSize; @@ -3381,65 +3250,5 @@ } -HRESULT GuestSession::fileRename(const com::Utf8Str &aSource, const com::Utf8Str &aDest, - const std::vector &aFlags) -{ -#ifndef VBOX_WITH_GUEST_CONTROL - ReturnComNotImplemented(); -#else - LogFlowThisFuncEnter(); - - if (RT_UNLIKELY((aSource.c_str()) == NULL || *(aSource.c_str()) == '\0')) - return setError(E_INVALIDARG, tr("No source file to rename specified")); - - if (RT_UNLIKELY((aDest.c_str()) == NULL || *(aDest.c_str()) == '\0')) - return setError(E_INVALIDARG, tr("No destination file to rename the source to specified")); - - HRESULT hr = i_isReadyExternal(); - if (FAILED(hr)) - return hr; - - /* No flags; only remove the directory when empty. */ - uint32_t uFlags = 0; - - int guestRc; - int vrc = i_pathRenameInternal(aSource, aDest, uFlags, &guestRc); - if (RT_FAILURE(vrc)) - { - switch (vrc) - { - case VERR_NOT_SUPPORTED: - hr = setError(VBOX_E_IPRT_ERROR, - tr("Handling renaming guest files not supported by installed Guest Additions")); - break; - - case VERR_GSTCTL_GUEST_ERROR: - /** @todo Proper guestRc to text translation needed. */ - hr = setError(VBOX_E_IPRT_ERROR, - tr("Renaming guest file failed: %Rrc"), guestRc); - break; - - default: - hr = setError(VBOX_E_IPRT_ERROR, tr("Renaming guest file \"%s\" failed: %Rrc"), - aSource.c_str(), vrc); - break; - } - } - - return hr; -#endif /* VBOX_WITH_GUEST_CONTROL */ -} - -HRESULT GuestSession::fileSetACL(const com::Utf8Str &aFile, const com::Utf8Str &aAcl) -{ -#ifndef VBOX_WITH_GUEST_CONTROL - ReturnComNotImplemented(); -#else - LogFlowThisFuncEnter(); - - ReturnComNotImplemented(); -#endif /* VBOX_WITH_GUEST_CONTROL */ -} - -HRESULT GuestSession::fsExists(const com::Utf8Str &aPath, BOOL aFollowSymlinks, BOOL *aExists) +HRESULT GuestSession::fsObjExists(const com::Utf8Str &aPath, BOOL aFollowSymlinks, BOOL *aExists) { #ifndef VBOX_WITH_GUEST_CONTROL @@ -3474,5 +3283,5 @@ } -HRESULT GuestSession::fsQueryInfo(const com::Utf8Str &aPath, BOOL aFollowSymlinks, ComPtr &aInfo) +HRESULT GuestSession::fsObjQueryInfo(const com::Utf8Str &aPath, BOOL aFollowSymlinks, ComPtr &aInfo) { #ifndef VBOX_WITH_GUEST_CONTROL @@ -3511,4 +3320,111 @@ #endif /* VBOX_WITH_GUEST_CONTROL */ } + +HRESULT GuestSession::fsObjRemove(const com::Utf8Str &aPath) +{ +#ifndef VBOX_WITH_GUEST_CONTROL + ReturnComNotImplemented(); +#else + LogFlowThisFuncEnter(); + + if (RT_UNLIKELY(aPath.isEmpty())) + return setError(E_INVALIDARG, tr("Empty path specified")); + + HRESULT hr = S_OK; + + int guestRc; + int vrc = i_fileRemoveInternal(aPath, &guestRc); + if (RT_FAILURE(vrc)) + { + switch (vrc) + { + case VERR_GSTCTL_GUEST_ERROR: + hr = GuestProcess::i_setErrorExternal(this, guestRc); + break; + + default: + hr = setError(VBOX_E_IPRT_ERROR, tr("Removing file \"%s\" failed: %Rrc"), + aPath.c_str(), vrc); + break; + } + } + + return hr; +#endif /* VBOX_WITH_GUEST_CONTROL */ +} + +HRESULT GuestSession::fsObjRename(const com::Utf8Str &aSource, + const com::Utf8Str &aDestination, + const std::vector &aFlags) +{ +#ifndef VBOX_WITH_GUEST_CONTROL + ReturnComNotImplemented(); +#else + LogFlowThisFuncEnter(); + + if (RT_UNLIKELY(aSource.isEmpty())) + return setError(E_INVALIDARG, tr("No source path specified")); + + if (RT_UNLIKELY(aDestination.isEmpty())) + return setError(E_INVALIDARG, tr("No destination path specified")); + + HRESULT hr = i_isReadyExternal(); + if (FAILED(hr)) + return hr; + + /* Combine, validate and convert flags. */ + uint32_t fApiFlags = 0; + for (size_t i = 0; i < aFlags.size(); i++) + fApiFlags |= aFlags[i]; + if (fApiFlags & ~((uint32_t)FsObjRenameFlag_NoReplace | (uint32_t)FsObjRenameFlag_Replace)) + return setError(E_INVALIDARG, tr("Unknown rename flag: %#x"), fApiFlags); + + AssertCompile(FsObjRenameFlag_NoReplace == 0); + AssertCompile(FsObjRenameFlag_Replace != 0); + uint32_t fBackend; + if ((fApiFlags & ((uint32_t)FsObjRenameFlag_NoReplace | (uint32_t)FsObjRenameFlag_Replace)) == FsObjRenameFlag_Replace) + fBackend = PATHRENAME_FLAG_REPLACE; + else + fBackend = PATHRENAME_FLAG_NO_REPLACE; + + /* Call worker to do the job. */ + int guestRc; + int vrc = i_pathRenameInternal(aSource, aDestination, fBackend, &guestRc); + if (RT_FAILURE(vrc)) + { + switch (vrc) + { + case VERR_NOT_SUPPORTED: + hr = setError(VBOX_E_IPRT_ERROR, + tr("Handling renaming guest directories not supported by installed Guest Additions")); + break; + + case VERR_GSTCTL_GUEST_ERROR: + hr = setError(VBOX_E_IPRT_ERROR, + tr("Renaming guest directory failed: %Rrc"), guestRc); + break; + + default: + hr = setError(VBOX_E_IPRT_ERROR, tr("Renaming guest directory \"%s\" failed: %Rrc"), + aSource.c_str(), vrc); + break; + } + } + + return hr; +#endif /* VBOX_WITH_GUEST_CONTROL */ +} + +HRESULT GuestSession::fsObjMove(const com::Utf8Str &aSource, const com::Utf8Str &aDestination, + const std::vector &aFlags, ComPtr &aProgress) +{ + ReturnComNotImplemented(); +} + +HRESULT GuestSession::fsObjSetACL(const com::Utf8Str &aPath, BOOL aFollowSymlinks, const com::Utf8Str &aAcl, ULONG aMode) +{ + ReturnComNotImplemented(); +} + HRESULT GuestSession::processCreate(const com::Utf8Str &aExecutable, const std::vector &aArguments, @@ -3704,26 +3620,4 @@ } -HRESULT GuestSession::symlinkRemoveDirectory(const com::Utf8Str &aPath) -{ -#ifndef VBOX_WITH_GUEST_CONTROL - ReturnComNotImplemented(); -#else - LogFlowThisFuncEnter(); - - ReturnComNotImplemented(); -#endif /* VBOX_WITH_GUEST_CONTROL */ -} - -HRESULT GuestSession::symlinkRemoveFile(const com::Utf8Str &aFile) -{ -#ifndef VBOX_WITH_GUEST_CONTROL - ReturnComNotImplemented(); -#else - LogFlowThisFuncEnter(); - - ReturnComNotImplemented(); -#endif /* VBOX_WITH_GUEST_CONTROL */ -} - HRESULT GuestSession::waitFor(ULONG aWaitFor, ULONG aTimeoutMS, GuestSessionWaitResult_T *aReason) { Index: /trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp (revision 55630) +++ /trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp (revision 55631) @@ -937,5 +937,5 @@ SessionTaskCopyTo *pTask = new SessionTaskCopyTo(pSession /* GuestSession */, &pISO->file, cbOffset, cbSize, - strFileDest, CopyFileFlag_None); + strFileDest, FileCopyFlag_None); AssertPtrReturn(pTask, VERR_NO_MEMORY); @@ -973,5 +973,5 @@ GuestFsObjData objData; int64_t cbSizeOnGuest; int guestRc; - rc = pSession->i_fileQuerySizeInternal(strFileDest, &cbSizeOnGuest, &guestRc); + rc = pSession->i_fileQuerySizeInternal(strFileDest, false /*fFollowSymlinks*/, &cbSizeOnGuest, &guestRc); if ( RT_SUCCESS(rc) && cbSize == (uint64_t)cbSizeOnGuest)