summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorBill Marquette <billm@pfsense.org>2005-03-17 05:28:08 +0000
committerBill Marquette <billm@pfsense.org>2005-03-17 05:28:08 +0000
commit1682dc1edd6631222e6009a5e20210e40fe13b09 (patch)
treeb09cb362c57b2d963192693af7374a35068a7a20 /etc
parenta37b05dc06d0477f5a234cd80274120b56124154 (diff)
downloadpfsense-1682dc1edd6631222e6009a5e20210e40fe13b09.zip
pfsense-1682dc1edd6631222e6009a5e20210e40fe13b09.tar.gz
safe_mkdir()
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/pfsense-utils.inc31
1 files changed, 21 insertions, 10 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index 0a88d8d..dea186f 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -901,16 +901,7 @@ function sync_package($pkg_name, $sync_depends = true, $show_message = false) {
}
/*
- * make_dirs($path, $mode = 0755)
- * create directory tree recursively (mkdir -p)
- */
-function make_dirs($path, $mode = 0755)
-{
- return is_dir($path) || (make_dirs(dirname($path), $mode) && mkdir($path, $mode));
-}
-
-/*
- * rmdirRecursive($path,$followLinks=false)
+ * rmdir_recursive($path,$followLinks=false)
* Recursively remove a directory tree (rm -rf path)
* This is for directories _only_
*/
@@ -927,4 +918,24 @@ function rmdir_recursive($path,$follow_links=false) {
return rmdir($path);
}
+/*
+ * safe_mkdir($path, $mode = 0755)
+ * create directory if it doesn't already exist and isn't a file!
+ */
+function safe_mkdir($path, $mode=0755) {
+ if (!is_file($path) && !is_dir($path))
+ return mkdir($path, $mode);
+ else
+ return false;
+}
+
+/*
+ * make_dirs($path, $mode = 0755)
+ * create directory tree recursively (mkdir -p)
+ */
+function make_dirs($path, $mode = 0755)
+{
+ return is_dir($path) || (make_dirs(dirname($path), $mode) && safe_mkdir($path, $mode));
+}
+
?>
OpenPOWER on IntegriCloud