1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
|
--- a/configure 2017-11-25 13:33:45.000000000 -0500
+++ b/configure 2018-01-17 13:10:33.355116203 -0500
@@ -30379,7 +30379,7 @@
ac_config_files="$ac_config_files src/man2hlp/man2hlp"
-ac_config_files="$ac_config_files Makefile contrib/Makefile contrib/dist/Makefile contrib/dist/gentoo/Makefile contrib/dist/redhat/Makefile contrib/dist/redhat/mc.spec contrib/dist/pkginfo contrib/dist/prototype misc/Makefile misc/mc.menu misc/mcedit.menu misc/skins/Makefile misc/ext.d/Makefile misc/ext.d/doc.sh misc/ext.d/misc.sh misc/ext.d/text.sh misc/ext.d/web.sh misc/macros.d/Makefile misc/mc.ext src/Makefile src/consaver/Makefile src/editor/Makefile src/man2hlp/Makefile src/subshell/Makefile src/viewer/Makefile src/diffviewer/Makefile src/filemanager/Makefile src/vfs/Makefile src/vfs/cpio/Makefile src/vfs/extfs/Makefile src/vfs/extfs/helpers/Makefile src/vfs/extfs/helpers/a+ src/vfs/extfs/helpers/apt+ src/vfs/extfs/helpers/audio src/vfs/extfs/helpers/deb src/vfs/extfs/helpers/deba src/vfs/extfs/helpers/debd src/vfs/extfs/helpers/dpkg+ src/vfs/extfs/helpers/iso9660 src/vfs/extfs/helpers/hp48+ src/vfs/extfs/helpers/lslR src/vfs/extfs/helpers/mailfs src/vfs/extfs/helpers/patchfs src/vfs/extfs/helpers/rpms+ src/vfs/extfs/helpers/s3+ src/vfs/extfs/helpers/uace src/vfs/extfs/helpers/ualz src/vfs/extfs/helpers/uar src/vfs/extfs/helpers/uarc src/vfs/extfs/helpers/uarj src/vfs/extfs/helpers/uc1541 src/vfs/extfs/helpers/ucab src/vfs/extfs/helpers/uha src/vfs/extfs/helpers/ulha src/vfs/extfs/helpers/ulib src/vfs/extfs/helpers/urar src/vfs/extfs/helpers/uzip src/vfs/extfs/helpers/uzoo src/vfs/fish/Makefile src/vfs/fish/helpers/Makefile src/vfs/ftpfs/Makefile src/vfs/sftpfs/Makefile src/vfs/local/Makefile src/vfs/sfs/Makefile src/vfs/smbfs/Makefile src/vfs/tar/Makefile src/vfs/undelfs/Makefile lib/Makefile lib/event/Makefile lib/filehighlight/Makefile lib/mcconfig/Makefile lib/search/Makefile lib/skin/Makefile lib/strutil/Makefile lib/tty/Makefile lib/vfs/Makefile lib/widget/Makefile misc/syntax/Makefile misc/syntax/Syntax doc/Makefile doc/hints/Makefile doc/hints/l10n/Makefile doc/man/Makefile doc/man/es/Makefile doc/man/hu/Makefile doc/man/it/Makefile doc/man/pl/Makefile doc/man/ru/Makefile doc/man/sr/Makefile doc/hlp/Makefile doc/hlp/es/Makefile doc/hlp/hu/Makefile doc/hlp/it/Makefile doc/hlp/pl/Makefile doc/hlp/ru/Makefile doc/hlp/sr/Makefile intl/Makefile po/Makefile.in"
+ac_config_files="$ac_config_files Makefile contrib/Makefile contrib/dist/Makefile contrib/dist/gentoo/Makefile contrib/dist/redhat/Makefile contrib/dist/redhat/mc.spec contrib/dist/pkginfo contrib/dist/prototype misc/Makefile misc/mc.menu misc/mcedit.menu misc/skins/Makefile misc/ext.d/Makefile misc/ext.d/doc.sh misc/ext.d/misc.sh misc/ext.d/text.sh misc/ext.d/web.sh misc/macros.d/Makefile misc/mc.ext src/Makefile src/consaver/Makefile src/editor/Makefile src/man2hlp/Makefile src/subshell/Makefile src/viewer/Makefile src/diffviewer/Makefile src/filemanager/Makefile src/vfs/Makefile src/vfs/cpio/Makefile src/vfs/extfs/Makefile src/vfs/extfs/helpers/Makefile src/vfs/extfs/helpers/a+ src/vfs/extfs/helpers/apt+ src/vfs/extfs/helpers/audio src/vfs/extfs/helpers/deb src/vfs/extfs/helpers/deba src/vfs/extfs/helpers/debd src/vfs/extfs/helpers/dpkg+ src/vfs/extfs/helpers/iso9660 src/vfs/extfs/helpers/hp48+ src/vfs/extfs/helpers/lslR src/vfs/extfs/helpers/mailfs src/vfs/extfs/helpers/patchfs src/vfs/extfs/helpers/rpms+ src/vfs/extfs/helpers/s3+ src/vfs/extfs/helpers/ualz src/vfs/extfs/helpers/uar src/vfs/extfs/helpers/uarc src/vfs/extfs/helpers/uarj src/vfs/extfs/helpers/uc1541 src/vfs/extfs/helpers/ucab src/vfs/extfs/helpers/uha src/vfs/extfs/helpers/ulha src/vfs/extfs/helpers/ulib src/vfs/extfs/helpers/uzip src/vfs/extfs/helpers/uzoo src/vfs/fish/Makefile src/vfs/fish/helpers/Makefile src/vfs/ftpfs/Makefile src/vfs/sftpfs/Makefile src/vfs/local/Makefile src/vfs/sfs/Makefile src/vfs/smbfs/Makefile src/vfs/tar/Makefile src/vfs/undelfs/Makefile lib/Makefile lib/event/Makefile lib/filehighlight/Makefile lib/mcconfig/Makefile lib/search/Makefile lib/skin/Makefile lib/strutil/Makefile lib/tty/Makefile lib/vfs/Makefile lib/widget/Makefile misc/syntax/Makefile misc/syntax/Syntax doc/Makefile doc/hints/Makefile doc/hints/l10n/Makefile doc/man/Makefile doc/man/es/Makefile doc/man/hu/Makefile doc/man/it/Makefile doc/man/pl/Makefile doc/man/ru/Makefile doc/man/sr/Makefile doc/hlp/Makefile doc/hlp/es/Makefile doc/hlp/hu/Makefile doc/hlp/it/Makefile doc/hlp/pl/Makefile doc/hlp/ru/Makefile doc/hlp/sr/Makefile intl/Makefile po/Makefile.in"
ac_config_files="$ac_config_files tests/Makefile tests/lib/Makefile tests/lib/mcconfig/Makefile tests/lib/search/Makefile tests/lib/strutil/Makefile tests/lib/vfs/Makefile tests/lib/widget/Makefile tests/src/Makefile tests/src/filemanager/Makefile tests/src/editor/Makefile tests/src/editor/test-data.txt tests/src/vfs/Makefile tests/src/vfs/extfs/Makefile tests/src/vfs/extfs/helpers-list/Makefile tests/src/vfs/extfs/helpers-list/data/config.sh tests/src/vfs/extfs/helpers-list/misc/Makefile"
@@ -31646,7 +31646,6 @@
"src/vfs/extfs/helpers/patchfs") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/patchfs" ;;
"src/vfs/extfs/helpers/rpms+") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/rpms+" ;;
"src/vfs/extfs/helpers/s3+") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/s3+" ;;
- "src/vfs/extfs/helpers/uace") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uace" ;;
"src/vfs/extfs/helpers/ualz") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/ualz" ;;
"src/vfs/extfs/helpers/uar") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uar" ;;
"src/vfs/extfs/helpers/uarc") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uarc" ;;
@@ -31656,7 +31655,6 @@
"src/vfs/extfs/helpers/uha") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uha" ;;
"src/vfs/extfs/helpers/ulha") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/ulha" ;;
"src/vfs/extfs/helpers/ulib") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/ulib" ;;
- "src/vfs/extfs/helpers/urar") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/urar" ;;
"src/vfs/extfs/helpers/uzip") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uzip" ;;
"src/vfs/extfs/helpers/uzoo") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uzoo" ;;
"src/vfs/fish/Makefile") CONFIG_FILES="$CONFIG_FILES src/vfs/fish/Makefile" ;;
--- a/configure.ac 2017-11-18 12:45:59.000000000 -0500
+++ b/configure.ac 2018-01-17 13:13:08.044979701 -0500
@@ -568,7 +568,6 @@
src/vfs/extfs/helpers/patchfs
src/vfs/extfs/helpers/rpms+
src/vfs/extfs/helpers/s3+
-src/vfs/extfs/helpers/uace
src/vfs/extfs/helpers/ualz
src/vfs/extfs/helpers/uar
src/vfs/extfs/helpers/uarc
@@ -578,7 +577,6 @@
src/vfs/extfs/helpers/uha
src/vfs/extfs/helpers/ulha
src/vfs/extfs/helpers/ulib
-src/vfs/extfs/helpers/urar
src/vfs/extfs/helpers/uzip
src/vfs/extfs/helpers/uzoo
--- a/misc/ext.d/archive.sh 2017-02-24 15:25:57.000000000 -0500
+++ b/misc/ext.d/archive.sh 2018-01-17 13:15:10.486261473 -0500
@@ -75,8 +75,7 @@
lha l "${MC_EXT_FILENAME}"
;;
arj)
- arj l "${MC_EXT_FILENAME}" 2>/dev/null || \
- unarj l "${MC_EXT_FILENAME}"
+ arj l "${MC_EXT_FILENAME}" 2>/dev/null
;;
cab)
cabextract -l "${MC_EXT_FILENAME}"
@@ -84,10 +83,6 @@
ha)
ha lf "${MC_EXT_FILENAME}"
;;
- rar)
- rar v -c- "${MC_EXT_FILENAME}" 2>/dev/null || \
- unrar v -c- "${MC_EXT_FILENAME}"
- ;;
alz)
unalz -l "${MC_EXT_FILENAME}"
;;
@@ -115,9 +110,6 @@
7z l "${MC_EXT_FILENAME}"
;;
- ace)
- unace l "${MC_EXT_FILENAME}"
- ;;
arc)
arc l "${MC_EXT_FILENAME}"
;;
--- a/misc/filehighlight.ini 2017-11-18 12:45:59.000000000 -0500
+++ b/misc/filehighlight.ini 2018-01-17 13:16:59.554798037 -0500
@@ -28,7 +28,7 @@
regexp=(^#.*|.*~$)
[archive]
- extensions=7z;Z;ace;arc;arj;ark;bz2;cab;gz;lha;lz;lz4;lzh;lzma;rar;rpm;tar;tbz;tbz2;tgz;tlz;txz;xz;zip;zoo
+ extensions=7z;Z;arc;arj;ark;bz2;cab;gz;lha;lz;lz4;lzh;lzma;rpm;tar;tbz;tbz2;tgz;tlz;txz;xz;zip;zoo
[doc]
extensions=chm;css;ctl;diz;doc;docm;docx;dtd;htm;html;letter;lsm;mail;man;me;msg;nroff;odp;ods;odt;pdf;po;ppt;pptm;pptx;ps;rtf;sgml;shtml;tex;text;txt;xls;xlsm;xlsx;xml;xsd;xslt
--- a/misc/mc.ext.in 2017-02-24 15:25:57.000000000 -0500
+++ b/misc/mc.ext.in 2018-01-17 13:18:13.904861498 -0500
@@ -185,11 +185,6 @@
Open=%cd %p/uha://
View=%view{ascii} @EXTHELPERSDIR@/archive.sh view ha
-# rar
-regex/i/\.r(ar|[0-9][0-9])$
- Open=%cd %p/urar://
- View=%view{ascii} @EXTHELPERSDIR@/archive.sh view rar
-
# ALZip
shell/i/.alz
Open=%cd %p/ualz://
@@ -706,12 +701,6 @@
### Plain compressed files ###
-# ace
-shell/i/.ace
- Open=%cd %p/uace://
- View=%view{ascii} @EXTHELPERSDIR@/archive.sh view ace
- Extract=unace x %f
-
# arc
shell/i/.arc
Open=%cd %p/uarc://
--- a/misc/syntax/php.syntax 2017-11-18 12:45:59.000000000 -0500
+++ b/misc/syntax/php.syntax 2018-01-17 13:19:14.398867675 -0500
@@ -2177,22 +2177,6 @@
# Radius constants
keyword whole RADIUS\_\[0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_\] white
-# Rar Functions
- keyword whole rar_close yellow
- keyword whole rar_entry_get yellow
- keyword whole rar_list yellow
- keyword whole rar_open yellow
-
-# Rar Functions Rar methods
- keyword whole Rar yellow
-
-# Rar Functions constants
- keyword whole RAR_HOST_BEOS white
- keyword whole RAR_HOST_MSDOS white
- keyword whole RAR_HOST_OS2 white
- keyword whole RAR_HOST_UNIX white
- keyword whole RAR_HOST_WIN32 white
-
# GNU Readline
keyword whole readline\[0123456789_abcdefghijklmnopqrstuvwxyz\] yellow
--- a/misc/syntax/sh.syntax 2017-02-24 15:25:57.000000000 -0500
+++ b/misc/syntax/sh.syntax 2018-01-17 13:20:38.588498398 -0500
@@ -610,7 +610,6 @@
keyword whole pwunconv cyan
keyword whole ramsize cyan
keyword whole ranlib cyan
- keyword whole rar cyan
keyword whole rarp cyan
keyword whole raw cyan
keyword whole rbash cyan
@@ -782,7 +781,6 @@
keyword whole ul cyan
keyword whole umount cyan
keyword whole uname cyan
- keyword whole unarj cyan
keyword whole uncompress cyan
keyword whole unexpand cyan
keyword whole unicode_start cyan
@@ -1714,7 +1712,6 @@
keyword whole pwunconv cyan
keyword whole ramsize cyan
keyword whole ranlib cyan
- keyword whole rar cyan
keyword whole rarp cyan
keyword whole raw cyan
keyword whole rbash cyan
@@ -1886,7 +1883,6 @@
keyword whole ul cyan
keyword whole umount cyan
keyword whole uname cyan
- keyword whole unarj cyan
keyword whole uncompress cyan
keyword whole unexpand cyan
keyword whole unicode_start cyan
--- a/src/vfs/extfs/helpers/Makefile.am 2017-02-24 15:25:57.000000000 -0500
+++ b/src/vfs/extfs/helpers/Makefile.am 2018-01-17 13:22:02.854792416 -0500
@@ -24,7 +24,6 @@
patchfs.in \
rpms+.in \
s3+.in \
- uace.in \
ualz.in \
uar.in \
uarc.in \
@@ -34,7 +33,6 @@
uha.in \
ulha.in \
ulib.in \
- urar.in \
uzip.in \
uzoo.in
@@ -54,7 +52,6 @@
patchfs \
rpms+ \
s3+ \
- uace \
ualz \
uar \
uarc \
@@ -64,7 +61,6 @@
uha \
ulha \
ulib \
- urar \
uzip \
uzoo
--- a/src/vfs/extfs/helpers/Makefile.in 2017-11-25 13:33:53.000000000 -0500
+++ b/src/vfs/extfs/helpers/Makefile.in 2018-01-17 13:26:22.653366629 -0500
@@ -154,8 +154,8 @@
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = a+ apt+ audio deb deba debd dpkg+ iso9660 hp48+ \
- lslR mailfs patchfs rpms+ s3+ uace ualz uar uarc uarj uc1541 \
- ucab uha ulha ulib urar uzip uzoo
+ lslR mailfs patchfs rpms+ s3+ ualz uar uarc uarj uc1541 \
+ ucab uha ulha ulib uzip uzoo
CONFIG_CLEAN_VPATH_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
@@ -213,10 +213,10 @@
$(srcdir)/deba.in $(srcdir)/debd.in $(srcdir)/dpkg+.in \
$(srcdir)/hp48+.in $(srcdir)/iso9660.in $(srcdir)/lslR.in \
$(srcdir)/mailfs.in $(srcdir)/patchfs.in $(srcdir)/rpms+.in \
- $(srcdir)/s3+.in $(srcdir)/uace.in $(srcdir)/ualz.in \
+ $(srcdir)/s3+.in $(srcdir)/ualz.in \
$(srcdir)/uar.in $(srcdir)/uarc.in $(srcdir)/uarj.in \
$(srcdir)/uc1541.in $(srcdir)/ucab.in $(srcdir)/uha.in \
- $(srcdir)/ulha.in $(srcdir)/ulib.in $(srcdir)/urar.in \
+ $(srcdir)/ulha.in $(srcdir)/ulib.in \
$(srcdir)/uzip.in $(srcdir)/uzoo.in README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
@@ -475,7 +475,6 @@
patchfs.in \
rpms+.in \
s3+.in \
- uace.in \
ualz.in \
uar.in \
uarc.in \
@@ -485,7 +484,6 @@
uha.in \
ulha.in \
ulib.in \
- urar.in \
uzip.in \
uzoo.in
@@ -506,7 +504,6 @@
patchfs \
rpms+ \
s3+ \
- uace \
ualz \
uar \
uarc \
@@ -516,7 +513,6 @@
uha \
ulha \
ulib \
- urar \
uzip \
uzoo
@@ -585,8 +581,6 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
s3+: $(top_builddir)/config.status $(srcdir)/s3+.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-uace: $(top_builddir)/config.status $(srcdir)/uace.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
ualz: $(top_builddir)/config.status $(srcdir)/ualz.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
uar: $(top_builddir)/config.status $(srcdir)/uar.in
@@ -605,8 +599,6 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
ulib: $(top_builddir)/config.status $(srcdir)/ulib.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-urar: $(top_builddir)/config.status $(srcdir)/urar.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
uzip: $(top_builddir)/config.status $(srcdir)/uzip.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
uzoo: $(top_builddir)/config.status $(srcdir)/uzoo.in
--- a/src/vfs/extfs/helpers/uarj.in 2017-02-24 15:25:57.000000000 -0500
+++ b/src/vfs/extfs/helpers/uarj.in 2018-01-17 13:28:05.322184649 -0500
@@ -3,9 +3,8 @@
# Written by Viatcheslav Odintsov (2:5020/181)
# (C) 2002 ARJ Software Russia.
#
-# This is an updated parser for ARJ archives in Midnight Commander. You need
-# full ARJ rather than UNARJ. Open-source ARJ v 3.10 for Unix platforms can
-# be obtained here:
+# This is an updated parser for ARJ archives in Midnight Commander.
+# Open-source ARJ v 3.10 for Unix platforms can be obtained here:
#
# - http://www.sourceforge.net/projects/arj/
# - http://arj.sourceforge.net/
|
