Reorganized pathes to files in '#include' directives

This commit is contained in:
Slava Zanko 2010-01-08 16:47:19 +02:00
parent ddb9ada2e8
commit 39d5b94cac
148 changed files with 555 additions and 550 deletions

View File

@ -545,7 +545,7 @@ dnl Libraries used only when building the mc binary
AC_SUBST(MCLIBS)
if test -n "$use_smbfs"; then
AC_CONFIG_SUBDIRS([src/vfs/mc-vfs/samba])
AC_CONFIG_SUBDIRS([lib/vfs/mc-vfs/samba])
fi
AM_CONDITIONAL(USE_MAINTAINER_MODE, [test x"$USE_MAINTAINER_MODE" = xyes])

View File

@ -14,9 +14,6 @@ libmc_la_LIBADD = \
tty/libmctty.la
if ENABLE_VFS
libmc_la_LIBADD+= vfs/mc-vfs/libvfs-mc.a
if USE_SAMBA_FS
libmc_la_LIBADD+= vfs/mc-vfs/samba/libsamba.a
endif
libmc_la_LIBADD += vfs/mc-vfs/libvfs-mc.la
endif

View File

@ -7,7 +7,7 @@ libmcfilehighlight_la_SOURCES = \
ini-file-read.c \
internal.h
libmcfilehighlight_la_CFLAGS=-I../ -I$(top_srcdir)/src \
libmcfilehighlight_la_CFLAGS = -I$(top_srcdir) \
$(GLIB_CFLAGS) $(PCRE_CFLAGS) \
-DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\"

View File

@ -28,7 +28,7 @@
#include <config.h>
#include "../src/global.h"
#include "src/global.h"
#include "../lib/filehighlight/fhl.h"
#include "internal.h"

View File

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

View File

@ -29,8 +29,8 @@
#include <string.h>
#include "../src/global.h"
#include "../src/util.h"
#include "src/global.h"
#include "src/util.h"
#include "../lib/skin/skin.h"
#include "../lib/filehighlight/fhl.h"
#include "internal.h"

View File

@ -28,12 +28,12 @@
#include <config.h>
#include <string.h>
#include "../src/global.h"
#include "../src/main.h"
#include "../src/fileloc.h"
#include "../src/strescape.h"
#include "src/global.h"
#include "src/main.h"
#include "src/fileloc.h"
#include "src/strescape.h"
#include "../lib/skin/skin.h"
#include "../../src/util.h"
#include "src/util.h"
#include "fhl.h"
#include "internal.h"

View File

@ -7,7 +7,7 @@ libmcconfig_la_SOURCES = \
get.c \
set.c
libmcconfig_la_CFLAGS=-I../ -I$(top_srcdir)/src \
libmcconfig_la_CFLAGS = -I$(top_srcdir) \
$(GLIB_CFLAGS) \
-DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\"

View File

@ -26,10 +26,10 @@
#include <errno.h> /* extern int errno */
#include "global.h"
#include "src/global.h"
#include "../../lib/vfs/mc-vfs/vfs.h" /* mc_stat */
#include "../../src/util.h"
#include "src/util.h"
#include "mcconfig.h"

View File

@ -19,10 +19,10 @@
#include <config.h>
#include "global.h"
#include "src/global.h"
#include "mcconfig.h"
#include "../src/strutil.h"
#include "src/strutil.h"
/*** global variables **************************************************/

View File

@ -19,10 +19,10 @@
#include <config.h>
#include "global.h"
#include "src/global.h"
#include "mcconfig.h"
#include "../src/strutil.h"
#include "src/strutil.h"
/*** global variables **************************************************/

View File

@ -10,7 +10,7 @@ libsearch_la_SOURCES = \
glob.c \
hex.c
libsearch_la_CFLAGS=-I../ -I$(top_srcdir)/src \
libsearch_la_CFLAGS = -I$(top_srcdir) \
$(GLIB_CFLAGS) \
-DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\" $(PCRE_CFLAGS)

View File

@ -28,12 +28,12 @@
#include <config.h>
#include "../src/global.h"
#include "src/global.h"
#include "search.h"
#include "internal.h"
#include "../src/strutil.h"
#include "../src/strescape.h"
#include "../src/charsets.h"
#include "src/strutil.h"
#include "src/strescape.h"
#include "src/charsets.h"
/*** global variables ****************************************************************************/

View File

@ -29,12 +29,12 @@
#include <stdio.h>
#include "../src/global.h"
#include "src/global.h"
#include "search.h"
#include "internal.h"
#include "../src/strutil.h"
#include "../src/strescape.h"
#include "../src/charsets.h"
#include "src/strutil.h"
#include "src/strescape.h"
#include "src/charsets.h"
/*** global variables ****************************************************************************/

View File

@ -30,11 +30,11 @@
#include <stdlib.h>
#include <sys/types.h>
#include "../src/global.h"
#include "src/global.h"
#include "search.h"
#include "internal.h"
#include "../src/strutil.h"
#include "../src/charsets.h"
#include "src/strutil.h"
#include "src/charsets.h"
/*** global variables ****************************************************************************/

View File

@ -28,11 +28,11 @@
#include <config.h>
#include "../src/global.h"
#include "src/global.h"
#include "search.h"
#include "internal.h"
#include "../src/strutil.h"
#include "../src/charsets.h"
#include "src/strutil.h"
#include "src/charsets.h"
/*** global variables ****************************************************************************/

View File

@ -29,12 +29,12 @@
#include <stdlib.h>
#include "../src/global.h"
#include "src/global.h"
#include "search.h"
#include "internal.h"
#include "../src/strutil.h"
#include "../src/strescape.h"
#include "../src/charsets.h"
#include "src/strutil.h"
#include "src/strescape.h"
#include "src/charsets.h"
/*** global variables ****************************************************************************/

View File

@ -30,11 +30,11 @@
#include <stdlib.h>
#include <sys/types.h>
#include "../src/global.h"
#include "src/global.h"
#include "search.h"
#include "internal.h"
#include "../src/strutil.h"
#include "../src/charsets.h"
#include "src/strutil.h"
#include "src/charsets.h"
/*** global variables ****************************************************************************/

