Ticket #4173: 0001-Resolve-file-name-base-conflicts-to-avoid-libtool-co.patch

File 0001-Resolve-file-name-base-conflicts-to-avoid-libtool-co.patch, 70.5 KB (added by psprint, 3 years ago)

a patch that makes all conflicting source files unique

  • lib/Makefile.am 

    From 98d18fc4398f431971a54018d5895fc9ef54a7e0 Mon Sep 17 00:00:00 2001
From: Sebastian Gniazdowski <sgniazdowski@gmail.com>
Date: Tue, 12 Jan 2021 16:38:35 -0600
Subject: [PATCH] Resolve file name base conflicts to avoid libtool copy stage.

---
 lib/Makefile.am                                  | 2 +-
 lib/charsets.c                                   | 2 +-
 lib/event/event.c                                | 2 +-
 lib/event/manage.c                               | 2 +-
 lib/filehighlight.h                              | 2 +-
 lib/filehighlight/Makefile.am                    | 2 +-
 lib/filehighlight/{common.c => fh-common.c}      | 0
 lib/filehighlight/get-color.c                    | 2 +-
 lib/filehighlight/ini-file-read.c                | 2 +-
 lib/lock.c                                       | 2 +-
 lib/mcconfig.c                                   | 0
 lib/mcconfig/Makefile.am                         | 4 ++--
 lib/mcconfig/common.h                            | 0
 lib/mcconfig/{common.c => mcconf-common.c}       | 2 +-
 lib/mcconfig/{history.c => mcconf-history.c}     | 2 +-
 lib/mcconfig/paths.c                             | 2 +-
 lib/search/Makefile.am                           | 6 +++---
 lib/search/{search.c => main-search.c}           | 2 +-
 lib/search/regex.c                               | 2 +-
 lib/search/{hex.c => srch-hex.c}                 | 0
 lib/search/{lib.c => srch-lib.c}                 | 0
 lib/shell.c                                      | 2 +-
 lib/skin/Makefile.am                             | 2 +-
 lib/skin/ini-file.c                              | 2 +-
 lib/skin/{common.c => skin-common.c}             | 2 +-
 lib/strutil/strutil.c                            | 2 +-
 lib/{util.c => sub-util.c}                       | 2 +-
 lib/{util.h => sub-util.h}                       | 0
 lib/tty/Makefile.am                              | 2 +-
 lib/tty/color-slang.c                            | 2 +-
 lib/tty/key.c                                    | 2 +-
 lib/tty/keyxdef.c                                | 2 +-
 lib/tty/{mouse.c => tty-mouse.c}                 | 2 +-
 lib/tty/{mouse.h => tty-mouse.h}                 | 0
 lib/tty/tty-ncurses.c                            | 2 +-
 lib/tty/tty-slang.c                              | 4 ++--
 lib/tty/tty.c                                    | 2 +-
 lib/tty/win.c                                    | 2 +-
 lib/utilunix.c                                   | 2 +-
 lib/vfs/direntry.c                               | 2 +-
 lib/vfs/gc.c                                     | 2 +-
 lib/vfs/interface.c                              | 2 +-
 lib/vfs/path.c                                   | 2 +-
 lib/vfs/utilvfs.c                                | 2 +-
 lib/vfs/vfs.c                                    | 2 +-
 lib/widget/Makefile.am                           | 4 ++--
 lib/widget/buttonbar.c                           | 2 +-
 lib/widget/dialog.c                              | 4 ++--
 lib/widget/frame.c                               | 2 +-
 lib/widget/groupbox.c                            | 2 +-
 lib/widget/{history.c => history-widget.c}       | 0
 lib/widget/input.c                               | 2 +-
 lib/widget/input_complete.c                      | 2 +-
 lib/widget/listbox.c                             | 2 +-
 lib/widget/quick.c                               | 2 +-
 lib/widget/quick.h                               | 2 +-
 lib/widget/widget-common.h                       | 4 ++--
 lib/widget/{mouse.c => widget-mouse.c}           | 2 +-
 lib/widget/{mouse.h => widget-mouse.h}           | 2 +-
 lib/widget/wtools.c                              | 2 +-
 src/Makefile.am                                  | 2 +-
 src/args.c                                       | 2 +-
 src/clipboard.c                                  | 2 +-
 src/cons.handler.c                               | 2 +-
 src/diffviewer/Makefile.am                       | 2 +-
 src/diffviewer/{search.c => df-view-search.c}    | 0
 src/diffviewer/ydiff.c                           | 2 +-
 src/editor/bookmark.c                            | 2 +-
 src/editor/edit.c                                | 2 +-
 src/editor/editcmd.c                             | 2 +-
 src/editor/editdraw.c                            | 2 +-
 src/editor/editwidget.c                          | 2 +-
 src/editor/etags.c                               | 2 +-
 src/editor/syntax.c                              | 2 +-
 src/events_init.c                                | 2 +-
 src/execute.c                                    | 2 +-
 src/file_history.c                               | 2 +-
 src/filemanager/Makefile.am                      | 2 +-
 src/filemanager/achown.c                         | 2 +-
 src/filemanager/boxes.c                          | 6 +++---
 src/filemanager/boxes.h                          | 2 +-
 src/filemanager/chmod.c                          | 2 +-
 src/filemanager/chown.c                          | 2 +-
 src/filemanager/cmd.c                            | 4 ++--
 src/filemanager/command.c                        | 2 +-
 src/filemanager/ext.c                            | 2 +-
 src/filemanager/file.c                           | 6 +++---
 src/filemanager/filegui.c                        | 2 +-
 src/filemanager/filenot.c                        | 2 +-
 src/filemanager/find.c                           | 4 ++--
 src/filemanager/{dir.c => fman-dir.c}            | 4 ++--
 src/filemanager/{dir.h => fman-dir.h}            | 2 +-
 src/filemanager/hotlist.c                        | 2 +-
 src/filemanager/info.c                           | 2 +-
 src/filemanager/layout.c                         | 6 +++---
 src/filemanager/listmode.c                       | 2 +-
 src/filemanager/midnight.c                       | 4 ++--
 src/filemanager/panel.c                          | 4 ++--
 src/filemanager/panel.h                          | 2 +-
 src/filemanager/panelize.c                       | 4 ++--
 src/filemanager/tree.c                           | 4 ++--
 src/filemanager/treestore.c                      | 2 +-
 src/help.c                                       | 2 +-
 src/learn.c                                      | 2 +-
 src/main.c                                       | 4 ++--
 src/setup.c                                      | 4 ++--
 src/subshell/Makefile.am                         | 2 +-
 src/subshell/{common.c => subshell-common.c}     | 2 +-
 src/{background.c => task-background.c}          | 2 +-
 src/{background.h => task-background.h}          | 0
 src/textconf.c                                   | 2 +-
 src/usermenu.c                                   | 4 ++--
 src/util.c                                       | 2 +-
 src/vfs/cpio/cpio.c                              | 2 +-
 src/vfs/extfs/extfs.c                            | 2 +-
 src/vfs/fish/fish.c                              | 2 +-
 src/vfs/ftpfs/ftpfs.c                            | 2 +-
 src/vfs/sfs/sfs.c                                | 2 +-
 src/vfs/sftpfs/Makefile.am                       | 4 ++--
 src/vfs/sftpfs/config_parser.c                   | 2 +-
 src/vfs/sftpfs/connection.c                      | 2 +-
 src/vfs/sftpfs/internal.c                        | 2 +-
 src/vfs/sftpfs/{dir.c => sftp-dir.c}             | 2 +-
 src/vfs/sftpfs/{file.c => sftp-file.c}           | 2 +-
 src/vfs/smbfs/smbfs.c                            | 2 +-
 src/vfs/tar/tar.c                                | 2 +-
 src/vfs/undelfs/undelfs.c                        | 2 +-
 src/viewer/Makefile.am                           | 6 +++---
 src/viewer/actions_cmd.c                         | 2 +-
 src/viewer/ascii.c                               | 2 +-
 src/viewer/datasource.c                          | 2 +-
 src/viewer/display.c                             | 2 +-
 src/viewer/growbuf.c                             | 2 +-
 src/viewer/internal.h                            | 2 +-
 src/viewer/mcviewer.c                            | 2 +-
 src/viewer/{hex.c => view-hex.c}                 | 2 +-
 src/viewer/{lib.c => view-lib.c}                 | 2 +-
 src/viewer/{search.c => view-search.c}           | 0
 tests/lib/mc_build_filename.c                    | 2 +-
 tests/lib/mc_realpath.c                          | 2 +-
 tests/lib/name_quote.c                           | 2 +-
 tests/lib/utilunix__my_system-fork_child.c       | 2 +-
 tests/lib/utilunix__my_system-fork_child_shell.c | 2 +-
 tests/lib/utilunix__my_system-fork_fail.c        | 2 +-
 tests/lib/vfs/canonicalize_pathname.c            | 2 +-
 tests/lib/x_basename.c                           | 2 +-
 tests/src/filemanager/get_random_hint.c          | 2 +-
 tests/src/vfs/extfs/helpers-list/mc_parse_ls_l.c | 2 +-
 148 files changed, 163 insertions(+), 163 deletions(-)
 rename lib/filehighlight/{common.c => fh-common.c} (100%)
 create mode 100644 lib/mcconfig.c
 create mode 100644 lib/mcconfig/common.h
 rename lib/mcconfig/{common.c => mcconf-common.c} (99%)
 rename lib/mcconfig/{history.c => mcconf-history.c} (99%)
 rename lib/search/{search.c => main-search.c} (99%)
 rename lib/search/{hex.c => srch-hex.c} (100%)
 rename lib/search/{lib.c => srch-lib.c} (100%)
 rename lib/skin/{common.c => skin-common.c} (99%)
 rename lib/{util.c => sub-util.c} (99%)
 rename lib/{util.h => sub-util.h} (100%)
 rename lib/tty/{mouse.c => tty-mouse.c} (99%)
 rename lib/tty/{mouse.h => tty-mouse.h} (100%)
 rename lib/widget/{history.c => history-widget.c} (100%)
 rename lib/widget/{mouse.c => widget-mouse.c} (99%)
 rename lib/widget/{mouse.h => widget-mouse.h} (97%)
 rename src/diffviewer/{search.c => df-view-search.c} (100%)
 rename src/filemanager/{dir.c => fman-dir.c} (99%)
 rename src/filemanager/{dir.h => fman-dir.h} (99%)
 rename src/subshell/{common.c => subshell-common.c} (99%)
 rename src/{background.c => task-background.c} (99%)
 rename src/{background.h => task-background.h} (100%)
 rename src/vfs/sftpfs/{dir.c => sftp-dir.c} (99%)
 rename src/vfs/sftpfs/{file.c => sftp-file.c} (99%)
 rename src/viewer/{hex.c => view-hex.c} (99%)
 rename src/viewer/{lib.c => view-lib.c} (99%)
 rename src/viewer/{search.c => view-search.c} (100%)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 455f9ddf7..3f8c3386b 100644
    a b SUBLIB_includes = \ 
    2626SRC_mc_utils = \ 
    2727        utilunix.c utilunix.h \ 
    2828        unixcompat.h \ 
    29         util.c util.h 
     29        sub-util.c sub-util.h 
    3030 
    3131 
    3232libmc_la_SOURCES = \ 

  • lib/charsets.c 

    diff --git a/lib/charsets.c b/lib/charsets.c
