Don't include lib/util.h via lib/global.h.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>

lib/filehighlight/get-color.c

@@ -30,6 +30,7 @@
 
 #include "lib/global.h"
 #include "lib/skin.h"
+#include "lib/util.h"           /* is_exe() */
 #include "lib/filehighlight.h"
 #include "internal.h"
 

lib/filehighlight/ini-file-read.c

@@ -32,6 +32,7 @@
 #include "lib/fileloc.h"
 #include "lib/strescape.h"
 #include "lib/skin.h"
+#include "lib/util.h"           /* exist_file() */
 #include "lib/filehighlight.h"
 
 #include "src/main.h"

lib/global.h

@@ -84,7 +84,6 @@
 #endif /* !ENABLE_NLS */
 
 #include "fs.h"
-#include "util.h"
 
 #ifdef USE_MAINTAINER_MODE
 #include "lib/logging.h"

lib/mcconfig/common.c

@@ -27,6 +27,7 @@
 
 #include "lib/global.h"
 #include "lib/vfs/mc-vfs/vfs.h" /* mc_stat */
+#include "lib/util.h"
 #include "lib/mcconfig.h"
 
 /*** global variables **************************************************/

lib/skin/ini-file.c

@@ -30,6 +30,7 @@
 
 #include "internal.h"
 #include "lib/fileloc.h"
+#include "lib/util.h"           /* exist_file() */
 
 #include "src/main.h"
 

lib/tty/win.c

@@ -33,6 +33,7 @@
 #include <unistd.h>
 
 #include "lib/global.h"
+#include "lib/util.h"           /* is_printable() */
 #include "tty.h"                /* tty_gotoyx, tty_print_char */
 #include "win.h"
 #include "src/consaver/cons.saver.h"    /* console_flag */

lib/util.c

@@ -42,12 +42,11 @@
 
 #include "lib/global.h"
 #include "lib/tty/win.h"        /* xterm_flag */
-#include "lib/search.h"
 #include "lib/mcconfig.h"
-#include "lib/timefmt.h"
 #include "lib/fileloc.h"
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/strutil.h"
+#include "lib/util.h"
 
 #include "src/filegui.h"
 #include "src/file.h"           /* copy_file_file() */

lib/utilunix.c

@@ -52,8 +52,9 @@
 #include <grp.h>
 
 #include "lib/global.h"
-#include "lib/strutil.h"        /* str_move() */
 #include "lib/vfs/mc-vfs/vfs.h" /* VFS_ENCODING_PREFIX */
+#include "lib/strutil.h"        /* str_move() */
+#include "lib/util.h"
 #include "lib/widget/wtools.h"  /* message() */
 
 #include "src/execute.h"

lib/vfs/mc-vfs/cpio.c

@@ -31,6 +31,7 @@
 
 #include "lib/global.h"
 #include "lib/unixcompat.h"
+#include "lib/util.h"
 #include "lib/widget/wtools.h"  /* message() */
 
 #include "vfs-impl.h"

lib/vfs/mc-vfs/extfs.c

@@ -48,6 +48,7 @@
 
 #include "lib/global.h"
 #include "lib/fileloc.h"
+#include "lib/util.h"
 #include "lib/widget/wtools.h"  /* message() */
 
 #include "src/main.h"           /* shell */

lib/vfs/mc-vfs/ftpfs.c

@@ -87,6 +87,7 @@ What to do with this?
 #include <stdint.h>             /* uintmax_t */
 
 #include "lib/global.h"
+#include "lib/util.h"
 
 #include "lib/tty/tty.h"        /* enable/disable interrupt key */
 #include "lib/widget/wtools.h"  /* message() */

lib/vfs/mc-vfs/sfs.c

@@ -42,6 +42,7 @@
 #include <fcntl.h>
 
 #include "lib/global.h"
+#include "lib/util.h"
 #include "lib/widget/wtools.h"  /* D_ERROR, D_NORMAL */
 
 #include "src/main.h"           /* mc_home */

lib/vfs/mc-vfs/tar.c

