X-Spam-Check-By: sourceware.org
Message-ID: <BAY105-F39143EFEBD716BAED61693FFEC0@phx.gbl>
X-Sender: lode_leroy AT hotmail DOT com
From: "lode leroy" <lode_leroy AT hotmail DOT com>
To: cygwin AT cygwin DOT com
Subject: CVS patch for cygwin
Date: Tue, 21 Nov 2006 13:47:07 +0100
Mime-Version: 1.0
Content-Type: text/plain; format=flowed
Mailing-List: contact cygwin-help AT cygwin DOT com; run by ezmlm
List-Subscribe: <mailto:cygwin-subscribe AT cygwin DOT com>
List-Archive: <http://sourceware.org/ml/cygwin/>
List-Post: <mailto:cygwin AT cygwin DOT com>
List-Help: <mailto:cygwin-help AT cygwin DOT com>, <http://sourceware.org/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

Cygwin port maintained by: Charles Wilson  (bug reports to 
<cygwin AT cygwin DOT com>)

I applied the following patch to CVS-1.21.11-1 in order to allow myself
to share sandboxes between WinCVS and cygwin/cvs.

The problem is that WinCVS puts a CR/LF in the file "CVS/Root"
on which cygwin/cvs chokes....

This (trivial) patch solves that problem...

( I prefer not to mount the sandbox as "Text" in cygwin, which might also 
have fixed it )



diff -u src/root.c.orig src/root.c
--- src/root.c.orig 2006-11-21 13:40:12.758930500 +0100
+++ src/root.c      2006-11-21 13:39:12.461870500 +0100
@@ -95,7 +95,10 @@
     fclose (fpin);
     cp = root + len - 1;
     if (*cp == '\n')
-       *cp = '\0';                     /* strip the newline */
+       *cp-- = '\0';                   /* strip the newline */
+
+    if (*cp == '\r')
+       *cp-- = '\0';                   /* strip the carriage return */

     /*
      * root now contains a candidate for CVSroot. It must be an

_________________________________________________________________
Get back at your best friend for publishing your picture! 
http://spaces.live.com/default.aspx?page=Ed01&ss=False


--
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/