index 51b5aaf21..7c9652adb 100644
    a b  
    3636#include "lib/global.h" 
    3737#include "lib/strutil.h"        /* utf-8 functions */ 
    3838#include "lib/fileloc.h" 
    39 #include "lib/util.h"           /* whitespace() */ 
     39#include "lib/sub-util.h"           /* whitespace() */ 
    4040 
    4141#include "lib/charsets.h" 
    4242 

  • lib/event/event.c 

    diff --git a/lib/event/event.c b/lib/event/event.c
index 3ca22977a..709ce5b9f 100644
    a b  
    2727#include <config.h> 
    2828 
    2929#include "lib/global.h" 
    30 #include "lib/util.h" 
     30#include "lib/sub-util.h" 
    3131#include "lib/event.h" 
    3232 
    3333#include "internal.h" 

  • lib/event/manage.c 

    diff --git a/lib/event/manage.c b/lib/event/manage.c
index b2dda1d86..5828071a4 100644
    a b  
    2727#include <config.h> 
    2828 
    2929#include "lib/global.h" 
    30 #include "lib/util.h" 
     30#include "lib/sub-util.h" 
    3131#include "lib/event.h" 
    3232 
    3333#include "internal.h" 

  • lib/filehighlight.h 

    diff --git a/lib/filehighlight.h b/lib/filehighlight.h
index 980258898..9a635d5c2 100644
    a b  
    22#define MC__FILEHIGHLIGHT_H 
    33 
    44#include "lib/mcconfig.h"       /* mc_config_t */ 
    5 #include "lib/util.h"           /* file_entry_t */ 
     5#include "lib/sub-util.h"           /* file_entry_t */ 
    66 
    77/*** typedefs(not structures) and defined constants **********************************************/ 
    88 

  • lib/filehighlight/Makefile.am 

    diff --git a/lib/filehighlight/Makefile.am b/lib/filehighlight/Makefile.am
index 57a8d949f..842bdfcd8 100644
    a b  
    11noinst_LTLIBRARIES = libmcfilehighlight.la 
    22 
    33libmcfilehighlight_la_SOURCES = \ 
    4         common.c \ 
     4        fh-common.c \ 
    55        get-color.c \ 
    66        ini-file-read.c \ 
    77        internal.h 

  • lib/filehighlight/get-color.c 

    diff --git a/lib/filehighlight/common.c b/lib/filehighlight/fh-common.c
similarity index 100%
rename from lib/filehighlight/common.c
rename to lib/filehighlight/fh-common.c
diff --git a/lib/filehighlight/get-color.c b/lib/filehighlight/get-color.c
index dbb84c8b7..ac0c17a6a 100644
    a b  
    2929 
    3030#include "lib/global.h" 
    3131#include "lib/skin.h" 
    32 #include "lib/util.h"           /* is_exe() */ 
     32#include "lib/sub-util.h"           /* is_exe() */ 
    3333#include "lib/filehighlight.h" 
    3434#include "internal.h" 
    3535 

  • lib/filehighlight/ini-file-read.c 

    diff --git a/lib/filehighlight/ini-file-read.c b/lib/filehighlight/ini-file-read.c
index 68befd3ca..9a3c9295e 100644
    a b  
    3131#include "lib/fileloc.h" 
    3232#include "lib/strescape.h" 
    3333#include "lib/skin.h" 
    34 #include "lib/util.h"           /* exist_file() */ 
     34#include "lib/sub-util.h"           /* exist_file() */ 
    3535#include "lib/filehighlight.h" 
    3636 
    3737#include "internal.h" 

  • lib/lock.c 

    diff --git a/lib/lock.c b/lib/lock.c
index bdecb582d..124da81ac 100644
    a b  
    5656 
    5757#include "lib/global.h" 
    5858#include "lib/vfs/vfs.h" 
    59 #include "lib/util.h"           /* tilde_expand() */ 
     59#include "lib/sub-util.h"           /* tilde_expand() */ 
    6060#include "lib/lock.h" 
    6161#include "lib/widget.h"         /* query_dialog() */ 
    6262 

  • lib/mcconfig/Makefile.am 

    diff --git a/lib/mcconfig.c b/lib/mcconfig.c
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/mcconfig/Makefile.am b/lib/mcconfig/Makefile.am
index ad62b9132..8685e6209 100644
    a b  
    22noinst_LTLIBRARIES = libmcconfig.la 
    33 
    44libmcconfig_la_SOURCES = \ 
    5         common.c \ 
     5        mcconf-common.c \ 
    66        get.c \ 
    7         history.c \ 
     7        mcconf-history.c \ 
    88        set.c \ 
    99        paths.c 
    1010 

  • .c 

    diff --git a/lib/mcconfig/common.h b/lib/mcconfig/common.h
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/mcconfig/common.c b/lib/mcconfig/mcconf-common.c
similarity index 99%
rename from lib/mcconfig/common.c
rename to lib/mcconfig/mcconf-common.c
index 5affb45b4..0bdf34978 100644
    old new  
    2929 
    3030#include "lib/global.h" 
    3131#include "lib/vfs/vfs.h"        /* mc_stat */ 
    32 #include "lib/util.h" 
     32#include "lib/sub-util.h" 
    3333 
    3434#include "lib/mcconfig.h" 
    3535 

  • .c 

    diff --git a/lib/mcconfig/history.c b/lib/mcconfig/mcconf-history.c
similarity index 99%
rename from lib/mcconfig/history.c
rename to lib/mcconfig/mcconf-history.c
index c1a00e297..8b2882f0f 100644
    old new  
    4141 
    4242#include "lib/fileloc.h"        /* MC_HISTORY_FILE */ 
    4343#include "lib/strutil.h" 
    44 #include "lib/util.h"           /* list_append_unique */ 
     44#include "lib/sub-util.h"           /* list_append_unique */ 
    4545 
    4646#include "lib/mcconfig.h" 
    4747 

  • lib/mcconfig/paths.c 

    diff --git a/lib/mcconfig/paths.c b/lib/mcconfig/paths.c
index e111dc7a2..dae8297d0 100644
    a b  
    3232#include "lib/global.h" 
    3333#include "lib/fileloc.h" 
    3434#include "lib/vfs/vfs.h" 
    35 #include "lib/util.h"           /* unix_error_string() */ 
     35#include "lib/sub-util.h"           /* unix_error_string() */ 
    3636 
    3737#include "lib/mcconfig.h" 
    3838 

  • lib/search/Makefile.am 

    diff --git a/lib/search/Makefile.am b/lib/search/Makefile.am
index ed9d3aadb..5abccd695 100644
    a b  
    11noinst_LTLIBRARIES = libsearch.la 
    22 
    33libsearch_la_SOURCES = \ 
    4         search.c \ 
     4        main-search.c \ 
    55        internal.h \ 
    6         lib.c \ 
     6        srch-lib.c \ 
    77        normal.c \ 
    88        regex.c \ 
    99        glob.c \ 
    10         hex.c 
     10        srch-hex.c 
    1111 
    1212AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CPPFLAGS) 

  • .c 

    diff --git a/lib/search/search.c b/lib/search/main-search.c
similarity index 99%
rename from lib/search/search.c
rename to lib/search/main-search.c
index 963f3b108..dd6129717 100644
    old new  
    3434#include "lib/global.h" 
    3535#include "lib/strutil.h" 
    3636#include "lib/search.h" 
    37 #include "lib/util.h" 
     37#include "lib/sub-util.h" 
    3838#ifdef HAVE_CHARSET 
    3939#include "lib/charsets.h" 
    4040#endif 

  • lib/search/regex.c 

    diff --git a/lib/search/regex.c b/lib/search/regex.c
index 8e6bbb4dd..2d2285e35 100644
    a b  
    3434#include "lib/strutil.h" 
    3535#include "lib/search.h" 
    3636#include "lib/strescape.h" 
    37 #include "lib/util.h"           /* MC_PTR_FREE */ 
     37#include "lib/sub-util.h"           /* MC_PTR_FREE */ 
    3838 
    3939#include "internal.h" 
    4040 

  • lib/shell.c 

    diff --git a/lib/search/hex.c b/lib/search/srch-hex.c
similarity index 100%
rename from lib/search/hex.c
rename to lib/search/srch-hex.c
diff --git a/lib/search/lib.c b/lib/search/srch-lib.c
similarity index 100%
rename from lib/search/lib.c
rename to lib/search/srch-lib.c
diff --git a/lib/shell.c b/lib/shell.c
index c826c96a3..165873e74 100644
    a b  
    3535#include <stdlib.h> 
    3636 
    3737#include "global.h" 
    38 #include "util.h" 
     38#include "sub-util.h" 
    3939 
    4040 
    4141/*** global variables ****************************************************************************/ 

  • lib/skin/Makefile.am 

    diff --git a/lib/skin/Makefile.am b/lib/skin/Makefile.am
index 04f12ed1d..0c8b3b693 100644
    a b noinst_LTLIBRARIES = libmcskin.la 
    33libmcskin_la_SOURCES = \ 
    44        colors.c \ 
    55        colors-old.c \ 
    6         common.c \ 
     6        skin-common.c \ 
    77        hc-skins.c \ 
    88        ini-file.c \ 
    99        lines.c \ 

  • lib/skin/ini-file.c 

    diff --git a/lib/skin/ini-file.c b/lib/skin/ini-file.c
index 2b62b4b3d..9754a0d5b 100644
    a b  
    3232 
    3333#include "internal.h" 
    3434#include "lib/fileloc.h" 
    35 #include "lib/util.h"           /* exist_file() */ 
     35#include "lib/sub-util.h"           /* exist_file() */ 
    3636 
    3737/*** global variables ****************************************************************************/ 
    3838 

  • .c 

    diff --git a/lib/skin/common.c b/lib/skin/skin-common.c
similarity index 99%
rename from lib/skin/common.c
rename to lib/skin/skin-common.c
index 2092eee1e..b7abe4a45 100644
    old new  
    2929#include <stdlib.h> 
    3030 
    3131#include "internal.h" 
    32 #include "lib/util.h" 
     32#include "lib/sub-util.h" 
    3333 
    3434#include "lib/tty/color.h"      /* tty_use_256colors(); */ 
    3535 

  • lib/strutil/strutil.c 

    diff --git a/lib/strutil/strutil.c b/lib/strutil/strutil.c
index cf11d00d8..4b371466c 100644
    a b  
    3131#include <errno.h> 
    3232 
    3333#include "lib/global.h" 
    34 #include "lib/util.h"           /* MC_PTR_FREE */ 
     34#include "lib/sub-util.h"           /* MC_PTR_FREE */ 
    3535#include "lib/strutil.h" 
    3636 
    3737/*** global variables ****************************************************************************/ 

  • .c 

    diff --git a/lib/util.c b/lib/sub-util.c
similarity index 99%
rename from lib/util.c
rename to lib/sub-util.c
index 1a9bfd16f..a48133a80 100644
    old new  
    5050#include "lib/fileloc.h" 
    5151#include "lib/vfs/vfs.h" 
    5252#include "lib/strutil.h" 
    53 #include "lib/util.h" 
     53#include "lib/sub-util.h" 
    5454#include "lib/timer.h" 
    5555 
    5656/*** global variables ****************************************************************************/ 

  • lib/tty/Makefile.am 

    diff --git a/lib/util.h b/lib/sub-util.h