@@ -41,6 +41,7 @@
 #endif
 
 #include "lib/global.h"
+#include "lib/util.h"
 #include "lib/widget/wtools.h"  /* message() */
 
 #include "vfs-impl.h"

lib/vfs/mc-vfs/utilvfs.c

@@ -37,6 +37,7 @@
 
 #include "lib/global.h"
 #include "lib/unixcompat.h"
+#include "lib/util.h"           /* mc_mkstemps() */
 #include "lib/widget/wtools.h"  /* message() */
 
 #include "src/history.h"

lib/vfs/mc-vfs/vfs.c

@@ -52,6 +52,7 @@
 
 #include "lib/global.h"
 #include "lib/strutil.h"
+#include "lib/util.h"
 #include "lib/widget/wtools.h"  /* message() */
 
 #ifdef HAVE_CHARSET

lib/widget/widget.c

@@ -51,6 +51,7 @@
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/fileloc.h"
 #include "lib/strutil.h"
+#include "lib/util.h"
 
 #include "dialog.h"
 #include "widget.h"

lib/widget/wtools.c

@@ -38,6 +38,7 @@
 #include "lib/tty/key.h"        /* tty_getch() */
 #include "lib/skin.h"           /* INPUT_COLOR */
 #include "lib/strutil.h"
+#include "lib/util.h"
 
 #include "dialog.h"
 #include "widget.h"

src/achown.c

@@ -38,8 +38,9 @@
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"        /* XCTRL and ALT macros */
 #include "lib/skin.h"
-#include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/strutil.h"
+#include "lib/vfs/mc-vfs/vfs.h"
+#include "lib/util.h"
 #include "lib/widget/dialog.h"
 #include "lib/widget/widget.h"
 #include "lib/widget/wtools.h"  /* For init_box_colors() */

src/args.c

@@ -37,6 +37,7 @@
 #ifdef ENABLE_VFS_SMB
 #include "lib/vfs/mc-vfs/smbfs.h"       /* smbfs_set_debugf()  */
 #endif
+#include "lib/util.h"           /* x_basename() */
 
 #include "src/main.h"
 #include "src/textconf.h"

src/boxes.c

@@ -50,6 +50,7 @@
 #include "lib/vfs/mc-vfs/smbfs.h"
 #endif /* ENABLE_VFS_SMB */
 
+#include "lib/util.h"           /* Q_() */
 #include "lib/widget/dialog.h"  /* The nice dialog manager */
 #include "lib/widget/widget.h"  /* The widgets for the nice dialog manager */
 #include "lib/widget/wtools.h"

src/chmod.c

@@ -37,6 +37,7 @@
 #include "lib/skin.h"
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/strutil.h"
+#include "lib/util.h"
 #include "lib/widget/dialog.h"  /* add_widget() */
 #include "lib/widget/widget.h"  /* NORMAL_BUTTON */
 #include "lib/widget/wtools.h"  /* message() */

src/chown.c

@@ -38,6 +38,7 @@
 #include "lib/skin.h"
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/strutil.h"
+#include "lib/util.h"
 #include "lib/widget/dialog.h"
 #include "lib/widget/widget.h"
 #include "lib/widget/wtools.h"  /* init_box_colors() */

src/clipboard.c

@@ -31,6 +31,7 @@
 
 #include "lib/global.h"
 #include "lib/fileloc.h"
+#include "lib/util.h"
 
 #include "main.h"
 #include "src/execute.h"

src/cmd.c

@@ -52,11 +52,11 @@
 #include "lib/tty/win.h"        /* do_enter_ca_mode() */
 #include "lib/mcconfig.h"
 #include "lib/search.h"
-#include "src/viewer/mcviewer.h"
 #include "lib/filehighlight.h"  /* MC_FHL_INI_FILE */
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/fileloc.h"
 #include "lib/strutil.h"
+#include "lib/util.h"
 #include "lib/widget/dialog.h"  /* Widget */
 #include "lib/widget/dialog-switch.h"
 #include "lib/widget/wtools.h"  /* message() */
