mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

On Win32, return original patch if GetShortPathName() fails (no short

Browse Source 
name, path does not exist), rather than returning nothing.

Backpatch to 8.1.X.
This commit is contained in:
Bruce Momjian 2006-06-06 22:32:19 +00:00
parent 8a30cc2127
commit 62e7ad6603
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/bin/pg_config/pg_config.c
View File

@ -17,7 +17,7 @@
* *
* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/bin/pg_config/pg_config.c,v 1.18 2006/03/05 15:58:50 momjian Exp $ * $PostgreSQL: pgsql/src/bin/pg_config/pg_config.c,v 1.19 2006/06/06 22:32:19 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -35,11 +35,6 @@ static char mypath[MAXPGPATH];
* on Windows. We need them to use filenames without spaces, for which a * on Windows. We need them to use filenames without spaces, for which a
* short filename is the safest equivalent, eg: * short filename is the safest equivalent, eg:
* C:/Progra~1/ * C:/Progra~1/
*
* This can fail in 2 ways - if the path doesn't exist, or short names are
* disabled. In the first case, don't return any path. In the second case,
* we leave the path in the long form. In this case, it does still seem to
* fix elements containing spaces which is all we actually need.
*/ */
static void static void
cleanup_path(char *path) cleanup_path(char *path)
@ -47,18 +42,12 @@ cleanup_path(char *path)
#ifdef WIN32 #ifdef WIN32
char *ptr; char *ptr;
if (GetShortPathName(path, path, MAXPGPATH - 1) == 0)
{
/* /*
* Ignore ERROR_INVALID_PARAMETER as it almost certainly means that * GetShortPathName() will fail if the path does not exist, or short names
* short names are disabled * are disabled on this file system. In both cases, we just return the
* original path.
*/ */
if (GetLastError() != ERROR_INVALID_PARAMETER) GetShortPathName(path, path, MAXPGPATH - 1);
{
path[0] = '\0';
return;
}
}
/* Replace '\' with '/' */ /* Replace '\' with '/' */
for (ptr = path; *ptr; ptr++) for (ptr = path; *ptr; ptr++)