blob: 5ede82d3428b74678c073ad08301b5cf14e73f77 [file] [log] [blame]
Patrick Williams864cc432023-02-09 14:54:44 -06001From 62c86b69106d0d702167ba1b963ea1c201cce5af Mon Sep 17 00:00:00 2001
Brad Bishop6e60e8b2018-02-01 10:27:11 -05002From: Robert Yang <liezhi.yang@windriver.com>
3Date: Thu, 6 Apr 2017 02:24:28 -0700
4Subject: [PATCH] mc: replace "perl -w" with "use warnings"
5
6The shebang's max length is usually 128 as defined in
7/usr/include/linux/binfmts.h:
8 #define BINPRM_BUF_SIZE 128
9
10There would be errors when @PERL@ is longer than 128, use
11'/usr/bin/env perl' can fix the problem, but '/usr/bin/env perl -w'
12doesn't work:
13
14/usr/bin/env: perl -w: No such file or directory
15
16So replace "perl -w" with "use warnings" to make it work.
17
18The man2hlp.in already has "use warnings;", so just remove '-w' is OK.
19
Patrick Williams92b42cb2022-09-03 06:53:57 -050020Upstream-Status: Submitted [https://github.com/MidnightCommander/mc/pull/174]
Brad Bishop6e60e8b2018-02-01 10:27:11 -050021
22Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Patrick Williams864cc432023-02-09 14:54:44 -060023
Brad Bishop6e60e8b2018-02-01 10:27:11 -050024---
25 src/man2hlp/man2hlp.in | 2 +-
26 src/vfs/extfs/helpers/a+.in | 4 +++-
27 src/vfs/extfs/helpers/mailfs.in | 3 ++-
28 src/vfs/extfs/helpers/patchfs.in | 3 ++-
29 src/vfs/extfs/helpers/ulib.in | 4 +++-
30 src/vfs/extfs/helpers/uzip.in | 3 ++-
31 6 files changed, 13 insertions(+), 6 deletions(-)
32
33diff --git a/src/man2hlp/man2hlp.in b/src/man2hlp/man2hlp.in
Patrick Williams864cc432023-02-09 14:54:44 -060034index 08765d8..8aa7131 100644
Brad Bishop6e60e8b2018-02-01 10:27:11 -050035--- a/src/man2hlp/man2hlp.in
36+++ b/src/man2hlp/man2hlp.in
37@@ -1,4 +1,4 @@
Patrick Williams864cc432023-02-09 14:54:44 -060038-#! @PERL_FOR_BUILD@ -w
39+#! @PERL_FOR_BUILD@
Brad Bishop6e60e8b2018-02-01 10:27:11 -050040 #
41 # Man page to help file converter
42 # Copyright (C) 1994, 1995, 1998, 2000, 2001, 2002, 2003, 2004, 2005,
43diff --git a/src/vfs/extfs/helpers/a+.in b/src/vfs/extfs/helpers/a+.in
44index 579441c..fe446f4 100644
45--- a/src/vfs/extfs/helpers/a+.in
46+++ b/src/vfs/extfs/helpers/a+.in
47@@ -1,4 +1,4 @@
48-#! @PERL@ -w
49+#! @PERL@
50 #
51 # External filesystem for mc, using mtools
52 # Written Ludek Brukner <lubr@barco.cz>, 1997
53@@ -9,6 +9,8 @@
54
55 # These mtools components must be in PATH for this to work
56
57+use warnings;
58+
59 sub quote {
60 $_ = shift(@_);
61 s/([^\w\/.+-])/\\$1/g;
62diff --git a/src/vfs/extfs/helpers/mailfs.in b/src/vfs/extfs/helpers/mailfs.in
Patrick Williams864cc432023-02-09 14:54:44 -060063index 4bdd68b..5bb373b 100644
Brad Bishop6e60e8b2018-02-01 10:27:11 -050064--- a/src/vfs/extfs/helpers/mailfs.in
65+++ b/src/vfs/extfs/helpers/mailfs.in
66@@ -1,6 +1,7 @@
67-#! @PERL@ -w
68+#! @PERL@
69
70 use bytes;
71+use warnings;
72
73 # MC extfs for (possibly compressed) Berkeley style mailbox files
74 # Peter Daum <gator@cs.tu-berlin.de> (Jan 1998, mc-4.1.24)
75diff --git a/src/vfs/extfs/helpers/patchfs.in b/src/vfs/extfs/helpers/patchfs.in
Patrick Williams864cc432023-02-09 14:54:44 -060076index c20cd54..1f1e75b 100644
Brad Bishop6e60e8b2018-02-01 10:27:11 -050077--- a/src/vfs/extfs/helpers/patchfs.in
78+++ b/src/vfs/extfs/helpers/patchfs.in
79@@ -1,4 +1,4 @@
80-#! @PERL@ -w
81+#! @PERL@
82 #
83 # Written by Adam Byrtek <alpha@debian.org>, 2002
84 # Rewritten by David Sterba <dave@jikos.cz>, 2009
85@@ -9,6 +9,7 @@
86
87 use bytes;
88 use strict;
89+use warnings;
90 use POSIX;
91 use File::Temp 'tempfile';
92
93diff --git a/src/vfs/extfs/helpers/ulib.in b/src/vfs/extfs/helpers/ulib.in
94index 418611f..82c7ccf 100644
95--- a/src/vfs/extfs/helpers/ulib.in
96+++ b/src/vfs/extfs/helpers/ulib.in
97@@ -1,9 +1,11 @@
98-#! @PERL@ -w
99+#! @PERL@
100 #
101 # VFS to manage the gputils archives.
102 # Written by Molnár Károly (proton7@freemail.hu) 2012
103 #
104
105+use warnings;
106+
107 my %month = ('jan' => '01', 'feb' => '02', 'mar' => '03',
108 'apr' => '04', 'may' => '05', 'jun' => '06',
109 'jul' => '07', 'aug' => '08', 'sep' => '09',
110diff --git a/src/vfs/extfs/helpers/uzip.in b/src/vfs/extfs/helpers/uzip.in
Patrick Williams864cc432023-02-09 14:54:44 -0600111index c468f3a..ceffb53 100644
Brad Bishop6e60e8b2018-02-01 10:27:11 -0500112--- a/src/vfs/extfs/helpers/uzip.in
113+++ b/src/vfs/extfs/helpers/uzip.in
114@@ -1,4 +1,4 @@
115-#! @PERL@ -w
116+#! @PERL@
117 #
118 # zip file archive Virtual File System for Midnight Commander
119 # Version 1.4.0 (2001-08-07).
120@@ -9,6 +9,7 @@
121 use POSIX;
122 use File::Basename;
123 use strict;
124+use warnings;
125
126 #
127 # Configuration options