@@ -82,6 +82,7 @@
 #include "history.h"
 #include "dir.h"
 #include "cmddef.h"             /* CK_InputHistoryShow */
+#include "viewer/mcviewer.h"
 
 
 #ifdef USE_INTERNAL_EDIT

src/command.c

@@ -37,6 +37,7 @@
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/strescape.h"
 #include "lib/skin.h"           /* DEFAULT_COLOR */
+#include "lib/util.h"
 #include "lib/widget/widget.h"  /* WInput */
 #include "lib/widget/wtools.h"  /* message () */
 

src/complete.c

@@ -43,6 +43,7 @@
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/strescape.h"
 #include "lib/strutil.h"
+#include "lib/util.h"
 #include "lib/widget/dialog.h"
 #include "lib/widget/widget.h"
 #include "lib/widget/wtools.h"

src/cons.handler.c

@@ -39,6 +39,7 @@
 #include "lib/tty/tty.h"
 #include "lib/skin.h"           /* tty_set_normal_attrs */
 #include "lib/tty/win.h"
+#include "lib/util.h"           /* concat_dir_and_file() */
 
 #include "consaver/cons.saver.h"
 

src/diffviewer/ydiff.c

@@ -39,6 +39,7 @@
 #include "lib/tty/key.h"
 #include "lib/skin.h"           /* EDITOR_NORMAL_COLOR */
 #include "lib/vfs/mc-vfs/vfs.h" /* mc_opendir, mc_readdir, mc_closedir, */
+#include "lib/util.h"
 #include "lib/widget/dialog.h"
 #include "lib/widget/wtools.h"
 

src/dir.c

@@ -33,6 +33,7 @@
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/fs.h"
 #include "lib/strutil.h"
+#include "lib/util.h"
 #include "lib/widget/wtools.h"
 
 #include "treestore.h"

src/editor/editdraw.c

@@ -43,6 +43,7 @@
 #include "lib/tty/key.h"        /* is_idle() */
 #include "lib/skin.h"
 #include "lib/strutil.h"        /* utf string functions */
+#include "lib/util.h"           /* is_printable() */
 #include "lib/widget/widget.h"  /* buttonbar_redraw() */
 
 #include "src/charsets.h"

src/editor/editkeys.c

@@ -43,6 +43,7 @@
 #include "lib/tty/tty.h"        /* keys */
 #include "lib/tty/key.h"        /* KEY_M_SHIFT */
 #include "lib/strutil.h"        /* str_isutf8 () */
+#include "lib/util.h"           /* is_printable() */
 
 #include "edit-impl.h"
 #include "edit-widget.h"        /* edit->macro_i */

src/editor/editwidget.c

@@ -44,6 +44,7 @@
 #include "lib/tty/tty.h"        /* LINES, COLS */
 #include "lib/tty/key.h"        /* is_idle() */
 #include "lib/strutil.h"        /* str_term_trim() */
+#include "lib/util.h"           /* concat_dir_and_file() */
 #include "lib/widget/dialog.h"
 #include "lib/widget/widget.h"  /* ButtonBar */
 #include "lib/widget/menu.h"    /* menubar_new() */

src/editor/etags.c

@@ -39,7 +39,9 @@
 #include <ctype.h>
 
 #include "lib/global.h"
-#include "src/editor/etags.h"
+#include "lib/util.h"           /* canonicalize_pathname() */
+
+#include "etags.h"
 
 /*** global variables ****************************************************************************/
 

src/editor/syntax.c

@@ -52,6 +52,7 @@
 #include "lib/search.h"         /* search engine */
 #include "lib/skin.h"
 #include "lib/strutil.h"        /* utf string functions */
+#include "lib/util.h"
 #include "lib/widget/wtools.h"  /* message() */
 
 #include "src/main.h"           /* mc_home */

src/execute.c

@@ -30,6 +30,8 @@
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"
 #include "lib/tty/win.h"
+#include "lib/vfs/mc-vfs/vfs.h"
+#include "lib/util.h"
 #include "lib/widget/dialog.h"
 #include "lib/widget/wtools.h"
 
