diff options
author | abs <abs> | 2001-12-22 14:43:19 +0000 |
---|---|---|
committer | abs <abs> | 2001-12-22 14:43:19 +0000 |
commit | 1d4024bd3d1b29dad2f1b73ee323e50d558a57eb (patch) | |
tree | d3930d650475320191e9d76a5e4d511aebf7c56c | |
parent | 5e12017fa0c6fa71434baf553436229da1079993 (diff) | |
download | pkgsrc-1d4024bd3d1b29dad2f1b73ee323e50d558a57eb.tar.gz |
Update ns-remote to 1.5:
Change ns-open to always start a new netscape process for URLs containing a
comma, rather than trying to URL encode them.
The XChangeProperty() call inside ns-remote interprets commas as deliminating
optional arguments and does not handle URL encoded commas.
Fixes PR pkg/14984 from reed@reedmedia.net
-rw-r--r-- | www/ns-remote/Makefile | 4 | ||||
-rwxr-xr-x | www/ns-remote/files/ns-open | 13 |
2 files changed, 10 insertions, 7 deletions
diff --git a/www/ns-remote/Makefile b/www/ns-remote/Makefile index a4990d73ffe..851ec283a2f 100644 --- a/www/ns-remote/Makefile +++ b/www/ns-remote/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2001/08/29 22:41:27 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2001/12/22 14:43:19 abs Exp $ DISTNAME= ns-remote -PKGNAME= ns-remote-1.4 +PKGNAME= ns-remote-1.5 CATEGORIES= www MASTER_SITES= http://home.netscape.com/newsref/std/ DISTFILES= remote.c vroot.h diff --git a/www/ns-remote/files/ns-open b/www/ns-remote/files/ns-open index e912e87f21b..26d155d0c3a 100755 --- a/www/ns-remote/files/ns-open +++ b/www/ns-remote/files/ns-open @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: ns-open,v 1.5 2001/07/27 14:26:19 abs Exp $ +# $NetBSD: ns-open,v 1.6 2001/12/22 14:43:20 abs Exp $ # # Simple script to open a URL in Netscape, starting a new process if necessary # If a netscape process is not running it will look for a valid netscape @@ -57,11 +57,14 @@ do -raise | -noraise) RAISE= ;; - -* ) - UNRECOGNISED_OPTION=1 + -* ) # Unrecognised option + START_NEW_NETSCAPE=1 + ;; + *,* ) # ns-remote cannot handle a URL encoded comma (XChangeProperty) + START_NEW_NETSCAPE=1 ;; *) - URL=`echo $a | sed -e 's/"/%22/g' -e 's/,/%2c/g' -e 's/\`/%60/g` + URL=`echo $a | sed -e 's/"/%22/g' -e 's/\`/%60/g` break; ;; esac @@ -70,7 +73,7 @@ done # If we recognised all the options, try ns-remote # -if [ -z "$UNRECOGNISED_OPTION" ];then +if [ -z "$START_NEW_NETSCAPE" ];then NS_REMOTE_ARGS="$NS_REMOTE_ARGS $RAISE" if [ -z "$REMOTE_SPECIFIED" ];then if [ -n "$URL" ];then |