Skip to content

Commit ba6079f

Browse files
qq542vevqq542vev
committed
Update about: error page
1 parent 8e533a4 commit ba6079f

File tree

12 files changed

+23
-16
lines changed

12 files changed

+23
-16
lines changed

‎release/.w3mplus/bin/cgi-bin/w3mplus‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,11 @@ if [ -f "${W3MPLUS_PASS_FILE}" ] && [ "${W3MPLUS_PASS_VALUE}" '!=' "$(cat -- "${
480480
fi
481481

482482
case "${query_action-}" in
483-
'about-uri') org_lc w3mabouturi -- ${query_about+"${query_about}"} ;;
483+
'about-uri') org_lc w3mabouturi -- ${query_about+"${query_about}"} ||
484+
case "${?}" in [!1] | 1?*)
485+
exit "${?}"
486+
;;
487+
esac ;;
484488
'close-tab')
485489
expand 'uri' "${query_uri-W3M_URL}"
486490
expand 'line' "${query_line-W3M_CURRENT_LINE}" '1'
@@ -598,7 +602,7 @@ case "${query_action-}" in
598602
;;
599603
esac
600604

601-
org_lc eval w3maction \
605+
eval org_lc w3maction \
602606
'"${query_subaction}"' \
603607
'"${query_variable-W3M_URL}"' \
604608
"${commandArg-}"

‎release/.w3mplus/bin/framelinkmenu‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,6 @@ esac
763763
path_to_fileurl 'menu' "${output}"
764764

765765
case "${position}" in
766-
'left') org_lc eval "htmlframe ${attribute} --title \"\${title}\" --n1 'menu' --n2 'main' --t1 'Menu page' --t2 'Main page' -- \"\${menu}\" \"\${main}\"" ;;
767-
'right') org_lc eval "htmlframe ${attribute} --title \"\${title}\" --n1 'main' --n2 'menu' --t1 'Main page' --t2 'Menu page' -- \"\${main}\" \"\${menu}\"" ;;
766+
'left') eval org_lc "htmlframe ${attribute} --title \"\${title}\" --n1 'menu' --n2 'main' --t1 'Menu page' --t2 'Main page' -- \"\${menu}\" \"\${main}\"" ;;
767+
'right') eval org_lc "htmlframe ${attribute} --title \"\${title}\" --n1 'main' --n2 'menu' --t1 'Main page' --t2 'Menu page' -- \"\${main}\" \"\${menu}\"" ;;
768768
esac

‎release/.w3mplus/bin/w3maction‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ GETOPTIONSHERE
695695
;;
696696
esac
697697

698-
org_lc eval "w3mredirect ${option-} -- \${value}"
698+
eval org_lc "w3mredirect ${option-} -- \${value}"
699699
;;
700700
'setenv')
701701
encode='raw'

‎release/.w3mplus/bin/w3mfindinpage‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,4 +483,4 @@ case "${search}" in ?*)
483483
;;
484484
esac
485485

486-
org_lc eval "httpresponse -H 'W3m-control: BACK' ${header}"
486+
eval org_lc "httpresponse -H 'W3m-control: BACK' ${header}"

‎release/.w3mplus/bin/w3mredirect‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -746,6 +746,6 @@ option=$(
746746
esac | awk -v "tab=${tab}" -- "${awkScript}"
747747
)
748748

749-
org_lc eval httpresponse \
749+
eval org_lc httpresponse \
750750
'${template:+--template "${template}"}' \
751751
"${option}"

‎release/bin/w3m-private‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,4 +383,4 @@ shellScript=$(
383383
done
384384
)
385385

386-
LC_ALL="${LC_ALL_ORG}" HOME="${tmpDir}" w3m ${@+"${@}"}
386+
HOME="${tmpDir}" org_lc w3m ${@+"${@}"}

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,10 @@ if [ -f "${W3MPLUS_PASS_FILE}" ] && [ "${W3MPLUS_PASS_VALUE}" '!=' "$(cat -- "${
302302
fi
303303

304304
case "${query_action-}" in
305-
'about-uri') org_lc w3mabouturi -- ${query_about+"${query_about}"};;
305+
'about-uri') org_lc w3mabouturi -- ${query_about+"${query_about}"} \
306+
|| case "${?}" in [!1] | 1?*)
307+
exit "${?}"
308+
esac;;
306309
'close-tab')
307310
expand 'uri' "${query_uri-W3M_URL}"
308311
expand 'line' "${query_line-W3M_CURRENT_LINE}" '1'
@@ -416,7 +419,7 @@ case "${query_action-}" in
416419
;;
417420
esac
418421

419-
org_lc eval w3maction \
422+
eval org_lc w3maction \
420423
'"${query_subaction}"' \
421424
'"${query_variable-W3M_URL}"' \
422425
"${commandArg-}"

‎source/.w3mplus/bin/framelinkmenu‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,6 @@ esac
216216
path_to_fileurl 'menu' "${output}"
217217

218218
case "${position}" in
219-
'left') org_lc eval "htmlframe ${attribute} --title \"\${title}\" --n1 'menu' --n2 'main' --t1 'Menu page' --t2 'Main page' -- \"\${menu}\" \"\${main}\"";;
220-
'right') org_lc eval "htmlframe ${attribute} --title \"\${title}\" --n1 'main' --n2 'menu' --t1 'Main page' --t2 'Menu page' -- \"\${main}\" \"\${menu}\"";;
219+
'left') eval org_lc "htmlframe ${attribute} --title \"\${title}\" --n1 'menu' --n2 'main' --t1 'Menu page' --t2 'Main page' -- \"\${menu}\" \"\${main}\"";;
220+
'right') eval org_lc "htmlframe ${attribute} --title \"\${title}\" --n1 'main' --n2 'menu' --t1 'Main page' --t2 'Menu page' -- \"\${main}\" \"\${menu}\"";;
221221
esac

‎source/.w3mplus/bin/w3maction‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ case "${action}" in
207207
value="${value%_}"
208208
esac
209209

210-
org_lc eval "w3mredirect ${option-} -- \${value}"
210+
eval org_lc "w3mredirect ${option-} -- \${value}"
211211
;;
212212
'setenv')
213213
# @gengetoptions parser -i parser_definition_setenv parse_setenv "${1}"

‎source/.w3mplus/bin/w3mfindinpage‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,4 +140,4 @@ case "${search}" in ?*)
140140
done
141141
esac
142142

143-
org_lc eval "httpresponse -H 'W3m-control: BACK' ${header}"
143+
eval org_lc "httpresponse -H 'W3m-control: BACK' ${header}"

0 commit comments

Comments
 (0)