diff --git a/checkin_notes b/checkin_notes index ad77de7cad..ee6679f8f1 100644 --- a/checkin_notes +++ b/checkin_notes @@ -3461,3 +3461,9 @@ David 10 Jun 2011 client/ cs_scheduler.cpp + +David 10 Jun 2011 + - update_versions: read from stdin a different way + + tools/ + update_versions diff --git a/doc/addon_data.php b/doc/addon_data.php index 1d4b54f646..62074ba1fd 100644 --- a/doc/addon_data.php +++ b/doc/addon_data.php @@ -335,7 +335,7 @@ array('cpulimit-1.1.tar.gz', 'CPU limiter', '1.1', 'Limits the CPU usage (good for laptops)', - 'http://marlon80.interfree.it/cpulimit/index.html', + 'http://cpulimit.sourceforge.net/', '', 'cpulimit is a simple program that attempts to limit the CPU usage of a process (expressed in percentage, not in cpu time). This is useful to control batch jobs, when you don\'t want they eat too much cpu. It does not act on the nice value or other priority stuff, but on the real cpu usage. Besides it is able to adapt itself to the overall system load, dynamically and quickly.
diff --git a/tools/update_versions b/tools/update_versions index 449a16844e..659cc7f5ce 100755 --- a/tools/update_versions +++ b/tools/update_versions @@ -170,8 +170,7 @@ function confirm_sig_gen($name) { Continue (y/n)? "; - $stdin = fopen("php://stdin", "r"); - $x = trim(fgets($stdin)); + $x = trim(fgets(STDIN)); if ($x != "y") { exit; } @@ -308,8 +307,7 @@ function confirm($fds) { echo "\n"; } echo " Do you want to add this application version (y/n)? "; - $stdin = fopen("php://stdin", "r"); - $x = trim(fgets($stdin)); + $x = trim(fgets(STDIN)); return ($x == "y"); }