View File

@ -3,7 +3,7 @@
#include <config.h>
#include "../src/global.h" /* <glib.h> */
#include "src/global.h" /* <glib.h> */
#include <sys/types.h>

View File

@ -10,7 +10,7 @@ libmcskin_la_SOURCES = \
skin.h \
internal.h
libmcskin_la_CFLAGS=-I../ -I$(top_srcdir)/src \
libmcskin_la_CFLAGS = -I$(top_srcdir) \
$(GLIB_CFLAGS) $(PCRE_CFLAGS) \
-DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\"

View File

@ -30,8 +30,8 @@
#include <sys/types.h> /* size_t */
#include "../tty/color.h"
#include "../src/global.h"
#include "../src/setup.h"
#include "src/global.h"
#include "src/setup.h"
#include "skin.h"
#include "internal.h"

View File

@ -28,8 +28,8 @@
#include <config.h>
#include <string.h>
#include "../src/global.h"
#include "../src/args.h"
#include "src/global.h"
#include "src/args.h"
#include "../tty/color.h"
#include "skin.h"
#include "internal.h"

View File

@ -28,8 +28,8 @@
#include <config.h>
#include <stdlib.h>
#include "../src/global.h"
#include "../src/args.h"
#include "src/global.h"
#include "src/args.h"
#include "skin.h"
#include "internal.h"

View File

@ -26,7 +26,7 @@
*/
#include <config.h>
#include "../src/global.h"
#include "src/global.h"
#include "skin.h"
#include "internal.h"

View File

@ -28,10 +28,10 @@
#include <config.h>
#include <string.h>
#include "../src/global.h"
#include "../src/main.h"
#include "../src/fileloc.h"
#include "../../src/util.h"
#include "src/global.h"
#include "src/main.h"
#include "src/fileloc.h"
#include "src/util.h"
#include "skin.h"
#include "internal.h"

View File

@ -1,7 +1,7 @@
#ifndef MC__SKIN_INTERNAL_H
#define MC__SKIN_INTERNAL_H
#include "../../src/global.h"
#include "src/global.h"
#include "skin.h"

View File

@ -28,8 +28,8 @@
#include <config.h>
#include <stdlib.h>
#include "../src/global.h"
#include "../src/args.h"
#include "src/global.h"
#include "src/args.h"
#include "../tty/tty.h"
#include "skin.h"
#include "internal.h"

View File

@ -1,7 +1,7 @@
#ifndef MC__SKIN_H
#define MC__SKIN_H
#include "../../src/global.h"
#include "src/global.h"
#include "../../lib/mcconfig/mcconfig.h"

View File

@ -22,6 +22,6 @@ TTY_SRC = \
libmctty_la_SOURCES = $(TTY_SRC) $(TTY_SCREEN_SRC)
libmctty_la_CFLAGS = -I../ -I$(top_srcdir)/src \
libmctty_la_CFLAGS = -I$(top_srcdir) \
$(GLIB_CFLAGS) \
-DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\"

View File

@ -8,7 +8,7 @@
#include <sys/types.h> /* size_t */
#include "../../src/global.h"
#include "src/global.h"
#ifdef HAVE_SLANG
# include "tty-slang.h"

View File

@ -30,7 +30,7 @@
#include <string.h>
#include <sys/types.h> /* size_t */
#include "../../src/global.h"
#include "src/global.h"
#include "tty-ncurses.h"
#include "color.h" /* variables */

View File

@ -30,13 +30,13 @@
#include <string.h>
#include <sys/types.h> /* size_t */
#include "../../src/global.h"
#include "src/global.h"
#include "tty-slang.h"
#include "color.h" /* variables */
#include "color-internal.h"
#include "../../src/setup.h" /* color_terminal_string */
#include "src/setup.h" /* color_terminal_string */
static int
has_colors (gboolean disable, gboolean force)

View File

@ -33,7 +33,7 @@
#include <string.h>
#include <sys/types.h> /* size_t */
#include "../../src/global.h"
#include "src/global.h"
#include "tty.h"
#include "color.h"

View File

@ -12,7 +12,7 @@
#ifndef MC_COLOR_H
#define MC_COLOR_H
#include "../../src/global.h" /* glib.h */
#include "src/global.h" /* glib.h */
#ifdef HAVE_SLANG
# include "color-slang.h"

View File

@ -37,7 +37,7 @@
#include <sys/types.h>
#include <unistd.h>
#include "../../src/global.h"
#include "src/global.h"
#include "tty.h"
#include "tty-internal.h" /* mouse_enabled */
@ -45,15 +45,15 @@
#include "key.h"
#include "win.h" /* xterm_flag */
#include "../../src/main.h"
#include "../../src/layout.h" /* winch_flag, mc_refresh() */
#include "../../src/cons.saver.h"
#include "../../src/strutil.h" /* str_casecmp */
#include "src/main.h"
#include "src/layout.h" /* winch_flag, mc_refresh() */
#include "src/cons.saver.h"
#include "src/strutil.h" /* str_casecmp */
#include "../../vfs/vfs.h"
#include "lib/vfs/mc-vfs/vfs.h"
#ifdef ENABLE_VFS
#include "../../vfs/gc.h"
#include "lib/vfs/mc-vfs/gc.h"
#endif /* ENABLE_VFS */
#ifdef HAVE_TEXTMODE_X11_SUPPORT

View File

@ -6,8 +6,8 @@
#ifndef MC_KEY_H
#define MC_KEY_H
#include "../../src/global.h" /* <glib.h> */
#include "../../src/dialog.h" /* cb_ret_t */
#include "src/global.h" /* <glib.h> */
#include "src/dialog.h" /* cb_ret_t */
#include "tty.h" /* KEY_F macro */

View File

@ -41,7 +41,7 @@
#include <config.h>
#include "../../src/global.h"
#include "src/global.h"
#include "tty.h"
#include "mouse.h" /* required before key.h */

View File