similarity index 100%
rename from lib/util.h
rename to lib/sub-util.h
diff --git a/lib/tty/Makefile.am b/lib/tty/Makefile.am
index d4260fee8..ae717033a 100644
    a b TTY_SRC = \ 
    1515        color-internal.c color-internal.h \ 
    1616        color.c color.h \ 
    1717        key.c key.h keyxdef.c \ 
    18         mouse.c mouse.h \ 
     18        tty-mouse.c tty-mouse.h \ 
    1919        tty-internal.c tty-internal.h \ 
    2020        tty.c tty.h \ 
    2121        win.c win.h 

  • lib/tty/color-slang.c 

    diff --git a/lib/tty/color-slang.c b/lib/tty/color-slang.c
index 6a0993e7d..53a4cbb30 100644
    a b  
    3636#include <sys/types.h>          /* size_t */ 
    3737 
    3838#include "lib/global.h" 
    39 #include "lib/util.h"           /* whitespace() */ 
     39#include "lib/sub-util.h"           /* whitespace() */ 
    4040 
    4141#include "tty-slang.h" 
    4242#include "color.h"              /* variables */ 

  • lib/tty/key.c 

    diff --git a/lib/tty/key.c b/lib/tty/key.c
index 4abfc71d7..58a2f018b 100644
    a b  
    5454 
    5555#include "tty.h" 
    5656#include "tty-internal.h"       /* mouse_enabled */ 
    57 #include "mouse.h" 
     57#include "tty-mouse.h" 
    5858#include "key.h" 
    5959 
    6060#include "lib/widget.h"         /* mc_refresh() */ 

  • lib/tty/keyxdef.c 

    diff --git a/lib/tty/keyxdef.c b/lib/tty/keyxdef.c
index cb1c8becc..b4d375e3e 100644
    a b  
    4949#include "lib/global.h" 
    5050 
    5151#include "tty.h" 
    52 #include "mouse.h"              /* required before key.h */ 
     52#include "tty-mouse.h"              /* required before key.h */ 
    5353#include "key.h" 
    5454 
    5555#if defined (__QNX__) && !defined (__QNXNTO__) 

  • .c 

    diff --git a/lib/tty/mouse.c b/lib/tty/tty-mouse.c
similarity index 99%
rename from lib/tty/mouse.c
rename to lib/tty/tty-mouse.c
index 1bba0cc58..d58210b47 100644
    old new  
    3939 
    4040#include "tty.h" 
    4141#include "tty-internal.h"       /* mouse_enabled */ 
    42 #include "mouse.h" 
     42#include "tty-mouse.h" 
    4343#include "key.h"                /* define sequence */ 
    4444 
    4545/*** global variables ****************************************************************************/ 

  • lib/tty/tty-ncurses.c 

    diff --git a/lib/tty/mouse.h b/lib/tty/tty-mouse.h
similarity index 100%
rename from lib/tty/mouse.h
rename to lib/tty/tty-mouse.h
diff --git a/lib/tty/tty-ncurses.c b/lib/tty/tty-ncurses.c
index 03235cd5b..bc9a24a1b 100644
    a b  
    5151#include "color.h"              /* tty_setcolor */ 
    5252#include "color-internal.h" 
    5353#include "key.h" 
    54 #include "mouse.h" 
     54#include "tty-mouse.h" 
    5555#include "win.h" 
    5656 
    5757/* include at last !!! */ 

  • lib/tty/tty-slang.c 

    diff --git a/lib/tty/tty-slang.c b/lib/tty/tty-slang.c
index 6bf22a90d..1c135bc68 100644
    a b  
    4343 
    4444#include "lib/global.h" 
    4545#include "lib/strutil.h"        /* str_term_form */ 
    46 #include "lib/util.h"           /* is_printable() */ 
     46#include "lib/sub-util.h"           /* is_printable() */ 
    4747 
    4848#include "tty-internal.h"       /* mc_tty_normalize_from_utf8() */ 
    4949#include "tty.h" 
    5050#include "color.h" 
    5151#include "color-slang.h" 
    5252#include "color-internal.h" 
    53 #include "mouse.h"              /* Gpm_Event is required in key.h */ 
     53#include "tty-mouse.h"              /* Gpm_Event is required in key.h */ 
    5454#include "key.h"                /* define_sequence */ 
    5555#include "win.h" 
    5656 

  • lib/tty/tty.c 

    diff --git a/lib/tty/tty.c b/lib/tty/tty.c
index d4a731343..cdf28f5a4 100644
    a b  
    5656 
    5757#include "tty.h" 
    5858#include "tty-internal.h" 
    59 #include "mouse.h"              /* use_mouse_p */ 
     59#include "tty-mouse.h"              /* use_mouse_p */ 
    6060#include "win.h" 
    6161 
    6262/*** global variables ****************************************************************************/ 

  • lib/tty/win.c 

    diff --git a/lib/tty/win.c b/lib/tty/win.c
index d65ffe64e..53fdb612d 100644
    a b  
    4141#endif 
    4242 
    4343#include "lib/global.h" 
    44 #include "lib/util.h"           /* is_printable() */ 
     44#include "lib/sub-util.h"           /* is_printable() */ 
    4545#include "tty-internal.h" 
    4646#include "tty.h"                /* tty_gotoyx, tty_print_char */ 
    4747#include "win.h" 

  • lib/utilunix.c 

    diff --git a/lib/utilunix.c b/lib/utilunix.c
index bbcf86b78..0a64fba51 100644
    a b  
    6767#include "lib/unixcompat.h" 
    6868#include "lib/vfs/vfs.h"        /* VFS_ENCODING_PREFIX */ 
    6969#include "lib/strutil.h"        /* str_move() */ 
    70 #include "lib/util.h" 
     70#include "lib/sub-util.h" 
    7171#include "lib/widget.h"         /* message() */ 
    7272#include "lib/vfs/xdirentry.h" 
    7373 

  • lib/vfs/direntry.c 

    diff --git a/lib/vfs/direntry.c b/lib/vfs/direntry.c
index 87e71a660..3cec4edd3 100644
    a b  
    6969#include "lib/global.h" 
    7070 
    7171#include "lib/tty/tty.h"        /* enable/disable interrupt key */ 
    72 #include "lib/util.h"           /* custom_canonicalize_pathname() */ 
     72#include "lib/sub-util.h"           /* custom_canonicalize_pathname() */ 
    7373#include "lib/timer.h" 
    7474#if 0 
    7575#include "lib/widget.h"         /* message() */ 

  • lib/vfs/gc.c 

    diff --git a/lib/vfs/gc.c b/lib/vfs/gc.c
index 5090aaacb..54378184b 100644
    a b  
    4343 
    4444#include "lib/global.h" 
    4545#include "lib/event.h" 
    46 #include "lib/util.h"           /* MC_PTR_FREE */ 
     46#include "lib/sub-util.h"           /* MC_PTR_FREE */ 
    4747#include "lib/timer.h" 
    4848 
    4949#include "vfs.h" 

  • lib/vfs/interface.c 

    diff --git a/lib/vfs/interface.c b/lib/vfs/interface.c
index ca29653a2..666b83411 100644
    a b  
    5151 
    5252#include "lib/widget.h"         /* message() */ 
    5353#include "lib/strutil.h"        /* str_crt_conv_from() */ 
    54 #include "lib/util.h" 
     54#include "lib/sub-util.h" 
    5555 
    5656#include "vfs.h" 
    5757#include "utilvfs.h" 

  • lib/vfs/path.c 

    diff --git a/lib/vfs/path.c b/lib/vfs/path.c
index 49553198f..f5630e6bd 100644
    a b  
    3636 
    3737#include "lib/global.h" 
    3838#include "lib/strutil.h" 
    39 #include "lib/util.h"           /* mc_build_filename() */ 
     39#include "lib/sub-util.h"           /* mc_build_filename() */ 
    4040#include "lib/serialize.h" 
    4141 
    4242#include "vfs.h" 

  • lib/vfs/utilvfs.c 

    diff --git a/lib/vfs/utilvfs.c b/lib/vfs/utilvfs.c
index ce3213c7b..fea5db04d 100644
    a b  
    4040 
    4141#include "lib/global.h" 
    4242#include "lib/unixcompat.h" 
    43 #include "lib/util.h"           /* mc_mkstemps() */ 
     43#include "lib/sub-util.h"           /* mc_mkstemps() */ 
    4444#include "lib/widget.h"         /* message() */ 
    4545#include "lib/strutil.h"        /* INVALID_CONV */ 
    4646 

  • lib/vfs/vfs.c 

    diff --git a/lib/vfs/vfs.c b/lib/vfs/vfs.c
index 0b948846c..a4bec8c83 100644
    a b  
    5656 
    5757#include "lib/global.h" 
    5858#include "lib/strutil.h" 
    59 #include "lib/util.h" 
     59#include "lib/sub-util.h" 
    6060#include "lib/widget.h"         /* message() */ 
    6161#include "lib/event.h" 
    6262 

  • lib/widget/Makefile.am 

    diff --git a/lib/widget/Makefile.am b/lib/widget/Makefile.am
index 90f023bbc..00d5f1835 100644
    a b libmcwidget_la_SOURCES = \ 
    1313        group.c group.h \ 
    1414        groupbox.c groupbox.h \ 
    1515        hline.c hline.h \ 
    16         history.c history.h \ 
     16        history-widget.c history-widget.h \ 
    1717        input.c input.h \ 
    1818        input_complete.c \ 
    1919        listbox-window.c listbox-window.h \ 
    2020        listbox.c listbox.h \ 
    2121        label.c label.h \ 
    2222        menu.c menu.h \ 
    23         mouse.c mouse.h \ 
     23        widget-mouse.c widget-mouse.h \ 
    2424        quick.c quick.h \ 
    2525        radio.c radio.h \ 
    2626        rect.c rect.h \ 

  • lib/widget/buttonbar.c 

    diff --git a/lib/widget/buttonbar.c b/lib/widget/buttonbar.c
index b52a2b887..f0f37b3cd 100644
    a b  
    4343#include "lib/tty/key.h"        /* XCTRL and ALT macros  */ 
    4444#include "lib/skin.h" 
    4545#include "lib/strutil.h" 
    46 #include "lib/util.h" 
     46#include "lib/sub-util.h" 
    4747#include "lib/widget.h" 
    4848 
    4949/*** global variables ****************************************************************************/ 

  • lib/widget/dialog.c 

    diff --git a/lib/widget/dialog.c b/lib/widget/dialog.c
index f984e03af..4c29e5787 100644
    a b  
    4242#include "lib/strutil.h" 
    4343#include "lib/fileloc.h"        /* MC_HISTORY_FILE */ 
    4444#include "lib/event.h"          /* mc_event_raise() */ 
    45 #include "lib/util.h"           /* MC_PTR_FREE */ 
     45#include "lib/sub-util.h"           /* MC_PTR_FREE */ 
    4646#include "lib/mcconfig.h"       /* num_history_items_recorded */ 
    4747 
    4848#include "lib/widget.h" 
    49 #include "lib/widget/mouse.h" 
     49#include "lib/widget/widget-mouse.h" 
    5050 
    5151/*** global variables ****************************************************************************/ 
    5252 

  • lib/widget/frame.c 

    diff --git a/lib/widget/frame.c b/lib/widget/frame.c
