github-repos/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2025-02-05 09:10:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Ignore CR in CRLF line terminators for compatibility with DOSsy

Browse Source 
makefiles.
This commit is contained in:
Paul Smith 1999-03-31 23:25:13 +00:00
parent 47922a5a65
commit 7052a57152
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
1999-03-31 Paul D. Smith <psmith@gnu.org>
* read.c (readline): Ignore carriage returns at the end of the
line, to allow Windows-y CRLF line terminators.
1999-03-30 Paul D. Smith <psmith@gnu.org> 1999-03-30 Paul D. Smith <psmith@gnu.org>
* configure.in: Don't put build.sh here, since build.sh.in doesn't * configure.in: Don't put build.sh here, since build.sh.in doesn't

9
NEWS
View File

@ -1,6 +1,6 @@
GNU make NEWS -*-indented-text-*- GNU make NEWS -*-indented-text-*-
History of user-visible changes. History of user-visible changes.
22 Mar 1999 31 Mar 1999
Copyright (C) 1992,93,94,95,96,97,98,1999 Free Software Foundation, Inc. Copyright (C) 1992,93,94,95,96,97,98,1999 Free Software Foundation, Inc.
See the end for copying conditions. See the end for copying conditions.
@ -21,6 +21,9 @@ Version 3.78
* Make defines a new variable, .LIBPATTERNS. This variable controls how * Make defines a new variable, .LIBPATTERNS. This variable controls how
the link library dependency expansion (dependencies like ``-lfoo'') is the link library dependency expansion (dependencies like ``-lfoo'') is
performed. performed.
* Make allows CRLF sequences as well as traditional LF, in makefiles for
UNIX.
Version 3.77 Version 3.77
@ -682,7 +685,3 @@ Copyright information:
Permission is granted to distribute modified versions of this Permission is granted to distribute modified versions of this
document, or of portions of it, under the above conditions, provided document, or of portions of it, under the above conditions, provided
also that they carry prominent notices stating who last changed them. also that they carry prominent notices stating who last changed them.
Local variables:
version-control: never
end:

11
read.c
View File

@ -2129,6 +2129,17 @@ readline (linebuffer, stream, flocp)
++nlines; ++nlines;
#if !defined(WINDOWS32) && !defined(__MSDOS__)
/* Check to see if the line was really ended with CRLF; if so ignore
the CR. */
if (len > 1 && p[-2] == '\r')
{
--len;
--p;
p[-1] = '\n';
}
#endif
if (len == 1 && p > buffer) if (len == 1 && p > buffer)
/* P is pointing at a newline and it's the beginning of /* P is pointing at a newline and it's the beginning of
the buffer returned by the last fgets call. However, the buffer returned by the last fgets call. However,