--- parser3/src/classes/file.C	2012/06/15 11:54:18	1.222
+++ parser3/src/classes/file.C	2013/03/14 02:50:58	1.225
@@ -25,7 +25,7 @@
 #include "pa_vregex.h"
 #include "pa_version.h"
 
-volatile const char * IDENT_FILE_C="$Id: file.C,v 1.222 2012/06/15 11:54:18 moko Exp $";
+volatile const char * IDENT_FILE_C="$Id: file.C,v 1.225 2013/03/14 02:50:58 misha Exp $";
 
 // defines
 
@@ -33,6 +33,8 @@ volatile const char * IDENT_FILE_C="$Id:
 #define CHARSET_EXEC_PARAM_NAME "charset"
 
 #define NAME_NAME "name"
+#define KEEP_EMPTY_DIRS_NAME "keep-empty-dirs"
+#define SUPPRESS_EXCEPTION_NAME "exception"
 
 // externs
 
@@ -128,19 +130,49 @@ static void _save(Request& r, MethodPara
 
 static void _delete(Request& r, MethodParams& params) {
 	const String& file_name=params.as_string(0, FILE_NAME_MUST_NOT_BE_CODE);
+	bool keep_empty_dirs=false;
+	bool fail_on_problem=true;
+
+	if(params.count()>1)
+		if(HashStringValue* options=params.as_hash(1)){
+			int valid_options=0;
+			if(Value* vkeep_empty_dirs=options->get(KEEP_EMPTY_DIRS_NAME)){
+				keep_empty_dirs=r.process_to_value(*vkeep_empty_dirs).as_bool();
+				valid_options++;
+			}
+			if(Value* vsuppress_exception=options->get(SUPPRESS_EXCEPTION_NAME)){
+				fail_on_problem=r.process_to_value(*vsuppress_exception).as_bool();
+				valid_options++;
+			}
+			if(valid_options != options->count())
+				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
+		}
 
 	// unlink
-	file_delete(r.absolute(file_name));
+	file_delete(r.absolute(file_name), fail_on_problem, keep_empty_dirs);
 }
 
 static void _move(Request& r, MethodParams& params) {
 	Value& vfrom_file_name=params.as_no_junction(0, "from file name must not be code");
 	Value& vto_file_name=params.as_no_junction(1, "to file name must not be code");
+	bool keep_empty_dirs=false;
+
+	if(params.count()>2)
+		if(HashStringValue* options=params.as_hash(2)){
+			int valid_options=0;
+			if(Value* vkeep_empty_dirs=options->get(KEEP_EMPTY_DIRS_NAME)){
+				keep_empty_dirs=r.process_to_value(*vkeep_empty_dirs).as_bool();
+				valid_options++;
+			}
+			if(valid_options != options->count())
+				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
+		}
 
 	// move
 	file_move(
 		r.absolute(vfrom_file_name.as_string()),
-		r.absolute(vto_file_name.as_string()));
+		r.absolute(vto_file_name.as_string()),
+		keep_empty_dirs);
 }
 
 static void copy_process_source(
@@ -433,7 +465,7 @@ static void _exec_cgi(Request& r, Method
 				if(eq_at[1]) // has value
 					env.put(
 						pa_strdup(pair, eq_at-pair),
-						pa_strdup(eq_at+1, 0));
+						pa_strdup(eq_at+1));
 	}
 
 	// const
@@ -1119,10 +1151,12 @@ MFile::MFile(): Methoded("file") {
 	add_native_method("save", Method::CT_DYNAMIC, _save, 2, 3);
 
 	// ^file:delete[file-name]
-	add_native_method("delete", Method::CT_STATIC, _delete, 1, 1);
+	// ^file:delete[file-name;$.keep-empty-dir(true)$.exception(false)]
+	add_native_method("delete", Method::CT_STATIC, _delete, 1, 2);
 
 	// ^file:move[from-file-name;to-file-name]
-	add_native_method("move", Method::CT_STATIC, _move, 2, 2);
+	// ^file:move[from-file-name;to-file-name;$.keep-empty-dir(true)]
+	add_native_method("move", Method::CT_STATIC, _move, 2, 3);
 
 	// ^file::load[mode;disk-name]
 	// ^file::load[mode;disk-name;user-name]