index 5d5a5acdf..633f7cb11 100644
    a b  
    3636#include "lib/tty/color.h" 
    3737#include "lib/skin.h" 
    3838#include "lib/strutil.h" 
    39 #include "lib/util.h"           /* MC_PTR_FREE */ 
     39#include "lib/sub-util.h"           /* MC_PTR_FREE */ 
    4040#include "lib/widget.h" 
    4141 
    4242/*** global variables ****************************************************************************/ 

  • lib/widget/groupbox.c 

    diff --git a/lib/widget/groupbox.c b/lib/widget/groupbox.c
index fe16e6e28..e21d28b98 100644
    a b  
    3939#include "lib/tty/tty.h" 
    4040#include "lib/tty/color.h" 
    4141#include "lib/skin.h" 
    42 #include "lib/util.h" 
     42#include "lib/sub-util.h" 
    4343#include "lib/widget.h" 
    4444 
    4545/*** global variables ****************************************************************************/ 

  • lib/widget/input.c 

    diff --git a/lib/widget/history.c b/lib/widget/history-widget.c
similarity index 100%
rename from lib/widget/history.c
rename to lib/widget/history-widget.c
diff --git a/lib/widget/input.c b/lib/widget/input.c
index b5cec7e6b..6e83c8e72 100644
    a b  
    4545#include "lib/fileloc.h" 
    4646#include "lib/skin.h" 
    4747#include "lib/strutil.h" 
    48 #include "lib/util.h" 
     48#include "lib/sub-util.h" 
    4949#include "lib/widget.h" 
    5050#include "lib/event.h"          /* mc_event_raise() */ 
    5151#include "lib/mcconfig.h"       /* mc_config_history_*() */ 

  • lib/widget/input_complete.c 

    diff --git a/lib/widget/input_complete.c b/lib/widget/input_complete.c
index 59a994d62..0eb7b5f7c 100644
    a b  
    5050#include "lib/vfs/vfs.h" 
    5151#include "lib/strescape.h" 
    5252#include "lib/strutil.h" 
    53 #include "lib/util.h" 
     53#include "lib/sub-util.h" 
    5454#include "lib/widget.h" 
    5555 
    5656/*** global variables ****************************************************************************/ 

  • lib/widget/listbox.c 

    diff --git a/lib/widget/listbox.c b/lib/widget/listbox.c
index e20c1a82d..f33164fec 100644
    a b  
    4141#include "lib/tty/tty.h" 
    4242#include "lib/skin.h" 
    4343#include "lib/strutil.h" 
    44 #include "lib/util.h"           /* Q_() */ 
     44#include "lib/sub-util.h"           /* Q_() */ 
    4545#include "lib/widget.h" 
    4646 
    4747/*** global variables ****************************************************************************/ 

  • lib/widget/quick.c 

    diff --git a/lib/widget/quick.c b/lib/widget/quick.c
index 434def9ee..a4ed84171 100644
    a b  
    3838 
    3939#include "lib/global.h" 
    4040#include "lib/strutil.h"        /* str_term_width1() */ 
    41 #include "lib/util.h"           /* tilde_expand() */ 
     41#include "lib/sub-util.h"           /* tilde_expand() */ 
    4242#include "lib/widget.h" 
    4343 
    4444/*** global variables ****************************************************************************/ 

  • lib/widget/quick.h 

    diff --git a/lib/widget/quick.h b/lib/widget/quick.h
index 86c027c88..bffbdf41d 100644
    a b  
    55#ifndef MC__QUICK_H 
    66#define MC__QUICK_H 
    77 
    8 #include "lib/tty/mouse.h" 
     8#include "lib/tty/tty-mouse.h" 
    99 
    1010/*** typedefs(not structures) and defined constants **********************************************/ 
    1111 

  • lib/widget/widget-common.h 

    diff --git a/lib/widget/widget-common.h b/lib/widget/widget-common.h
index a20bcd671..a0d5236c6 100644
    a b  
    77#define MC__WIDGET_INTERNAL_H 
    88 
    99#include "lib/keybind.h"        /* global_keymap_t */ 
    10 #include "lib/tty/mouse.h" 
    11 #include "lib/widget/mouse.h"   /* mouse_msg_t, mouse_event_t */ 
     10#include "lib/tty/tty-mouse.h" 
     11#include "lib/widget/widget-mouse.h"   /* mouse_msg_t, mouse_event_t */ 
    1212 
    1313/*** typedefs(not structures) and defined constants **********************************************/ 
    1414 

  • .c 

    diff --git a/lib/widget/mouse.c b/lib/widget/widget-mouse.c
similarity index 99%
rename from lib/widget/mouse.c
rename to lib/widget/widget-mouse.c
index 1123738c9..f1f4a483c 100644
    old new  
    3232#include "lib/global.h" 
    3333#include "lib/widget.h" 
    3434 
    35 #include "lib/widget/mouse.h" 
     35#include "lib/widget/widget-mouse.h" 
    3636 
    3737/*** global variables ****************************************************************************/ 
    3838 

  • .h 

    diff --git a/lib/widget/mouse.h b/lib/widget/widget-mouse.h
similarity index 97%
rename from lib/widget/mouse.h
rename to lib/widget/widget-mouse.h
index 44e7b238b..ee209357e 100644
    old new  
    1010#ifndef MC__WIDGET_MOUSE_H 
    1111#define MC__WIDGET_MOUSE_H 
    1212 
    13 #include "lib/tty/mouse.h"      /* Gpm_Event */ 
     13#include "lib/tty/tty-mouse.h"      /* Gpm_Event */ 
    1414 
    1515/*** enums ***************************************************************************************/ 
    1616 

  • lib/widget/wtools.c 

    diff --git a/lib/widget/wtools.c b/lib/widget/wtools.c
index 00cc50df7..a1bbb60f1 100644
    a b  
    4040#include "lib/tty/tty.h" 
    4141#include "lib/tty/key.h"        /* tty_getch() */ 
    4242#include "lib/strutil.h" 
    43 #include "lib/util.h"           /* tilde_expand() */ 
     43#include "lib/sub-util.h"           /* tilde_expand() */ 
    4444#include "lib/widget.h" 
    4545#include "lib/event.h"          /* mc_event_raise() */ 
    4646 

  • src/Makefile.am 

    diff --git a/src/Makefile.am b/src/Makefile.am
index e883ab4bd..d0f11af26 100644
    a b endif 
    8888 
    8989 
    9090if ENABLE_BACKGROUND 
    91     libinternal_la_SOURCES += background.c background.h 
     91    libinternal_la_SOURCES += task-background.c task-background.h 
    9292endif 
    9393 
    9494EXTRA_DIST = $(SRC_maintainer) $(SRC_charset) 

  • src/args.c 

    diff --git a/src/args.c b/src/args.c
index 4cb0f67fd..9561ea559 100644
    a b  
    3232#include "lib/tty/tty.h" 
    3333#include "lib/strutil.h" 
    3434#include "lib/vfs/vfs.h" 
    35 #include "lib/util.h"           /* x_basename() */ 
     35#include "lib/sub-util.h"           /* x_basename() */ 
    3636 
    3737#ifdef ENABLE_VFS_SMB 
    3838#include "src/vfs/smbfs/smbfs.h"        /* smbfs_set_debugf()  */ 

  • src/clipboard.c 

    diff --git a/src/clipboard.c b/src/clipboard.c
index c277ae66b..14cb8c3f3 100644
    a b  
    3333#include "lib/global.h" 
    3434#include "lib/fileloc.h" 
    3535#include "lib/mcconfig.h" 
    36 #include "lib/util.h" 
     36#include "lib/sub-util.h" 
    3737#include "lib/event.h" 
    3838 
    3939#include "lib/vfs/vfs.h" 

  • src/cons.handler.c 

    diff --git a/src/cons.handler.c b/src/cons.handler.c
index 79297c2a7..d3ef02b40 100644
    a b  
    4444#include "lib/tty/tty.h" 
    4545#include "lib/tty/color.h"      /* tty_set_normal_attrs */ 
    4646#include "lib/tty/win.h" 
    47 #include "lib/util.h"           /* mc_build_filename() */ 
     47#include "lib/sub-util.h"           /* mc_build_filename() */ 
    4848 
    4949#include "consaver/cons.saver.h" 
    5050 

  • src/diffviewer/Makefile.am 

    diff --git a/src/diffviewer/Makefile.am b/src/diffviewer/Makefile.am
index 58e8e5b04..804ebca81 100644
    a b noinst_LTLIBRARIES = libdiffviewer.la 
    22 
    33libdiffviewer_la_SOURCES = \ 
    44        internal.h \ 
    5         search.c \ 
     5        df-view-search.c \ 
    66        ydiff.c ydiff.h 
    77 
    88AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CPPFLAGS) 

  • src/diffviewer/ydiff.c 

    diff --git a/src/diffviewer/search.c b/src/diffviewer/df-view-search.c
similarity index 100%
rename from src/diffviewer/search.c
rename to src/diffviewer/df-view-search.c
diff --git a/src/diffviewer/ydiff.c b/src/diffviewer/ydiff.c
index 43c758971..92be19c01 100644
    a b  
    4141#include "lib/tty/key.h" 
    4242#include "lib/skin.h"           /* EDITOR_NORMAL_COLOR */ 
    4343#include "lib/vfs/vfs.h"        /* mc_opendir, mc_readdir, mc_closedir, */ 
    44 #include "lib/util.h" 
     44#include "lib/sub-util.h" 
    4545#include "lib/widget.h" 
    4646#include "lib/strutil.h" 
    4747#include "lib/strescape.h"      /* strutils_glob_escape() */ 

  • src/editor/bookmark.c 

    diff --git a/src/editor/bookmark.c b/src/editor/bookmark.c
index 4fef88584..746e36041 100644
    a b  
    4343#include <unistd.h> 
    4444 
    4545#include "lib/global.h" 
    46 #include "lib/util.h"           /* MAX_SAVED_BOOKMARKS */ 
     46#include "lib/sub-util.h"           /* MAX_SAVED_BOOKMARKS */ 
    4747 
    4848#include "editwidget.h" 
    4949 

  • src/editor/edit.c 

    diff --git a/src/editor/edit.c b/src/editor/edit.c
index e13be389a..edcfeaf54 100644
    a b  
    5252#include "lib/fileloc.h"        /* EDIT_HOME_BLOCK_FILE */ 
    5353#include "lib/vfs/vfs.h" 
    5454#include "lib/strutil.h"        /* utf string functions */ 
    55 #include "lib/util.h"           /* load_file_position(), save_file_position() */ 
     55#include "lib/sub-util.h"           /* load_file_position(), save_file_position() */ 
    5656#include "lib/timefmt.h"        /* time formatting */ 
    5757#include "lib/lock.h" 
    5858#include "lib/widget.h" 

  • src/editor/editcmd.c 

    diff --git a/src/editor/editcmd.c b/src/editor/editcmd.c
index e2b904604..62f10650b 100644
    a b  
    5353#include "lib/strutil.h"        /* utf string functions */ 
    5454#include "lib/fileloc.h" 
    5555#include "lib/lock.h" 
    56 #include "lib/util.h"           /* tilde_expand() */ 
     56#include "lib/sub-util.h"           /* tilde_expand() */ 
    5757#include "lib/vfs/vfs.h" 
    5858#include "lib/widget.h" 
    5959#include "lib/event.h"          /* mc_event_raise() */ 

  • src/editor/editdraw.c 

    diff --git a/src/editor/editdraw.c b/src/editor/editdraw.c