@@ -39,7 +41,6 @@
 #include "layout.h"             /* use_dash() */
 #include "panel.h"              /* update_panels() */
 #include "execute.h"
-#include "lib/vfs/mc-vfs/vfs.h"
 
 /*** global variables ****************************************************************************/
 

src/ext.c

@@ -36,14 +36,14 @@
 #include "lib/tty/tty.h"
 #include "lib/search.h"
 #include "lib/fileloc.h"
-
-#include "consaver/cons.saver.h"
-#include "viewer/mcviewer.h"
-
+#include "lib/util.h"
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/widget/wtools.h"
 #include "lib/widget/dialog-switch.h"
 
+#include "consaver/cons.saver.h"
+#include "viewer/mcviewer.h"
+
 #include "user.h"
 #include "main.h"
 #include "execute.h"

src/file.c

@@ -61,6 +61,7 @@
 #include "lib/search.h"
 #include "lib/strescape.h"
 #include "lib/strutil.h"
+#include "lib/util.h"
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/widget/dialog.h"
 #include "lib/widget/widget.h"

src/filegui.c

@@ -85,6 +85,7 @@
 #include "lib/strescape.h"
 #include "lib/strutil.h"
 #include "lib/timefmt.h"        /* file_date() */
+#include "lib/util.h"
 #include "lib/widget/dialog.h"             /* do_refresh() */
 #include "lib/widget/widget.h"             /* WLabel */
 #include "lib/widget/wtools.h"             /* QuickDialog */

src/filenot.c

@@ -36,7 +36,7 @@
 
 #include "lib/global.h"
 #include "lib/fs.h"
-
+#include "lib/util.h"
 #include "lib/vfs/mc-vfs/vfs.h"
 
 /*** global variables ****************************************************************************/

src/find.c

@@ -42,6 +42,7 @@
 #include "lib/mcconfig.h"
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/strutil.h"
+#include "lib/util.h"
 #include "lib/widget/dialog.h"
 #include "lib/widget/widget.h"
 #include "lib/widget/wtools.h"

src/help.c

@@ -58,6 +58,7 @@
 #include "lib/skin.h"
 #include "lib/strutil.h"
 #include "lib/fileloc.h"
+#include "lib/util.h"
 #include "lib/widget/dialog.h"  /* For Dlg_head */
 #include "lib/widget/widget.h"  /* For Widget */
 #include "lib/widget/wtools.h"  /* For common_dialog_repaint() */

src/hotlist.c

@@ -49,6 +49,7 @@
 #include "lib/fileloc.h"
 #include "lib/strutil.h"
 #include "lib/vfs/mc-vfs/vfs.h"
+#include "lib/util.h"
 #include "lib/widget/dialog.h"
 #include "lib/widget/widget.h"
 #include "lib/widget/wtools.h"  /* QuickDialog */

src/info.c

@@ -33,6 +33,7 @@
 #include "lib/skin.h"
 #include "lib/strutil.h"
 #include "lib/timefmt.h"        /* file_date() */
+#include "lib/util.h"
 #include "lib/widget/dialog.h"
 #include "lib/widget/widget.h"  /* default_proc */
 #include "lib/widget/menu.h"    /* menubar_visible */

src/learn.c

@@ -41,6 +41,7 @@
 #include "lib/mcconfig.h"       /* Save profile */
 #include "lib/strescape.h"
 #include "lib/strutil.h"
+#include "lib/util.h"           /* convert_controls() */
 #include "lib/widget/dialog.h"
 #include "lib/widget/widget.h"
 #include "lib/widget/wtools.h"

src/main.c

@@ -56,6 +56,7 @@
 #include "lib/vfs/mc-vfs/smbfs.h"       /* smbfs_set_debug() */
 #endif /* ENABLE_VFS_SMB */
 
+#include "lib/util.h"
 #include "lib/widget/dialog.h"
 #include "lib/widget/widget.h"
 #include "lib/widget/wtools.h"

