CRLF to LF Issue

CRLF to LF Issue

[Richard Bland]

Hi All,

I'm trying to use the 'patch' utility to modify some source code files
created in MS-Windows Notepad. The source code is designed to ONLY be used
in MS-Windows, so I'm not interested in porting between Unix/MS-Windows. The
source code files are line terminated with a CR and LF, in the normal MS-DOS
fashion. If I use 'patch' to apply a patch file to this source code, the
CRLF pair become a single LF for every line in the file. The patch file may
only apply to one or two lines and was generated using 'diff -Nur' on this
platform. Obviously, I want to retain my CRLF pair instead of it being
converted to a single LF. 

I've checked the FAQ and some of the mailing list archives, but cannot find
anything part from references to 'Text and Binary modes' in the user guide.
I've tried setting the CYGWIN environment variable to binmode and nobinmode
and I've tried the commands within the Cygwin shell as well as a regular
MS-DOS prompt. The commands are being run on the local NTFS partition.

Version Numbers
---------------
Microsoft Windows XP [Version 5.1.2600]
uname -a : CYGWIN_NT-5.1 net251 1.3.22(0.78/3/2) 2003-03-18 09:20 i686
unknown unknown Cygwin
Patch :  2.5.8

TIA

Rich



Note: ESPO currently uses Microsoft Office 2000/XP.  

Please make sure that files you send can be read in this format. This
message is intended only for the named addressee(s) and may contain
confidential and/or privileged information.  If you are not the named
addressee you should not disseminate, copy, disclose, modify or distribute
this e-mail unless authorised to do so by the sender.  If you have received
this message in error then please notify m.geary@espo.org and delete the
message and any attachments accompanying it immediately.

You are also advised that the views and opinions expressed in this e-mail
message and any attachments are the author's own, and may not reflect the
views and opinions of ESPO.

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

Re: CRLF to LF Issue

[Igor Pechtchanski]

On Thu, 26 Jun 2003, Richard Bland wrote:

> Hi All,
>
> I'm trying to use the 'patch' utility to modify some source code files
> created in MS-Windows Notepad. The source code is designed to ONLY be used
> in MS-Windows, so I'm not interested in porting between Unix/MS-Windows. The
> source code files are line terminated with a CR and LF, in the normal MS-DOS
> fashion. If I use 'patch' to apply a patch file to this source code, the
> CRLF pair become a single LF for every line in the file. The patch file may
> only apply to one or two lines and was generated using 'diff -Nur' on this
> platform. Obviously, I want to retain my CRLF pair instead of it being
> converted to a single LF.
>
> I've checked the FAQ and some of the mailing list archives, but cannot find
> anything part from references to 'Text and Binary modes' in the user guide.
> I've tried setting the CYGWIN environment variable to binmode and nobinmode
> and I've tried the commands within the Cygwin shell as well as a regular
> MS-DOS prompt. The commands are being run on the local NTFS partition.
>
> Version Numbers
> ---------------
> Microsoft Windows XP [Version 5.1.2600]
> uname -a : CYGWIN_NT-5.1 net251 1.3.22(0.78/3/2) 2003-03-18 09:20 i686
> unknown unknown Cygwin
> Patch :  2.5.8
>
> TIA
> Rich

Rich,

The "binmode" setting in the CYGWIN environment variable only affects
writes to pipes.  For disk writes, Cygwin consults the mount table.
Check your mounts (using the "mount" command), and make sure the directory
that contains the input/output file of "patch" is mounted in text mode.
If it isn't, use the "mount" command again to re-mount it.
	Igor
-- 
				http://cs.nyu.edu/~pechtcha/
      |\      _,,,---,,_		pechtcha@cs.nyu.edu
