]> granicus.if.org Git - postgresql/commitdiff
Adjust use of sizeof(EXE).
authorBruce Momjian <bruce@momjian.us>
Mon, 1 Nov 2004 04:46:56 +0000 (04:46 +0000)
committerBruce Momjian <bruce@momjian.us>
Mon, 1 Nov 2004 04:46:56 +0000 (04:46 +0000)
src/port/path.c

index 8a73422f8b96081cb9d1ab70518a5ee0b99c8061..ca46ed1d94e08d4e84fc5ceb3a18ecabbb354a11 100644 (file)
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/port/path.c,v 1.39 2004/11/01 04:25:18 momjian Exp $
+ *       $PostgreSQL: pgsql/src/port/path.c,v 1.40 2004/11/01 04:46:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -195,8 +195,8 @@ get_progname(const char *argv0)
 
 #if defined(__CYGWIN__) || defined(WIN32)
        /* strip .exe suffix, regardless of case */
-       if (strlen(nodir_name) > sizeof(EXE) &&
-               pg_strcasecmp(nodir_name + strlen(nodir_name) - sizeof(EXE), EXE) == 0)
+       if (strlen(nodir_name) > sizeof(EXE) - 1 &&
+               pg_strcasecmp(nodir_name + strlen(nodir_name)-sizeof(EXE)-1, EXE) == 0)
        {
                char *progname;
 
@@ -206,7 +206,7 @@ get_progname(const char *argv0)
                        fprintf(stderr, "%s: out of memory\n", nodir_name);
                        exit(1);
                }
-               progname[strlen(progname) - sizeof(EXE)] = '\0';
+               progname[strlen(progname) - sizeof(EXE) - 1] = '\0';
                nodir_name = progname; 
        }
 #endif