Skip to content

Commit dbc92b8

Browse files
committed
Merge branch '4572_cleanup'
* 4572_cleanup: (43 commits) Update po/*.po. Update copyright years. maint/update-years.sh: add command to restore script permissions. (check_dir_is_empty): handle the return value of mc_opendir(). viewer: type accuracy related to the WView::locked flag. mcedit: type accuracy. mcedit: reset WEdit::locked flag at file unlock. WEdit: remove unused member max_column. search: change types of start and end search positions from gsize to off_t. mcedit (editsearch): minor refactoring. (edit_search_show_error): rename from edit_show_search_error. mcedit: move definition of edit_search_options_t to editsearch.c. src/vfs/tar/tar.c: fix typos. (size_trunc_len): fix Undefined Binary Operator Result. (quick_create_labeled_input): fix potential leak of memory. (listbox_drawscroll:) fix division by zero warning. (edit_dialog_search_show): fix uninitialized value and null pointer dereference. mcedit: fix uninitialized value function call. (configure_box): fix uninitialized value function call. (quick_dialog_skip): fix undefined behavior. ...
2 parents 2503882 + 04e3dfa commit dbc92b8

File tree

319 files changed

+3216
-2937
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

319 files changed

+3216
-2937
lines changed

configure.ac

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ if $HAVE_nroff; then
9797
AC_CACHE_VAL(mc_cv_mandoc, [
9898
nroff -mandoc < /dev/null > /dev/null 2>&1
9999
if test $? = 0; then
100-
mc_cv_mandoc=-mandoc
100+
mc_cv_mandoc=-mandoc
101101
else
102-
mc_cv_mandoc=-man
102+
mc_cv_mandoc=-man
103103
fi
104104
])
105105
MANDOC=$mc_cv_mandoc
@@ -109,9 +109,9 @@ if $HAVE_nroff; then
109109
AC_CACHE_VAL(mc_cv_man_nocolor, [
110110
nroff -c < /dev/null > /dev/null 2>&1
111111
if test $? = 0; then
112-
mc_cv_man_nocolor=-c
112+
mc_cv_man_nocolor=-c
113113
else
114-
mc_cv_man_nocolor=
114+
mc_cv_man_nocolor=
115115
fi
116116
])
117117
MAN_FLAGS=$mc_cv_man_nocolor
@@ -122,12 +122,12 @@ if $HAVE_nroff; then
122122
mc_cv_nroff_tascii=
123123
nroff -Tlatin1 < /dev/null > /dev/null 2>&1 /dev/null
124124
if test $? = 0; then
125-
mc_cv_nroff_tascii=-Tlatin1
125+
mc_cv_nroff_tascii=-Tlatin1
126126
else
127127
nroff -Tascii < /dev/null > /dev/null 2>&1 /dev/null
128128
if test $? = 0; then
129-
mc_cv_nroff_tascii=-Tascii
130-
fi
129+
mc_cv_nroff_tascii=-Tascii
130+
fi
131131
fi
132132
])
133133
AC_MSG_RESULT([${mc_cv_nroff_tascii-no}])
@@ -239,9 +239,9 @@ dnl Check for header files
239239
dnl ############################################################################
240240

241241
AC_CHECK_HEADERS([string.h memory.h limits.h malloc.h \
242-
utime.h sys/statfs.h sys/vfs.h \
243-
sys/select.h sys/ioctl.h stropts.h arpa/inet.h \
244-
sys/socket.h])
242+
utime.h sys/statfs.h sys/vfs.h \
243+
sys/select.h sys/ioctl.h stropts.h arpa/inet.h \
244+
sys/socket.h])
245245
dnl This macro is redefined in m4.include/gnulib/sys_types_h.m4
246246
dnl to work around a buggy version in autoconf <= 2.69.
247247
AC_HEADER_MAJOR
@@ -318,9 +318,9 @@ dnl Check for functions
318318
dnl ############################################################################
319319

320320
AC_CHECK_FUNCS([\
321-
strverscmp \
322-
strncasecmp \
323-
realpath
321+
strverscmp \
322+
strncasecmp \
323+
realpath
324324
])
325325

326326
dnl getpt is a GNU Extension (glibc 2.1.x)
@@ -420,17 +420,16 @@ AC_ARG_WITH([gpm-mouse],
420420
case $host_os in
421421
linux*)
422422
if test x$with_gpm_mouse != xno; then
423-
AC_CHECK_LIB(gpm, Gpm_Repeat,
424-
[AC_DEFINE(HAVE_LIBGPM, 1,
425-
[Define to enable gpm mouse support on Linux])
426-
mouse_lib="gpm and xterm"
427-
MCLIBS="$MCLIBS -lgpm"],
423+
AC_CHECK_LIB(gpm, Gpm_Repeat,
424+
[AC_DEFINE(HAVE_LIBGPM, 1, [Define to enable gpm mouse support on Linux])
425+
mouse_lib="gpm and xterm"
426+
MCLIBS="$MCLIBS -lgpm"],
428427
if test "x$with_gpm_mouse" = "xyes"; then
429428
[AC_MSG_ERROR([libgpm is missing or older than 0.18])]
430429
else
431430
[AC_MSG_WARN([libgpm is missing or older than 0.18])]
432431
fi
433-
)
432+
)
434433
fi
435434
;;
436435
esac
@@ -477,12 +476,12 @@ AC_ARG_WITH([diff_viewer],
477476
AS_HELP_STRING([--with-diff-viewer], [Compile with diff viewer @<:@yes@:>@]))
478477

479478
if test x$with_diff_viewer != xno; then
480-
AC_DEFINE(USE_DIFF_VIEW, 1, [Define to enable diff viewer])
481-
use_diff=yes
482-
diff_msg="yes"
483-
AC_MSG_NOTICE([using diff viewer])
479+
AC_DEFINE(USE_DIFF_VIEW, 1, [Define to enable diff viewer])
480+
use_diff=yes
481+
diff_msg="yes"
482+
AC_MSG_NOTICE([using diff viewer])
484483
else
485-
diff_msg="no"
484+
diff_msg="no"
486485
fi
487486

488487
mc_SUBSHELL
@@ -522,20 +521,20 @@ ALL_DOC_LINGUAS="es hu it pl ru sr"
522521
DOC_LINGUAS=
523522
if test "x$USE_NLS" = xyes; then
524523
if test -z "$LINGUAS"; then
525-
langs="`grep -v '^#' $srcdir/po/LINGUAS`"
524+
langs="`grep -v '^#' $srcdir/po/LINGUAS`"
526525
else
527-
langs="$LINGUAS"
526+
langs="$LINGUAS"
528527
fi
529528
else
530529
langs=
531530
fi
532531

533532
for h_lang in $ALL_DOC_LINGUAS; do
534533
for lang in $langs; do
535-
if test "$lang" = "$h_lang"; then
536-
DOC_LINGUAS="$DOC_LINGUAS $lang"
537-
break
538-
fi
534+
if test "$lang" = "$h_lang"; then
535+
DOC_LINGUAS="$DOC_LINGUAS $lang"
536+
break
537+
fi
539538
done
540539
done
541540
AC_SUBST(DOC_LINGUAS)

doc/HACKING

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,7 @@ lists.
1313
Compiling from GIT
1414
==================
1515

16-
To compile GNU Midnight commander from GIT, the following software is
17-
required:
18-
19-
Autoconf 2.64 and above (latest is recommended)
20-
Automake 1.14 and above (latest is recommended)
21-
Gettext 0.18.2 and above
22-
Glib 2.32 and above
23-
24-
Full list of requirements you can see at:
25-
https://www.midnight-commander.org/wiki/doc/buildAndInstall/req
16+
The full list of requirements is listed in the INSTALL file.
2617

2718
It is recommended that all those tools are installed with the same
2819
prefix. Make sure that the tools with the right version are first in

doc/INSTALL

Lines changed: 29 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,40 @@
11
Build requirements for GNU Midnight Commander
22
---------------------------------------------
33

4-
- glibc
5-
- gcc
4+
- glibc or uClibc or musl
5+
- https://www.gnu.org/software/libc/
6+
- https://uclibc.org
7+
- https://www.musl-libc.org
8+
- gcc or clang
9+
- https://gcc.gnu.org
10+
- https://clang.llvm.org
611
- make
12+
- https://www.gnu.org/software/make/
713
- autoconf >= 2.64
14+
- https://www.gnu.org/software/autoconf/
815
- automake >= 1.14
16+
- https://www.gnu.org/software/automake/
917
- libtool
18+
- https://www.gnu.org/software/libtool/
19+
- pkg-config (optional)
20+
- https://pkg-config.freedesktop.org/wiki/
1021
- glib2 >= 2.32
11-
- slang2 or ncurses
22+
- https://www.gtk.org
23+
- slang2 or ncurses screen library
24+
- https://www.jedsoft.org/slang/
25+
- https://invisible-island.net/ncurses/ncurses.html
1226
- gettext >= 0.18.2
13-
- libssh2 >= 1.2.8 is required only for sftp vfs
14-
- libaspell to support spell checking in the internal editor
15-
- ext2fs >= 1.42.4 to support ext{2,3,4}fs extended attributes
27+
- https://www.gnu.org/software/gettext/
28+
- pcre or pcre2 (as an alternative to glib-regexp)
29+
- https://www.pcre.org
30+
- gpm (general purpose mouse daemon as an alternative to xterm mouse)
31+
- https://www.nico.schottelius.org/software/gpm/
32+
- libssh2 >= 1.2.8 (required only for sftp vfs)
33+
- https://libssh2.org
34+
- libaspell (spell checking support in the internal editor)
35+
- http://aspell.net
36+
- ext2fs >= 1.42.4 (support for ext{2,3,4}fs extended attributes)
37+
- https://e2fsprogs.sourceforge.net
1638

1739

1840
Installation instructions for GNU Midnight Commander
@@ -222,61 +244,16 @@ only needed on systems where users cannot access /dev/vcsaN, where N is
222244
the virtual console number, on which the uses is logged on.
223245

224246

225-
Obtaining related software
226-
--------------------------
227-
228-
glib
229-
----
230-
231-
The only "hard" dependency of GNU Midnight Commander is glib. You can
232-
get glib from
233-
234-
* https://download.gnome.org/sources/glib/
235-
236-
Minimal version of glib: 2.32.0
237-
Recommended version: 2.32.x and higher.
238-
239-
Newer versions may work, but haven't been tested.
240-
241-
PCRE
242-
----
243-
244-
Both PCRE and PCRE2 libraries are supported. You can get PCRE from
245-
246-
* https://www.pcre.org
247-
248247
Terminal database
249248
-----------------
250249

251250
There are many incomplete terminal databases out there, however, a
252251
complete terminfo is bundled with ncurses. (It is simple to generate
253252
the termcap database using the infocmp utility in ncurses).
254253

255-
Some terminfo data are included with the mc distribution (lib/*.ti).
256-
Particularly linux, xterm and vt100. Use e.g. ''tic linux.ti'' to use
257-
them.
258-
259254
If you want to run mc on xterm/color_xterm/ansi_xterm (not rxvt), then
260-
you might read lib/README.xterm for further information.
261-
262-
Screen libraries
263-
----------------
264-
265-
GNU Midnight Commander can use the included version of S-Lang, but you
266-
can get the latest version here:
267-
268-
* https://www.jedsoft.org/slang/
269-
270-
Alternatively, you can use ncurses:
271-
272-
* https://invisible-island.net/ncurses/announce.html
273-
274-
Mouse support
275-
-------------
276-
277-
The general purpose mouse (gpm) daemon is available from
255+
you might read contrib/README.xterm for further information.
278256

279-
* https://www.nico.schottelius.org/software/gpm/
280257

281258
Porting
282259
-------

lib/charsets.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Text conversion from one charset to another.
33
4-
Copyright (C) 2001-2024
4+
Copyright (C) 2001-2025
55
Free Software Foundation, Inc.
66
77
Written by:

lib/event/event.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Handle events in application.
33
Interface functions: init/deinit; start/stop
44
5-
Copyright (C) 2011-2024
5+
Copyright (C) 2011-2025
66
Free Software Foundation, Inc.
77
88
Written by:

lib/event/manage.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Handle any events in application.
33
Manage events: add, delete, destroy, search
44
5-
Copyright (C) 2011-2024
5+
Copyright (C) 2011-2025
66
Free Software Foundation, Inc.
77
88
Written by:

lib/event/raise.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Handle any events in application.
33
Raise events.
44
5-
Copyright (C) 2011-2024
5+
Copyright (C) 2011-2025
66
Free Software Foundation, Inc.
77
88
Written by:

lib/filehighlight/common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
File highlight plugin.
33
Interface functions
44
5-
Copyright (C) 2009-2024
5+
Copyright (C) 2009-2025
66
Free Software Foundation, Inc.
77
88
Written by:

lib/filehighlight/get-color.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
File highlight plugin.
33
Interface functions. get color pair index for highlighted file.
44
5-
Copyright (C) 2009-2024
5+
Copyright (C) 2009-2025
66
Free Software Foundation, Inc.
77
88
Written by:

lib/filehighlight/ini-file-read.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
File highlight plugin.
33
Reading and parse rules from ini-files
44
5-
Copyright (C) 2009-2024
5+
Copyright (C) 2009-2025
66
Free Software Foundation, Inc.
77
88
Written by:

lib/glibcompat.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
GLIB - Library of useful routines for C programming
33
4-
Copyright (C) 2009-2024
4+
Copyright (C) 2009-2025
55
Free Software Foundation, Inc.
66
77
Written by:

lib/global.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Global structure for some library-related variables
33
4-
Copyright (C) 2009-2024
4+
Copyright (C) 2009-2025
55
Free Software Foundation, Inc.
66
77
Written by:

lib/hook.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Slavaz: Warning! this file is deprecated and should be replaced
55
by mcevents functional.
66
7-
Copyright (C) 1994-2024
7+
Copyright (C) 1994-2025
88
Free Software Foundation, Inc.
99
1010
Written by:

lib/keybind.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Definitions of key bindings.
33
4-
Copyright (C) 2005-2024
4+
Copyright (C) 2005-2025
55
Free Software Foundation, Inc.
66
77
Written by:

lib/lock.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
File locking
33
4-
Copyright (C) 2003-2024
4+
Copyright (C) 2003-2025
55
Free Software Foundation, Inc.
66
77
Written by:

lib/logging.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Provides a log file to ease tracing the program.
33
4-
Copyright (C) 2006-2024
4+
Copyright (C) 2006-2025
55
Free Software Foundation, Inc.
66
77
Written by:

lib/mcconfig/common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Configure module for the Midnight Commander
33
4-
Copyright (C) 1994-2024
4+
Copyright (C) 1994-2025
55
Free Software Foundation, Inc.
66
77
This file is part of the Midnight Commander.

lib/mcconfig/get.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Configure module for the Midnight Commander
33
4-
Copyright (C) 1994-2024
4+
Copyright (C) 1994-2025
55
Free Software Foundation, Inc.
66
77
This file is part of the Midnight Commander.

0 commit comments

Comments
 (0)