database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Rename find_my_binary/find_other_binary to

Browse Source 
find_my_exec/find_other_exec().  Remove passing of progname to these
functions as they can find that out from argv[0], which they already
have.

Make get_progname return const char *, and update all progname variables
to be const char *.
This commit is contained in:
Bruce Momjian
2004-05-12 13:38:49 +00:00
parent 3bfd4d9284
commit b1ffacddfc
20 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/port/exec.c
View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/port/exec.c,v 1.1 2004/05/11 21:57:15 momjian Exp $
* $PostgreSQL: pgsql/src/port/exec.c,v 1.2 2004/05/12 13:38:49 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -165,7 +165,7 @@ validate_exec(char *path)
}
/*
* find_my_binary -- find an absolute path to a valid executable
* find_my_exec -- find an absolute path to a valid executable
*
* The reason we have to work so hard to find an absolute path is that
* on some platforms we can't do dynamic loading unless we know the
@ -177,13 +177,14 @@ validate_exec(char *path)
* non-threaded binaries, not in library routines.
*/
int
find_my_binary(char *full_path, const char *argv0, const char *binary_name)
find_my_exec(char *full_path, const char *argv0)
{
char buf[MAXPGPATH + 2];
char *p;
char *path,
*startp,
*endp;
const char *binary_name = get_progname(argv0);
/*
* First try: use the binary that's located in the
@ -273,14 +274,14 @@ find_my_binary(char *full_path, const char *argv0, const char *binary_name)
* Find our binary directory, then make sure the "target" executable
* is the proper version.
*/
int find_other_binary(char *retpath, const char *argv0, const char *progname,
int find_other_exec(char *retpath, const char *argv0,
char const *target, const char *versionstr)
{
char cmd[MAXPGPATH];
char line[100];
FILE *pgver;
if (find_my_binary(retpath, argv0, progname) < 0)
if (find_my_exec(retpath, argv0) < 0)
return -1;
/* Trim off program name and keep just directory */