X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/8e2ef2842ef6d854e87a27ff57043971765fdd8a..62747c934d3445b000810f8a7737ea86777995e3:/lib/cmd.php diff --git a/lib/cmd.php b/lib/cmd.php index 898fbe95..8ccbb036 100644 --- a/lib/cmd.php +++ b/lib/cmd.php @@ -16,7 +16,7 @@ function getCmdOpt($aArg, $aSpec, &$aResult, $bExitOnError = false, $bExitOnUnkn $aResult = array(); $bUnknown = false; - $iSize = sizeof($aArg); + $iSize = count($aArg); for ($i = 1; $i < $iSize; $i++) { if (isset($aQuick[$aArg[$i]])) { $aLine = $aQuick[$aArg[$i]]; @@ -99,7 +99,7 @@ function showUsage($aSpec, $bExit = false, $sError = false) echo 'Try `'.basename($_SERVER['argv'][0]).' --help` for more information.'."\n"; exit; } - echo "Usage: ".basename($_SERVER['argv'][0])."\n"; + echo 'Usage: '.basename($_SERVER['argv'][0])."\n"; $bFirst = true; foreach ($aSpec as $aLine) { if (is_array($aLine)) { @@ -134,7 +134,7 @@ function info($sMsg) echo date('Y-m-d H:i:s == ').$sMsg."\n"; } -$aWarnings = []; +$aWarnings = array(); function warn($sMsg) @@ -158,6 +158,16 @@ function runSQLScript($sScript, $bfatal = true, $bVerbose = false, $bIgnoreError $aDSNInfo = DB::parseDSN(CONST_Database_DSN); if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432; $sCMD = 'psql -p '.$aDSNInfo['port'].' -d '.$aDSNInfo['database']; + if (isset($aDSNInfo['hostspec']) && $aDSNInfo['hostspec']) { + $sCMD .= ' -h ' . $aDSNInfo['hostspec']; + } + if (isset($aDSNInfo['username']) && $aDSNInfo['username']) { + $sCMD .= ' -U ' . $aDSNInfo['username']; + } + $procenv = null; + if (isset($aDSNInfo['password']) && $aDSNInfo['password']) { + $procenv = array_merge(array('PGPASSWORD' => $aDSNInfo['password']), $_ENV); + } if (!$bVerbose) { $sCMD .= ' -q'; } @@ -170,7 +180,7 @@ function runSQLScript($sScript, $bfatal = true, $bVerbose = false, $bIgnoreError 2 => STDERR ); $ahPipes = null; - $hProcess = @proc_open($sCMD, $aDescriptors, $ahPipes); + $hProcess = @proc_open($sCMD, $aDescriptors, $ahPipes, null, $procenv); if (!is_resource($hProcess)) { fail('unable to start pgsql'); }