cvs: phpdoc /scripts file-entities.php.in

goba Thu Aug 8 05:34:40 2002 EDT Modified files: /phpdoc/scripts file-entities.php.in Log: Moving windows backslash modification to abs_path(), correcting comments... Verified that this works on Windows Index: phpdoc/scripts/file-entities.php.in diff -u phpdoc/scripts/file-entities.php.in:1.4 phpdoc/scripts/file-entities.php.in:1.5 --- phpdoc/scripts/file-entities.php.in:1.4 Wed Aug 7 07:03:24 2002 +++ phpdoc/scripts/file-entities.php.in Thu Aug 8 05:34:40 2002 @@ -17,7 +17,7 @@ # | Gabor Hojtsy <goba@php.net> | # +----------------------------------------------------------------------+ # -# $Id: file-entities.php.in,v 1.4 2002/08/07 11:03:24 goba Exp $ +# $Id: file-entities.php.in,v 1.5 2002/08/08 09:34:40 goba Exp $ */ /** @@ -53,13 +53,10 @@ // The output directory, which we need to parse for windows specific // things, special cygwin path notation, and correct all problems is // needed. Also use absolute path to have meaningful error messages -$out_dir = preg_replace("!^/cygdrive/(\\w)/!", "\\1:/", "@WORKDIR@"); -$out_dir = str_replace("\\", "/", abs_path($out_dir)); +$out_dir = abs_path(preg_replace("!^/cygdrive/(\\w)/!", "\\1:/", "@WORKDIR@")); // The source directory is passed in the 5th argument counting from backwards. -// All backslashes are converted, and the possible "scripts" dirname at the -// end is omitted -$srcdir = str_replace("\\", "/", abs_path("@SRCDIR@")); +$srcdir = abs_path("@SRCDIR@"); // The translation dir is passed as the 6th argument, counting // from the end of the argument list @@ -161,7 +158,8 @@ // Get directory parts - $absdirs = explode("/", preg_replace("!/scripts$!", "", getcwd())); + $absdir = str_replace("\\", "/", getcwd()); + $absdirs = explode("/", preg_replace("!/scripts$!", "", $absdir)); $dirs = explode("/", $path); // Generate array representation of absolute path