Moved filemanager-related stuff to src/filemanager directory

Signed-off-by: Slava Zanko <slavazanko@gmail.com>

configure.ac

@@ -561,6 +561,7 @@ src/editor/Makefile
 src/man2hlp/Makefile
 src/viewer/Makefile
 src/diffviewer/Makefile
+src/filemanager/Makefile
 
 lib/Makefile
 lib/filehighlight/Makefile

lib/filehighlight.h

@@ -3,7 +3,8 @@
 
 #include "lib/mcconfig.h"
 #include "lib/search.h"
-#include "src/dir.h"
+
+#include "src/filemanager/dir.h"
 
 /*** typedefs(not structures) and defined constants **********************************************/
 

lib/fs.h

@@ -16,33 +16,33 @@
 
 /* Replacement for permission bits missing in sys/stat.h */
 #ifndef S_ISLNK
-#   define S_ISLNK(x) 0
+#define S_ISLNK(x) 0
 #endif
 
 #ifndef S_ISSOCK
-#   define S_ISSOCK(x) 0
+#define S_ISSOCK(x) 0
 #endif
 
 #ifndef S_ISFIFO
-#   define S_ISFIFO(x) 0
+#define S_ISFIFO(x) 0
 #endif
 
 #ifndef S_ISCHR
-#   define S_ISCHR(x) 0
+#define S_ISCHR(x) 0
 #endif
 
 #ifndef S_ISBLK
-#   define S_ISBLK(x) 0
+#define S_ISBLK(x) 0
 #endif
 
 /* Door is something that only exists on Solaris */
 #ifndef S_ISDOOR
-#   define S_ISDOOR(x) 0
+#define S_ISDOOR(x) 0
 #endif
 
 /* Special named files are widely used in QNX6 */
 #ifndef S_ISNAM
-#   define S_ISNAM(x) 0
+#define S_ISNAM(x) 0
 #endif
 
 #ifndef PATH_MAX
@@ -58,9 +58,9 @@
 #endif
 
 #ifndef MAXPATHLEN
-#   define MC_MAXPATHLEN 4096
+#define MC_MAXPATHLEN 4096
 #else
-#   define MC_MAXPATHLEN MAXPATHLEN
+#define MC_MAXPATHLEN MAXPATHLEN
 #endif
 
 /* unistd.h defines _POSIX_VERSION on POSIX.1 systems. */
@@ -68,9 +68,9 @@
 #define DIRENT_LENGTH_COMPUTED 1
 
 #ifndef MAXNAMLEN
-#   define MC_MAXFILENAMELEN 256
+#define MC_MAXFILENAMELEN 256
 #else
-#   define MC_MAXFILENAMELEN MAXNAMLEN
+#define MC_MAXFILENAMELEN MAXNAMLEN
 #endif
 
 /*** enums ***************************************************************************************/

lib/keybind/keymap.c

@@ -1,2 +0,0 @@
-
-

lib/tty/key.c

@@ -49,7 +49,7 @@
 #include "win.h"                /* xterm_flag */
 
 #include "src/main.h"
-#include "src/layout.h"         /* winch_flag, mc_refresh() */
+#include "src/filemanager/layout.h"     /* winch_flag, mc_refresh() */
 #include "src/consaver/cons.saver.h"
 
 

lib/util.c

@@ -48,8 +48,8 @@
 #include "lib/strutil.h"
 #include "lib/util.h"
 
-#include "src/filegui.h"
-#include "src/file.h"           /* copy_file_file() */
+#include "src/filemanager/filegui.h"
+#include "src/filemanager/file.h"       /* copy_file_file() */
 #include "src/main.h"           /* home_dir, eight_bit_clean */
 
 /*** global variables ****************************************************************************/

lib/util.h

@@ -166,10 +166,10 @@ GList *list_append_unique (GList * list, char *text);
 /* Position saving and restoring */
 /* Load position for the given filename */
 void load_file_position (const char *filename, long *line, long *column, off_t * offset,
-                         GArray **bookmarks);
+                         GArray ** bookmarks);
 /* Save position for the given filename */
 void save_file_position (const char *filename, long line, long column, off_t offset,
-                         GArray *bookmarks);
+                         GArray * bookmarks);
 
 
 /* if ch is in [A-Za-z], returns the corresponding control character,

lib/vfs/mc-vfs/direntry.c

@@ -45,7 +45,7 @@
 #include "lib/widget.h"         /* message() */
 #endif
 
-#include "src/layout.h"           /* print_vfs_message */
+#include "src/filemanager/layout.h"     /* print_vfs_message */
 
 #include "vfs-impl.h"
 #include "utilvfs.h"

lib/vfs/mc-vfs/fish.c

@@ -62,7 +62,7 @@
 #include "lib/unixcompat.h"
 #include "lib/fileloc.h"
 
-#include "src/layout.h"         /* print_vfs_message */
+#include "src/filemanager/layout.h"     /* print_vfs_message */
 #include "src/execute.h"        /* pre_exec, post_exec */
 
 #include "vfs-impl.h"

lib/vfs/mc-vfs/ftpfs.c

@@ -92,7 +92,7 @@ What to do with this?
 #include "lib/tty/tty.h"        /* enable/disable interrupt key */
 #include "lib/widget.h"         /* message() */
 
-#include "src/layout.h"         /* print_vfs_message */
+#include "src/filemanager/layout.h"     /* print_vfs_message */
 #include "src/history.h"
 #include "src/setup.h"          /* for load_anon_passwd */