Skip to content

Commit 354327b

Browse files
qq542vevqq542vev
committed
EOF >> __EOF__
1 parent a983b13 commit 354327b

30 files changed

+158
-158
lines changed

‎source/.w3mplus/bin/cgi-bin/protectionpage‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,12 @@ case "${query_category-}" in
115115
;;
116116
esac
117117

118-
printhtml --title 'Forbidden Site' -- - <<-EOF | httpresponse -H 'Content-Type: text/html; charset=UTF-8' -- -
118+
printhtml --title 'Forbidden Site' -- - <<-__EOF__ | httpresponse -H 'Content-Type: text/html; charset=UTF-8' -- -
119119
<h1>${title}</h1>
120120
121121
<p>This Web page at <a href="${url}">${url}</a> has been blocked based on <a href="${source}">${name}</a></p>
122122
123123
${message}
124124
125125
<p>To access this web page, change <a href="about:permissions">about:permissions</a> settings.</p>
126-
EOF
126+
__EOF__

‎source/.w3mplus/bin/cgi-bin/viewsource‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ if uricheck --field '' -- "${url}"; then
8484
-H 'W3m-control: DEL_PREBUF' \
8585
-H 'W3m-control: VIEW'
8686
else
87-
httpresponse -H 'Content-type: text/palin; charset=UTF-8' - <<-EOF
87+
httpresponse -H 'Content-type: text/palin; charset=UTF-8' - <<-__EOF__
8888
'${url}' is not URL.
89-
EOF
89+
__EOF__
9090
fi

‎source/.w3mplus/bin/cgi-bin/w3mplus‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ add_printtmp() {
131131
}
132132

133133
error_meesage() {
134-
httpresponse --status-line 'HTTP/1.1 500 Internal Server Error' -H 'Content-Type: text/plain; charset=UTF-8' -- - <<-EOF
134+
httpresponse --status-line 'HTTP/1.1 500 Internal Server Error' -H 'Content-Type: text/plain; charset=UTF-8' -- - <<-__EOF__
135135
An unexpected error occurred during request processing.
136136
137137
# Error message
@@ -141,7 +141,7 @@ error_meesage() {
141141
# Environment variable
142142
143143
$(env)
144-
EOF
144+
__EOF__
145145
}
146146

147147
expand() {
@@ -192,9 +192,9 @@ if [ -f "${W3MPLUS_PASS_FILE}" ] && [ "${W3MPLUS_PASS_VALUE}" '!=' "$(cat -- "${
192192
httpresponse \
193193
--status-line 'HTTP/1.1 400 Bad Request' \
194194
-H 'Content-Type: text/plain; charset=UTF-8' \
195-
-- - <<-'EOF'
195+
-- - <<-'__EOF__'
196196
The value of 'pass' is invalid.
197-
EOF
197+
__EOF__
198198

199199
exit
200200
fi
@@ -288,9 +288,9 @@ case "${query_action-}" in
288288

289289
query_subaction='goto'
290290
commandArg="${commandArg}$(
291-
cat <<-'EOF'
291+
cat <<-'__EOF__'
292292
-- incrementuri ${query_number+--number "'${query_number}'"}
293-
EOF
293+
__EOF__
294294
)"
295295
;;
296296
'parent-uripath')
@@ -300,9 +300,9 @@ case "${query_action-}" in
300300

301301
query_subaction='goto'
302302
commandArg="${commandArg}$(
303-
cat <<-'EOF'
303+
cat <<-'__EOF__'
304304
-- parenturipath ${query_number+--number "'${query_number}'"}
305-
EOF
305+
__EOF__
306306
)"
307307
;;
308308
'redirect')
@@ -314,9 +314,9 @@ case "${query_action-}" in
314314
pass=$(printf '%s' "${W3MPLUS_PASS_VALUE}" | urlencode)
315315
path_to_fileurl 'filepath' "${SCRIPT_NAME}"
316316
commandArg="${commandArg}$(
317-
cat <<-'EOF'
317+
cat <<-'__EOF__'
318318
-- printf "'%s%s'" "'${query_redirect-${filepath}?pass=${pass}&action=search&tab=del-prebuf&query=}'" '"$(urlencode)"'
319-
EOF
319+
__EOF__
320320
)"
321321
;;
322322
esac
@@ -386,7 +386,7 @@ case "${query_action-}" in
386386
;;
387387
'get-url-mark' | 'get-url-mark-line-begin')
388388
awkScript=$(
389-
cat <<-'EOF'
389+
cat <<-'__EOF__'
390390
BEGIN {
391391
FS = "\t"
392392
}
@@ -397,7 +397,7 @@ case "${query_action-}" in
397397
398398
printf("%s\t%s\t\t\t%s\n", uri, line, (moveURL == "" ? "" : "GOTO " moveURL $3))
399399
}
400-
EOF
400+
__EOF__
401401
)
402402

