Commitff2fbac

committed

Fix trim_trailing_separator() to not trim c:\ nor \\network\ on Win32.

1 parenteee9317 commitff2fbacCopy full SHA for ff2fbac

File tree

+21

-2

lines changed

+21

-2

lines changed

Lines changed: 21 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/port/path.c,v 1.21 2004/07/10 22:58:42tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/port/path.c,v 1.22 2004/07/11 02:59:42momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -389,7 +389,26 @@ static void`
`389`	`389`	`trim_trailing_separator(char*path)`
`390`	`390`	`{`
`391`	`391`	`char*p=path+strlen(path);`
`392`		`-`
	`392`	`+`
	`393`	`+#ifdefWIN32`
	`394`	`+/* Skip over network and drive specifiers for win32 */`
	`395`	`+if (strlen(path) >=2)`
	`396`	`+ {`
	`397`	`+if (IS_DIR_SEP(path[0])&&IS_DIR_SEP(path[1]))`
	`398`	`+ {`
	`399`	`+path+=2;`
	`400`	`+while (path&& !IS_DIR_SEP(path))`
	`401`	`+path++;`
	`402`	`+}`
	`403`	`+elseif (isalpha(path[0])&&path[1]==':')`
	`404`	`+ {`
	`405`	`+path++;`
	`406`	`+if (IS_DIR_SEP(path[1]))`
	`407`	`+path++;`
	`408`	`+ }`
	`409`	`+ }`
	`410`	`+#endif`
	`411`	`+`
`393`	`412`	`/* trim off trailing slashes */`
`394`	`413`	`if (p>path)`
`395`	`414`	`for (p--;p>path&&IS_DIR_SEP(*p);p--)`

Comments

(0)