mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small pg_config.c cleanup.

Browse Source
This commit is contained in:
Bruce Momjian 2004-08-01 14:01:36 +00:00
parent 48187a1dea
commit b6a40d895e
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/bin/pg_config/pg_config.c
View File

@ -17,7 +17,7 @@
* *
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/bin/pg_config/pg_config.c,v 1.1 2004/08/01 13:54:05 momjian Exp $ * $PostgreSQL: pgsql/src/bin/pg_config/pg_config.c,v 1.2 2004/08/01 14:01:36 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -28,7 +28,7 @@
#define _(x) gettext((x)) #define _(x) gettext((x))
char * progname; static char *progname;
static void static void
help() help()
@ -67,8 +67,6 @@ main (int argc, char ** argv)
progname = (char *)get_progname(argv[0]); progname = (char *)get_progname(argv[0]);
if (argc < 2) if (argc < 2)
{ {
fprintf(stderr,_("%s: argument required\n"),progname); fprintf(stderr,_("%s: argument required\n"),progname);
@ -83,11 +81,9 @@ main (int argc, char ** argv)
strcmp(argv[i],"--includedir-server") == 0 || strcmp(argv[i],"--includedir-server") == 0 ||
strcmp(argv[i],"--libdir") == 0 || strcmp(argv[i],"--libdir") == 0 ||
strcmp(argv[i],"--pkglibdir") == 0 || strcmp(argv[i],"--pkglibdir") == 0 ||
strcmp(argv[i],"--configure") == 0 strcmp(argv[i],"--configure") == 0)
)
{ {
/* come back to these later */ /* come back to these later */
continue; continue;
} }
@ -114,14 +110,11 @@ main (int argc, char ** argv)
exit(1); exit(1);
} }
for (i=1; i < argc; i++) for (i=1; i < argc; i++)
{ {
if (strcmp(argv[i],"--configure") == 0) if (strcmp(argv[i],"--configure") == 0)
{ {
/* the VAL_CONFIGURE macro must be defined by the Makefile */ /* the VAL_CONFIGURE macro must be defined by the Makefile */
printf("%s\n",VAL_CONFIGURE); printf("%s\n",VAL_CONFIGURE);
continue; continue;
} }
@ -129,8 +122,7 @@ main (int argc, char ** argv)
if (strcmp(argv[i],"--bindir") == 0) if (strcmp(argv[i],"--bindir") == 0)
{ {
/* assume we are located in the bindir */ /* assume we are located in the bindir */
char *lastsep;
char * lastsep;
strcpy(otherpath,mypath); strcpy(otherpath,mypath);
lastsep = strrchr(otherpath,'/'); lastsep = strrchr(otherpath,'/');
if (lastsep) if (lastsep)
@ -146,8 +138,6 @@ main (int argc, char ** argv)
get_pkglib_path(mypath,otherpath); get_pkglib_path(mypath,otherpath);
printf("%s\n",otherpath); printf("%s\n",otherpath);
} }
return 0; return 0;