Use new utils/version.c instead of backend/utils/init/magic.c.

Author: Bryan Henderson

src/backend/Makefile

@@ -34,7 +34,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.14 1996/11/03 09:05:30 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.15 1996/11/12 06:46:04 bryanh Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -131,15 +131,16 @@ OBJS = access/SUBSYS.o bootstrap/SUBSYS.o catalog/SUBSYS.o  \
        lib/SUBSYS.o libpq/SUBSYS.o main/SUBSYS.o nodes/SUBSYS.o \
        optimizer/SUBSYS.o parser/SUBSYS.o port/SUBSYS.o \
        postmaster/SUBSYS.o regex/SUBSYS.o rewrite/SUBSYS.o \
-       storage/SUBSYS.o tcop/SUBSYS.o utils/SUBSYS.o
+       storage/SUBSYS.o tcop/SUBSYS.o utils/SUBSYS.o \
+       ../utils/version.o
 
 ifdef TIOGA
 OBJS += tioga/SUBSYS.o
 endif
 
 all: postgres global1.bki.source local1_template1.bki.source
 
-postgres: postgres_group1 postgres_group2 postgres_group3 postgres_group4
+postgres: postgres_group1 postgres_group2 postgres_group3 postgres_group4 
 	$(CC) $(LDFLAGS) -o postgres $(OBJS) $(LDADD)
 
 postgres_group1:
@@ -167,6 +168,7 @@ postgres_group4:
 ifdef TIOGA
 	$(MAKE) -C tioga      all   
 endif
+	$(MAKE) -C ../utils version.o        
 
 global1.bki.source local1_template1.bki.source: 
 	$(MAKE) -C catalog $@

src/backend/postmaster/postmaster.c

@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.23 1996/11/10 03:01:41 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.24 1996/11/12 06:46:36 bryanh Exp $
  *
  * NOTES
  *
@@ -75,6 +75,7 @@
 #include "libpq/auth.h"
 #include "libpq/pqcomm.h"
 #include "miscadmin.h"
+#include "version.h"
 #include "lib/dllist.h"
 #include "nodes/nodes.h"
 #include "utils/mcxt.h"
@@ -1186,18 +1187,27 @@ checkDataDir(void)
 	    SEP_CHAR);
     if ((fp=fopen(path, "r")) == NULL) {
         fprintf(stderr, "%s does not find the database.  Expected to find it "
-                "in the PGDATA directory \"%s\", but unable to open directory "
+                "in the PGDATA directory \"%s\", but unable to open file "
                 "with pathname \"%s\".\n", 
                 progname, DataDir, path);
 	exit(2);
     }
     fclose(fp);
 
-#ifndef WIN32    
-    if (!ValidPgVersion(DataDir)) {
-	fprintf(stderr, "%s: data base in \"%s\" is of a different version.\n",
-		progname, DataDir);
-	exit(2);
+#ifndef WIN32   
+    {
+        char *reason;   /* reason ValidatePgVersion failed.  NULL if didn't */
+        ValidatePgVersion(DataDir, &reason); 
+        if (reason) {
+            fprintf(stderr, 
+                    "Database system in directory %s "
+                    "is not compatible with this version of "
+                    "Postgres, or we are unable to read the PG_VERSION file. "
+                    "Explanation from ValidatePgVersion: %s\n",
+                    DataDir, reason);
+            free(reason);
+            exit(2);
+        }
     }
 #endif /* WIN32 */
 }

src/backend/utils/init/Makefile

@@ -4,7 +4,7 @@
 #    Makefile for utils/init
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/init/Makefile,v 1.2 1996/11/09 06:23:41 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/init/Makefile,v 1.3 1996/11/12 06:46:40 bryanh Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -20,7 +20,7 @@ CFLAGS += $(INCLUDE_OPT)
 CFLAGS += -DPOSTGRESDIR='"$(POSTGRESDIR)"' -DPGDATADIR='"$(DATADIR)"' \
           -DPOSTPORT='"$(POSTPORT)"'
 
-OBJS = enbl.o findbe.o globals.o magic.o miscinit.o postinit.o
+OBJS = enbl.o findbe.o globals.o miscinit.o postinit.o
 
 all: SUBSYS.o