ZZZzz /,`.-'`'    -.  ;-;;,_		igor@watson.ibm.com
     |,4-  ) )-,_. ,\ (  `'-'		Igor Pechtchanski, Ph.D.
    '---''(_/--'  `-'\_) fL	a.k.a JaguaR-R-R-r-r-r-.-.-.  Meow!

"I have since come to realize that being between your mentor and his route
to the bathroom is a major career booster."  -- Patrick Naughton


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

Re: CRLF to LF Issue

[Corinna Vinschen]

On Thu, Jun 26, 2003 at 11:54:30AM +0100, Richard Bland wrote:
> fashion. If I use 'patch' to apply a patch file to this source code, the
> CRLF pair become a single LF for every line in the file.

Cygwin patch always creates output files in binary (LF EOL).  This solves
more problems (discussed earlier in this list and elsewhere) than it
produces so I'm not inclined to revert that change.  If you don't like
it, use a Windows native patch or unix2dos.

Corinna

-- 
Corinna Vinschen                  Please, send mails regarding Cygwin to
Cygwin Developer                                mailto:cygwin@cygwin.com
Red Hat, Inc.

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

Re: CRLF to LF Issue

[Dean Scarff]

On July 3 at 2003 0:49, "Hannu E K Nevalainen (garbage mail)" wrote:

> 
> FYI... :-}
> 
> I've been in this situation since 1985 or so... (Amiga user since 
> then.AmigaOS uses LF EOL. Also been using MS "OS'es" since before 
> '85).
> "My way" has been:
> 1) Keep each OS clean of files not having the default line ending
> 2) Make sure to always CONVERT files _at the very moment_ they're
> transferred
> 

Im sure that must be convenient ;)

> Sidenote:
> There is several ways to accomplish "2)" on the Amiga:
> a) Enable CrossDOS (AmigaDOS file system for vfat) internal 
> conversion b) dos2unix-like utilities
> c) Use an editor that manages files undependent of EOL style

Bingo.  If you're using Cygwin you've got access to vim, emacs, nano, 
all of which support variations to the line terminator.  Richard 
mentioned before that "The source code is designed to ONLY be used in 
MS-Windows, so I'm not interested in porting between Unix/MS-
Windows."  There's plenty of good editors (especially the ones 
intended for development) for windows that can handle LF as EOL.  
ConTEXT is quite nice if you go for 'free'/shareware.

I use LF for all my sources, whether they're unix or not.  As (I 
think?) you say, internal CRLF'ing and vice versa is just going to 
have problems where internal conversion doesn't behave as the user 
expects (read: cant read the user's mind).

Cheers,
Dean Scarff


 


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

RE: CRLF to LF Issue

[Hannu E K Nevalainen (garbage mail)]

 FYI... :-}

 I've been in this situation since 1985 or so... (Amiga user since then.
AmigaOS uses LF EOL. Also been using MS "OS'es" since before '85).

"My way" has been:
 1) Keep each OS clean of files not having the default line ending
 2) Make sure to always CONVERT files _at the very moment_ they're
transferred

i.e. files in "cygwin" file tree should always have LF EOL. Move/Copy out of
the 'file tree' and immediately convert accordingly.
 A simple "$ find -type f | xargs u2d" (or some such; not checked) should do
the trick in one go.


 IMHO the mere possibility to switch between EOL-conventions on cygwin is a
nuisance. It just generates problems[1] without any clear benefit for
anything.


/Hannu E K Nevalainen, Mariefred, Sweden


--
[1] Problems:
 * User interaction
   i.e. The user inadverently does something that causes EOL's to be
otherwise
   than expected.
 * Initial implementation
   The source has to be converted (at least in some cases) to handle the
   possible switch.
 * Updating the source
   Upstream changes might cause a rewrite of the implementation.

Sidenote:
There is several ways to accomplish "2)" on the Amiga:
 a) Enable CrossDOS (AmigaDOS file system for vfat) internal conversion
 b) dos2unix-like utilities
 c) Use an editor that manages files undependent of EOL style

On the Amiga "c)" is almost the same as "b)" as the editor can act exactly
as a dos2unix utility, given the standard ARexx IPC and scriptability.

--END OF MESSAGE--




