Re-add elog() to exec.c, per Tom.

bmomjian · bmomjian · commit ecc198bd39b2 · 2004-05-19T17:15:21.000Z
diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
@@ -5,7 +5,7 @@
 # Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/bin/initdb/Makefile,v 1.39 2004/05/18 20:18:58 momjian Exp $
+# $PostgreSQL: pgsql/src/bin/initdb/Makefile,v 1.40 2004/05/19 17:15:20 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -15,13 +15,17 @@ include $(top_builddir)/src/Makefile.global
 
 override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS)
 
-OBJS=	initdb.o
+OBJS=	initdb.o \
+	$(filter exec.o, $(LIBOBJS))
 
 all: submake-libpq submake-libpgport initdb
 
 initdb: $(OBJS) $(libpq_builddir)/libpq.a
 	$(CC) $(CFLAGS) $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@$(X)
 
+exec.c: % : $(top_srcdir)/src/port/%
+	rm -f $@ && $(LN_S) $< .
+
 install: all installdirs
 	$(INSTALL_PROGRAM) initdb$(X) $(DESTDIR)$(bindir)/initdb$(X)
 
@@ -32,7 +36,7 @@ uninstall:
 	rm -f $(DESTDIR)$(bindir)/initdb$(X)
 
 clean distclean maintainer-clean:
-	rm -f initdb$(X) $(OBJS)
+	rm -f initdb$(X) $(OBJS) exec.c
 
 
 # ensure that changes in datadir propagate into object file
diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile
@@ -5,7 +5,7 @@
 # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.48 2004/05/18 20:18:58 momjian Exp $
+# $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.49 2004/05/19 17:15:20 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -18,6 +18,7 @@ override CPPFLAGS += -DFRONTEND
 OBJS=	pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o \
 	pg_backup_files.o pg_backup_null.o pg_backup_tar.o \
 	dumputils.o
+PG_DUMPALL_OBJS =	$(filter exec.o, $(LIBOBJS))
 
 EXTRA_OBJS = $(top_builddir)/src/backend/parser/keywords.o
 
