* src/cmp.c: Don't include <setmode.h>.

(specify_ignore_initial): Reword to avoid gcc -W warnings.
(main): Use freopen instead of setmode, since freopen is in POSIX.
* src/context.c: Revert most 2004-09-01 changes.  Then:
(TIMESPEC_NS): Remove.  All uses replaced by
get_stat_mtime_ns.
Include stat-time.h, strftime.h.
(nstrtime): Remove decl.
* src/diff.c: Revert most 2004-09-01 changes.  Then:
Don't include <posixver.h>, <quotesys.h>, <setmode.h>.
Include <sh-quote.h>, <stat-time.h>, <timespec.h>.
All uses of quotesys replaced by sh-quote.
(main, compare_files):
Use freopen instead of setmode, since freopen is in POSIX.
(main): Don't complain about "diff -NUM'.
(main, set_mtime_to_now):
Adjust to stat-time.h macros when accessing nanoseconds.
* src/diff3.c: Include sh-quote.h rather than quotesys.  All uses
changed.
* src/dir.c (dir_read): excluded_filename renamed to
excluded_file_name.
* src/io.c: Don't include <setmode.h>.
(sip, read_files): Remove binary file stuff, leaving a FIXME behind.
A DOS expert needs to look at this.
* src/diff.c: Include sh-quote.h rather than quotesys.h.
All uses changed.
* src/system.h: Include verify.h.
(verify): Remove.  All uses changed to verify.h version.
Include <intprops.h>.
(TYPE_SIGNED, TYPE_MINIMUM, TYPE_MAXIMUM): Remove.  Now uses
intprops.h versions.
(O_BINARY): New defns, taken from coreutils.
* src/util.c: Include sh-quote.h rather than quotesys.h.
All uses changed.

1 files changed, 46 insertions, 105 deletions

diff --git a/AUTHORS b/AUTHORS
index f5f0e90..698d517 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,112 +1,53 @@
-Authors of GNU diffutils.
+GNU diff was written by Paul Eggert, Mike Haertel, David Hayes,
+Richard Stallman, and Len Tower.
 
-	Copyright 2001 Free Software Foundation, Inc.
+GNU diff3 was written by Randy Smith.
 
-	This file is part of GNU diffutils.
+GNU sdiff was written by Thomas Lord.
 
-	GNU diffutils is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; either version 2, or (at your option)
-	any later version.
+GNU cmp was written by Torbjorn Granlund and David MacKenzie.
 
-	GNU diffutils is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
+The diffutils manual was written by David MacKenzie, Paul Eggert, and
+Richard Stallman.  Parts are adapted by from a manual page written by
+Larry Wall, with his permission.
 
-	You should have received a copy of the GNU General Public License
-	along with GNU diffutils; see the file COPYING.  If not, write to
-	the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-	Boston, MA 02111-1307, USA.
+Many other people have contributed to GNU diffutils, including Wayne
+Davison, Patrick D'Cruze, F. Thomas May, Greg McGary, Chip Rosenthal,
+and Eli Zaretskii.
 
 The following contributions warranted legal paper exchanges with the
-Free Software Foundation.  Also see files ChangeLog and THANKS.
-
-DIFFUTILS	Leonard H. Tower Jr.	US 1949	1987-03-09
-Assigns diff (diff.c, initial version).
-
-DIFFUTILS	Torbjorn Granlund	Sweden 1961	1988-01-11
-Assigns cmp.
-tege@matematik.su.se
-
-DIFFUTILS	Mike Haertel	US 1967	1988-09-16
-Assigns changes to diff.
-
-DIFFUTILS	David S. Hayes	US ?	1988-01-12
-Assigns changes to diff.
-
-DIFFUTILS	Randall Smith	US 1964	1988-09-21
-Assigns diff3.
-
-DIFFUTILS	Richard Stallman	US 1953	1988-01-15
-Assigns changes to GNU Diff.
-
-DIFFUTILS	F. Thomas May	US 1965	1989-08-22
-Assigns changes to diff (for -D).
-
-DIFFUTILS	Optimal Solutions, Inc.	1989-08-14
-Disclaims changes by Thomas May to diff.
-
-DIFFUTILS	Wayne Davison	1990-09-10
-Disclaims changes to diff.
-
-DIFFUTILS	Digital Research Inc.	1990-09-13
-Disclaims changes by Wayne Davison to diff.
-
-DIFFUTILS	Paul Eggert	1990-03-16
-Disclaims changes to diff.
-eggert@twinsun.com
-
-DIFFUTILS	Paul Eggert	1990-08-14
-Disclaims changes to GNU Diff.
-eggert@twinsun.com
-
-DIFFUTILS	Twin Sun Inc.	1990-03-16
-Disclaims changes to GNU Diff by Paul Eggert.
-
-DIFFUTILS	Twin Sun Inc.	1990-08-14
-Disclaims changes to GNU Diff by Paul Eggert.
-
-DIFFUTILS	Chip Rosenthal	US 1959	1990-03-06
-Assigns changes to diff.
-chip@chinacat.Unicom.COM
-
-DIFFUTILS	Unicom Systems Development	1990-03-06
-Disclaims changes by Chip Rosenthal to diff.
-
-GCC DIFFUTILS	Paul Eggert and Twin Sun Inc.	1992-03-11
-Disclaims changes by Paul Eggert to gcc and diff.
-eggert@twinsun.com
-
-DIFF	Wayne Davison	1993-06-20
-Disclaims diffcvt.c.
-
-DIFFUTILS	Francois Pinard	Canada 1949	1993-01-15
-Assigns wdiff and future changes submitted to the FSF.
-pinard@iro.umontreal.ca
-
-DIFFUTILS	Patrick D'Cruze	Australia 1971	1994-11-10
-Assigns changes (makefile.in, analyze.c, cmp.c, error.c, diff.c,
-diff3.c, getopt.c, getopt1.c, regex.c, sdiff.c, util.c, xmalloc.c;
-new file: language.++)
-
-DIFFUTILS	Paul R. Eggert	US 1954	1997-04-07
-Assigns past and future changes.
-eggert@twinsun.com
-
-DIFFUTILS	Paul R. Eggert	US 1954	1997-04-07
-Assigns past and future changes to manual.
-eggert@twinsun.com
-
-ANY DIFFUTILS GNATS	Cyclic Software	1997-11-11
-Assigns past and future works (work for hire by Tim Pierce (diffutils) and
-Abe Feldman (GNATS)).
-kingdon@cyclic.com
-
-WEBPAGES        Gregory B. Harvey       Canada 1976     1998-02-14
-Assigns web pages describing GNU Diffutils and future changes.
-
-DIFFUTILS	Olga Nikulin	Russia 1965	2001-01-11
-Assigns changes to diff. (diffutils-2.7.2/analyze.c, context.c, diff.[ch],
-ed.c, ifdef.c, io.c, normal.c, side.c, util.c)
-onikulin@yahoo.com
+Free Software Foundation.  Also see the files ChangeLog and THANKS.
+
+Leonard H. Tower Jr.
+Torbjorn Granlund
+Mike Haertel
+David S. Hayes
+Randall Smith
+Richard Stallman
+F. Thomas May
+Wayne Davison
+Paul R. Eggert
+Chip Rosenthal
+Wayne Davison
+Patrick D'Cruze
+Eli Zaretskii
+
+
+Copyright (C) 2001, 2006 Free Software Foundation, Inc.
+
+This file is part of GNU diffutils.
+
+GNU diffutils is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU diffutils is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU diffutils; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.