summaryrefslogtreecommitdiffstats
path: root/contrib/diff/normal.c
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2007-06-15 07:17:50 +0000
committerdelphij <delphij@FreeBSD.org>2007-06-15 07:17:50 +0000
commit019bb6b05e782444408e9d3c2aa418b846d9e9ca (patch)
treeff3696bd9bcd91fcf2444fce70d56055e8b1a695 /contrib/diff/normal.c
parent33aeb00c4daa9fed804a4da2a6e20c45f5194305 (diff)
downloadFreeBSD-src-019bb6b05e782444408e9d3c2aa418b846d9e9ca.zip
FreeBSD-src-019bb6b05e782444408e9d3c2aa418b846d9e9ca.tar.gz
This commit was generated by cvs2svn to compensate for changes in r170759,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/diff/normal.c')
-rw-r--r--contrib/diff/normal.c71
1 files changed, 0 insertions, 71 deletions
diff --git a/contrib/diff/normal.c b/contrib/diff/normal.c
deleted file mode 100644
index 4d9e23c..0000000
--- a/contrib/diff/normal.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Normal-format output routines for GNU DIFF.
- Copyright (C) 1988, 1989, 1993 Free Software Foundation, Inc.
-
-This file is part of GNU DIFF.
-
-GNU DIFF 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 DIFF 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 DIFF; see the file COPYING. If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
-
-
-#include "diff.h"
-
-static void print_normal_hunk PARAMS((struct change *));
-
-/* Print the edit-script SCRIPT as a normal diff.
- INF points to an array of descriptions of the two files. */
-
-void
-print_normal_script (script)
- struct change *script;
-{
- print_script (script, find_change, print_normal_hunk);
-}
-
-/* Print a hunk of a normal diff.
- This is a contiguous portion of a complete edit script,
- describing changes in consecutive lines. */
-
-static void
-print_normal_hunk (hunk)
- struct change *hunk;
-{
- int first0, last0, first1, last1, deletes, inserts;
- register int i;
-
- /* Determine range of line numbers involved in each file. */
- analyze_hunk (hunk, &first0, &last0, &first1, &last1, &deletes, &inserts);
- if (!deletes && !inserts)
- return;
-
- begin_output ();
-
- /* Print out the line number header for this hunk */
- print_number_range (',', &files[0], first0, last0);
- fprintf (outfile, "%c", change_letter (inserts, deletes));
- print_number_range (',', &files[1], first1, last1);
- fprintf (outfile, "\n");
-
- /* Print the lines that the first file has. */
- if (deletes)
- for (i = first0; i <= last0; i++)
- print_1_line ("<", &files[0].linbuf[i]);
-
- if (inserts && deletes)
- fprintf (outfile, "---\n");
-
- /* Print the lines that the second file has. */
- if (inserts)
- for (i = first1; i <= last1; i++)
- print_1_line (">", &files[1].linbuf[i]);
-}
OpenPOWER on IntegriCloud