Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 17:44:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added missing features in GetFullPathName[A/W]().

Browse source 
svn path=/trunk/; revision=420
This commit is contained in:
Eric Kohl 1999-04-28 14:19:34 +00:00
parent e5bfd35667
commit c842409323
1 changed files with 148 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

147
reactos/lib/kernel32/file/dir.c
View file

@ -163,6 +163,24 @@ WINBOOL STDCALL RemoveDirectoryW(LPCWSTR lpPathName)
return TRUE; return TRUE;
} }
static DWORD GetDotSequenceLengthA (PSTR p)
{
DWORD dwCount = 0;
for (;;)
{
if (*p == '.')
dwCount++;
else if ((*p == '\\' || *p == '\0') && dwCount)
return dwCount;
else
return 0;
p++;
}
return 0;
}
DWORD STDCALL GetFullPathNameA(LPCSTR lpFileName, DWORD STDCALL GetFullPathNameA(LPCSTR lpFileName,
DWORD nBufferLength, DWORD nBufferLength,
LPSTR lpBuffer, LPSTR lpBuffer,
@ -204,7 +222,58 @@ DWORD STDCALL GetFullPathNameA(LPCSTR lpFileName,
while ((*p) != 0) while ((*p) != 0)
{ {
DWORD dwDotLen;
dwDotLen = GetDotSequenceLengthA (p+1);
DPRINT("DotSequenceLength %u\n", dwDotLen);
DPRINT("prev %s p %s\n",prev,p); DPRINT("prev %s p %s\n",prev,p);
if (dwDotLen == 0)
{
prev = p;
do
{
p++;
}
while ((*p) != 0 && (*p) != '\\');
}
else if (dwDotLen == 1)
{
lstrcpyA(p, p+2);
}
else
{
if (dwDotLen > 2)
{
int n = dwDotLen - 2;
while (n > 0)
{
prev--;
if ((*prev) == '\\')
n--;
if (prev == (lpBuffer+2))
break;
}
}
lstrcpyA (prev, p+dwDotLen+1);
p = prev;
if (prev == (lpBuffer+2))
{
prev = NULL;
}
else
{
prev--;
while ((*prev) != '\\')
{
prev--;
}
}
}
#if 0
if (p[1] == '.' && (p[2] == '\\' || p[2] == 0)) if (p[1] == '.' && (p[2] == '\\' || p[2] == 0))
{ {
lstrcpyA(p, p+2); lstrcpyA(p, p+2);
@ -236,11 +305,12 @@ DWORD STDCALL GetFullPathNameA(LPCSTR lpFileName,
} }
while ((*p) != 0 && (*p) != '\\'); while ((*p) != 0 && (*p) != '\\');
} }
#endif
} }
if (lpFilePart != NULL) if (lpFilePart != NULL)
{ {
(*lpFilePart) = prev; (*lpFilePart) = prev + 1;
} }
DPRINT("lpBuffer %s\n",lpBuffer); DPRINT("lpBuffer %s\n",lpBuffer);
@ -248,6 +318,25 @@ DWORD STDCALL GetFullPathNameA(LPCSTR lpFileName,
return strlen(lpBuffer); return strlen(lpBuffer);
} }
static DWORD GetDotSequenceLengthW (PWSTR p)
{
DWORD dwCount = 0;
for (;;)
{
if (*p == '.')
dwCount++;
else if ((*p == '\\' || *p == '\0') && dwCount)
return dwCount;
else
return 0;
p++;
}
return 0;
}
DWORD STDCALL GetFullPathNameW(LPCWSTR lpFileName, DWORD STDCALL GetFullPathNameW(LPCWSTR lpFileName,
DWORD nBufferLength, DWORD nBufferLength,
LPWSTR lpBuffer, LPWSTR lpBuffer,
@ -289,6 +378,59 @@ DWORD STDCALL GetFullPathNameW(LPCWSTR lpFileName,
while ((*p) != 0) while ((*p) != 0)
{ {
DWORD dwDotLen;
dwDotLen = GetDotSequenceLengthW (p+1);
DPRINT("DotSequenceLength %u\n", dwDotLen);
DPRINT("prev %w p %w\n",prev,p);
if (dwDotLen == 0)
{
prev = p;
do
{
p++;
}
while ((*p) != 0 && (*p) != '\\');
}
else if (dwDotLen == 1)
{
lstrcpyW(p, p+2);
}
else
{
if (dwDotLen > 2)
{
int n = dwDotLen - 2;
while (n > 0)
{
prev--;
if ((*prev) == '\\')
n--;
if (prev == (lpBuffer+2))
break;
}
}
lstrcpyW (prev, p+dwDotLen+1);
p = prev;
if (prev == (lpBuffer+2))
{
prev = NULL;
}
else
{
prev--;
while ((*prev) != '\\')
{
prev--;
}
}
}
#if 0
DPRINT("prev %w p %w\n",prev,p); DPRINT("prev %w p %w\n",prev,p);
if (p[1] == '.' && (p[2] == '\\' || p[2] == 0)) if (p[1] == '.' && (p[2] == '\\' || p[2] == 0))
{ {
@ -321,11 +463,12 @@ DWORD STDCALL GetFullPathNameW(LPCWSTR lpFileName,
} }
while ((*p) != 0 && (*p) != '\\'); while ((*p) != 0 && (*p) != '\\');
} }
#endif
} }
if (lpFilePart != NULL) if (lpFilePart != NULL)
{ {
(*lpFilePart) = prev; (*lpFilePart) = prev + 1;
} }
DPRINT("lpBuffer %w\n",lpBuffer); DPRINT("lpBuffer %w\n",lpBuffer);