> -----Original Message-----
> From: cygwin-owner@cygwin.com [mailto:cygwin-owner@cygwin.com]On Behalf
> Of Richard Bland
> Sent: Monday, June 30, 2003 5:18 PM
> To: cygwin@cygwin.com
> Subject: RE: CRLF to LF Issue
>
>
> OK, thanks for the hint. I've hacked out reference to O_BINARY in the
> function 'create_output_file', and that, amongst other hacks,
> seems to have
> done the trick.
>
> Ta!
>
> Rich
>
> -----Original Message-----
> From: Corinna Vinschen [mailto:corinna-cygwin@cygwin.com]
> Sent: 30 June 2003 13:50
> To: cygwin@cygwin.com
> Subject: Re: CRLF to LF Issue
>
>
> On Thu, Jun 26, 2003 at 11:54:30AM +0100, Richard Bland wrote:
> > fashion. If I use 'patch' to apply a patch file to this source code,
> > the CRLF pair become a single LF for every line in the file.
>
> Cygwin patch always creates output files in binary (LF EOL).  This solves
> more problems (discussed earlier in this list and elsewhere) than it
> produces so I'm not inclined to revert that change.  If you don't like it,
> use a Windows native patch or unix2dos.
>
> Corinna
>
> --
> Corinna Vinschen                  Please, send mails regarding Cygwin to
> Cygwin Developer                                mailto:cygwin@cygwin.com
> Red Hat, Inc.
>
> --
> 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/
>
>
>
> Note: ESPO currently uses Microsoft Office 2000/XP.
>
> Please make sure that files you send can be read in this format. This
> message is intended only for the named addressee(s) and may contain
> confidential and/or privileged information.  If you are not the named
> addressee you should not disseminate, copy, disclose, modify or distribute
> this e-mail unless authorised to do so by the sender.  If you
> have received
> this message in error then please notify m.geary@espo.org and delete the
> message and any attachments accompanying it immediately.
>
> You are also advised that the views and opinions expressed in this e-mail
> message and any attachments are the author's own, and may not reflect the
> views and opinions of ESPO.
>
> --
> 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/
>


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

RE: CRLF to LF Issue

[Richard Bland]

OK, thanks for the hint. I've hacked out reference to O_BINARY in the
function 'create_output_file', and that, amongst other hacks, seems to have
done the trick.

Ta!

Rich

-----Original Message-----
From: Corinna Vinschen [mailto:corinna-cygwin@cygwin.com] 
Sent: 30 June 2003 13:50
To: cygwin@cygwin.com
Subject: Re: CRLF to LF Issue


On Thu, Jun 26, 2003 at 11:54:30AM +0100, Richard Bland wrote:
> fashion. If I use 'patch' to apply a patch file to this source code, 
> the CRLF pair become a single LF for every line in the file.

Cygwin patch always creates output files in binary (LF EOL).  This solves
more problems (discussed earlier in this list and elsewhere) than it
produces so I'm not inclined to revert that change.  If you don't like it,
use a Windows native patch or unix2dos.

Corinna

-- 
Corinna Vinschen                  Please, send mails regarding Cygwin to
Cygwin Developer                                mailto:cygwin@cygwin.com
Red Hat, Inc.

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



Note: ESPO currently uses Microsoft Office 2000/XP.  

Please make sure that files you send can be read in this format. This
message is intended only for the named addressee(s) and may contain
confidential and/or privileged information.  If you are not the named
addressee you should not disseminate, copy, disclose, modify or distribute
this e-mail unless authorised to do so by the sender.  If you have received
this message in error then please notify m.geary@espo.org and delete the
message and any attachments accompanying it immediately.

You are also advised that the views and opinions expressed in this e-mail
message and any attachments are the author's own, and may not reflect the
views and opinions of ESPO.

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

RE: CRLF to LF Issue

[Richard Bland]

Hmm, OK. I've tried this again booting off a Knoppix Linux CD and the diff /
patch over the CRLF files on the FDD worked fine, applying the patch and
preserving the CRLF. This does seem to be something weird with the way
Cygwin is dealing with the files.

Thanks,

Rich

-----Original Message-----
From: Richard Bland [mailto:r.bland@espo.org] 
Sent: 26 June 2003 17:17
To: cygwin@cygwin.com
Subject: RE: CRLF to LF Issue


All,

Sorry, no joy - same outcome

Here's my mount :

drb398@net251 /
$ mount
C:\cygwin\usr\X11R6\lib\X11\fonts on /usr/X11R6/lib/X11/fonts type system
(binmode)
C:\cygwin\bin on /usr/bin type system (binmode)
C:\cygwin\lib on /usr/lib type system (binmode)
C:\cygwin on / type system (binmode)
a: on /mnt/foo type system (textmode)
c: on /cygdrive/c type user (binmode,noumount)

