diff options
| author | Colin Smith <colin@pfsense.org> | 2005-03-21 04:25:48 +0000 |
|---|---|---|
| committer | Colin Smith <colin@pfsense.org> | 2005-03-21 04:25:48 +0000 |
| commit | 0a44a4212d4325ef7b5b205ad820ff209182ec01 (patch) | |
| tree | d41733cba6ad8d181b6654d245023f945534ecdd | |
| parent | 7eb2e498b1c0fff310e9d9b9b12fa721605cd5f0 (diff) | |
| download | pfsense-0a44a4212d4325ef7b5b205ad820ff209182ec01.zip pfsense-0a44a4212d4325ef7b5b205ad820ff209182ec01.tar.gz | |
Fix wildcard handling in rmdir_recursive().
| -rw-r--r-- | etc/inc/pfsense-utils.inc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index da10da7..7183297 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -925,6 +925,8 @@ function rmdir_recursive($path,$follow_links=false) { rmdir_recursive("$path/$entry"); } closedir($dir); + rmdir($path); + return; } else { foreach($to_do as $workingdir) { // Handle wildcards by foreaching. $dir = opendir($workingdir); @@ -935,9 +937,11 @@ function rmdir_recursive($path,$follow_links=false) { rmdir_recursive("$workingdir/$entry"); } closedir($dir); + rmdir($workingdir); } + return; } - return rmdir($path); + return; } /* |