@ -31,7 +31,7 @@
#include <sys/types.h>
#include <unistd.h>
#include "../../src/global.h"
#include "src/global.h"
#include "tty.h"
#include "tty-internal.h" /* mouse_enabled */

View File

@ -6,7 +6,7 @@
#ifndef MC_TTY_INTERNAL_H
#define MC_TTY_INTERNAL_H
#include "../../src/global.h" /* include <glib.h> */
#include "src/global.h" /* include <glib.h> */
/* If true lines are shown by spaces */
extern gboolean slow_tty;

View File

@ -36,7 +36,7 @@
#include <stdarg.h>
#include <signal.h>
#include "../../src/global.h"
#include "src/global.h"
#ifndef WANT_TERM_H
# define WANT_TERM_H
@ -46,9 +46,9 @@
#include "tty.h"
#include "color-internal.h"
#include "win.h"
#include "../../src/main.h"
#include "src/main.h"
#include "../../src/strutil.h" /* str_term_form */
#include "src/strutil.h" /* str_term_form */
/* include at last !!! */
#ifdef WANT_TERM_H

View File

@ -39,7 +39,7 @@
#include <unistd.h>
#include <signal.h>
#include "../../src/global.h"
#include "src/global.h"
#include "tty-internal.h" /* slow_tty */
#include "tty.h"
@ -49,7 +49,7 @@
#include "key.h" /* define_sequence */
#include "win.h"
#include "../../src/strutil.h" /* str_term_form */
#include "src/strutil.h" /* str_term_form */
/*** global variables **************************************************/
extern int reset_hp_softkeys;

View File

@ -34,12 +34,12 @@
#include <signal.h>
#include <stdarg.h>
#include "../../src/global.h"
#include "src/global.h"
#include "tty.h"
#include "tty-internal.h"
#include "../../src/strutil.h"
#include "src/strutil.h"
/*** global variables **************************************************/

View File

@ -11,7 +11,7 @@
#ifndef MC_TTY_H
#define MC_TTY_H
#include "../../src/global.h" /* include <glib.h> */
#include "src/global.h" /* include <glib.h> */
#ifdef HAVE_SLANG
# include "tty-slang.h"

View File

@ -34,8 +34,8 @@
#include "tty.h" /* tty_gotoyx, tty_print_char */
#include "win.h"
#include "../../src/util.h"
#include "../../src/cons.saver.h" /* console_flag */
#include "src/util.h"
#include "src/cons.saver.h" /* console_flag */
/*** global variables **************************************************/

View File

@ -6,7 +6,7 @@
#ifndef MC_WIN_H
#define MC_WIN_H
#include "../../src/global.h" /* <glib.h> */
#include "src/global.h" /* <glib.h> */
extern int xterm_flag;

View File

@ -39,7 +39,7 @@ typedef int dummy; /* C99 forbids empty compilation unit */
# include <gmodule.h>
#endif
#include "../../src/global.h"
#include "src/global.h"
#include "x11conn.h"
/*** file scope type declarations **************************************/

View File

@ -76,21 +76,23 @@ distclean-local:
else :; fi
if ENABLE_VFS
noinst_LIBRARIES = libvfs-mc.a
noinst_LTLIBRARIES = libvfs-mc.la
else
noinst_LIBRARIES =
noinst_LTLIBRARIES =
endif
if ENABLE_VFS_NET
libvfs_mc_a_SOURCES = $(NETFILES) $(NONETFILES)
libvfs_mc_la_SOURCES = $(NETFILES) $(NONETFILES)
else
libvfs_mc_a_SOURCES = $(NONETFILES)
libvfs_mc_la_SOURCES = $(NONETFILES)
endif
if ENABLE_VFS
if ENABLE_MCSERVER
sbin_PROGRAMS = mcserv
mcserv_SOURCES = mcserv.c mcfsutil.c
mcserv_LDADD = $(MCSERVLIBS) $(GLIB_LIBS)
mcserv_SOURCES = mcserv.c
mcserv_LDADD = $(MCSERVLIBS) $(GLIB_LIBS) libvfs-mc.la
endif
endif

View File

@ -29,11 +29,11 @@
#include <errno.h>
#include <fcntl.h>
#include "../src/global.h"
#include "../src/wtools.h" /* message() */
#include "../src/main.h" /* print_vfs_message */
#include "../src/unixcompat.h"
#include "../vfs/vfs.h"
#include "src/global.h"
#include "src/wtools.h" /* message() */
#include "src/main.h" /* print_vfs_message */
#include "src/unixcompat.h"
#include "vfs.h"
#include "utilvfs.h"
#include "vfs-impl.h"

View File

@ -35,13 +35,13 @@
#include <time.h>
#include <sys/time.h> /* gettimeofday() */
#include "../src/global.h"
#include "src/global.h"
#include "../tty/tty.h" /* enable/disable interrupt key */
#include "lib/tty/tty.h" /* enable/disable interrupt key */
#include "../src/wtools.h" /* message() */
#include "../src/main.h" /* print_vfs_message */
#include "../vfs/vfs.h"
#include "src/wtools.h" /* message() */
#include "src/main.h" /* print_vfs_message */
#include "vfs.h"
#include "utilvfs.h"
#include "vfs-impl.h"

View File

@ -45,11 +45,11 @@
#include <errno.h>
#include <sys/wait.h>
#include "../src/global.h"
#include "src/global.h"
#include "../src/wtools.h" /* message() */
#include "../src/main.h" /* print_vfs_message */
#include "../src/execute.h" /* For shell_execute */
#include "src/wtools.h" /* message() */
#include "src/main.h" /* print_vfs_message */
#include "src/execute.h" /* For shell_execute */
#include "utilvfs.h"
#include "vfs.h"

View File