index 564e18d6c..f3849ec25 100644
    a b  
    4747#include "lib/tty/key.h"        /* is_idle() */ 
    4848#include "lib/skin.h" 
    4949#include "lib/strutil.h"        /* utf string functions */ 
    50 #include "lib/util.h"           /* is_printable() */ 
     50#include "lib/sub-util.h"           /* is_printable() */ 
    5151#include "lib/widget.h" 
    5252#ifdef HAVE_CHARSET 
    5353#include "lib/charsets.h" 

  • src/editor/editwidget.c 

    diff --git a/src/editor/editwidget.c b/src/editor/editwidget.c
index 18ac00e66..090dd8d7f 100644
    a b  
    4747#include "lib/skin.h" 
    4848#include "lib/fileloc.h"        /* EDIT_HOME_DIR */ 
    4949#include "lib/strutil.h"        /* str_term_trim() */ 
    50 #include "lib/util.h"           /* mc_build_filename() */ 
     50#include "lib/sub-util.h"           /* mc_build_filename() */ 
    5151#include "lib/widget.h" 
    5252#include "lib/mcconfig.h" 
    5353#include "lib/event.h"          /* mc_event_raise() */ 

  • src/editor/etags.c 

    diff --git a/src/editor/etags.c b/src/editor/etags.c
index 35c7a2f04..14ae67122 100644
    a b  
    3838#include <ctype.h> 
    3939 
    4040#include "lib/global.h" 
    41 #include "lib/util.h"           /* canonicalize_pathname() */ 
     41#include "lib/sub-util.h"           /* canonicalize_pathname() */ 
    4242 
    4343#include "etags.h" 
    4444 

  • src/editor/syntax.c 

    diff --git a/src/editor/syntax.c b/src/editor/syntax.c
index 93aa7512c..91be0a396 100644
    a b  
    5858#include "lib/skin.h" 
    5959#include "lib/fileloc.h"        /* EDIT_HOME_DIR, EDIT_HOME_SYNTAX_FILE */ 
    6060#include "lib/strutil.h"        /* utf string functions */ 
    61 #include "lib/util.h" 
     61#include "lib/sub-util.h" 
    6262#include "lib/widget.h"         /* message() */ 
    6363 
    6464#include "edit-impl.h" 

  • src/events_init.c 

    diff --git a/src/events_init.c b/src/events_init.c
index a1ba78be3..f7f982c69 100644
    a b  
    3030#include "lib/event.h" 
    3131 
    3232#ifdef ENABLE_BACKGROUND 
    33 #include "background.h"         /* (background_parent_call), background_parent_call_string() */ 
     33#include "task-background.h"         /* (background_parent_call), background_parent_call_string() */ 
    3434#endif /* ENABLE_BACKGROUND */ 
    3535#include "clipboard.h"          /* clipboard events */ 
    3636#include "execute.h"            /* execute_suspend() */ 

  • src/execute.c 

    diff --git a/src/execute.c b/src/execute.c
index f35c53d94..2459e3a40 100644
    a b  
    4141#include "lib/tty/win.h" 
    4242#include "lib/vfs/vfs.h" 
    4343#include "lib/mcconfig.h" 
    44 #include "lib/util.h" 
     44#include "lib/sub-util.h" 
    4545#include "lib/strutil.h"        /* str_replace_all_substrings() */ 
    4646#include "lib/widget.h" 
    4747 

  • src/file_history.c 

    diff --git a/src/file_history.c b/src/file_history.c
index 4304655aa..4989bda3b 100644
    a b  
    3232#include "lib/fileloc.h"        /* MC_FILEPOS_FILE */ 
    3333#include "lib/mcconfig.h"       /* mc_config_get_full_path() */ 
    3434#include "lib/strutil.h"        /* str_term_width1() */ 
    35 #include "lib/util.h"           /* backup functions */ 
     35#include "lib/sub-util.h"           /* backup functions */ 
    3636 
    3737#include "file_history.h" 
    3838 

  • src/filemanager/Makefile.am 

    diff --git a/src/filemanager/Makefile.am b/src/filemanager/Makefile.am
index ba4a1be96..2f0c16430 100644
    a b libmcfilemanager_la_SOURCES = \ 
    88        chown.c \ 
    99        cmd.c cmd.h \ 
    1010        command.c command.h \ 
    11         dir.c dir.h \ 
     11        fman-dir.c fman-dir.h \ 
    1212        ext.c ext.h \ 
    1313        file.c file.h \ 
    1414        filegui.c filegui.h \ 

  • src/filemanager/achown.c 

    diff --git a/src/filemanager/achown.c b/src/filemanager/achown.c
index 7a9ba7a97..7ee390e55 100644
    a b  
    4242#include "lib/skin.h" 
    4343#include "lib/vfs/vfs.h" 
    4444#include "lib/strutil.h" 
    45 #include "lib/util.h" 
     45#include "lib/sub-util.h" 
    4646#include "lib/widget.h" 
    4747 
    4848#include "midnight.h"           /* current_panel */ 

  • src/filemanager/boxes.c 

    diff --git a/src/filemanager/boxes.c b/src/filemanager/boxes.c
index 5b4d8c527..dd6cb928c 100644
    a b  
    5656#include "src/vfs/smbfs/smbfs.h" 
    5757#endif /* ENABLE_VFS_SMB */ 
    5858 
    59 #include "lib/util.h"           /* Q_() */ 
     59#include "lib/sub-util.h"           /* Q_() */ 
    6060#include "lib/widget.h" 
    6161 
    6262#include "src/setup.h" 
    6363#include "src/history.h"        /* MC_HISTORY_ESC_TIMEOUT */ 
    6464#include "src/execute.h"        /* pause_after_run */ 
    6565#ifdef ENABLE_BACKGROUND 
    66 #include "src/background.h"     /* task_list */ 
     66#include "src/task-background.h"     /* task_list */ 
    6767#endif 
    6868 
    6969#ifdef HAVE_CHARSET 
    … …  
    7272#endif 
    7373 
    7474#include "command.h"            /* For cmdline */ 
    75 #include "dir.h" 
     75#include "fman-dir.h" 
    7676#include "panel.h"              /* LIST_FORMATS */ 
    7777#include "tree.h" 
    7878#include "layout.h"             /* for get_nth_panel_name proto */ 

  • src/filemanager/boxes.h 

    diff --git a/src/filemanager/boxes.h b/src/filemanager/boxes.h
index 4d6acc3a8..3cbe8b56c 100644
    a b  
    55#ifndef MC__BOXES_H 
    66#define MC__BOXES_H 
    77 
    8 #include "dir.h" 
     8#include "fman-dir.h" 
    99#include "panel.h" 
    1010 
    1111/*** typedefs(not structures) and defined constants **********************************************/ 

  • src/filemanager/chmod.c 

    diff --git a/src/filemanager/chmod.c b/src/filemanager/chmod.c
index 26fb846cd..49fb268d2 100644
    a b  
    3737#include "lib/skin.h" 
    3838#include "lib/vfs/vfs.h" 
    3939#include "lib/strutil.h" 
    40 #include "lib/util.h" 
     40#include "lib/sub-util.h" 
    4141#include "lib/widget.h" 
    4242 
    4343#include "midnight.h"           /* current_panel */ 

  • src/filemanager/chown.c 

    diff --git a/src/filemanager/chown.c b/src/filemanager/chown.c
index e7b104a06..801923521 100644
    a b  
    4141#include "lib/skin.h" 
    4242#include "lib/vfs/vfs.h" 
    4343#include "lib/strutil.h" 
    44 #include "lib/util.h" 
     44#include "lib/sub-util.h" 
    4545#include "lib/widget.h" 
    4646 
    4747#include "src/setup.h"          /* panels_options */ 

  • src/filemanager/cmd.c 

    diff --git a/src/filemanager/cmd.c b/src/filemanager/cmd.c
index 7daf7b763..69e7924cd 100644
    a b  
    5858#include "lib/vfs/vfs.h" 
    5959#include "lib/fileloc.h" 
    6060#include "lib/strutil.h" 
    61 #include "lib/util.h" 
     61#include "lib/sub-util.h" 
    6262#include "lib/widget.h" 
    6363#include "lib/keybind.h"        /* CK_Down, CK_History */ 
    6464#include "lib/event.h"          /* mc_event_raise() */ 
    … …  
    9090#include "layout.h"             /* get_current_type() */ 
    9191#include "ext.h"                /* regex_command() */ 
    9292#include "boxes.h"              /* cd_box() */ 
    93 #include "dir.h" 
     93#include "fman-dir.h" 
    9494 
    9595#include "cmd.h"                /* Our definitions */ 
    9696 

  • src/filemanager/command.c 

    diff --git a/src/filemanager/command.c b/src/filemanager/command.c
index cce18fbc9..a2c2ed3dc 100644
    a b  
    4141#include "lib/vfs/vfs.h" 
    4242#include "lib/strescape.h" 
    4343#include "lib/skin.h"           /* DEFAULT_COLOR */ 
    44 #include "lib/util.h" 
     44#include "lib/sub-util.h" 
    4545#include "lib/widget.h" 
    4646 
    4747#include "src/setup.h"          /* quit */ 

  • src/filemanager/ext.c 

    diff --git a/src/filemanager/ext.c b/src/filemanager/ext.c
index 4e1520050..d291c18a5 100644
    a b  
    4343#include "lib/search.h" 
    4444#include "lib/fileloc.h" 
    4545#include "lib/mcconfig.h" 
    46 #include "lib/util.h" 
     46#include "lib/sub-util.h" 
    4747#include "lib/vfs/vfs.h" 
    4848#include "lib/widget.h" 
    4949#ifdef HAVE_CHARSET 

  • src/filemanager/file.c 

    diff --git a/src/filemanager/file.c b/src/filemanager/file.c
index b9833de1d..ea3ba6c9c 100644
    a b  
    6666#include "lib/search.h" 
    6767#include "lib/strescape.h" 
    6868#include "lib/strutil.h" 
    69 #include "lib/util.h" 
     69#include "lib/sub-util.h" 
    7070#include "lib/vfs/vfs.h" 
    7171#include "lib/widget.h" 
    7272 
    7373#include "src/setup.h" 
    7474#ifdef ENABLE_BACKGROUND 
    75 #include "src/background.h"     /* do_background() */ 
     75#include "src/task-background.h"     /* do_background() */ 
    7676#endif 
    7777 
    7878/* Needed for current_panel, other_panel and WTree */ 
    79 #include "dir.h" 
     79#include "fman-dir.h" 
    8080#include "filegui.h" 
    8181#include "filenot.h" 
    8282#include "tree.h" 

  • src/filemanager/filegui.c 

    diff --git a/src/filemanager/filegui.c b/src/filemanager/filegui.c
index c43a2ae99..ec2dbc87c 100644
    a b statfs (char const *filename, struct fs_info *buf) 
    150150#include "lib/strescape.h" 
    151151#include "lib/strutil.h" 
    152152#include "lib/timefmt.h"        /* file_date() */ 
    153 #include "lib/util.h" 
     153#include "lib/sub-util.h" 
    154154#include "lib/widget.h" 
    155155 
    156156#include "src/setup.h"          /* verbose, safe_overwrite */ 

  • src/filemanager/filenot.c 

    diff --git a/src/filemanager/filenot.c b/src/filemanager/filenot.c
index 31b31f6c4..25e614559 100644
    a b  
    4141 
    4242#include "lib/global.h" 
    4343#include "lib/fs.h" 
    44 #include "lib/util.h" 
     44#include "lib/sub-util.h" 
    4545#include "lib/vfs/vfs.h" 
    4646 
    4747#include "filenot.h" 

  • src/filemanager/find.c 

    diff --git a/src/filemanager/find.c b/src/filemanager/find.c