I've used the a: drive as the location for patching, just to keep it
separate from other mounts. I recreated the patch file using diff on the
textmode mount point, just to be sure. My patch file and the target source
code files were all under /mnt/foo (a:). I used 'mount -t a:/ /mnt/foo' for
the mount.

Thanks

Rich

-----Original Message-----
From: Igor Pechtchanski [mailto:pechtcha@cs.nyu.edu] 
Sent: 26 June 2003 16:19
To: Richard Bland
Cc: cygwin@cygwin.com
Subject: Re: CRLF to LF Issue


On Thu, 26 Jun 2003, Richard Bland wrote:

> Hi All,
>
> I'm trying to use the 'patch' utility to modify some source code files
> created in MS-Windows Notepad. The source code is designed to ONLY be 
> used in MS-Windows, so I'm not interested in porting between 
> Unix/MS-Windows. The source code files are line terminated with a CR 
> and LF, in the normal MS-DOS fashion. If I use 'patch' to apply a 
> patch file to this source code, the CRLF pair become a single LF for 
> every line in the file. The patch file may only apply to one or two 
> lines and was generated using 'diff -Nur' on this platform. Obviously, 
> I want to retain my CRLF pair instead of it being converted to a 
> single LF.
>
> I've checked the FAQ and some of the mailing list archives, but cannot
> find anything part from references to 'Text and Binary modes' in the 
> user guide. I've tried setting the CYGWIN environment variable to 
> binmode and nobinmode and I've tried the commands within the Cygwin 
> shell as well as a regular MS-DOS prompt. The commands are being run 
> on the local NTFS partition.
>
> Version Numbers
> ---------------
> Microsoft Windows XP [Version 5.1.2600]
> uname -a : CYGWIN_NT-5.1 net251 1.3.22(0.78/3/2) 2003-03-18 09:20 i686
> unknown unknown Cygwin Patch :  2.5.8
>
> TIA
> Rich

Rich,

The "binmode" setting in the CYGWIN environment variable only affects writes
to pipes.  For disk writes, Cygwin consults the mount table. Check your
mounts (using the "mount" command), and make sure the directory that
contains the input/output file of "patch" is mounted in text mode. If it
isn't, use the "mount" command again to re-mount it.
	Igor
-- 
				http://cs.nyu.edu/~pechtcha/
      |\      _,,,---,,_		pechtcha@cs.nyu.edu
