rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Go back to emitting path names with forward slashes on Windows. 

I'm not clear on what the double-backslash idea was intended to fix,
but it breaks at least mingw GNU Make.  Per report from Thomas Hallgren.
This commit is contained in:
Tom Lane 2005-10-13 17:58:44 +00:00
parent 84cc9a4bb3
commit a0fc05aa6e
1 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@
*
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
*
* $PostgreSQL: pgsql/src/bin/pg_config/pg_config.c,v 1.15 2005/10/06 12:04:58 petere Exp $
* $PostgreSQL: pgsql/src/bin/pg_config/pg_config.c,v 1.16 2005/10/13 17:58:44 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -32,9 +32,9 @@ static char mypath[MAXPGPATH];
/*
* This function cleans up the paths for use with either cmd.exe or Msys
* on Windows. We need them to use double backslashes and filenames without
* spaces (for which a short filename is the safest equivalent) eg:
* C:\\Progra~1\\
* on Windows. We need them to use filenames without spaces, for which a
* short filename is the safest equivalent, eg:
* 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,
@ -45,8 +45,7 @@ static void
cleanup_path(char *path)
{
#ifdef WIN32
int x=0, y=0;
char temp[MAXPGPATH];
char *ptr;
if (GetShortPathName(path, path, MAXPGPATH - 1) == 0)
{
@ -59,31 +58,13 @@ cleanup_path(char *path)
return;
}
}
/* Replace '\' with '\\'. */
for (x = 0; x < strlen(path); x++)
{
if (path[x] == '/' || path[x] == '\\')
{
temp[y] = '\\';
y++;
temp[y] = '\\';
}
else
{
temp[y] = path[x];
}
y++;
/* Bail out if we're too close to MAXPGPATH */
if (y >= MAXPGPATH - 2)
break;
/* Replace '\' with '/' */
for (ptr = path; *ptr; ptr++)
{
if (*ptr == '\\')
*ptr = '/';
}
temp[y] = '\0';
strncpy(path, temp, MAXPGPATH - 1);
#endif
}