index b7506bf7d..4687b3911 100644
    a b  
    4747#include "lib/vfs/vfs.h" 
    4848#include "lib/strutil.h" 
    4949#include "lib/widget.h" 
    50 #include "lib/util.h"           /* canonicalize_pathname() */ 
     50#include "lib/sub-util.h"           /* canonicalize_pathname() */ 
    5151 
    5252#include "src/setup.h"          /* verbose */ 
    5353#include "src/history.h"        /* MC_HISTORY_SHARED_SEARCH */ 
    5454 
    55 #include "dir.h" 
     55#include "fman-dir.h" 
    5656#include "cmd.h"                /* find_cmd(), view_file_at_line() */ 
    5757#include "midnight.h"           /* current_panel */ 
    5858#include "boxes.h" 

  • .c 

    diff --git a/src/filemanager/dir.c b/src/filemanager/fman-dir.c
similarity index 99%
rename from src/filemanager/dir.c
rename to src/filemanager/fman-dir.c
index 92b616668..a85d896e1 100644
    old new  
    4141#include "lib/vfs/vfs.h" 
    4242#include "lib/fs.h" 
    4343#include "lib/strutil.h" 
    44 #include "lib/util.h" 
     44#include "lib/sub-util.h" 
    4545 
    4646#include "src/setup.h"          /* panels_options */ 
    4747 
    4848#include "treestore.h" 
    4949#include "file.h"               /* file_is_symlink_to_dir() */ 
    50 #include "dir.h" 
     50#include "fman-dir.h" 
    5151 
    5252/*** global variables ****************************************************************************/ 
    5353 

  • .h 

    diff --git a/src/filemanager/dir.h b/src/filemanager/fman-dir.h
similarity index 99%
rename from src/filemanager/dir.h
rename to src/filemanager/fman-dir.h
index a159271f5..04473d104 100644
    old new  
    88#include <sys/stat.h> 
    99 
    1010#include "lib/global.h" 
    11 #include "lib/util.h" 
     11#include "lib/sub-util.h" 
    1212#include "lib/vfs/vfs.h" 
    1313 
    1414/*** typedefs(not structures) and defined constants **********************************************/ 

  • src/filemanager/hotlist.c 

    diff --git a/src/filemanager/hotlist.c b/src/filemanager/hotlist.c
index 90df75bf6..cbe9bbc57 100644
    a b  
    5353#include "lib/fileloc.h" 
    5454#include "lib/strutil.h" 
    5555#include "lib/vfs/vfs.h" 
    56 #include "lib/util.h" 
     56#include "lib/sub-util.h" 
    5757#include "lib/widget.h" 
    5858 
    5959#include "src/setup.h"          /* For profile_bname */ 

  • src/filemanager/info.c 

    diff --git a/src/filemanager/info.c b/src/filemanager/info.c
index b981b85d0..c027e07df 100644
    a b  
    4545#include "lib/skin.h" 
    4646#include "lib/strutil.h" 
    4747#include "lib/timefmt.h"        /* file_date() */ 
    48 #include "lib/util.h" 
     48#include "lib/sub-util.h" 
    4949#include "lib/widget.h" 
    5050 
    5151#include "src/setup.h"          /* panels_options */ 

  • src/filemanager/layout.c 

    diff --git a/src/filemanager/layout.c b/src/filemanager/layout.c
index f5df9f7bf..062de010b 100644
    a b  
    4444#include "lib/tty/tty.h" 
    4545#include "lib/skin.h" 
    4646#include "lib/tty/key.h" 
    47 #include "lib/tty/mouse.h" 
     47#include "lib/tty/tty-mouse.h" 
    4848#include "lib/mcconfig.h" 
    4949#include "lib/vfs/vfs.h"        /* For _vfs_get_cwd () */ 
    5050#include "lib/strutil.h" 
    5151#include "lib/widget.h" 
    5252#include "lib/event.h" 
    53 #include "lib/util.h"           /* mc_time_elapsed() */ 
     53#include "lib/sub-util.h"           /* mc_time_elapsed() */ 
    5454 
    5555#include "src/consaver/cons.saver.h" 
    5656#include "src/viewer/mcviewer.h"        /* The view widget */ 
    … …  
    6363#include "midnight.h" 
    6464#include "tree.h" 
    6565/* Needed for the extern declarations of integer parameters */ 
    66 #include "dir.h" 
     66#include "fman-dir.h" 
    6767#include "layout.h" 
    6868#include "info.h"               /* The Info widget */ 
    6969 

  • src/filemanager/listmode.c 

    diff --git a/src/filemanager/listmode.c b/src/filemanager/listmode.c
index 0aaa0e91f..0b1526952 100644
    a b  
    4747#include "lib/skin/skin.h" 
    4848 
    4949/* Needed for the extern declarations of integer parameters */ 
    50 #include "dir.h" 
     50#include "fman-dir.h" 
    5151#include "panel.h"              /* Needed for the externs */ 
    5252#include "file.h" 
    5353#include "listmode.h" 

  • src/filemanager/midnight.c 

    diff --git a/src/filemanager/midnight.c b/src/filemanager/midnight.c
index 36461b260..fa83c2d11 100644
    a b  
    5050#include "lib/tty/tty.h" 
    5151#include "lib/tty/key.h"        /* KEY_M_* masks */ 
    5252#include "lib/skin.h" 
    53 #include "lib/util.h" 
     53#include "lib/sub-util.h" 
    5454 
    5555#include "lib/vfs/vfs.h" 
    5656 
    … …  
    7373#include "hotlist.h" 
    7474#include "panelize.h" 
    7575#include "command.h"            /* cmdline */ 
    76 #include "dir.h"                /* dir_list_clean() */ 
     76#include "fman-dir.h"                /* dir_list_clean() */ 
    7777 
    7878#ifdef USE_INTERNAL_EDIT 
    7979#include "src/editor/edit.h" 

  • src/filemanager/panel.c 

    diff --git a/src/filemanager/panel.c b/src/filemanager/panel.c
index c74247aea..309eee844 100644
    a b  
    4848#include "lib/unixcompat.h" 
    4949#include "lib/search.h" 
    5050#include "lib/timefmt.h"        /* file_date() */ 
    51 #include "lib/util.h" 
     51#include "lib/sub-util.h" 
    5252#include "lib/widget.h" 
    5353#ifdef HAVE_CHARSET 
    5454#include "lib/charsets.h"       /* get_codepage_id () */ 
    … …  
    6767 
    6868#include "src/usermenu.h" 
    6969 
    70 #include "dir.h" 
     70#include "fman-dir.h" 
    7171#include "boxes.h" 
    7272#include "tree.h" 
    7373#include "ext.h"                /* regexp_command */ 

  • src/filemanager/panel.h 

    diff --git a/src/filemanager/panel.h b/src/filemanager/panel.h
index 57f4d6284..bb7ef665c 100644
    a b  
    1414#include "lib/widget.h"         /* Widget */ 
    1515#include "lib/filehighlight.h" 
    1616 
    17 #include "dir.h"                /* dir_list */ 
     17#include "fman-dir.h"                /* dir_list */ 
    1818 
    1919/*** typedefs(not structures) and defined constants **********************************************/ 
    2020 

  • src/filemanager/panelize.c 

    diff --git a/src/filemanager/panelize.c b/src/filemanager/panelize.c
index 8c1af1ed8..1820e3467 100644
    a b  
    4343#include "lib/vfs/vfs.h" 
    4444#include "lib/mcconfig.h"       /* Load/save directories panelize */ 
    4545#include "lib/strutil.h" 
    46 #include "lib/util.h" 
     46#include "lib/sub-util.h" 
    4747#include "lib/widget.h" 
    4848 
    4949#include "src/setup.h"          /* For profile_bname */ 
    5050#include "src/history.h" 
    5151 
    52 #include "dir.h" 
     52#include "fman-dir.h" 
    5353#include "midnight.h"           /* current_panel */ 
    5454#include "layout.h"             /* rotate_dash() */ 
    5555#include "panel.h"              /* WPanel */ 

  • src/filemanager/tree.c 

    diff --git a/src/filemanager/tree.c b/src/filemanager/tree.c
index 008bc0403..9d6ddecb3 100644
    a b  
    5151#include "lib/vfs/vfs.h" 
    5252#include "lib/fileloc.h" 
    5353#include "lib/strutil.h" 
    54 #include "lib/util.h" 
     54#include "lib/sub-util.h" 
    5555#include "lib/widget.h" 
    5656#include "lib/event.h"          /* mc_event_raise() */ 
    5757 
    … …  
    5959#include "src/keybind-defaults.h" 
    6060#include "src/history.h" 
    6161 
    62 #include "dir.h" 
     62#include "fman-dir.h" 
    6363#include "midnight.h"           /* the_menubar */ 
    6464#include "file.h"               /* copy_dir_dir(), move_dir_dir(), erase_dir() */ 
    6565#include "layout.h"             /* command_prompt */ 

  • src/filemanager/treestore.c 

    diff --git a/src/filemanager/treestore.c b/src/filemanager/treestore.c
index 08354b217..a8e86b94a 100644
    a b  
    5656#include "lib/fileloc.h" 
    5757#include "lib/strescape.h" 
    5858#include "lib/hook.h" 
    59 #include "lib/util.h" 
     59#include "lib/sub-util.h" 
    6060 
    6161#include "src/setup.h"          /* setup_init() */ 
    6262 

  • src/help.c 

    diff --git a/src/help.c b/src/help.c
index f5922f086..8881d448c 100644
    a b  
    6161#include "lib/skin.h" 
    6262#include "lib/strutil.h" 
    6363#include "lib/fileloc.h" 
    64 #include "lib/util.h" 
     64#include "lib/sub-util.h" 
    6565#include "lib/widget.h" 
    6666#include "lib/event-types.h" 
    6767 

  • src/learn.c 

    diff --git a/src/learn.c b/src/learn.c
index 8c607f67c..92c4902d3 100644
    a b  
    3939#include "lib/mcconfig.h" 
    4040#include "lib/strescape.h" 
    4141#include "lib/strutil.h" 
    42 #include "lib/util.h"           /* convert_controls() */ 
     42#include "lib/sub-util.h"           /* convert_controls() */ 
    4343#include "lib/widget.h" 
    4444 
    4545#include "setup.h" 

  • src/main.c 

    diff --git a/src/main.c b/src/main.c
index 6db18b200..c30f51c30 100644
    a b  
    4848#include "lib/event.h" 
    4949#include "lib/tty/tty.h" 
    5050#include "lib/tty/key.h"        /* For init_key() */ 
    51 #include "lib/tty/mouse.h"      /* init_mouse() */ 
     51#include "lib/tty/tty-mouse.h"      /* init_mouse() */ 
    5252#include "lib/timer.h" 
    5353#include "lib/skin.h" 
    5454#include "lib/filehighlight.h" 
    5555#include "lib/fileloc.h" 
    5656#include "lib/strutil.h" 
    57 #include "lib/util.h" 
     57#include "lib/sub-util.h" 
    5858#include "lib/vfs/vfs.h"        /* vfs_init(), vfs_shut() */ 
    5959 
    6060#include "filemanager/midnight.h"       /* current_panel */ 

  • src/setup.c 

    diff --git a/src/setup.c b/src/setup.c
