database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-15 19:21:59 +03:00
Code Activity

Remove optreset from src/port/ implementations of getopt and getopt_long.

Browse Source 
We don't actually need optreset, because we can easily fix the code to
ensure that it's cleanly restartable after having completed a scan over the
argv array; which is the only case we need to restart in.  Getting rid of
it avoids a class of interactions with the system libraries and allows
reversion of my change of yesterday in postmaster.c and postgres.c.

Back-patch to 8.4.  Before that the getopt code was a bit different anyway.
This commit is contained in:
Tom Lane
2010-12-16 16:22:05 -05:00
parent cd1fefa973
commit 61b53695fb
5 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/backend/postmaster/postmaster.c
View File

@ -313,8 +313,7 @@ extern char *optarg;
extern int optind,
opterr;
/* If not HAVE_GETOPT, we are using src/port/getopt.c, which has optreset */
#if defined(HAVE_INT_OPTRESET) || !defined(HAVE_GETOPT)
#ifdef HAVE_INT_OPTRESET
extern int optreset; /* might not be declared by system headers */
#endif
@ -752,7 +751,7 @@ PostmasterMain(int argc, char *argv[])
* getopt(3) library so that it will work correctly in subprocesses.
*/
optind = 1;
#if defined(HAVE_INT_OPTRESET) || !defined(HAVE_GETOPT)
#ifdef HAVE_INT_OPTRESET
optreset = 1; /* some systems need this too */
#endif