Mailing-List:	contact cygwin-help AT cygwin DOT com; run by ezmlm
List-Subscribe:	<mailto:cygwin-subscribe AT cygwin DOT com>
List-Archive:	<http://sources.redhat.com/ml/cygwin/>
List-Post:	<mailto:cygwin AT cygwin DOT com>
List-Help:	<mailto:cygwin-help AT cygwin DOT com>, <http://sources.redhat.com/ml/#faqs>
Sender:	cygwin-owner AT cygwin DOT com
Mail-Followup-To:	cygwin AT cygwin DOT com
Delivered-To:	mailing list cygwin AT cygwin DOT com
To:	cygwin AT cygwin DOT com
From:	"Steven E. Harris" <seharris AT raytheon DOT com>
Subject:	keychain patch (was: Filenames with spaces: very rare in Cygwin)
Date:	Thu, 15 Jan 2004 15:29:31 -0800
Organization:	Raytheon
Lines:	92
Message-ID:	<q671xq0vlic.fsf_-_@L75001820.us.ray.com>
References:	<000b01c3db63$4c975fe0$580210ac AT tcgp DOT dundee DOT ac DOT uk> <Pine DOT GSO DOT 4 DOT 56 DOT 0401151157250 DOT 1497 AT slinky DOT cs DOT nyu DOT edu> <q67ad4ovmt4 DOT fsf AT L75001820 DOT us DOT ray DOT com> <40071D7A DOT 1030503 AT hack DOT kampbjorn DOT com>
Mime-Version:	1.0
X-Complaints-To:	usenet AT sea DOT gmane DOT org
User-Agent:	Gnus/5.1003 (Gnus v5.10.3) XEmacs/21.4 (Rational FORTRAN, cygwin32)

Hack Kampbjorn <cygwin AT hack DOT kampbjorn DOT com> writes:

> If you send the patch to the list I'll look at it and possibly release
> an updated cygwin package.

Attached, per your request.

> But keep bugging the gentoo people that I don't have to maintain
> local patches.

I'll send them a note again. They released 2.0.8 about a week after I
sent my patch, I think, and it didn't include my changes, so I assumed
they had discarded my suggestions.


--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment; filename=keychain-2.0.3.diff

--- /bin/keychain	2003-11-22 10:40:13.001000000 -0800
+++ ./keychain	2003-11-25 13:17:16.296875000 -0800
@@ -9,6 +9,9 @@
 
 PATH="/sbin:/usr/sbin:${PATH}:/usr/ucb"; export PATH;
 
+LISTSEP="
+"                       # Separate list elements with linefeed for splitting.
+
 myaction=""
 myactionarg=""
 noaskopt=""
@@ -55,7 +58,7 @@
 			nocolopt="yes"
 			;;
 		*)
-			mykeys="${mykeys} $1"
+			mykeys="${mykeys}${LISTSEP}$1"
 			;;
 	esac
 	shift
@@ -219,15 +222,15 @@
 cshpidf="${keydir}/${hostname}-csh"
 lockf="${keydir}/${hostname}-lock"
 
-if [ -f ${keydir} ]
+if [ -f "${keydir}" ]
 then
 	echo "$0: ${keydir} is a file (it should be a directory;) please fix."
 	exit 1
 #Solaris 9 doesn't have -e; using -d....
-elif [ ! -d ${keydir} ]
+elif [ ! -d "${keydir}" ]
 then
-	mkdir ${keydir} || exit 1
-	chmod 0700 ${keydir}
+	mkdir "${keydir}" || exit 1
+	chmod 0700 "${keydir}"
 fi
 
 # perform lock if we have lockfile available                                    
@@ -301,9 +304,9 @@
 fi
 
 SSH_AGENT_PID="NULL"
-if [ -f $pidf ]
+if [ -f "$pidf" ]
 then
-	. $pidf	
+	. "$pidf"
 fi
 
 # Copy application-specific environment variables into generic local variables.
@@ -441,7 +444,7 @@
 		done
 		if [ $skip -ne 1 ]
 		then
-			missingkeys="$missingkeys $x"
+			missingkeys="$missingkeys${LISTSEP}$x"
 			mcount=`expr $mcount + 1`
 		fi
 	done



-- 
Steven E. Harris        :: seharris AT raytheon DOT com
Raytheon                :: http://www.raytheon.com


--=-=-=
Content-Type: text/plain; charset=us-ascii

--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Problem reports:       http://cygwin.com/problems.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/
--=-=-=--

- Raw text -