index 97da20940..27d8b65d6 100644
    a b  
    3939#include "lib/mcconfig.h"       /* num_history_items_recorded */ 
    4040#include "lib/fileloc.h" 
    4141#include "lib/timefmt.h" 
    42 #include "lib/util.h" 
     42#include "lib/sub-util.h" 
    4343#include "lib/widget.h" 
    4444 
    4545#ifdef ENABLE_VFS_FTP 
    … …  
    5353#include "lib/charsets.h" 
    5454#endif 
    5555 
    56 #include "filemanager/dir.h" 
     56#include "filemanager/fman-dir.h" 
    5757#include "filemanager/midnight.h" 
    5858#include "filemanager/tree.h"   /* xtree_mode */ 
    5959#include "filemanager/hotlist.h"        /* load/save/done hotlist */ 

  • src/subshell/Makefile.am 

    diff --git a/src/subshell/Makefile.am b/src/subshell/Makefile.am
index 369cb6f47..c18786496 100644
    a b  
    11noinst_LTLIBRARIES = libsubshell.la 
    22 
    33libsubshell_la_SOURCES = \ 
    4         common.c \ 
     4        subshell-common.c \ 
    55        internal.h \ 
    66        proxyfunc.c \ 
    77        subshell.h 

  • .c 

    diff --git a/src/subshell/common.c b/src/subshell/subshell-common.c
similarity index 99%
rename from src/subshell/common.c
rename to src/subshell/subshell-common.c
index 02ae85211..8e22d6ad2 100644
    old new  
    103103#include "lib/vfs/vfs.h" 
    104104#include "lib/strutil.h" 
    105105#include "lib/mcconfig.h" 
    106 #include "lib/util.h" 
     106#include "lib/sub-util.h" 
    107107#include "lib/widget.h" 
    108108 
    109109#include "src/filemanager/layout.h"     /* setup_cmdline() */ 

  • .c 

    diff --git a/src/background.c b/src/task-background.c
similarity index 99%
rename from src/background.c
rename to src/task-background.c
index 8774c0cd7..36112a7b7 100644
    old new  
    5252 
    5353#include "filemanager/fileopctx.h"      /* file_op_context_t */ 
    5454 
    55 #include "background.h" 
     55#include "task-background.h" 
    5656 
    5757/*** global variables ****************************************************************************/ 
    5858 

  • src/textconf.c 

    diff --git a/src/background.h b/src/task-background.h
similarity index 100%
rename from src/background.h
rename to src/task-background.h
diff --git a/src/textconf.c b/src/textconf.c
index fbb187b12..57c114724 100644
    a b  
    3333#include "lib/global.h" 
    3434#include "lib/fileloc.h" 
    3535#include "lib/mcconfig.h" 
    36 #include "lib/util.h"           /* mc_get_profile_root() */ 
     36#include "lib/sub-util.h"           /* mc_get_profile_root() */ 
    3737#include "lib/tty/tty.h"        /* S-Lang or ncurses version */ 
    3838 
    3939#include "src/textconf.h" 

  • src/usermenu.c 

    diff --git a/src/usermenu.c b/src/usermenu.c
index 698244220..fda44a895 100644
    a b  
    4343#include "lib/search.h" 
    4444#include "lib/vfs/vfs.h" 
    4545#include "lib/strutil.h" 
    46 #include "lib/util.h" 
     46#include "lib/sub-util.h" 
    4747#include "lib/widget.h" 
    4848 
    4949#include "src/editor/edit.h"    /* WEdit, BLOCK_FILE */ 
    … …  
    5353#include "src/setup.h" 
    5454#include "src/history.h" 
    5555 
    56 #include "src/filemanager/dir.h" 
     56#include "src/filemanager/fman-dir.h" 
    5757#include "src/filemanager/midnight.h" 
    5858#include "src/filemanager/layout.h" 
    5959 

  • src/util.c 

    diff --git a/src/util.c b/src/util.c
index 4b3f99569..68bfa7169 100644
    a b  
    2727#include <config.h> 
    2828 
    2929#include "lib/global.h" 
    30 #include "lib/util.h" 
     30#include "lib/sub-util.h" 
    3131 
    3232#include "src/filemanager/file.h" 
    3333#include "src/filemanager/filegui.h" 

  • src/vfs/cpio/cpio.c 

    diff --git a/src/vfs/cpio/cpio.c b/src/vfs/cpio/cpio.c
index 774fdf356..76cfe10f7 100644
    a b  
    3838 
    3939#include "lib/global.h" 
    4040#include "lib/unixcompat.h" 
    41 #include "lib/util.h" 
     41#include "lib/sub-util.h" 
    4242#include "lib/widget.h"         /* message() */ 
    4343 
    4444#include "lib/vfs/vfs.h" 

  • src/vfs/extfs/extfs.c 

    diff --git a/src/vfs/extfs/extfs.c b/src/vfs/extfs/extfs.c
index 7ddbc7a80..641cd140e 100644
    a b  
    5353#include "lib/global.h" 
    5454#include "lib/fileloc.h" 
    5555#include "lib/mcconfig.h" 
    56 #include "lib/util.h" 
     56#include "lib/sub-util.h" 
    5757#include "lib/widget.h"         /* message() */ 
    5858 
    5959#include "src/execute.h"        /* For shell_execute */ 

  • src/vfs/fish/fish.c 

    diff --git a/src/vfs/fish/fish.c b/src/vfs/fish/fish.c
index 5cd279f95..9b7e98ddf 100644
    a b  
    6363#include "lib/strescape.h" 
    6464#include "lib/unixcompat.h" 
    6565#include "lib/fileloc.h" 
    66 #include "lib/util.h"           /* my_exit() */ 
     66#include "lib/sub-util.h"           /* my_exit() */ 
    6767#include "lib/mcconfig.h" 
    6868#include "lib/timer.h" 
    6969 

  • src/vfs/ftpfs/ftpfs.c 

    diff --git a/src/vfs/ftpfs/ftpfs.c b/src/vfs/ftpfs/ftpfs.c
index 8a841ac1a..80ba5a548 100644
    a b What to do with this? 
    9595#include <inttypes.h>           /* uintmax_t */ 
    9696 
    9797#include "lib/global.h" 
    98 #include "lib/util.h" 
     98#include "lib/sub-util.h" 
    9999#include "lib/strutil.h"        /* str_move() */ 
    100100#include "lib/mcconfig.h" 
    101101#include "lib/timer.h" 

  • src/vfs/sfs/sfs.c 

    diff --git a/src/vfs/sfs/sfs.c b/src/vfs/sfs/sfs.c
index fafcf32e7..0321f5ff0 100644
    a b  
    4545#include <string.h> 
    4646 
    4747#include "lib/global.h" 
    48 #include "lib/util.h" 
     48#include "lib/sub-util.h" 
    4949#include "lib/widget.h"         /* D_ERROR, D_NORMAL */ 
    5050 
    5151#include "src/execute.h"        /* EXECUTE_AS_SHELL */ 

  • src/vfs/sftpfs/Makefile.am 

    diff --git a/src/vfs/sftpfs/Makefile.am b/src/vfs/sftpfs/Makefile.am
index 423f38730..49fe59caa 100644
    a b noinst_LTLIBRARIES = libvfs-sftpfs.la 
    66libvfs_sftpfs_la_SOURCES = \ 
    77        config_parser.c \ 
    88        connection.c \ 
    9         dir.c \ 
    10         file.c \ 
     9        sftp-dir.c \ 
     10        sftp-file.c \ 
    1111        init.c init.h \ 
    1212        internal.c internal.h \ 
    1313        vfs_class.c \ 

  • src/vfs/sftpfs/config_parser.c 

    diff --git a/src/vfs/sftpfs/config_parser.c b/src/vfs/sftpfs/config_parser.c
index f5736996d..e95193835 100644
    a b  
    3232#include "lib/global.h" 
    3333 
    3434#include "lib/search.h" 
    35 #include "lib/util.h"           /* tilde_expand() */ 
     35#include "lib/sub-util.h"           /* tilde_expand() */ 
    3636#include "lib/vfs/utilvfs.h" 
    3737 
    3838#include "internal.h" 

  • src/vfs/sftpfs/connection.c 

    diff --git a/src/vfs/sftpfs/connection.c b/src/vfs/sftpfs/connection.c
index 0fc08d285..d0fe4948c 100644
    a b  
    3939 
    4040#include "lib/global.h" 
    4141 
    42 #include "lib/util.h" 
     42#include "lib/sub-util.h" 
    4343#include "lib/tty/tty.h"        /* tty_enable_interrupt_key () */ 
    4444#include "lib/vfs/utilvfs.h" 
    4545 

  • src/vfs/sftpfs/internal.c 

    diff --git a/src/vfs/sftpfs/internal.c b/src/vfs/sftpfs/internal.c
index baa2de4f7..daae5239b 100644
    a b  
    3636#endif 
    3737 
    3838#include "lib/global.h" 
    39 #include "lib/util.h" 
     39#include "lib/sub-util.h" 
    4040 
    4141#include "internal.h" 
    4242 

  • .c 

    diff --git a/src/vfs/sftpfs/dir.c b/src/vfs/sftpfs/sftp-dir.c
similarity index 99%
rename from src/vfs/sftpfs/dir.c
rename to src/vfs/sftpfs/sftp-dir.c
index 67b7f29ee..653bc9d7b 100644
    old new  
    3030#include <libssh2_sftp.h> 
    3131 
    3232#include "lib/global.h" 
    33 #include "lib/util.h" 
     33#include "lib/sub-util.h" 
    3434 
    3535#include "internal.h" 
    3636 

  • .c 

    diff --git a/src/vfs/sftpfs/file.c b/src/vfs/sftpfs/sftp-file.c
similarity index 99%
rename from src/vfs/sftpfs/file.c
rename to src/vfs/sftpfs/sftp-file.c
index 40d019f11..01a92fe6d 100644
    old new  
    3131#include <libssh2_sftp.h> 
    3232 
    3333#include "lib/global.h" 
    34 #include "lib/util.h" 
     34#include "lib/sub-util.h" 
    3535 
    3636#include "internal.h" 
    3737 

  • src/vfs/smbfs/smbfs.c 

    diff --git a/src/vfs/smbfs/smbfs.c b/src/vfs/smbfs/smbfs.c
index e91a18fbd..b73331cd4 100644
    a b  
    4747 
    4848#include "lib/global.h" 
    4949#include "lib/strutil.h" 
    50 #include "lib/util.h" 
     50#include "lib/sub-util.h" 
    5151#include "lib/widget.h"         /* message() */ 
    5252 
    5353#undef  PACKAGE_BUGREPORT 

  • src/vfs/tar/tar.c 

    diff --git a/src/vfs/tar/tar.c b/src/vfs/tar/tar.c
index 913a39520..39086ba6e 100644
    a b  
    4646#endif 
    4747 
    4848#include "lib/global.h" 
    49 #include "lib/util.h" 
     49#include "lib/sub-util.h" 
    5050#include "lib/unixcompat.h"     /* makedev() */ 
    5151#include "lib/widget.h"         /* message() */ 
    5252 

  • src/vfs/undelfs/undelfs.c 

    diff --git a/src/vfs/undelfs/undelfs.c b/src/vfs/undelfs/undelfs.c