src/panelize.c

@@ -39,6 +39,7 @@
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/mcconfig.h"       /* Load/save directories panelize */
 #include "lib/strutil.h"
+#include "lib/util.h"
 #include "lib/widget/dialog.h"
 #include "lib/widget/widget.h"
 #include "lib/widget/wtools.h"  /* For common_dialog_repaint() */

src/screen.c

@@ -43,6 +43,7 @@
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/unixcompat.h"
 #include "lib/timefmt.h"
+#include "lib/util.h"
 #include "lib/widget/wtools.h"  /* for message (...) */
 #include "lib/widget/widget.h"
 #include "lib/widget/menu.h"    /* menubar_visible */

src/setup.c

@@ -45,6 +45,7 @@
 #include "lib/vfs/mc-vfs/fish.h"
 #endif
 
+#include "lib/util.h"
 #include "lib/widget/wtools.h"
 #include "lib/widget/menu.h"    /* menubar_visible declaration */
 

src/subshell.c

@@ -53,6 +53,7 @@
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/strutil.h"
 #include "lib/fileloc.h"
+#include "lib/util.h"
 #include "lib/widget/wtools.h"  /* query_dialog() */
 
 #include "panel.h"              /* current_panel */

src/tree.c

@@ -48,6 +48,7 @@
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/fileloc.h"
 #include "lib/strutil.h"
+#include "lib/util.h"
 #include "lib/widget/wtools.h"  /* message() */
 #include "lib/widget/dialog.h"
 #include "lib/widget/widget.h"

src/treestore.c

@@ -52,6 +52,7 @@
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/fileloc.h"
 #include "lib/hook.h"
+#include "lib/util.h"
 
 #include "treestore.h"
 #include "setup.h"

src/user.c

@@ -34,6 +34,7 @@
 #include "lib/search.h"
 #include "lib/vfs/mc-vfs/vfs.h"
 #include "lib/strutil.h"
+#include "lib/util.h"
 #include "lib/widget/dialog.h"
 #include "lib/widget/dialog-switch.h"
 #include "lib/widget/widget.h"

src/viewer/actions_cmd.c

@@ -54,6 +54,7 @@
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"        /* is_idle() */
 #include "lib/lock.h"           /* lock_file() */
+#include "lib/util.h"
 #include "lib/widget/dialog.h"  /* cb_ret_t */
 #include "lib/widget/wtools.h"
 

src/viewer/datasource.c

@@ -57,8 +57,9 @@
 #include <config.h>
 
 #include "lib/global.h"
-#include "lib/widget/wtools.h"
+#include "lib/util.h"
 #include "lib/vfs/mc-vfs/vfs.h"
+#include "lib/widget/wtools.h"
 
 #include "internal.h"
 

src/viewer/display.c

@@ -43,6 +43,7 @@
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"
 #include "lib/strutil.h"
+#include "lib/util.h"
 #include "lib/widget/dialog.h"  /* Dlg_head */
 #include "lib/widget/widget.h"  /* WButtonBar */
 

src/viewer/growbuf.c

@@ -39,8 +39,9 @@
 #include <errno.h>
 
 #include "lib/global.h"
-#include "lib/widget/wtools.h"
+#include "lib/util.h"
 #include "lib/vfs/mc-vfs/vfs.h"
+#include "lib/widget/wtools.h"
 
 #include "internal.h"
 

src/viewer/hex.c

@@ -45,6 +45,7 @@
 #include "lib/tty/tty.h"
 #include "lib/skin.h"
 #include "lib/vfs/mc-vfs/vfs.h"
+#include "lib/util.h"
 #include "lib/widget/wtools.h"
 
 #include "src/main.h"

src/viewer/plain.c

@@ -41,6 +41,7 @@
 #include "lib/global.h"
 #include "lib/tty/tty.h"
 #include "lib/skin.h"
+#include "lib/util.h"           /* is_printable() */
 
 #include "src/main.h"           /* utf8_display */
 #include "src/setup.h"          /* option_tab_spacing */