- Update to r53061

[reactos.git] / drivers / filesystems / cdfs / misc.c

diff --git a/drivers/filesystems/cdfs/misc.c b/drivers/filesystems/cdfs/misc.c
index 4e7128b..d1f618a 100644 (file)
--- a/drivers/filesystems/cdfs/misc.c
+++ b/drivers/filesystems/cdfs/misc.c
@@ -95,6 +95,46 @@ CdfsFileFlagsToAttributes(PFCB Fcb,
         ((Fcb->Entry.FileFlags & FILE_FLAG_READONLY) ? FILE_ATTRIBUTE_READONLY : 0);
 }
 
+BOOLEAN
+CdfsIsNameLegalDOS8Dot3(IN UNICODE_STRING FileName
+    )
+{
+    ULONG i;
+    STRING DbcsName;
+    CHAR DbcsNameBuffer[12];
+
+    /* 8dot3 filename is max 12 length */
+    if (FileName.Length / sizeof(WCHAR) > 12)
+    {
+        return FALSE;
+    }
+
+    for (i = 0; i < FileName.Length / sizeof(WCHAR) ; i++)
+    {
+        /* Don't allow spaces in FileName */
+        if (FileName.Buffer[i] == L' ')
+            return FALSE;
+    }
+
+    /* If FileName is finishing with a dot, remove it */
+    if (FileName.Buffer[FileName.Length / sizeof(WCHAR) - 1] == '.')
+    {
+        FileName.Length -= sizeof(WCHAR);
+    }
+
+    /* Finally, convert the string to call the FsRtl function */
+    DbcsName.MaximumLength = 12;
+    DbcsName.Buffer = DbcsNameBuffer;
+    if (!NT_SUCCESS(RtlUnicodeStringToCountedOemString(&DbcsName,
+                                                       &FileName,
+                                                       FALSE )))
+    {
+
+        return FALSE;
+    }
+    return FsRtlIsFatDbcsLegal(DbcsName, FALSE, FALSE, FALSE);
+}
+
 VOID
 CdfsShortNameCacheGet
 (PFCB DirectoryFcb, 
@@ -102,7 +142,6 @@ CdfsShortNameCacheGet
  PUNICODE_STRING LongName, 
  PUNICODE_STRING ShortName)
 {
-    BOOLEAN HasSpaces;
     PLIST_ENTRY Entry;
     PCDFS_SHORT_NAME ShortNameEntry;
     GENERATE_NAME_CONTEXT Context = { 0 };
@@ -132,8 +171,7 @@ CdfsShortNameCacheGet
     }
 
     /* Cache miss */
-    if ((RtlIsNameLegalDOS8Dot3(LongName, NULL, &HasSpaces) == FALSE) ||
-        (HasSpaces == TRUE))
+    if (!CdfsIsNameLegalDOS8Dot3(*LongName))
     {
         RtlGenerate8dot3Name(LongName, FALSE, &Context, ShortName);
     }