index 6e8a0685c..446953aa5 100644
    a b  
    6363 
    6464#include "lib/global.h" 
    6565 
    66 #include "lib/util.h" 
     66#include "lib/sub-util.h" 
    6767#include "lib/widget.h"         /* message() */ 
    6868#include "lib/vfs/xdirentry.h" 
    6969#include "lib/vfs/utilvfs.h" 

  • src/viewer/Makefile.am 

    diff --git a/src/viewer/Makefile.am b/src/viewer/Makefile.am
index 0602084d5..f5c0b7e13 100644
    a b libmcviewer_la_SOURCES = \ 
    99        dialogs.c \ 
    1010        display.c \ 
    1111        growbuf.c \ 
    12         hex.c \ 
     12        view-hex.c \ 
    1313        inlines.h \ 
    1414        internal.h \ 
    15         lib.c \ 
     15        view-lib.c \ 
    1616        mcviewer.c \ 
    1717        mcviewer.h \ 
    1818        move.c \ 
    1919        nroff.c \ 
    20         search.c 
     20        view-search.c 
    2121 
    2222AM_CPPFLAGS = -I$(top_srcdir) $(GLIB_CFLAGS) $(PCRE_CPPFLAGS) 
    2323 

  • src/viewer/actions_cmd.c 

    diff --git a/src/viewer/actions_cmd.c b/src/viewer/actions_cmd.c
index f5724ce20..3f63ea273 100644
    a b  
    5252#include "lib/tty/tty.h" 
    5353#include "lib/tty/key.h"        /* is_idle() */ 
    5454#include "lib/lock.h"           /* lock_file() */ 
    55 #include "lib/util.h" 
     55#include "lib/sub-util.h" 
    5656#include "lib/widget.h" 
    5757#ifdef HAVE_CHARSET 
    5858#include "lib/charsets.h" 

  • src/viewer/ascii.c 

    diff --git a/src/viewer/ascii.c b/src/viewer/ascii.c
index e2a3ce934..1e679c533 100644
    a b  
    149149#include "lib/global.h" 
    150150#include "lib/tty/tty.h" 
    151151#include "lib/skin.h" 
    152 #include "lib/util.h"           /* is_printable() */ 
     152#include "lib/sub-util.h"           /* is_printable() */ 
    153153#ifdef HAVE_CHARSET 
    154154#include "lib/charsets.h" 
    155155#endif 

  • src/viewer/datasource.c 

    diff --git a/src/viewer/datasource.c b/src/viewer/datasource.c
index 1f97e8dd1..56206f16b 100644
    a b  
    5656 
    5757#include "lib/global.h" 
    5858#include "lib/vfs/vfs.h" 
    59 #include "lib/util.h" 
     59#include "lib/sub-util.h" 
    6060#include "lib/widget.h"         /* D_NORMAL, D_ERROR */ 
    6161 
    6262#include "internal.h" 

  • src/viewer/display.c 

    diff --git a/src/viewer/display.c b/src/viewer/display.c
index 7512e4763..1c56f0a9b 100644
    a b  
    4141#include "lib/tty/tty.h" 
    4242#include "lib/tty/key.h" 
    4343#include "lib/strutil.h" 
    44 #include "lib/util.h" 
     44#include "lib/sub-util.h" 
    4545#include "lib/widget.h" 
    4646#ifdef HAVE_CHARSET 
    4747#include "lib/charsets.h" 

  • src/viewer/growbuf.c 

    diff --git a/src/viewer/growbuf.c b/src/viewer/growbuf.c
index c1292f255..954ecd90e 100644
    a b  
    3838 
    3939#include "lib/global.h" 
    4040#include "lib/vfs/vfs.h" 
    41 #include "lib/util.h" 
     41#include "lib/sub-util.h" 
    4242#include "lib/widget.h"         /* D_NORMAL */ 
    4343 
    4444#include "internal.h" 

  • src/viewer/internal.h 

    diff --git a/src/viewer/internal.h b/src/viewer/internal.h
index d96223f2f..94f8d30a7 100644
    a b  
    1212#include "lib/vfs/vfs.h"        /* vfs_path_t */ 
    1313 
    1414#include "src/keybind-defaults.h"       /* global_keymap_t */ 
    15 #include "src/filemanager/dir.h"        /* dir_list */ 
     15#include "src/filemanager/fman-dir.h"        /* dir_list */ 
    1616 
    1717#include "mcviewer.h" 
    1818 

  • src/viewer/mcviewer.c 

    diff --git a/src/viewer/mcviewer.c b/src/viewer/mcviewer.c
index 027323f1c..fbfa50f8b 100644
    a b  
    4040#include "lib/tty/tty.h" 
    4141#include "lib/vfs/vfs.h" 
    4242#include "lib/strutil.h" 
    43 #include "lib/util.h"           /* load_file_position() */ 
     43#include "lib/sub-util.h"           /* load_file_position() */ 
    4444#include "lib/widget.h" 
    4545 
    4646#include "src/filemanager/layout.h" 

  • .c 

    diff --git a/src/viewer/hex.c b/src/viewer/view-hex.c
similarity index 99%
rename from src/viewer/hex.c
rename to src/viewer/view-hex.c
index 7996d4308..6ac4ddedc 100644
    old new  
    4343#include "lib/skin.h" 
    4444#include "lib/vfs/vfs.h" 
    4545#include "lib/lock.h"           /* lock_file() and unlock_file() */ 
    46 #include "lib/util.h" 
     46#include "lib/sub-util.h" 
    4747#include "lib/widget.h" 
    4848#ifdef HAVE_CHARSET 
    4949#include "lib/charsets.h" 

  • .c 

    diff --git a/src/viewer/lib.c b/src/viewer/view-lib.c
similarity index 99%
rename from src/viewer/lib.c
rename to src/viewer/view-lib.c
index 744e7e9a2..6e81a1548 100644
    old new  
    4141#include "lib/global.h" 
    4242#include "lib/vfs/vfs.h" 
    4343#include "lib/strutil.h" 
    44 #include "lib/util.h"           /* save_file_position() */ 
     44#include "lib/sub-util.h"           /* save_file_position() */ 
    4545#include "lib/widget.h" 
    4646#ifdef HAVE_CHARSET 
    4747#include "lib/charsets.h" 

  • tests/lib/mc_build_filename.c 

    diff --git a/src/viewer/search.c b/src/viewer/view-search.c
similarity index 100%
rename from src/viewer/search.c
rename to src/viewer/view-search.c
diff --git a/tests/lib/mc_build_filename.c b/tests/lib/mc_build_filename.c
index 0b6b7a4cc..abf94ab64 100644
    a b  
    3030#include <stdio.h> 
    3131 
    3232#include "lib/strutil.h" 
    33 #include "lib/util.h" 
     33#include "lib/sub-util.h" 
    3434 
    3535/* --------------------------------------------------------------------------------------------- */ 
    3636 

  • tests/lib/mc_realpath.c 

    diff --git a/tests/lib/mc_realpath.c b/tests/lib/mc_realpath.c
index 17f7c2fff..6c4ac1744 100644
    a b  
    3131#include "lib/vfs/vfs.h"        /* VFS_ENCODING_PREFIX, vfs_init(), vfs_shut() */ 
    3232#include "src/vfs/local/local.c" 
    3333 
    34 #include "lib/util.h"           /* mc_realpath() */ 
     34#include "lib/sub-util.h"           /* mc_realpath() */ 
    3535 
    3636/* --------------------------------------------------------------------------------------------- */ 
    3737 

  • tests/lib/name_quote.c 

    diff --git a/tests/lib/name_quote.c b/tests/lib/name_quote.c
index eb5056d7d..27469cd64 100644
    a b  
    2727 
    2828#include "tests/mctest.h" 
    2929 
    30 #include "lib/util.h" 
     30#include "lib/sub-util.h" 
    3131 
    3232/* --------------------------------------------------------------------------------------------- */ 
    3333 

  • tests/lib/utilunix__my_system-fork_child.c 

    diff --git a/tests/lib/utilunix__my_system-fork_child.c b/tests/lib/utilunix__my_system-fork_child.c
index 95081db11..43d45585e 100644
    a b  
    2727 
    2828#include "tests/mctest.h" 
    2929 
    30 #include "lib/util.h" 
     30#include "lib/sub-util.h" 
    3131#include "lib/utilunix.h" 
    3232 
    3333#include "utilunix__my_system-common.c" 

  • tests/lib/utilunix__my_system-fork_child_shell.c 

    diff --git a/tests/lib/utilunix__my_system-fork_child_shell.c b/tests/lib/utilunix__my_system-fork_child_shell.c
index 6de19581b..46c462a17 100644
    a b  
    2727 
    2828#include "tests/mctest.h" 
    2929 
    30 #include "lib/util.h" 
     30#include "lib/sub-util.h" 
    3131#include "lib/utilunix.h" 
    3232 
    3333#include "utilunix__my_system-common.c" 

  • tests/lib/utilunix__my_system-fork_fail.c 

    diff --git a/tests/lib/utilunix__my_system-fork_fail.c b/tests/lib/utilunix__my_system-fork_fail.c
index 452efb161..c42f7c260 100644
    a b  
    3030#include <signal.h> 
    3131#include <unistd.h> 
    3232 
    33 #include "lib/util.h" 
     33#include "lib/sub-util.h" 
    3434#include "lib/utilunix.h" 
    3535 
    3636#include "utilunix__my_system-common.c" 

  • tests/lib/vfs/canonicalize_pathname.c 

    diff --git a/tests/lib/vfs/canonicalize_pathname.c b/tests/lib/vfs/canonicalize_pathname.c
index f070fa039..5e6c16aaf 100644
    a b  
    3232#endif 
    3333 
    3434#include "lib/strutil.h" 
    35 #include "lib/util.h" 
     35#include "lib/sub-util.h" 
    3636#include "lib/vfs/xdirentry.h" 
    3737 
    3838#include "src/vfs/local/local.c" 

  • tests/lib/x_basename.c 

    diff --git a/tests/lib/x_basename.c b/tests/lib/x_basename.c
index c3a85f463..95da4b1da 100644
    a b  
    3030#include <stdio.h> 
    3131 
    3232#include "lib/strutil.h" 
    33 #include "lib/util.h" 
     33#include "lib/sub-util.h" 
    3434 
    3535/* --------------------------------------------------------------------------------------------- */ 
    3636 

  • tests/src/filemanager/get_random_hint.c 

    diff --git a/tests/src/filemanager/get_random_hint.c b/tests/src/filemanager/get_random_hint.c
index c9a953227..721362180 100644
    a b  
    2929#include "tests/mctest.h" 
    3030 
    3131#include "lib/strutil.h" 
    32 #include "lib/util.h" 
     32#include "lib/sub-util.h" 
    3333#include "lib/timer.h" 
    3434 
    3535#include "src/filemanager/midnight.h" 

  • tests/src/vfs/extfs/helpers-list/mc_parse_ls_l.c 

    diff --git a/tests/src/vfs/extfs/helpers-list/mc_parse_ls_l.c b/tests/src/vfs/extfs/helpers-list/mc_parse_ls_l.c
index 8bd1f69e5..a846dc319 100644
    a b  
    4141#include "lib/global.h" 
    4242 
    4343#include "lib/vfs/utilvfs.h"    /* vfs_parse_ls_lga() */ 
    44 #include "lib/util.h"           /* string_perm() */ 
     44#include "lib/sub-util.h"           /* string_perm() */ 
    4545#include "lib/timefmt.h"        /* FMT_LOCALTIME */ 
    4646#include "lib/widget.h"         /* for the prototype of message() only */ 
    4747