@ -52,16 +52,16 @@
#include <stdlib.h>
#include <string.h>
#include "../src/global.h"
#include "src/global.h"
#include "../tty/tty.h" /* enable/disable interrupt key */
#include "lib/tty/tty.h" /* enable/disable interrupt key */
#include "../src/wtools.h" /* message() */
#include "../src/main.h" /* print_vfs_message */
#include "../src/util.h"
#include "../src/strescape.h"
#include "../src/unixcompat.h"
#include "../src/fs.h"
#include "src/wtools.h" /* message() */
#include "src/main.h" /* print_vfs_message */
#include "src/util.h"
#include "src/strescape.h"
#include "src/unixcompat.h"
#include "src/fs.h"
#include "utilvfs.h"
#include "xdirentry.h"
#include "vfs.h"

View File

@ -83,15 +83,15 @@ What to do with this?
#include <fcntl.h>
#include <sys/time.h> /* gettimeofday() */
#include "../src/global.h"
#include "src/global.h"
#include "../lib/tty/tty.h" /* enable/disable interrupt key */
#include "lib/tty/tty.h" /* enable/disable interrupt key */
#include "../src/wtools.h" /* message() */
#include "../src/main.h" /* print_vfs_message */
#include "../src/history.h"
#include "../src/setup.h" /* for load_anon_passwd */
#include "../lib/mcconfig/mcconfig.h"
#include "src/wtools.h" /* message() */
#include "src/main.h" /* print_vfs_message */
#include "src/history.h"
#include "src/setup.h" /* for load_anon_passwd */
#include "lib/mcconfig/mcconfig.h"
#include "utilvfs.h"
#include "xdirentry.h"

View File

@ -42,12 +42,12 @@
#include <ctype.h> /* is_digit() */
#include <sys/time.h> /* gettimeofday() */
#include "../src/global.h"
#include "src/global.h"
#include "../src/wtools.h" /* message() */
#include "../src/main.h" /* print_vfs_message */
#include "../src/panel.h" /* get_current_panel() */
#include "../src/layout.h" /* get_current_type() */
#include "src/wtools.h" /* message() */
#include "src/main.h" /* print_vfs_message */
#include "src/panel.h" /* get_current_panel() */
#include "src/layout.h" /* get_current_type() */
#include "utilvfs.h"
#include "vfs-impl.h"

View File

@ -12,10 +12,10 @@
#include <string.h>
#include <fcntl.h>
#include "../src/global.h"
#include "src/global.h"
#include "../src/wtools.h" /* message() */
#include "../src/main.h" /* print_vfs_message */
#include "src/wtools.h" /* message() */
#include "src/main.h" /* print_vfs_message */
#include "utilvfs.h"
#include "vfs.h"

View File

@ -57,9 +57,9 @@
#endif
#endif
#include "../src/global.h"
#include "../src/wtools.h" /* message() */
#include "../src/main.h" /* print_vfs_message */
#include "src/global.h"
#include "src/wtools.h" /* message() */
#include "src/main.h" /* print_vfs_message */
#include "utilvfs.h"
#include "vfs.h"
#include "vfs-impl.h"

View File

@ -50,9 +50,9 @@
#include <errno.h>
#include "../src/global.h"
#include "../src/wtools.h" /* message() */
#include "../src/main.h" /* print_vfs_message */
#include "src/global.h"
#include "src/wtools.h" /* message() */
#include "src/main.h" /* print_vfs_message */
#include "utilvfs.h"
#include "mcfsutil.h"
#include "netutil.h"

View File

@ -110,10 +110,10 @@
* a native printf(3) capable of all POSIX features.
*/
#undef ENABLE_NLS
#include "../src/global.h"
#include "src/global.h"
#include "../src/wtools.h" /* message() */
#include "../src/main.h" /* print_vfs_message */
#include "src/wtools.h" /* message() */
#include "src/main.h" /* print_vfs_message */
#include "utilvfs.h"
#include "vfs.h"
#include "mcfs.h"

View File

@ -31,9 +31,9 @@
#include <unistd.h>
#include <string.h>
#include "../src/global.h"
#include "../vfs/utilvfs.h"
#include "../vfs/netutil.h"
#include "src/global.h"
#include "utilvfs.h"
#include "netutil.h"
int got_sigpipe;

View File

@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_INIT(include/includes.h)
AC_PREREQ(2.52)
AC_CONFIG_HEADER(include/config.h)
AC_CONFIG_AUX_DIR(../../config)
AC_CONFIG_AUX_DIR(../../../../config)
# we want to be compatibe with older versions of Samba
AC_PREFIX_DEFAULT(/usr/local/samba)
AC_SYS_LARGEFILE

View File

@ -41,11 +41,11 @@
#include <string.h>
#include <fcntl.h>
#include "../src/global.h"
#include "src/global.h"
#include "../src/wtools.h" /* message() */
#include "../src/main.h" /* print_vfs_message */
#include "../src/execute.h" /* EXECUTE_AS_SHELL */
#include "src/wtools.h" /* message() */
#include "src/main.h" /* print_vfs_message */
#include "src/execute.h" /* EXECUTE_AS_SHELL */
#include "utilvfs.h"
#include "vfs.h"

View File

@ -38,10 +38,10 @@
#undef USE_NCURSES /* Don't include *curses.h */
#undef USE_NCURSESW
#include "../src/global.h"
#include "src/global.h"
#include "../src/wtools.h" /* message() */
#include "../src/main.h" /* print_vfs_message */
#include "src/wtools.h" /* message() */
#include "src/main.h" /* print_vfs_message */
#include "utilvfs.h"
@ -65,7 +65,7 @@
#include "vfs.h"
#include "vfs-impl.h"
#include "smbfs.h"
#include "vfs/netutil.h"
#include "netutil.h"
#define SMBFS_MAX_CONNECTIONS 16
static const char * const IPC = "IPC$";

View File

@ -40,11 +40,11 @@
#include <sys/mknod.h>
#endif
#include "../src/global.h"
#include "src/global.h"
#include "../src/wtools.h" /* message() */
#include "../src/main.h" /* print_vfs_message */
#include "../vfs/vfs.h"
#include "src/wtools.h" /* message() */
#include "src/main.h" /* print_vfs_message */
#include "vfs.h"
#include "utilvfs.h"
#include "gc.h" /* vfs_rmstamp */