@@ -32,8 +33,11 @@ pg_dump: pg_dump.o common.o pg_dump_sort.o $(OBJS) $(libpq_builddir)/libpq.a
 pg_restore: pg_restore.o $(OBJS) $(libpq_builddir)/libpq.a
 	$(CC) $(CFLAGS) pg_restore.o $(OBJS) $(EXTRA_OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@$(X)
 
-pg_dumpall: pg_dumpall.o dumputils.o $(libpq_builddir)/libpq.a
-	$(CC) $(CFLAGS) pg_dumpall.o dumputils.o $(EXTRA_OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@$(X)
+pg_dumpall: pg_dumpall.o dumputils.o $(PG_DUMPALL_OBJS) $(libpq_builddir)/libpq.a
+	$(CC) $(CFLAGS) pg_dumpall.o dumputils.o $(PG_DUMPALL_OBJS) $(EXTRA_OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@$(X)
+
+exec.c: % : $(top_srcdir)/src/port/%
+	rm -f $@ && $(LN_S) $< .
 
 .PHONY: submake-backend
 submake-backend:
@@ -52,4 +56,4 @@ uninstall:
 	rm -f $(addprefix $(DESTDIR)$(bindir)/, pg_dump$(X) pg_restore$(X) pg_dumpall$(X))
 
 clean distclean maintainer-clean:
-	rm -f pg_dump$(X) pg_restore$(X) pg_dumpall$(X) $(OBJS) pg_dump.o common.o pg_dump_sort.o pg_restore.o pg_dumpall.o
+	rm -f pg_dump$(X) pg_restore$(X) pg_dumpall$(X) $(OBJS) pg_dump.o common.o pg_dump_sort.o pg_restore.o pg_dumpall.o exec.c
diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile
@@ -5,7 +5,7 @@
 # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.45 2004/05/18 20:18:58 momjian Exp $
+# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.46 2004/05/19 17:15:21 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -19,7 +19,8 @@ override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) -DFRONTEND
 
 OBJS=	command.o common.o help.o input.o stringutils.o mainloop.o copy.o \
 	startup.o prompt.o variables.o large_obj.o print.o describe.o \
-	psqlscan.o tab-complete.o mbprint.o
+	psqlscan.o tab-complete.o mbprint.o \
+	$(filter exec.o, $(LIBOBJS))
 
 FLEXFLAGS = -Cfe
 
@@ -29,6 +30,9 @@ all: submake-libpq submake-libpgport psql
 psql: $(OBJS) $(libpq_builddir)/libpq.a
 	$(CC) $(CFLAGS) $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@$(X)
 
+exec.c: % : $(top_srcdir)/src/port/%
+	rm -f $@ && $(LN_S) $< .
+
 help.o: $(srcdir)/sql_help.h
 
 ifdef PERL
@@ -60,7 +64,7 @@ uninstall:
 
 # psqlscan.c is in the distribution tarball, so is not cleaned here
 clean distclean:
-	rm -f psql$(X) $(OBJS)
+	rm -f psql$(X) $(OBJS) exec.c
 
 maintainer-clean: distclean
 	rm -f $(srcdir)/sql_help.h $(srcdir)/psqlscan.c
diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.105 2004/05/18 20:18:58 momjian Exp $
+# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.106 2004/05/19 17:15:21 momjian Exp $
 
 subdir = src/interfaces/ecpg/preproc
 top_builddir = ../../../..
@@ -19,13 +19,17 @@ endif
 override CFLAGS += $(PTHREAD_CFLAGS)
 
 OBJS=	preproc.o type.o ecpg.o ecpg_keywords.o output.o\
-	keywords.o c_keywords.o ../ecpglib/typename.o descriptor.o variable.o
+	keywords.o c_keywords.o ../ecpglib/typename.o descriptor.o variable.o \
+	$(filter exec.o, $(LIBOBJS))
 
 all: submake-libpgport ecpg
 
 ecpg: $(OBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) $(PTHREAD_LIBS) -o $@$(X)
 
+exec.c: % : $(top_srcdir)/src/port/%
+	rm -f $@ && $(LN_S) $< .
+
 # pgc is compiled as part of preproc
 preproc.o: $(srcdir)/pgc.c
 
@@ -62,7 +66,7 @@ uninstall:
 	rm -f $(DESTDIR)$(bindir)/ecpg$(X)
 
 clean distclean:
-	rm -f *.o ecpg$(X)
+	rm -f *.o ecpg$(X) exec.c
 # garbage from partial builds
 	@rm -f y.tab.c y.tab.h
 # garbage from development
diff --git a/src/port/exec.c b/src/port/exec.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/port/exec.c,v 1.9 2004/05/19 04:36:33 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/port/exec.c,v 1.10 2004/05/19 17:15:21 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -48,6 +48,13 @@
 #define S_IXOTH		 ((S_IXUSR)>>6)
 #endif
 
+#ifndef FRONTEND
+/* We use only 3-parameter elog calls in this file, for simplicity */
+#define log_error(str, param)	elog(LOG, (str), (param))
+#else
+#define log_error(str, param)	fprintf(stderr, (str), (param))
+#endif
+
 static void win32_make_absolute(char *path);
 
 /*
@@ -192,7 +199,7 @@ find_my_exec(const char *argv0, char *full_path)
 	{
 		if (*++p == '\0')
 		{
-			fprintf(stderr, "argv[0] ends with a path separator \"%s\"", argv0);
+			log_error("argv[0] ends with a path separator \"%s\"", argv0);
 			return -1;
 		}
 		if (is_absolute_path(argv0) || !getcwd(buf, MAXPGPATH))
@@ -208,7 +215,7 @@ find_my_exec(const char *argv0, char *full_path)
 		}
 		else
 		{
-			fprintf(stderr, "invalid binary \"%s\"", buf);
+			log_error("invalid binary \"%s\"", buf);
 			return -1;
 		}
 	}
@@ -245,7 +252,7 @@ find_my_exec(const char *argv0, char *full_path)
 				case -1:		/* wasn't even a candidate, keep looking */
 					break;
 				case -2:		/* found but disqualified */
-					fprintf(stderr, "could not read binary \"%s\"", buf);
+					log_error("could not read binary \"%s\"", buf);
 					free(path);
 					return -1;
 			}
@@ -255,7 +262,7 @@ find_my_exec(const char *argv0, char *full_path)
 		free(path);
 	}
 
-	fprintf(stderr, "could not find a \"%s\" to execute", argv0);
+	log_error("could not find a \"%s\" to execute", argv0);
 	return -1;
 
 #if 0
@@ -337,17 +344,17 @@ pclose_check(FILE *stream)
 	}
 	else if (WIFEXITED(exitstatus))
 	{
-		fprintf(stderr, _("child process exited with exit code %d\n"),
+		log_error(_("child process exited with exit code %d\n"),
 				WEXITSTATUS(exitstatus));
 	}
 	else if (WIFSIGNALED(exitstatus))
 	{
-		fprintf(stderr, _("child process was terminated by signal %d\n"),
+		log_error(_("child process was terminated by signal %d\n"),
 				WTERMSIG(exitstatus));
 	}
 	else
 	{
-		fprintf(stderr, _("child process exited with unrecognized status %d\n"),
+		log_error(_("child process exited with unrecognized status %d\n"),
 				exitstatus);
 	}
 
@@ -369,7 +376,7 @@ win32_make_absolute(char *path)
 
 	if (_fullpath(abspath, path, MAXPGPATH) == NULL)
 	{
-		fprintf(stderr, "Win32 path expansion failed:  %s", strerror(errno));
+		log_error("Win32 path expansion failed:  %s", strerror(errno));
 		StrNCpy(abspath, path, MAXPGPATH);
 	}
 	canonicalize_path(abspath);

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $PostgreSQL: pgsql/src/port/exec.c,v 1.9 2004/05/19 04:36:33 momjian Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/port/exec.c,v 1.10 2004/05/19 17:15:21 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -48,6 +48,13 @@`
`48`	`48`	`#define S_IXOTH ((S_IXUSR)>>6)`
`49`	`49`	`#endif`
`50`	`50`
	`51`	`+#ifndef FRONTEND`
	`52`	`+/* We use only 3-parameter elog calls in this file, for simplicity */`
	`53`	`+#define log_error(str, param) elog(LOG, (str), (param))`
	`54`	`+#else`
	`55`	`+#define log_error(str, param) fprintf(stderr, (str), (param))`
	`56`	`+#endif`
	`57`	`+`
`51`	`58`	`static void win32_make_absolute(char *path);`
`52`	`59`
`53`	`60`	`/*`
`@@ -192,7 +199,7 @@ find_my_exec(const char argv0, char full_path)`
`192`	`199`	`{`
`193`	`200`	`if (*++p == '\0')`
`194`	`201`	`{`
`195`		`- fprintf(stderr, "argv[0] ends with a path separator \"%s\"", argv0);`
	`202`	`+ log_error("argv[0] ends with a path separator \"%s\"", argv0);`
`196`	`203`	`return -1;`
`197`	`204`	`}`
`198`	`205`	`if (is_absolute_path(argv0) \|\| !getcwd(buf, MAXPGPATH))`
`@@ -208,7 +215,7 @@ find_my_exec(const char argv0, char full_path)`
`208`	`215`	`}`
`209`	`216`	`else`
`210`	`217`	`{`
`211`		`- fprintf(stderr, "invalid binary \"%s\"", buf);`
	`218`	`+ log_error("invalid binary \"%s\"", buf);`
`212`	`219`	`return -1;`
`213`	`220`	`}`
`214`	`221`	`}`
`@@ -245,7 +252,7 @@ find_my_exec(const char argv0, char full_path)`
`245`	`252`	`case -1: /* wasn't even a candidate, keep looking */`
`246`	`253`	`break;`
`247`	`254`	`case -2: /* found but disqualified */`
`248`		`- fprintf(stderr, "could not read binary \"%s\"", buf);`
	`255`	`+ log_error("could not read binary \"%s\"", buf);`
`249`	`256`	`free(path);`
`250`	`257`	`return -1;`
`251`	`258`	`}`
`@@ -255,7 +262,7 @@ find_my_exec(const char argv0, char full_path)`
`255`	`262`	`free(path);`
`256`	`263`	`}`
`257`	`264`
`258`		`- fprintf(stderr, "could not find a \"%s\" to execute", argv0);`
	`265`	`+ log_error("could not find a \"%s\" to execute", argv0);`
`259`	`266`	`return -1;`
`260`	`267`
`261`	`268`	`#if 0`
`@@ -337,17 +344,17 @@ pclose_check(FILE *stream)`
`337`	`344`	`}`
`338`	`345`	`else if (WIFEXITED(exitstatus))`
`339`	`346`	`{`
`340`		`- fprintf(stderr, _("child process exited with exit code %d\n"),`
	`347`	`+ log_error(_("child process exited with exit code %d\n"),`
`341`	`348`	`WEXITSTATUS(exitstatus));`
`342`	`349`	`}`
`343`	`350`	`else if (WIFSIGNALED(exitstatus))`
`344`	`351`	`{`
`345`		`- fprintf(stderr, _("child process was terminated by signal %d\n"),`
	`352`	`+ log_error(_("child process was terminated by signal %d\n"),`
`346`	`353`	`WTERMSIG(exitstatus));`
`347`	`354`	`}`
`348`	`355`	`else`
`349`	`356`	`{`
`350`		`- fprintf(stderr, _("child process exited with unrecognized status %d\n"),`
	`357`	`+ log_error(_("child process exited with unrecognized status %d\n"),`
`351`	`358`	`exitstatus);`
`352`	`359`	`}`
`353`	`360`
`@@ -369,7 +376,7 @@ win32_make_absolute(char *path)`
`369`	`376`
`370`	`377`	`if (_fullpath(abspath, path, MAXPGPATH) == NULL)`
`371`	`378`	`{`
`372`		`- fprintf(stderr, "Win32 path expansion failed: %s", strerror(errno));`
	`379`	`+ log_error("Win32 path expansion failed: %s", strerror(errno));`
`373`	`380`	`StrNCpy(abspath, path, MAXPGPATH);`
`374`	`381`	`}`
`375`	`382`	`canonicalize_path(abspath);`