summaryrefslogtreecommitdiffstats
path: root/contrib/diff/diff.c
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>1999-11-26 02:51:44 +0000
committerobrien <obrien@FreeBSD.org>1999-11-26 02:51:44 +0000
commit46689ca7f0002e4deea37db960b95e14958d50cb (patch)
tree04d91218be61c3eaa96b304ba8cc96605bcb6f4d /contrib/diff/diff.c
parentd0da4e010d8ed65bf5f7db99a1b113baee7bf5fa (diff)
downloadFreeBSD-src-46689ca7f0002e4deea37db960b95e14958d50cb.zip
FreeBSD-src-46689ca7f0002e4deea37db960b95e14958d50cb.tar.gz
* Support the environtmental var "DIFF_OPTIONS". Which can hold a set of
default options for diff. These options are interpreted first and can be overwritten by explicit command line parameters. * Add the "-o" option to specify old-traditional output style. * Add utility functions for env vars obtained from GNU Grep 2.3h.
Diffstat (limited to 'contrib/diff/diff.c')
-rw-r--r--contrib/diff/diff.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/contrib/diff/diff.c b/contrib/diff/diff.c
index 2fbaae7..2b2eec0 100644
--- a/contrib/diff/diff.c
+++ b/contrib/diff/diff.c
@@ -20,6 +20,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* GNU DIFF was written by Mike Haertel, David Hayes,
Richard Stallman, Len Tower, and Paul Eggert. */
+/* $FreeBSD$ */
+
#define GDIFF_MAIN
#include "diff.h"
#include <signal.h>
@@ -30,6 +32,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#else
#include "fnmatch.h"
#endif
+#include "prepend_args.h"
#ifndef DEFAULT_WIDTH
#define DEFAULT_WIDTH 130
@@ -249,10 +252,12 @@ main (argc, argv)
output_style = OUTPUT_NORMAL;
context = -1;
+ prepend_default_options (getenv ("DIFF_OPTIONS"), &argc, &argv);
+
/* Decode the options. */
while ((c = getopt_long (argc, argv,
- "0123456789abBcC:dD:efF:hHiI:lL:nNpPqrsS:tTuU:vwW:x:X:y",
+ "0123456789abBcC:dD:efF:hHiI:lL:nNopPqrsS:tTuU:vwW:x:X:y",
longopts, 0)) != EOF)
{
switch (c)
@@ -424,6 +429,11 @@ main (argc, argv)
entire_new_file_flag = 1;
break;
+ case 'o':
+ /* Output in the old tradition style. */
+ specify_style (OUTPUT_NORMAL);
+ break;
+
case 'p':
/* Make context-style output and show name of last C function. */
show_c_function = 1;
OpenPOWER on IntegriCloud