From e9ad14f9f4a8b3eb2c7497e5cee7a444c3469784 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Fri, 14 May 2010 00:13:38 +0000 Subject: Use NAMEDATALEN instead of local define. Modify path separators for Win32. Per ideas from Takahiro Itagaki --- contrib/pg_upgrade/exec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'contrib/pg_upgrade/exec.c') diff --git a/contrib/pg_upgrade/exec.c b/contrib/pg_upgrade/exec.c index 2543763cbc4..a8797be9d7c 100644 --- a/contrib/pg_upgrade/exec.c +++ b/contrib/pg_upgrade/exec.c @@ -138,7 +138,7 @@ check_exec(migratorContext *ctx, const char *dir, const char *cmdName) char path[MAXPGPATH]; const char *errMsg; - snprintf(path, sizeof(path), "%s%c%s", dir, pathSeparator, cmdName); + snprintf(path, sizeof(path), "%s/%s", dir, cmdName); if ((errMsg = validate_exec(path)) == NULL) return 1; /* 1 -> first alternative OK */ @@ -286,8 +286,8 @@ check_data_dir(migratorContext *ctx, const char *pg_data) { struct stat statBuf; - snprintf(subDirName, sizeof(subDirName), "%s%c%s", pg_data, - pathSeparator, requiredSubdirs[subdirnum]); + snprintf(subDirName, sizeof(subDirName), "%s/%s", pg_data, + requiredSubdirs[subdirnum]); if ((stat(subDirName, &statBuf)) != 0) { -- cgit v1.2.3