View File

@ -56,9 +56,9 @@
#include <ext2fs/ext2fs.h>
#include <ctype.h>
#include "../src/global.h"
#include "../src/wtools.h" /* message() */
#include "../src/main.h" /* print_vfs_message */
#include "src/global.h"
#include "src/wtools.h" /* message() */
#include "src/main.h" /* print_vfs_message */
#include "utilvfs.h"
#include "vfs.h"
#include "vfs-impl.h"

View File

@ -33,12 +33,12 @@
#include <grp.h>
#include <stdlib.h>
#include "../src/global.h"
#include "src/global.h"
#include "../src/wtools.h" /* message() */
#include "../src/main.h" /* print_vfs_message */
#include "../src/unixcompat.h"
#include "../src/history.h"
#include "src/wtools.h" /* message() */
#include "src/main.h" /* print_vfs_message */
#include "src/unixcompat.h"
#include "src/history.h"
#include "vfs.h"
#include "utilvfs.h"

View File

@ -11,7 +11,7 @@
#include <sys/stat.h>
#include "../src/global.h"
#include "src/global.h"
/** Bit flags for vfs_split_url()
*

View File

@ -14,7 +14,7 @@
#include <stddef.h>
#include <utime.h>
#include "../src/fs.h" /* MC_MAXPATHLEN */
#include "src/fs.h" /* MC_MAXPATHLEN */
typedef void *vfsid;
struct vfs_stamping;

View File

@ -50,11 +50,11 @@
#include <unistd.h>
#include <dirent.h>
#include "../src/global.h"
#include "src/global.h"
#include "../src/wtools.h" /* message() */
#include "../src/main.h" /* print_vfs_message */
#include "../src/strutil.h"
#include "src/wtools.h" /* message() */
#include "src/main.h" /* print_vfs_message */
#include "src/strutil.h"
#include "utilvfs.h"
#include "gc.h"

View File

@ -53,6 +53,12 @@ mc_LDADD = \
viewer/libmcviewer.la \
$(INTLLIBS) $(MCLIBS) $(SLANGLIB) $(LIBICONV) $(GLIB_LIBS)
if USE_SAMBA_FS
# this is a hack for linking with own samba library in simple way
mc_LDADD += ../lib/vfs/mc-vfs/samba/libsamba.a
endif
SRC_mc_widgets = \
dialog.c dialog.h \
menu.c menu.h \

View File

@ -35,10 +35,10 @@
#include "global.h"
#include "../lib/tty/tty.h"
#include "../lib/tty/key.h" /* XCTRL and ALT macros */
#include "../lib/skin/skin.h"
#include "../lib/vfs/mc-vfs/vfs/vfs.h"
#include "lib/tty/tty.h"
#include "lib/tty/key.h" /* XCTRL and ALT macros */
#include "lib/skin/skin.h"
#include "lib/vfs/mc-vfs/vfs.h"
#include "dialog.h"
#include "widget.h"

View File

@ -28,11 +28,11 @@
#include <stdio.h>
#include "../src/global.h"
#include "../lib/tty/tty.h"
#include "../src/args.h"
#include "../src/strutil.h"
#include "../src/textconf.h"
#include "src/global.h"
#include "lib/tty/tty.h"
#include "src/args.h"
#include "src/strutil.h"
#include "src/textconf.h"
/*** external variables **************************************************************************/

View File

