Fix sizeof(EXE) arithmetic, per Andrew Dunstan.

tglsfdc · tglsfdc · commit d2f6c3e56cbd · 2004-11-06T04:24:14.000Z
diff --git a/src/port/path.c b/src/port/path.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/port/path.c,v 1.42 2004/11/06 01:16:22 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/port/path.c,v 1.43 2004/11/06 04:24:14 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -285,7 +285,7 @@ get_progname(const char *argv0)
 #if defined(__CYGWIN__) || defined(WIN32)
 	/* strip .exe suffix, regardless of case */
 	if (strlen(nodir_name) > sizeof(EXE) - 1 &&
-		pg_strcasecmp(nodir_name + strlen(nodir_name)-sizeof(EXE)-1, EXE) == 0)
+		pg_strcasecmp(nodir_name + strlen(nodir_name)-(sizeof(EXE)-1), EXE) == 0)
 	{
 		char *progname;
 
@@ -295,7 +295,7 @@ get_progname(const char *argv0)
 			fprintf(stderr, "%s: out of memory\n", nodir_name);
 			exit(1);	/* This could exit the postmaster */
 		}
-		progname[strlen(progname) - sizeof(EXE) - 1] = '\0';
+		progname[strlen(progname) - (sizeof(EXE) - 1)] = '\0';
 		nodir_name = progname; 
 	}
 #endif

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.42 2004/11/06 01:16:22 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/port/path.c,v 1.43 2004/11/06 04:24:14 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -285,7 +285,7 @@ get_progname(const char *argv0)`
`285`	`285`	`#if defined(__CYGWIN__) \|\| defined(WIN32)`
`286`	`286`	`/* strip .exe suffix, regardless of case */`
`287`	`287`	`if (strlen(nodir_name) > sizeof(EXE) - 1 &&`
`288`		`- pg_strcasecmp(nodir_name + strlen(nodir_name)-sizeof(EXE)-1, EXE) == 0)`
	`288`	`+ pg_strcasecmp(nodir_name + strlen(nodir_name)-(sizeof(EXE)-1), EXE) == 0)`
`289`	`289`	`{`
`290`	`290`	`char *progname;`
`291`	`291`
`@@ -295,7 +295,7 @@ get_progname(const char *argv0)`
`295`	`295`	`fprintf(stderr, "%s: out of memory\n", nodir_name);`
`296`	`296`	`exit(1); /* This could exit the postmaster */`
`297`	`297`	`}`
`298`		`- progname[strlen(progname) - sizeof(EXE) - 1] = '\0';`
	`298`	`+ progname[strlen(progname) - (sizeof(EXE) - 1)] = '\0';`
`299`	`299`	`nodir_name = progname;`
`300`	`300`	`}`
`301`	`301`	`#endif`