Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 06:46:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed a typo in RtlGenerate8dot3Name().

Browse source 
Added more tests to RtlIsNameLegalDOS8Dot3().

svn path=/trunk/; revision=3012
This commit is contained in:
Eric Kohl 2002-06-06 16:17:26 +00:00
parent 819490ac07
commit f9769b54cf
2 changed files with 26 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
reactos/lib/ntdll/rtl/dos8dot3.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id: dos8dot3.c,v 1.1 2002/06/05 16:50:43 ekohl Exp $
/* $Id: dos8dot3.c,v 1.2 2002/06/06 16:17:09 ekohl Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
@ -129,7 +129,7 @@ RtlGenerate8dot3Name(IN PUNICODE_STRING Name,
if ((Context->NameLength == CopyLength) &&
(wcsncmp(Context->NameBuffer, NameBuffer, CopyLength) == 0) &&
(Context->ExtensionLength = ExtLength) &&
(Context->ExtensionLength == ExtLength) &&
(wcsncmp(Context->ExtensionBuffer, ExtBuffer, ExtLength) == 0))
CurrentIndex = Context->LastIndexValue + 1;
else
@ -225,10 +225,11 @@ RtlIsNameLegalDOS8Dot3(IN PUNICODE_STRING UnicodeName,
break;
case '.':
if ((HasDot) || /* two dots */
(!i) || /* point is first char */
(i + 1 == Length) ||/* point is last char */
(Length - i > 4)) /* more than 3 chars of extension */
if ((HasDot) || /* two or more dots */
(i == 0) || /* dot is first char */
(i + 1 == Length) || /* dot is last char */
(Length - i > 4) || /* more than 3 chars of extension */
(HasDot == FALSE && i > 8)) /* name is longer than 8 chars */
return(FALSE);
HasDot = TRUE;
break;
@ -236,6 +237,12 @@ RtlIsNameLegalDOS8Dot3(IN PUNICODE_STRING UnicodeName,
}
}
/* Name is longer than 8 chars and does not have an extension */
if (Length > 8 && HasDot == FALSE)
{
return(FALSE);
}
if (SpacesFound)
*SpacesFound = HasSpace;

19
reactos/ntoskrnl/rtl/dos8dot3.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id: dos8dot3.c,v 1.1 2002/06/05 16:52:43 ekohl Exp $
/* $Id: dos8dot3.c,v 1.2 2002/06/06 16:17:26 ekohl Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@ -124,7 +124,7 @@ RtlGenerate8dot3Name(IN PUNICODE_STRING Name,
CopyLength = min(NameLength, (CurrentIndex < 10) ? 6 : 5);
if ((Context->NameLength == CopyLength) &&
(wcsncmp(Context->NameBuffer, NameBuffer, CopyLength) == 0) &&
(Context->ExtensionLength = ExtLength) &&
(Context->ExtensionLength == ExtLength) &&
(wcsncmp(Context->ExtensionBuffer, ExtBuffer, ExtLength) == 0))
CurrentIndex = Context->LastIndexValue + 1;
else
@ -219,10 +219,11 @@ RtlIsNameLegalDOS8Dot3(IN PUNICODE_STRING UnicodeName,
break;
case '.':
if ((HasDot) || /* two dots */
(!i) || /* point is first char */
(i + 1 == Length) ||/* point is last char */
(Length - i > 4)) /* more than 3 chars of extension */
if ((HasDot) || /* two or more dots */
(i == 0) || /* dot is first char */
(i + 1 == Length) || /* dot is last char */
(Length - i > 4) || /* more than 3 chars of extension */
(HasDot == FALSE && i > 8)) /* name is longer than 8 chars */
return(FALSE);
HasDot = TRUE;
break;
@ -230,6 +231,12 @@ RtlIsNameLegalDOS8Dot3(IN PUNICODE_STRING UnicodeName,
}
}
/* Name is longer than 8 chars and does not have an extension */
if (Length > 8 && HasDot == FALSE)
{
return(FALSE);
}
if (SpacesFound)
*SpacesFound = HasSpace;