Index: /trunk/include/iprt/mangling.h =================================================================== --- /trunk/include/iprt/mangling.h (revision 40978) +++ /trunk/include/iprt/mangling.h (revision 40979) @@ -906,6 +906,6 @@ # define RTPathGetCurrent RT_MANGLER(RTPathGetCurrent) # define RTPathGetMode RT_MANGLER(RTPathGetMode) -# define RTPathHaveExt RT_MANGLER(RTPathHaveExt) -# define RTPathHavePath RT_MANGLER(RTPathHavePath) +# define RTPathHasExt RT_MANGLER(RTPathHasExt) +# define RTPathHasPath RT_MANGLER(RTPathHasPath) # define RTPathJoin RT_MANGLER(RTPathJoin) # define RTPathJoinA RT_MANGLER(RTPathJoinA) Index: /trunk/include/iprt/path.h =================================================================== --- /trunk/include/iprt/path.h (revision 40978) +++ /trunk/include/iprt/path.h (revision 40979) @@ -332,5 +332,5 @@ /** - * Checks if a path have an extension. + * Checks if a path has an extension. * * @returns true if extension present. @@ -339,4 +339,6 @@ */ RTDECL(bool) RTPathHaveExt(const char *pszPath); +/** Misspelled, don't use. */ +#define RTPathHaveExt RTPathHasExt /** @@ -347,5 +349,7 @@ * @param pszPath Path to check. */ -RTDECL(bool) RTPathHavePath(const char *pszPath); +RTDECL(bool) RTPathHasPath(const char *pszPath); +/** Misspelled, don't use. */ +#define RTPathHavePath RTPathHasPath /** Index: /trunk/src/VBox/Runtime/Makefile.kmk =================================================================== --- /trunk/src/VBox/Runtime/Makefile.kmk (revision 40978) +++ /trunk/src/VBox/Runtime/Makefile.kmk (revision 40979) @@ -347,6 +347,6 @@ common/path/RTPathExt.cpp \ common/path/RTPathFilename.cpp \ - common/path/RTPathHaveExt.cpp \ - common/path/RTPathHavePath.cpp \ + common/path/RTPathHasExt.cpp \ + common/path/RTPathHasPath.cpp \ common/path/RTPathJoin.cpp \ common/path/RTPathJoinA.cpp \ @@ -1129,6 +1129,6 @@ common/path/RTPathExt.cpp \ common/path/RTPathFilename.cpp \ - common/path/RTPathHaveExt.cpp \ - common/path/RTPathHavePath.cpp \ + common/path/RTPathHasExt.cpp \ + common/path/RTPathHasPath.cpp \ common/path/RTPathJoin.cpp \ common/path/RTPathJoinA.cpp \ @@ -1637,6 +1637,6 @@ common/path/RTPathExt.cpp \ common/path/RTPathFilename.cpp \ - common/path/RTPathHaveExt.cpp \ - common/path/RTPathHavePath.cpp \ + common/path/RTPathHasExt.cpp \ + common/path/RTPathHasPath.cpp \ common/path/RTPathParse.cpp \ common/path/RTPathRealDup.cpp \ Index: /trunk/src/VBox/Runtime/common/path/RTPathHasExt.cpp =================================================================== --- /trunk/src/VBox/Runtime/common/path/RTPathHasExt.cpp (revision 40979) +++ /trunk/src/VBox/Runtime/common/path/RTPathHasExt.cpp (revision 40979) @@ -0,0 +1,47 @@ +/* $Id$ */ +/** @file + * IPRT - RTPathHasExt + */ + +/* + * 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 + + + +/** + * Checks if a path has an extension. + * + * @returns true if extension present. + * @returns false if no extension present. + * @param pszPath Path to check. + */ +RTDECL(bool) RTPathHasExt(const char *pszPath) +{ + return RTPathExt(pszPath) != NULL; +} + Index: /trunk/src/VBox/Runtime/common/path/RTPathHasPath.cpp =================================================================== --- /trunk/src/VBox/Runtime/common/path/RTPathHasPath.cpp (revision 40979) +++ /trunk/src/VBox/Runtime/common/path/RTPathHasPath.cpp (revision 40979) @@ -0,0 +1,51 @@ +/* $Id$ */ +/** @file + * IPRT - RTPathHasPath + */ + +/* + * 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 +#include + + +/** + * Checks if a path includes more than a filename. + * + * @returns true if path present. + * @returns false if no path. + * @param pszPath Path to check. + */ +RTDECL(bool) RTPathHasPath(const char *pszPath) +{ +#if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2) + return strpbrk(pszPath, "/\\:") != NULL; +#else + return strpbrk(pszPath, "/") != NULL; +#endif +} + Index: unk/src/VBox/Runtime/common/path/RTPathHaveExt.cpp =================================================================== --- /trunk/src/VBox/Runtime/common/path/RTPathHaveExt.cpp (revision 40978) +++ (revision ) @@ -1,47 +1,0 @@ -/* $Id$ */ -/** @file - * IPRT - RTPathHaveExt - */ - -/* - * Copyright (C) 2006-2007 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 - - - -/** - * Checks if a path has an extension. - * - * @returns true if extension present. - * @returns false if no extension present. - * @param pszPath Path to check. - */ -RTDECL(bool) RTPathHaveExt(const char *pszPath) -{ - return RTPathExt(pszPath) != NULL; -} - Index: unk/src/VBox/Runtime/common/path/RTPathHavePath.cpp =================================================================== --- /trunk/src/VBox/Runtime/common/path/RTPathHavePath.cpp (revision 40978) +++ (revision ) @@ -1,51 +1,0 @@ -/* $Id$ */ -/** @file - * IPRT - RTPathHavePath - */ - -/* - * Copyright (C) 2006-2007 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 -#include - - -/** - * Checks if a path includes more than a filename. - * - * @returns true if path present. - * @returns false if no path. - * @param pszPath Path to check. - */ -RTDECL(bool) RTPathHavePath(const char *pszPath) -{ -#if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2) - return strpbrk(pszPath, "/\\:") != NULL; -#else - return strpbrk(pszPath, "/") != NULL; -#endif -} -