403403
case "${query_action}" in
@@ -661,7 +661,7 @@ case "${query_action-}" in
661661
;;
662662
'show-search-history')
663663
awkScript=$(
664-
cat <<-'EOF'
664+
cat <<-'__EOF__'
665665
@include "html_escape.awk"
666666
@include "url_decode.awk"
667667
@@ -677,7 +677,7 @@ case "${query_action-}" in
677677
END {
678678
printf("</samp></pre>")
679679
}
680-
EOF
680+
__EOF__
681681
)
682682
pass=$(printf '%s' "${W3MPLUS_PASS_VALUE}" | urlencode)
683683
path_to_fileurl 'filepath' "${SCRIPT_NAME}"
@@ -835,7 +835,7 @@ case "${query_action-}" in
835835

836836
printhtml \
837837
--title 'Bad Request' \
838-
-- - <<-EOF \
838+
-- - <<-__EOF__ \
839839
| httpresponse \
840840
--status-line 'HTTP/1.1 400 Bad Request' \
841841
-H 'Content-Type: text/html; charset=UTF-8' \
@@ -973,6 +973,6 @@ case "${query_action-}" in
973973
<dt>zoom</dt>
974974
<dd>${filepath}?pass={PASS_VALUE}&amp;action=zoom&amp;zoom={([+*/-] '=')? UNSIGNED_INTEGER}</dd>
975975
</dl>
976-
EOF
976+
__EOF__
977977
;;
978978
esac

‎source/.w3mplus/bin/changeconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ eval "set -- ${REST}"
7575

7676
tmpDir=$(mktemp -d)
7777
awkScript=$(
78-
cat <<-'EOF'
78+
cat <<-'__EOF__'
7979
BEGIN {
8080
split("", not)
8181
split("", param)
@@ -147,7 +147,7 @@ awkScript=$(
147147
printf("%s\n", $0)
148148
}
149149
}
150-
EOF
150+
__EOF__
151151
)
152152

153153
command='awk -v "max=${max}" -v "min=${min}" -- "${awkScript}" '"${param} --"

‎source/.w3mplus/bin/executeusercommand‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,17 @@ if [ '!' -e "${config}" ]; then
7777
fi
7878

