Index: /trunk/include/VBox/VBoxGuest.h =================================================================== --- /trunk/include/VBox/VBoxGuest.h (revision 45374) +++ /trunk/include/VBox/VBoxGuest.h (revision 45375) @@ -377,10 +377,6 @@ #endif -/** IOCTL to for setting the mouse driver callback. (kernel only) - * @todo r=bird: Why is this using VBOXGUEST_IOCTL_CODE_ and not - * VBOXGUEST_IOCTL_CODE? Doesn't make any sense to me as the data is bit - * specific... - */ -#define VBOXGUEST_IOCTL_SET_MOUSE_NOTIFY_CALLBACK VBOXGUEST_IOCTL_CODE_(31, sizeof(VBoxGuestMouseSetNotifyCallback)) +/** IOCTL to for setting the mouse driver callback. (kernel only) */ +#define VBOXGUEST_IOCTL_SET_MOUSE_NOTIFY_CALLBACK VBOXGUEST_IOCTL_CODE(31, sizeof(VBoxGuestMouseSetNotifyCallback)) typedef DECLCALLBACK(void) FNVBOXGUESTMOUSENOTIFY(void *pfnUser); Index: /trunk/include/iprt/getopt.h =================================================================== --- /trunk/include/iprt/getopt.h (revision 45374) +++ /trunk/include/iprt/getopt.h (revision 45375) @@ -394,5 +394,5 @@ * vector that can be used with RTGetOptInit(). * - * This function aims at following the bourn shell string quoting rules. + * This function aims at following the bourne shell string quoting rules. * * @returns IPRT status code. Index: /trunk/include/iprt/mangling.h =================================================================== --- /trunk/include/iprt/mangling.h (revision 45374) +++ /trunk/include/iprt/mangling.h (revision 45375) @@ -938,5 +938,5 @@ # define RTPathJoinA RT_MANGLER(RTPathJoinA) # define RTPathJoinEx RT_MANGLER(RTPathJoinEx) -# define RTPathParse RT_MANGLER(RTPathParse) +# define RTPathParseSimple RT_MANGLER(RTPathParseSimple) # define RTPathQueryInfo RT_MANGLER(RTPathQueryInfo) # define RTPathQueryInfoEx RT_MANGLER(RTPathQueryInfoEx) Index: /trunk/include/iprt/path.h =================================================================== --- /trunk/include/iprt/path.h (revision 45374) +++ /trunk/include/iprt/path.h (revision 45375) @@ -294,5 +294,5 @@ /** - * Parses a path. + * Simple parsing of the a path. * * It figures the length of the directory component, the offset of @@ -311,5 +311,5 @@ * will be set to -1. Optional. */ -RTDECL(size_t) RTPathParse(const char *pszPath, size_t *pcchDir, ssize_t *poffName, ssize_t *poffSuff); +RTDECL(size_t) RTPathParseSimple(const char *pszPath, size_t *pcchDir, ssize_t *poffName, ssize_t *poffSuff); /** Index: /trunk/src/VBox/Runtime/Makefile.kmk =================================================================== --- /trunk/src/VBox/Runtime/Makefile.kmk (revision 45374) +++ /trunk/src/VBox/Runtime/Makefile.kmk (revision 45375) @@ -362,5 +362,5 @@ common/path/RTPathJoinA.cpp \ common/path/RTPathJoinEx.cpp \ - common/path/RTPathParse.cpp \ + common/path/RTPathParseSimple.cpp \ common/path/RTPathRealDup.cpp \ common/path/RTPathRmCmd.cpp \ @@ -1201,5 +1201,5 @@ common/path/RTPathJoin.cpp \ common/path/RTPathJoinA.cpp \ - common/path/RTPathParse.cpp \ + common/path/RTPathParseSimple.cpp \ common/path/RTPathRealDup.cpp \ common/path/RTPathStripExt.cpp \ @@ -1709,5 +1709,5 @@ common/path/RTPathHasExt.cpp \ common/path/RTPathHasPath.cpp \ - common/path/RTPathParse.cpp \ + common/path/RTPathParseSimple.cpp \ common/path/RTPathRealDup.cpp \ common/path/RTPathStripExt.cpp \ Index: /trunk/src/VBox/Runtime/VBox/VBoxRTImp.def =================================================================== --- /trunk/src/VBox/Runtime/VBox/VBoxRTImp.def (revision 45374) +++ /trunk/src/VBox/Runtime/VBox/VBoxRTImp.def (revision 45375) @@ -804,5 +804,5 @@ RTPathJoinA RTPathJoinEx - RTPathParse + RTPathParseSimple RTPathQueryInfo RTPathQueryInfoEx Index: unk/src/VBox/Runtime/common/path/RTPathParse.cpp =================================================================== --- /trunk/src/VBox/Runtime/common/path/RTPathParse.cpp (revision 45374) +++ (revision ) @@ -1,118 +1,0 @@ -/* $Id$ */ -/** @file - * IPRT - RTPathParse - */ - -/* - * Copyright (C) 2006-2012 Oracle Corporation - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - * - * The contents of this file may alternatively be used under the terms - * of the Common Development and Distribution License Version 1.0 - * (CDDL) only, as it comes in the "COPYING.CDDL" file of the - * VirtualBox OSE distribution, in which case the provisions of the - * CDDL are applicable instead of those of the GPL. - * - * You may elect to license modified versions of this file under the - * terms and conditions of either the GPL or the CDDL or both. - */ - - -/******************************************************************************* -* Header Files * -*******************************************************************************/ -#include "internal/iprt.h" -#include - - -/** - * Parses a path. - * - * It figures the length of the directory component, the offset of - * the file name and the location of the suffix dot. - * - * @returns The path length. - * - * @param pszPath Path to find filename in. - * @param pcchDir Where to put the length of the directory component. If - * no directory, this will be 0. Optional. - * @param poffName Where to store the filename offset. - * If empty string or if it's ending with a slash this - * will be set to -1. Optional. - * @param poffSuff Where to store the suffix offset (the last dot). - * If empty string or if it's ending with a slash this - * will be set to -1. Optional. - */ -RTDECL(size_t) RTPathParse(const char *pszPath, size_t *pcchDir, ssize_t *poffName, ssize_t *poffSuff) -{ - const char *psz = pszPath; - ssize_t offRoot = 0; - const char *pszName = pszPath; - const char *pszLastDot = NULL; - - for (;; psz++) - { - switch (*psz) - { - /* handle separators. */ -#if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2) - case ':': - pszName = psz + 1; - offRoot = pszName - psz; - break; - - case '\\': -#endif - case '/': - pszName = psz + 1; - break; - - case '.': - pszLastDot = psz; - break; - - /* - * The end. Complete the results. - */ - case '\0': - { - ssize_t offName = *pszName != '\0' ? pszName - pszPath : -1; - if (poffName) - *poffName = offName; - - if (poffSuff) - { - ssize_t offSuff = -1; - if (pszLastDot) - { - offSuff = pszLastDot - pszPath; - if (offSuff <= offName) - offSuff = -1; - } - *poffSuff = offSuff; - } - - if (pcchDir) - { - ssize_t off = offName - 1; - while (off >= offRoot && RTPATH_IS_SLASH(pszPath[off])) - off--; - *pcchDir = RT_MAX(off, offRoot) + 1; - } - - return psz - pszPath; - } - } - } - - /* will never get here */ - return 0; -} - Index: /trunk/src/VBox/Runtime/common/path/RTPathParseSimple.cpp =================================================================== --- /trunk/src/VBox/Runtime/common/path/RTPathParseSimple.cpp (revision 45375) +++ /trunk/src/VBox/Runtime/common/path/RTPathParseSimple.cpp (revision 45375) @@ -0,0 +1,118 @@ +/* $Id$ */ +/** @file + * IPRT - RTPathParseSimple + */ + +/* + * Copyright (C) 2006-2012 Oracle Corporation + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + * + * The contents of this file may alternatively be used under the terms + * of the Common Development and Distribution License Version 1.0 + * (CDDL) only, as it comes in the "COPYING.CDDL" file of the + * VirtualBox OSE distribution, in which case the provisions of the + * CDDL are applicable instead of those of the GPL. + * + * You may elect to license modified versions of this file under the + * terms and conditions of either the GPL or the CDDL or both. + */ + + +/******************************************************************************* +* Header Files * +*******************************************************************************/ +#include "internal/iprt.h" +#include + + +/** + * Parses a path. + * + * It figures the length of the directory component, the offset of + * the file name and the location of the suffix dot. + * + * @returns The path length. + * + * @param pszPath Path to find filename in. + * @param pcchDir Where to put the length of the directory component. If + * no directory, this will be 0. Optional. + * @param poffName Where to store the filename offset. + * If empty string or if it's ending with a slash this + * will be set to -1. Optional. + * @param poffSuff Where to store the suffix offset (the last dot). + * If empty string or if it's ending with a slash this + * will be set to -1. Optional. + */ +RTDECL(size_t) RTPathParseSimple(const char *pszPath, size_t *pcchDir, ssize_t *poffName, ssize_t *poffSuff) +{ + const char *psz = pszPath; + ssize_t offRoot = 0; + const char *pszName = pszPath; + const char *pszLastDot = NULL; + + for (;; psz++) + { + switch (*psz) + { + /* handle separators. */ +#if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2) + case ':': + pszName = psz + 1; + offRoot = pszName - psz; + break; + + case '\\': +#endif + case '/': + pszName = psz + 1; + break; + + case '.': + pszLastDot = psz; + break; + + /* + * The end. Complete the results. + */ + case '\0': + { + ssize_t offName = *pszName != '\0' ? pszName - pszPath : -1; + if (poffName) + *poffName = offName; + + if (poffSuff) + { + ssize_t offSuff = -1; + if (pszLastDot) + { + offSuff = pszLastDot - pszPath; + if (offSuff <= offName) + offSuff = -1; + } + *poffSuff = offSuff; + } + + if (pcchDir) + { + ssize_t off = offName - 1; + while (off >= offRoot && RTPATH_IS_SLASH(pszPath[off])) + off--; + *pcchDir = RT_MAX(off, offRoot) + 1; + } + + return psz - pszPath; + } + } + } + + /* will never get here */ + return 0; +} + Index: /trunk/src/VBox/Runtime/generic/createtemp-generic.cpp =================================================================== --- /trunk/src/VBox/Runtime/generic/createtemp-generic.cpp (revision 45374) +++ /trunk/src/VBox/Runtime/generic/createtemp-generic.cpp (revision 45375) @@ -150,5 +150,5 @@ /* Temporarily convert pszTemplate to a path. */ - RTPathParse(pszTemplate, &cchDir, NULL, NULL); + RTPathParseSimple(pszTemplate, &cchDir, NULL, NULL); chOld = pszTemplate[cchDir]; pszTemplate[cchDir] = '\0'; @@ -219,5 +219,5 @@ /* Temporarily convert pszTemplate to a path. */ - RTPathParse(pszTemplate, &cchDir, NULL, NULL); + RTPathParseSimple(pszTemplate, &cchDir, NULL, NULL); chOld = pszTemplate[cchDir]; pszTemplate[cchDir] = '\0'; Index: /trunk/src/VBox/Runtime/r3/init.cpp =================================================================== --- /trunk/src/VBox/Runtime/r3/init.cpp (revision 45374) +++ /trunk/src/VBox/Runtime/r3/init.cpp (revision 45375) @@ -232,5 +232,5 @@ */ ssize_t offName; - g_cchrtProcExePath = RTPathParse(g_szrtProcExePath, &g_cchrtProcDir, &offName, NULL); + g_cchrtProcExePath = RTPathParseSimple(g_szrtProcExePath, &g_cchrtProcDir, &offName, NULL); g_offrtProcName = offName; return VINF_SUCCESS;