added: now we have a fourth part in permissions (guests)

e.g.: 07555 means:
           7 for owner
           5 for group
           5 for others
           5 for guests (not logged users)
added:     the sticky bit for directories
           e.g. permissions to a directory with a sticky bit set
           can be set to: 017555
rewritten: rm/mv winix functions to correctly understand the sticky bit
added:     Dir::FollowLink() recognizes ".." and "." now
           consequently System::FollowAllLinks recognizes it too
added:     umask -- calculating privileges for new files/directories
           all users have their own umask (in meta)
           and there is one in the config
           (for guests and when a user has not definied its own one)
removed:   mount option: only_root_remove



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@801 e52654a7-88a9-db11-a3e9-0013d4bc506e

functions/mv.h

@@ -2,7 +2,7 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2010, Tomasz Sowa
+ * Copyright (c) 2010-2012, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -28,46 +28,74 @@ public:
 	bool HasAccess();
 	void MakePost();
 
+	// moving a directory
+	// new_url can be empty (in such a case the old one is preserved)
+	// src_dir will be accordingly updated
+	bool MoveDir(Item & src_dir, long dst_dir_id, const std::wstring & new_url, bool check_access = true);
+	bool MoveDir(Item & src_dir, const std::wstring & dst_path, bool check_access = true);
+
+	// moving only the content of src_dir
+	// dst_path should point to an existing directory
+	// src_dir will be accordingly updated
+	void MoveDirContent(Item & src_dir, long dst_dir_id, bool check_access = true);
+	void MoveDirContent(Item & src_dir, const std::wstring & dst_dir, bool check_access = true);
+
+	// moving a file
+	// new_url can be empty (the old one is used then)
+	// src_file will be accordingly updated
+	bool MoveFileOrSymlink(Item & src_file, long dst_dir_id, const std::wstring & new_url, bool check_access = true);
+	bool MoveFileOrSymlink(Item & src_file, const std::wstring & dst_path, bool check_access = true);
+
+
 private:
 
-	// destination dir
-	std::vector<Item*> dir_tab;
 
-	// destination file (if exists)
-	std::wstring file;
+	// directories parsed by ParseDir()
+	std::vector<Item*> out_dir_tab;		// destination directories
+	Item out_item;						// destination file/symlink (if out_has_file is true)
+	bool out_has_file;					// if true then out_item is set
+	std::wstring out_filename;			// the last part in an input path (not an existing directory, file or symlink)
+										// can be empty
 
-	// for copying static files
-	std::wstring new_path, new_path_thumb;
-	std::wstring old_path, old_path_thumb;
+	// temporaries
+	std::wstring out_path;
+	std::wstring old_url;
 
-	// for files in a directory
+	std::wstring old_static_path;
+	std::wstring old_static_thumb_path;
+	std::wstring new_static_path;
+	std::wstring new_static_thumb_path;
+
+	// for files/symlinks in a directory
 	std::vector<Item> files_item_tab;
 	DbItemQuery files_iq;
 
-	// for moving content of a directory
+	// for moving content of a directory (all dirs/files/symlinks)
 	DbItemQuery content_dir_iq;
 	std::vector<Item> item_tab;
 
-	// for logging
-	std::wstring old_url;
 
-	bool CheckAccessFromToDir();
-	bool CheckAccessFrom();
-	bool CheckAccessTo();
-	bool ParseDir();
+	bool CheckAccessFromToDir(const Item & dir, bool only_content);
+	bool CanRemoveRenameChild(const Item & child);
+	void Prepare();
+	bool ParseDirCheckLastName();
+	bool ParseDir(const std::wstring & dst_path, bool check_access);
 	bool MoveStaticFile(const std::wstring & from, const std::wstring & to);
 	void MoveStaticFile(Item & item);
-	void MoveFileOrSymlink(Item & item);
-	void MoveDirContent(const Item & dir);
-	void Prepare();
-	void Clear();
-	void MoveFilesPrepareTree(const Item & dir);
+	void MoveFilesPrepareTreeGo(const Item & src_dir);
+	void MoveFilesPrepareTree(const Item & src_dir);
 	void MoveFilesTree(const Item & dir);
-	void MoveDir(Item & dir);
-	bool IsTheSameFile(const Item & item);
-	void PostMoveFile();
-	void PostMoveDirContent();
-	void PostMoveDir();
+	bool MoveDir(Item & src_dir, std::vector<Item*> & dst_dir_tab, const std::wstring & dst_name);
+	bool MoveFileOrSymlink(Item & src_file, std::vector<Item*> & dst_dir_tab, const std::wstring & new_url);
+	void Clear();
+	bool MoveDir2(Item & src_dir, long dst_dir_id, const std::wstring & new_url, bool check_access);
+	bool MoveDir2(Item & src_dir, const std::wstring & dst_path, bool check_access);
+	bool MoveFileOrSymlink2(Item & src_file, long dst_dir_id, const std::wstring & new_url, bool check_access);
+	bool MoveFileOrSymlink2(Item & src_file, const std::wstring & dst_path, bool check_access);
+	void MoveDirContent2(Item & src_dir, long dst_dir_id, bool check_access);
+	void MoveAllFilesFromDir(Item & src_dir, std::vector<Item*> & dst_dir_tab, bool check_access);
+	void MoveDirContent2(Item & src_dir, const std::wstring & dst_dir, bool check_access);
+
 
 };