@ -49,8 +49,8 @@ static void makeAlterConfigCommand(PGconn *conn, const char *arrayitem,
const char * name2 ) ;
static void dumpDatabases ( PGconn * conn ) ;
static void dumpTimestamp ( const char * msg ) ;
static void doShellQuot ing( PQExpBuffer buf , const char * str ) ;
static void doConnStrQuoting ( PQExpBuffer buf , const char * str ) ;
static void appendShellStr ing( PQExpBuffer buf , const char * str ) ;
static void appendConnStrVal ( PQExpBuffer buf , const char * str ) ;
static int runPgDump ( const char * dbname ) ;
static void buildShSecLabels ( PGconn * conn , const char * catalog_name ,
@ -214,7 +214,7 @@ main(int argc, char *argv[])
case ' f ' :
filename = pg_strdup ( optarg ) ;
appendPQExpBufferStr ( pgdumpopts , " -f " ) ;
doShellQuot ing( pgdumpopts , filename ) ;
appendShellStr ing( pgdumpopts , filename ) ;
break ;
case ' g ' :
@ -251,7 +251,7 @@ main(int argc, char *argv[])
case ' S ' :
appendPQExpBufferStr ( pgdumpopts , " -S " ) ;
doShellQuot ing( pgdumpopts , optarg ) ;
appendShellStr ing( pgdumpopts , optarg ) ;
break ;
case ' t ' :
@ -287,13 +287,13 @@ main(int argc, char *argv[])
case 2 :
appendPQExpBufferStr ( pgdumpopts , " --lock-wait-timeout " ) ;
doShellQuot ing( pgdumpopts , optarg ) ;
appendShellStr ing( pgdumpopts , optarg ) ;
break ;
case 3 :
use_role = pg_strdup ( optarg ) ;
appendPQExpBufferStr ( pgdumpopts , " --role " ) ;
doShellQuot ing( pgdumpopts , use_role ) ;
appendShellStr ing( pgdumpopts , use_role ) ;
break ;
default :
@ -1726,9 +1726,9 @@ runPgDump(const char *dbname)
* string .
*/
appendPQExpBuffer ( connstrbuf , " %s dbname= " , connstr ) ;
doConnStrQuoting ( connstrbuf , dbname ) ;
appendConnStrVal ( connstrbuf , dbname ) ;
doShellQuot ing( cmd , connstrbuf - > data ) ;
appendShellStr ing( cmd , connstrbuf - > data ) ;
if ( verbose )
fprintf ( stderr , _ ( " %s: running \" %s \" \n " ) , progname , cmd - > data ) ;
@ -2008,7 +2008,7 @@ constructConnStr(const char **keywords, const char **values)
appendPQExpBufferChar ( buf , ' ' ) ;
firstkeyword = false ;
appendPQExpBuffer ( buf , " %s= " , keywords [ i ] ) ;
doConnStrQuoting ( buf , values [ i ] ) ;
appendConnStrVal ( buf , values [ i ] ) ;
}
connstr = pg_strdup ( buf - > data ) ;
@ -2089,7 +2089,7 @@ dumpTimestamp(const char *msg)
* string
*/
static void
doConnStrQuoting ( PQExpBuffer buf , const char * str )
appendConnStrVal ( PQExpBuffer buf , const char * str )
{
const char * s ;
bool needquotes ;
@ -2138,7 +2138,7 @@ doConnStrQuoting(PQExpBuffer buf, const char *str)
* there eventually leads to errors here .
*/
static void
doShellQuot ing( PQExpBuffer buf , const char * str )
appendShellStr ing( PQExpBuffer buf , const char * str )
{
const char * p ;