Changeset 33426 in vbox
- Timestamp:
- Oct 25, 2010 2:32:38 PM (14 years ago)
- svn:sync-xref-src-repo-rev:
- 67016
- Location:
- trunk
- Files:
-
- 4 added
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/iprt/err.h
r33386 r33426 430 430 #define VERR_NOT_IMPLEMENTED (-12) 431 431 432 /** The specified path does not point at a symbolic link. */ 433 #define VERR_NOT_SYMLINK (-19) 432 434 /** Failed to allocate temporary memory. */ 433 435 #define VERR_NO_TMP_MEMORY (-20) -
trunk/include/iprt/log.h
r32355 r33426 59 59 RTLOGGROUP_PATH, 60 60 RTLOGGROUP_PROCESS, 61 RTLOGGROUP_SYMLINK, 61 62 RTLOGGROUP_THREAD, 62 63 RTLOGGROUP_TIME, … … 87 88 "RT_PATH", \ 88 89 "RT_PROCESS", \ 90 "RT_SYMLINK", \ 89 91 "RT_THREAD", \ 90 92 "RT_TIME", \ 91 93 "RT_TIMER", \ 92 "RT_10", \93 94 "RT_11", \ 94 95 "RT_12", \ -
trunk/src/VBox/Runtime/Makefile.kmk
r33393 r33426 488 488 r3/win/semeventmulti-win.cpp \ 489 489 r3/win/semmutex-win.cpp \ 490 r3/win/symlink-win.cpp \ 490 491 r3/win/rtFileNativeSetAttributes-win.cpp \ 491 492 r3/win/thread-win.cpp \ … … 543 544 r3/posix/rand-posix.cpp \ 544 545 r3/posix/semrw-posix.cpp \ 546 r3/posix/symlink-posix.cpp \ 545 547 r3/posix/thread-posix.cpp \ 546 548 r3/posix/timelocal-posix.cpp \ … … 619 621 r3/posix/pathhost-posix.cpp \ 620 622 r3/posix/process-posix.cpp \ 623 r3/posix/symlink-posix.cpp \ 621 624 r3/posix/timelocal-posix.cpp \ 622 625 r3/posix/utf8-posix.cpp … … 669 672 r3/posix/semeventmulti-posix.cpp \ 670 673 r3/posix/semmutex-posix.cpp \ 674 r3/posix/symlink-posix.cpp \ 671 675 r3/posix/thread-posix.cpp \ 672 676 r3/posix/timelocal-posix.cpp \ … … 726 730 r3/posix/semmutex-posix.cpp \ 727 731 r3/posix/semrw-posix.cpp \ 732 r3/posix/symlink-posix.cpp \ 728 733 r3/posix/thread-posix.cpp \ 729 734 r3/posix/time-posix.cpp \ … … 771 776 r3/posix/semmutex-posix.cpp \ 772 777 r3/posix/semrw-posix.cpp \ 778 r3/posix/symlink-posix.cpp \ 773 779 r3/posix/thread-posix.cpp \ 774 780 r3/posix/time-posix.cpp \ -
trunk/src/VBox/Runtime/generic/pathhost-generic.cpp
r28919 r33426 80 80 } 81 81 82 83 int rtPathFromNativeDup(char **ppszPath, const char *pszNativePath, const char *pszBasePath) 84 { 85 int rc = RTStrValidateEncodingEx(pszNativePath, RTSTR_MAX, 0 /*fFlags*/); 86 if (RT_SUCCESS(rc)) 87 rc = RTStrDupEx(ppszPath, pszNativePath); 88 NOREF(pszBasePath); /* We don't query the FS for codeset preferences. */ 89 return rc; 90 } 91 -
trunk/src/VBox/Runtime/include/internal/path.h
r28915 r33426 85 85 * @returns IPRT status code. 86 86 * @param ppszPath Where to store the pointer to the IPRT path. 87 * Free by calling RTStrFree(). NULL on failure.87 * Free by calling rtPathFreeIprt(). NULL on failure. 88 88 * @param pszNativePath The native path to convert. 89 89 * @param pszBasePath What pszNativePath is relative to - in IPRT … … 117 117 int rtPathFromNativeCopy(char *pszPath, size_t cbPath, const char *pszNativePath, const char *pszBasePath); 118 118 119 /** 120 * Convert a path from the native representation to the IPRT one, allocating a 121 * string buffer for the result. 122 * 123 * @returns VINF_SUCCESS, VERR_NO_STR_MEMORY, and recoding errors. 124 * 125 * @param ppszPath Where to return the pointer to the IPRT path. Must 126 * be freed by calling RTStrFree. 127 * @param pszNativePath The path to convert. 128 * @param pszBasePath What pszNativePath is relative to - in IPRT 129 * representation. NULL if current directory. 130 */ 131 int rtPathFromNativeDup(char **ppszPath, const char *pszNativePath, const char *pszBasePath); 132 119 133 120 134 RT_C_DECLS_END -
trunk/src/VBox/Runtime/r3/darwin/pathhost-darwin.cpp
r28919 r33426 93 93 } 94 94 95 96 int rtPathFromNativeDup(char **ppszPath, const char *pszNativePath, const char *pszBasePath) 97 { 98 /** @todo We must compose the codepoints in the string here. We get file names 99 * in normalization form D so we'll end up with normalization form C 100 * whatever approach we take. */ 101 int rc = RTStrValidateEncodingEx(pszNativePath, RTSTR_MAX, 0 /*fFlags*/); 102 if (RT_SUCCESS(rc)) 103 rc = RTStrDupEx(ppszPath, pszNativePath); 104 NOREF(pszBasePath); /* We don't query the FS for codeset preferences. */ 105 return rc; 106 } 107 -
trunk/src/VBox/Runtime/r3/posix/pathhost-posix.cpp
r30303 r33426 263 263 } 264 264 265 266 int rtPathFromNativeDup(char **ppszPath, const char *pszNativePath, const char *pszBasePath) 267 { 268 int rc = RTOnce(&g_OnceInitPathConv, rtPathConvInitOnce, NULL, NULL); 269 if (RT_SUCCESS(rc)) 270 { 271 if (g_fPassthruUtf8 || !*pszNativePath) 272 rc = RTStrDupEx(ppszPath, pszNativePath); 273 else 274 rc = rtStrConvert(pszNativePath, strlen(pszNativePath), g_szFsCodeset, 275 ppszPath, 0, "UTF-8", 276 2, g_enmFsToUtf8Idx); 277 } 278 279 NOREF(pszBasePath); /* We don't query the FS for codeset preferences. */ 280 return rc; 281 } 282 -
trunk/src/VBox/Runtime/testcase/Makefile.kmk
r33290 r33426 100 100 tstStrToNum \ 101 101 tstRTStrVersion \ 102 tstRTSymlink \ 102 103 tstRTSystemQueryDmi \ 103 104 tstRTSystemQueryOsInfo \ … … 432 433 tstRTStrVersion_SOURCES = tstRTStrVersion.cpp 433 434 435 tstRTSymlink_TEMPLATE = VBOXR3TSTEXE 436 tstRTSymlink_SOURCES = tstRTSymlink.cpp 437 434 438 tstRTSystemQueryDmi_TEMPLATE = VBOXR3TSTEXE 435 439 tstRTSystemQueryDmi_SOURCES = tstRTSystemQueryDmi.cpp
Note:
See TracChangeset
for help on using the changeset viewer.