[PHP-DOC] cvs: phpdoc /scripts/iniupdate ini-update.php ini_search_lib.php print_arrays.php

[Nuno Lopes]

nlopess         Wed Jul 20 12:42:14 2005 EDT

  Added files:                 
    /phpdoc/scripts/iniupdate   print_arrays.php 

  Modified files:              
    /phpdoc/scripts/iniupdate   ini-update.php ini_search_lib.php 
  Log:
  fix a bug introduced when moving the recurse function to the ini_lib
  add a nice file for debugging
  
http://cvs.php.net/diff.php/phpdoc/scripts/iniupdate/ini-update.php?r1=1.3&r2=1.4&ty=u
Index: phpdoc/scripts/iniupdate/ini-update.php
diff -u phpdoc/scripts/iniupdate/ini-update.php:1.3 
phpdoc/scripts/iniupdate/ini-update.php:1.4
--- phpdoc/scripts/iniupdate/ini-update.php:1.3 Tue Jun 28 12:59:35 2005
+++ phpdoc/scripts/iniupdate/ini-update.php     Wed Jul 20 12:42:12 2005
@@ -84,7 +84,7 @@
 
 $array = array();
 $replace = array();
-recurse(array($php_src_dir, $pecl_dir), true);
+recurse(array($pecl_dir, $php_src_dir), true);
 
 $string = '';
 
http://cvs.php.net/diff.php/phpdoc/scripts/iniupdate/ini_search_lib.php?r1=1.3&r2=1.4&ty=u
Index: phpdoc/scripts/iniupdate/ini_search_lib.php
diff -u phpdoc/scripts/iniupdate/ini_search_lib.php:1.3 
phpdoc/scripts/iniupdate/ini_search_lib.php:1.4
--- phpdoc/scripts/iniupdate/ini_search_lib.php:1.3     Tue Jun 28 12:59:35 2005
+++ phpdoc/scripts/iniupdate/ini_search_lib.php Wed Jul 20 12:42:13 2005
@@ -34,7 +34,6 @@
     foreach($cfg_get as $entry) {
         if (!isset($array[$entry[0]]))
             $array[$entry[0]] = array($entry[1], 'PHP_INI_ALL');
-
     }
 
     uksort($array, 'strnatcasecmp');
@@ -45,20 +44,22 @@
 function recurse_aux($dir, $search_macros) {
     global $array, $replace, $cfg_get;
 
-    if (!$dh = opendir($dir)) {
-        die ("couldn't open the specified dir ($dir)");
+    if (is_file($dir)) {
+        $files = array(basename($dir));
+        $dir   = dirname($dir);
+    } else {
+        if (!is_file($dir) && !$files = scandir($dir)) {
+            die ("couldn't open the specified dir ($dir)");
+        }
+        unset($files[0], $files[1]); //remove the . and ..
     }
 
-    while (($file = readdir($dh)) !== false) {
-
-        if($file == '.' || $file == '..') {
-            continue;
-        }
+    foreach ($files as $file) {
 
         $path = $dir . '/' .$file;
 
         if(is_dir($path)) {
-            recurse($path);
+            recurse_aux($path, $search_macros);
         } else {
             $file = file_get_contents($path);
 
@@ -112,7 +113,5 @@
 
         } //!is_dir()
     } //while() loop
-
-    closedir($dh);
 }
 ?>

http://cvs.php.net/co.php/phpdoc/scripts/iniupdate/print_arrays.php?r=1.1&p=1
Index: phpdoc/scripts/iniupdate/print_arrays.php
+++ phpdoc/scripts/iniupdate/print_arrays.php
<?php

include 'ini_search_lib.php';

if ($argc == 1) die('specify a name!');

$array = $replace = array();

recurse($argv[1], true);

print_r($array);
print_r($replace);

?>