From 69bcd718dfd510750a83e4191b20d9ba3bfcd0fb Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 18 Jan 2019 15:06:26 -0500 Subject: Use our own getopt() on OpenBSD. Recent OpenBSD (at least 5.9 and up) has a version of getopt(3) that will not cope with the "-:" spec we use to accept double-dash options in postgres.c and postmaster.c. Admittedly, that's a hack because POSIX only requires getopt() to allow alphanumeric option characters. I have no desire to find another way, however, so let's just do what we were already doing on Solaris: force use of our own src/port/getopt.c implementation. In passing, improve some of the comments around said implementation. Per buildfarm and local testing. Back-patch to all supported branches. Discussion: https://postgr.es/m/30197.1547835700@sss.pgh.pa.us --- src/port/getopt.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/port/getopt.c') diff --git a/src/port/getopt.c b/src/port/getopt.c index 10f4228d7c9..207c2836d35 100644 --- a/src/port/getopt.c +++ b/src/port/getopt.c @@ -1,7 +1,5 @@ /* src/port/getopt.c */ -/* This is used by psql under Win32 */ - /* * Copyright (c) 1987, 1993, 1994 * The Regents of the University of California. All rights reserved. @@ -40,10 +38,11 @@ static char sccsid[] = "@(#)getopt.c 8.3 (Berkeley) 4/27/95"; /* - * On some versions of Solaris, opterr and friends are defined in core libc - * rather than in a separate getopt module. Define these variables only - * if configure found they aren't there by default. (We assume that testing - * opterr is sufficient for all of these.) + * On OpenBSD and some versions of Solaris, opterr and friends are defined in + * core libc rather than in a separate getopt module. Define these variables + * only if configure found they aren't there by default; otherwise, this + * module and its callers will just use libc's variables. (We assume that + * testing opterr is sufficient for all of these.) */ #ifndef HAVE_INT_OPTERR -- cgit v1.2.3