7979
if [ '!' -f "${config}" ]; then
80-
cat <<-EOF >&2
80+
cat <<-__EOF__ >&2
8181
${0##*/}: '${config}' は通常ファイルではありません。
8282
詳細については '${0##*/} --help' を実行してください。
83-
EOF
83+
__EOF__
8484

8585
end_call "${EX_DATAERR}"
8686
elif [ '!' -r "${config}" ]; then
87-
cat <<-EOF >&2
87+
cat <<-__EOF__ >&2
8888
${0##*/}: '${config}' の読み込み許可がありません。
8989
詳細については '${0##*/} --help' を実行してください。
90-
EOF
90+
__EOF__
9191

9292
end_call "${EX_NOINPUT}"
9393
fi
@@ -101,7 +101,7 @@ esac
101101

102102
tmpDir=$(mktemp -d)
103103
awkScript=$(
104-
cat <<-'EOF'
104+
cat <<-'__EOF__'
105105
@include "backslash_unescape.awk"
106106
107107
BEGIN {
@@ -133,7 +133,7 @@ awkScript=$(
133133
134134
exit 1
135135
}
136-
EOF
136+
__EOF__
137137
)
138138

139139
awkv_escape 'config' "${config}"

‎source/.w3mplus/bin/framelinkmenu‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ eval "set -- ${REST}"
8888

8989
tmpDir=$(mktemp -d)
9090
awkScript=$(
91-
cat <<-'EOF'
91+
cat <<-'__EOF__'
9292
@include "html_escape.awk"
9393
@include "url_decode.awk"
9494
@@ -131,7 +131,7 @@ awkScript=$(
131131
printf("</li></ul>")
132132
}
133133
}
134-
EOF
134+
__EOF__
135135
)
136136

137137
sed -e '/["[:blank:]]/d; s/^/"/; s/$/"/' -- ${@+"${@}"} \
@@ -158,10 +158,10 @@ case "${output}" in
158158
elif [ -f "${output}" ]; then
159159
cat -- "${tmpDir}/file" >"${output}"
160160
else
161-
cat <<-EOF >&2
161+
cat <<-__EOF__ >&2
162162
${0##*/}: '${output}' は通常ファイルではありません。
163163
詳細については '${0##*/} --help' を実行してください。
164-
EOF
164+
__EOF__
165165

166166
end_call "${EX_DATAERR}"
167167
fi

‎source/.w3mplus/bin/getquickmark‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,17 @@ if [ '!' -e "${config}" ]; then
7777
fi
7878

7979
if [ '!' -f "${config}" ]; then
80-
cat <<-EOF >&2
80+
cat <<-__EOF__ >&2
8181
${0##*/}: '${config}' は通常ファイルではありません。
8282
詳細については '${0##*/} --help' を実行してください。
83-
EOF
83+
__EOF__
8484

8585
end_call "${EX_DATAERR}"
8686
elif [ '!' -r "${config}" ]; then
87-
cat <<-EOF >&2
87+
cat <<-__EOF__ >&2
8888
${0##*/}: '${config}' の読み込み許可がありません。
8989
詳細については '${0##*/} --help' を実行してください。
90-
EOF
90+
__EOF__
9191

9292
end_call "${EX_NOINPUT}"
9393
fi
@@ -100,7 +100,7 @@ case "${#}" in
100100
esac
101101

102102
awkScript=$(
103-
cat <<-'EOF'
103+
cat <<-'__EOF__'
104104
@include "backslash_unescape.awk"
105105
106106
BEGIN {
@@ -124,7 +124,7 @@ awkScript=$(
124124
125125
exit exitStatus
126126
}
127-
EOF
127+
__EOF__
128128
)
129129

130130
awkv_escape 'config' "${config}"

‎source/.w3mplus/bin/getregister‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,17 @@ if [ '!' -e "${config}" ]; then
7979
fi
8080

8181
if [ '!' -f "${config}" ]; then
82-
cat <<-EOF >&2
82+
cat <<-__EOF__ >&2
8383
${0##*/}: '${config}' は通常ファイルではありません。
8484
詳細については '${0##*/} --help' を実行してください。
85-
EOF
85+
__EOF__
8686

8787
end_call "${EX_DATAERR}"
8888
elif [ '!' -r "${config}" ]; then
89-
cat <<-EOF >&2
89+
cat <<-__EOF__ >&2
9090
${0##*/}: '${config}' の読み込み許可がありません。
9191
詳細については '${0##*/} --help' を実行してください。
92-
EOF
92+
__EOF__
9393

9494
end_call "${EX_NOINPUT}"
9595
fi
@@ -101,7 +101,7 @@ case "${#}" in
101101
esac
102102

103103
awkScript=$(
104-
cat <<-'EOF'
104+
cat <<-'__EOF__'
105105
@include "backslash_unescape.awk"
106106
107107
BEGIN {
@@ -129,7 +129,7 @@ awkScript=$(
129129
130130
exit 1
131131
}
132-
EOF
132+
__EOF__
133133
)
134134

135135
awkv_escape 'config' "${config}"

‎source/.w3mplus/bin/htmlframe‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ parse ${@+"${@}"}
8181
eval "set -- ${REST}"
8282

8383
awkScript=$(
84-
cat <<-'EOF'
84+
cat <<-'__EOF__'
8585
@include "html_escape.awk"
8686
8787
BEGIN {
@@ -95,7 +95,7 @@ awkScript=$(
9595
printf(" %s=\"%s\"", name, html_escape(attribute[name]))
9696
}
9797
}
98-
EOF
98+
__EOF__
9999
)
100100

101101
html_escape 'title' "${title}"

‎source/.w3mplus/bin/httpresponse‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@ eval "set -- ${REST}"
8181

8282
case "${W3MPLUS_TEMPLATE_HTTP-}" in
8383
'')
84-
cat <<-EOF
84+
cat <<-__EOF__
8585
${statusLine}${CHAR_CR}
8686
Date: $(date -u '+%a, %d %b %Y %H:%M:%S GMT')${CHAR_CR}
8787
${header}${CHAR_CR}
88-
EOF
88+
__EOF__
8989

9090
case "${#}" in
9191
[!0]) cat -- ${@+"${@}"};;

0 commit comments

Comments
 (0)