@ -48,7 +48,7 @@
#include "wtools.h"
#include "layout.h" /* repaint_screen() */
#include "fileopctx.h" /* FileOpContext */
#include "../lib/tty/key.h" /* add_select_channel(), delete_select_channel() */
#include "lib/tty/key.h" /* add_select_channel(), delete_select_channel() */
enum ReturnType {
Return_String,

View File

@ -36,11 +36,11 @@
#include "global.h"
#include "../lib/tty/tty.h"
#include "../lib/skin/skin.h" /* INPUT_COLOR */
#include "../lib/tty/key.h" /* XCTRL and ALT macros */
#include "lib/tty/tty.h"
#include "lib/skin/skin.h" /* INPUT_COLOR */
#include "lib/tty/key.h" /* XCTRL and ALT macros */
#include "../lib/mcconfig/mcconfig.h" /* Load/save user formats */
#include "lib/mcconfig/mcconfig.h" /* Load/save user formats */
#include "dialog.h" /* The nice dialog manager */
#include "widget.h" /* The widgets for the nice dialog manager */
@ -62,11 +62,11 @@
#endif
#ifdef USE_NETCODE
# include "../vfs/ftpfs.h"
# include "lib/vfs/mc-vfs/ftpfs.h"
#endif
#ifdef ENABLE_VFS
#include "../vfs/gc.h"
#include "lib/vfs/mc-vfs/gc.h"
#endif

View File

@ -33,9 +33,9 @@
#include "global.h"
#include "../lib/tty/tty.h"
#include "../lib/skin/skin.h"
#include "../lib/vfs/mc-vfs/vfs/vfs.h"
#include "lib/tty/tty.h"
#include "lib/skin/skin.h"
#include "lib/vfs/mc-vfs/vfs.h"
#include "dialog.h" /* add_widget() */
#include "widget.h" /* NORMAL_BUTTON */

View File

@ -34,9 +34,9 @@
#include "global.h"
#include "../lib/tty/tty.h"
#include "../lib/skin/skin.h"
#include "../lib/vfs/mc-vfs/vfs/vfs.h"
#include "lib/tty/tty.h"
#include "lib/skin/skin.h"
#include "lib/vfs/mc-vfs/vfs.h"
#include "dialog.h"
#include "widget.h"

View File

@ -47,14 +47,14 @@
#include "global.h"
#include "../lib/tty/tty.h" /* LINES, tty_touch_screen() */
#include "../lib/tty/key.h" /* ALT() macro */
#include "../lib/tty/win.h" /* do_enter_ca_mode() */
#include "../lib/mcconfig/mcconfig.h"
#include "../lib/search/search.h"
#include "../src/viewer/mcviewer.h"
#include "../lib/filehighlight/fhl.h" /* MC_FHL_INI_FILE */
#include "../lib/vfs/mc-vfs/vfs.h"
#include "lib/tty/tty.h" /* LINES, tty_touch_screen() */
#include "lib/tty/key.h" /* ALT() macro */
#include "lib/tty/win.h" /* do_enter_ca_mode() */
#include "lib/mcconfig/mcconfig.h"
#include "lib/search/search.h"
#include "src/viewer/mcviewer.h"
#include "lib/filehighlight/fhl.h" /* MC_FHL_INI_FILE */
#include "lib/vfs/mc-vfs/vfs.h"
#include "cmd.h" /* Our definitions */
#include "fileopctx.h"
@ -87,7 +87,7 @@
#endif
#ifdef USE_INTERNAL_EDIT
# include "../src/editor/edit.h"
# include "src/editor/edit.h"
#endif
/* If set and you don't have subshell support,then C-o will give you a shell */

View File

@ -33,8 +33,8 @@
#include <string.h>
#include "global.h" /* home_dir */
#include "../lib/tty/tty.h"
#include "../../lib/vfs/mc-vfs/vfs.h"
#include "lib/tty/tty.h"
#include "lib/vfs/mc-vfs/vfs.h"
#include "widget.h" /* WInput */
#include "command.h"
#include "wtools.h" /* message () */
@ -44,9 +44,9 @@
#include "user.h" /* expand_format */
#include "subshell.h" /* SUBSHELL_EXIT */
#include "tree.h" /* for tree_chdir */
#include "../lib/skin/skin.h" /* DEFAULT_COLOR */
#include "lib/skin/skin.h" /* DEFAULT_COLOR */
#include "execute.h" /* shell_execute */
#include "../src/strescape.h"
#include "src/strescape.h"
/* This holds the command line */
WInput *cmdline;

View File

@ -38,16 +38,16 @@
#include "global.h"
#include "../lib/tty/tty.h"
#include "../lib/tty/key.h" /* XCTRL and ALT macros */
#include "../lib/vfs/mc-vfs/vfs/vfs.h"
#include "lib/tty/tty.h"
#include "lib/tty/key.h" /* XCTRL and ALT macros */
#include "lib/vfs/mc-vfs/vfs.h"
#include "dialog.h"
#include "widget.h"
#include "wtools.h"
#include "main.h" /* show_all_if_ambiguous */
#include "util.h"
#include "../src/strescape.h"
#include "src/strescape.h"
#include "strutil.h"
typedef char *CompletionFunction (const char * text, int state, INPUT_COMPLETE_FLAGS flags);

View File

@ -36,9 +36,9 @@
#include "global.h"
#include "../lib/tty/tty.h"
#include "../lib/skin/skin.h" /* tty_set_normal_attrs */
#include "../lib/tty/win.h"
#include "lib/tty/tty.h"
#include "lib/skin/skin.h" /* tty_set_normal_attrs */
#include "lib/tty/win.h"
#include "cons.saver.h"

View File

@ -62,7 +62,7 @@
#define LINUX_CONS_SAVER_C
#include "cons.saver.h"
#include "../lib/tty/win.h"
#include "lib/tty/win.h"
static void
send_contents (char *buffer, unsigned int columns, unsigned int rows)

View File

@ -31,10 +31,10 @@
#include "global.h"
#include "../lib/tty/tty.h"
#include "../lib/skin/skin.h"
#include "../lib/tty/mouse.h"
#include "../lib/tty/key.h"
#include "lib/tty/tty.h"
#include "lib/skin/skin.h"
#include "lib/tty/mouse.h"
#include "lib/tty/key.h"
#include "help.h" /* interactive_display() */
#include "dialog.h"

View File

@ -23,7 +23,7 @@
#ifndef MC_DIALOG_H
#define MC_DIALOG_H
#include "../lib/tty/mouse.h"
#include "lib/tty/mouse.h"
#include "util.h" /* Hook */
/* Common return values */

View File

@ -27,9 +27,9 @@
#include <string.h>
#include <sys/stat.h>
#include "../lib/tty/tty.h"
#include "../lib/search/search.h"
#include "../lib/vfs/mc-vfs/vfs/vfs.h"
#include "lib/tty/tty.h"
#include "lib/search/search.h"
#include "lib/vfs/mc-vfs/vfs.h"
#include "global.h"
#include "wtools.h"

View File

@ -39,7 +39,7 @@
#include <sys/stat.h>
#include <unistd.h>
#include "../src/global.h"
#include "src/global.h"
#include "edit-impl.h"
#include "edit-widget.h"

View File

@ -26,8 +26,8 @@
#include <stdlib.h>
#include "../src/global.h"
#include "../src/wtools.h"
#include "src/global.h"
#include "src/wtools.h"
#include "edit-impl.h"

View File

@ -32,10 +32,10 @@
#include <stdio.h>
#include "../src/dialog.h" /* cb_ret_t */
#include "../src/keybind.h" /* global_keymap_t */
#include "src/dialog.h" /* cb_ret_t */
#include "src/keybind.h" /* global_keymap_t */
#include "../src/editor/edit.h"
#include "src/editor/edit.h"
#define SEARCH_DIALOG_OPTION_NO_SCANF (1 << 0)
#define SEARCH_DIALOG_OPTION_NO_REGEX (1 << 1)

View File

@ -6,11 +6,11 @@
#ifndef MC_EDIT_WIDGET_H
#define MC_EDIT_WIDGET_H
#include "../src/dialog.h" /* Widget */
#include "../lib/search/search.h" /* mc_search_t */
#include "src/dialog.h" /* Widget */
#include "lib/search/search.h" /* mc_search_t */
#include "edit-impl.h"
#include "../src/keybind.h"
#include "src/keybind.h"
#define MAX_MACRO_LENGTH 1024
#define N_LINE_CACHES 32

View File

@ -39,30 +39,30 @@
#include <stdlib.h>
#include <fcntl.h>
#include "../src/global.h"
#include "src/global.h"
#include "../lib/tty/color.h"
#include "../lib/tty/tty.h" /* attrset() */
#include "../lib/tty/key.h" /* is_idle() */
#include "lib/tty/color.h"
#include "lib/tty/tty.h" /* attrset() */
#include "lib/tty/key.h" /* is_idle() */
#include "../lib/skin/skin.h" /* EDITOR_NORMAL_COLOR */
#include "lib/skin/skin.h" /* EDITOR_NORMAL_COLOR */
#include "../src/widget.h"
#include "../src/cmd.h" /* view_other_cmd() */
#include "../src/user.h" /* user_menu_cmd() */
#include "../src/wtools.h" /* query_dialog() */
#include "../src/timefmt.h" /* time formatting */
#include "../src/strutil.h" /* utf string functions */
#include "../src/charsets.h" /* get_codepage_id */
#include "../src/main.h" /* source_codepage */
#include "../src/learn.h" /* learn_keys */
#include "../src/cmddef.h"
#include "src/widget.h"
#include "src/cmd.h" /* view_other_cmd() */
#include "src/user.h" /* user_menu_cmd() */
#include "src/wtools.h" /* query_dialog() */
#include "src/timefmt.h" /* time formatting */
#include "src/strutil.h" /* utf string functions */
#include "src/charsets.h" /* get_codepage_id */
#include "src/main.h" /* source_codepage */
#include "src/learn.h" /* learn_keys */
#include "src/cmddef.h"
#include "edit-impl.h"
#include "editlock.h"
#include "edit-widget.h"
#include "../../lib/vfs/mc-vfs/vfs.h"
#include "lib/vfs/mc-vfs/vfs.h"
int option_word_wrap_line_length = 72;
int option_typewriter_wrap = 0;

View File

@ -32,8 +32,8 @@
#ifndef MC_EDIT_H
#define MC_EDIT_H
#include "../src/global.h" /* PATH_SEP_STR */
#include "../src/fileloc.h"
#include "src/global.h" /* PATH_SEP_STR */
#include "src/fileloc.h"
/* Editor widget */
struct WEdit;

View File

@ -45,34 +45,34 @@
#include <stdlib.h>
#include <fcntl.h>
#include "../src/global.h"
#include "src/global.h"
#include "../lib/tty/tty.h"
#include "../lib/tty/key.h" /* XCTRL */
#include "lib/tty/tty.h"
#include "lib/tty/key.h" /* XCTRL */
#include "../lib/mcconfig/mcconfig.h"
#include "lib/mcconfig/mcconfig.h"
#include "../lib/skin/skin.h"
#include "lib/skin/skin.h"
#include "../src/history.h"
#include "../src/widget.h" /* listbox_new() */
#include "../src/layout.h" /* clr_scr() */
#include "../src/main.h" /* mc_home source_codepage */
#include "../src/help.h" /* interactive_display() */
#include "../src/wtools.h" /* message() */
#include "../src/charsets.h"
#include "../src/selcodepage.h"
#include "../src/strutil.h" /* utf string functions */
#include "../src/cmddef.h"
#include "src/history.h"
#include "src/widget.h" /* listbox_new() */
#include "src/layout.h" /* clr_scr() */
#include "src/main.h" /* mc_home source_codepage */
#include "src/help.h" /* interactive_display() */
#include "src/wtools.h" /* message() */
#include "src/charsets.h"
#include "src/selcodepage.h"
#include "src/strutil.h" /* utf string functions */
#include "src/cmddef.h"
#include "../../lib/vfs/mc-vfs/vfs.h"
#include "lib/vfs/mc-vfs/vfs.h"
#include "../src/editor/edit-impl.h"
#include "../src/editor/edit.h"
#include "../src/editor/editlock.h"
#include "../src/editor/edit-widget.h"
#include "../src/editor/editcmd_dialogs.h"
#include "../src/editor/etags.h"
#include "src/editor/edit-impl.h"
#include "src/editor/edit.h"
#include "src/editor/editlock.h"
#include "src/editor/edit-widget.h"
#include "src/editor/editcmd_dialogs.h"
#include "src/editor/etags.h"
/* globals: */

View File

@ -26,25 +26,25 @@
#include <config.h>
#include "../src/global.h"
#include "src/global.h"
#include "../lib/tty/tty.h"
#include "../lib/skin/skin.h" /* INPUT_COLOR */
#include "../lib/tty/key.h"
#include "lib/tty/tty.h"
#include "lib/skin/skin.h" /* INPUT_COLOR */
#include "lib/tty/key.h"
#include "../lib/search/search.h"
#include "lib/search/search.h"
#include "../src/dialog.h"
#include "../src/widget.h"
#include "../src/wtools.h"
#include "../src/strutil.h"
#include "../src/main.h"
#include "../src/history.h"
#include "../src/charsets.h"
#include "src/dialog.h"
#include "src/widget.h"
#include "src/wtools.h"
#include "src/strutil.h"
#include "src/main.h"
#include "src/history.h"
#include "src/charsets.h"
#include "../src/editor/edit-widget.h"
#include "../src/editor/etags.h"
#include "../src/editor/editcmd_dialogs.h"
#include "src/editor/edit-widget.h"
#include "src/editor/etags.h"
#include "src/editor/editcmd_dialogs.h"
/*** global variables **************************************************/

View File

@ -1,7 +1,7 @@
#ifndef MC__EDITCMD_DIALOGS_H
#define MC__EDITCMD_DIALOGS_H
#include "../src/editor/edit.h"
#include "src/editor/edit.h"
/*** typedefs(not structures) and defined constants **********************************************/

View File

@ -38,21 +38,21 @@
#include <errno.h>
#include <sys/stat.h>
#include "../src/global.h"
#include "src/global.h"
#include "edit-impl.h"
#include "edit-widget.h"
#define MAX_LINE_LEN 1024
#include "../lib/tty/tty.h" /* tty_printf() */
#include "../lib/skin/skin.h"
#include "../lib/tty/key.h" /* is_idle() */
#include "lib/tty/tty.h" /* tty_printf() */
#include "lib/skin/skin.h"
#include "lib/tty/key.h" /* is_idle() */
#include "../src/widget.h" /* buttonbar_redraw() */
#include "../src/charsets.h"
#include "../src/strutil.h" /* utf string functions */
#include "../src/main.h" /* source_codepage */
#include "src/widget.h" /* buttonbar_redraw() */
#include "src/charsets.h"
#include "src/strutil.h" /* utf string functions */
#include "src/main.h" /* source_codepage */
/* Text styles */
#define MOD_ABNORMAL (1 << 8)

View File

@ -39,20 +39,20 @@
#include <stdlib.h>
#include "../src/global.h"
#include "src/global.h"
#include "edit-impl.h"
#include "edit-widget.h" /* edit->macro_i */
#include "editcmd_dialogs.h"
#include "../lib/tty/tty.h" /* keys */
#include "../lib/tty/key.h" /* KEY_M_SHIFT */
#include "lib/tty/tty.h" /* keys */
#include "lib/tty/key.h" /* KEY_M_SHIFT */
#include "../src/cmddef.h" /* list of commands */
#include "../src/keybind.h" /* lookup_keymap_command() */
#include "../src/charsets.h" /* convert_from_input_c() */
#include "../src/main.h" /* display_codepage */
#include "../src/strutil.h" /* str_isutf8 () */
#include "src/cmddef.h" /* list of commands */
#include "src/keybind.h" /* lookup_keymap_command() */
#include "src/charsets.h" /* convert_from_input_c() */
#include "src/main.h" /* display_codepage */
#include "src/strutil.h" /* str_isutf8 () */
/*
* Translate the keycode into either 'command' or 'char_for_insertion'.

View File

@ -52,15 +52,15 @@
#include <pwd.h>
#include <stdlib.h>
#include "../src/global.h"
#include "src/global.h"
#include "edit-impl.h"
#include "editlock.h"
#include "../src/wtools.h" /* edit_query_dialog () */
#include "../src/strutil.h" /* utf string functions */
#include "src/wtools.h" /* edit_query_dialog () */
#include "src/strutil.h" /* utf string functions */
#include "../../lib/vfs/mc-vfs/vfs.h"
#include "lib/vfs/mc-vfs/vfs.h"
#define BUF_SIZE 255
#define PID_BUF_SIZE 10

View File

@ -39,15 +39,15 @@
#include <sys/stat.h>
#include <stdlib.h>
#include "../src/global.h"
#include "src/global.h"
#include "../lib/tty/tty.h" /* KEY_F */
#include "../lib/tty/key.h" /* XCTRL */
#include "lib/tty/tty.h" /* KEY_F */
#include "lib/tty/key.h" /* XCTRL */
#include "../src/menu.h" /* menu_entry */
#include "../src/main.h" /* drop_menus */
#include "../src/dialog.h" /* cb_ret_t */
#include "../src/cmddef.h"
#include "src/menu.h" /* menu_entry */
#include "src/main.h" /* drop_menus */
#include "src/dialog.h" /* cb_ret_t */
#include "src/cmddef.h"
#include "edit-impl.h"
#include "edit-widget.h"

View File

@ -31,12 +31,12 @@
#include <stdlib.h> /* atoi(), NULL */
#include "../src/global.h"
#include "src/global.h"
#include "edit-impl.h"
#include "../src/dialog.h" /* B_CANCEL */
#include "../src/wtools.h" /* QuickDialog */
#include "../src/main.h" /* option_tab_spacing */
#include "src/dialog.h" /* B_CANCEL */
#include "src/wtools.h" /* QuickDialog */
#include "src/main.h" /* option_tab_spacing */
#define OPT_DLG_H 16
#define OPT_DLG_W 74

View File

@ -39,18 +39,18 @@
#include <sys/stat.h>
#include <stdlib.h>
#include "../src/global.h"
#include "src/global.h"
#include "../lib/tty/tty.h" /* LINES, COLS */
#include "../lib/tty/key.h" /* is_idle() */
#include "lib/tty/tty.h" /* LINES, COLS */
#include "lib/tty/key.h" /* is_idle() */
#include "edit-impl.h"
#include "edit-widget.h"
#include "../src/dialog.h"
#include "../src/widget.h" /* ButtonBar */
#include "../src/menu.h" /* menubar_new() */
#include "../src/cmddef.h"
#include "src/dialog.h"
#include "src/widget.h" /* ButtonBar */
#include "src/menu.h" /* menubar_new() */
#include "src/cmddef.h"
WEdit *wedit;
struct WMenuBar *edit_menubar;

View File

@ -38,9 +38,9 @@
#include <string.h>
#include <ctype.h>
#include "../src/global.h"
#include "../src/util.h" /* canonicalize_pathname() */
#include "../src/editor/etags.h"
#include "src/global.h"
#include "src/util.h" /* canonicalize_pathname() */
#include "src/editor/etags.h"
/*** file scope functions **********************************************/

View File

@ -2,7 +2,7 @@
#define MC_EDIT_ETAGS_H 1
#include <sys/types.h> /* size_t */
#include "../src/global.h" /* include <glib.h> */
#include "src/global.h" /* include <glib.h> */
#define MAX_WIDTH_DEF_DIALOG 60 /* max width def dialog */
#define MAX_DEFINITIONS 60 /* count found entries show */

View File

@ -46,15 +46,15 @@
#include <sys/stat.h>
#include <stdlib.h>
#include "../src/global.h"
#include "src/global.h"
#include "../lib/search/search.h" /* search engine */
#include "lib/search/search.h" /* search engine */
#include "../lib/skin/skin.h"
#include "lib/skin/skin.h"
#include "../src/main.h" /* mc_home */
#include "../src/wtools.h" /* message() */
#include "../src/strutil.h" /* utf string functions */
#include "src/main.h" /* mc_home */
#include "src/wtools.h" /* message() */
#include "src/strutil.h" /* utf string functions */
#include "edit-impl.h"
#include "edit-widget.h"

Some files were not shown because too many files have changed in this diff Show More