ZZZzz /,`.-'`'    -.  ;-;;,_		igor@watson.ibm.com
     |,4-  ) )-,_. ,\ (  `'-'		Igor Pechtchanski, Ph.D.
    '---''(_/--'  `-'\_) fL	a.k.a JaguaR-R-R-r-r-r-.-.-.  Meow!

"I have since come to realize that being between your mentor and his route
to the bathroom is a major career booster."  -- Patrick Naughton



Note: ESPO currently uses Microsoft Office 2000/XP.  

Please make sure that files you send can be read in this format. This
message is intended only for the named addressee(s) and may contain
confidential and/or privileged information.  If you are not the named
addressee you should not disseminate, copy, disclose, modify or distribute
this e-mail unless authorised to do so by the sender.  If you have received
this message in error then please notify m.geary@espo.org and delete the
message and any attachments accompanying it immediately.

You are also advised that the views and opinions expressed in this e-mail
message and any attachments are the author's own, and may not reflect the
views and opinions of ESPO.

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



Note: ESPO currently uses Microsoft Office 2000/XP.  

Please make sure that files you send can be read in this format. This
message is intended only for the named addressee(s) and may contain
confidential and/or privileged information.  If you are not the named
addressee you should not disseminate, copy, disclose, modify or distribute
this e-mail unless authorised to do so by the sender.  If you have received
this message in error then please notify m.geary@espo.org and delete the
message and any attachments accompanying it immediately.

You are also advised that the views and opinions expressed in this e-mail
message and any attachments are the author's own, and may not reflect the
views and opinions of ESPO.

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

RE: CRLF to LF Issue

[John Vincent]

If you just want a quick fix, try using the dos2unix and unix2dos utilities

_________________________________________________________________
On the move? Get Hotmail on your mobile phone http://www.msn.co.uk/msnmobile


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

RE: CRLF to LF Issue

[Richard Bland]

All,

Sorry, no joy - same outcome

Here's my mount :

drb398@net251 /
$ mount
C:\cygwin\usr\X11R6\lib\X11\fonts on /usr/X11R6/lib/X11/fonts type system
(binmode)
C:\cygwin\bin on /usr/bin type system (binmode)
C:\cygwin\lib on /usr/lib type system (binmode)
C:\cygwin on / type system (binmode)
a: on /mnt/foo type system (textmode)
c: on /cygdrive/c type user (binmode,noumount)

I've used the a: drive as the location for patching, just to keep it
separate from other mounts. I recreated the patch file using diff on the
textmode mount point, just to be sure. My patch file and the target source
code files were all under /mnt/foo (a:). I used 'mount -t a:/ /mnt/foo' for
the mount.

Thanks

Rich

-----Original Message-----
From: Igor Pechtchanski [mailto:pechtcha@cs.nyu.edu] 
Sent: 26 June 2003 16:19
To: Richard Bland
Cc: cygwin@cygwin.com
Subject: Re: CRLF to LF Issue


On Thu, 26 Jun 2003, Richard Bland wrote:

> Hi All,
>
> I'm trying to use the 'patch' utility to modify some source code files 
> created in MS-Windows Notepad. The source code is designed to ONLY be 
> used in MS-Windows, so I'm not interested in porting between 
> Unix/MS-Windows. The source code files are line terminated with a CR 
> and LF, in the normal MS-DOS fashion. If I use 'patch' to apply a 
> patch file to this source code, the CRLF pair become a single LF for 
> every line in the file. The patch file may only apply to one or two 
> lines and was generated using 'diff -Nur' on this platform. Obviously, 
> I want to retain my CRLF pair instead of it being converted to a 
> single LF.
>
> I've checked the FAQ and some of the mailing list archives, but cannot 
> find anything part from references to 'Text and Binary modes' in the 
> user guide. I've tried setting the CYGWIN environment variable to 
> binmode and nobinmode and I've tried the commands within the Cygwin 
> shell as well as a regular MS-DOS prompt. The commands are being run 
> on the local NTFS partition.
>
> Version Numbers
> ---------------
> Microsoft Windows XP [Version 5.1.2600]
> uname -a : CYGWIN_NT-5.1 net251 1.3.22(0.78/3/2) 2003-03-18 09:20 i686 
> unknown unknown Cygwin Patch :  2.5.8
>
> TIA
> Rich

Rich,

The "binmode" setting in the CYGWIN environment variable only affects writes
to pipes.  For disk writes, Cygwin consults the mount table. Check your
mounts (using the "mount" command), and make sure the directory that
contains the input/output file of "patch" is mounted in text mode. If it
isn't, use the "mount" command again to re-mount it.
	Igor
-- 
				http://cs.nyu.edu/~pechtcha/
      |\      _,,,---,,_		pechtcha@cs.nyu.edu
ZZZzz /,`.-'`'    -.  ;-;;,_		igor@watson.ibm.com
     |,4-  ) )-,_. ,\ (  `'-'		Igor Pechtchanski, Ph.D.
    '---''(_/--'  `-'\_) fL	a.k.a JaguaR-R-R-r-r-r-.-.-.  Meow!

"I have since come to realize that being between your mentor and his route
to the bathroom is a major career booster."  -- Patrick Naughton



Note: ESPO currently uses Microsoft Office 2000/XP.  

Please make sure that files you send can be read in this format. This
message is intended only for the named addressee(s) and may contain
confidential and/or privileged information.  If you are not the named
addressee you should not disseminate, copy, disclose, modify or distribute
this e-mail unless authorised to do so by the sender.  If you have received
this message in error then please notify m.geary@espo.org and delete the
message and any attachments accompanying it immediately.

You are also advised that the views and opinions expressed in this e-mail
message and any attachments are the author's own, and may not reflect the
views and opinions of ESPO.

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