src/usr.bin/diff/diff.c - diff

Return to diff.c CVS log

Up to [local] / src / usr.bin / diff

Diff for /src/usr.bin/diff/diff.c between version 1.50 and 1.51

version 1.50, 2007/05/29 18:24:56

version 1.51, 2009/06/06 15:00:27

Line 41

#include "diff.h"

#include "xmalloc.h"

int aflag, bflag, dflag, iflag, lflag, Nflag, Pflag, pflag, rflag;

int lflag, Nflag, Pflag, rflag, sflag, Tflag;

int sflag, tflag, Tflag, wflag;

int format, context, status;

char *start, *ifdefname, *diffargs, *label[2], *ignore_pats;

struct stat stb1, stb2;

Line 90

Line 89

{

char *ep, **oargv;

long l;

int ch, lastch, gotstdin, prevoptind, newarg;

int ch, dflags, lastch, gotstdin, prevoptind, newarg;

oargv = argv;

gotstdin = 0;

dflags = 0;

lastch = '\0';

prevoptind = 1;

newarg = 1;

Line 111

Line 110

context = (context * 10) + (ch - '0');

break;

case 'a':

aflag = 1;

dflags |= D_FORCEASCII;

break;

case 'b':

bflag = 1;

dflags |= D_FOLDBLANKS;

break;

case 'C':

case 'c':

Line 128

Line 127

context = 3;

break;

case 'd':

dflag = 1;

dflags |= D_MINIMAL;

break;

case 'D':

format = D_IFDEF;

Line 147

Line 146

push_ignore_pats(optarg);

break;

case 'i':

iflag = 1;

dflags |= D_IGNORECASE;

break;

case 'L':

if (label[0] == NULL)

Line 168

Line 167

format = D_NREVERSE;

break;

case 'p':

pflag = 1;

dflags |= D_PROTOTYPE;

break;

case 'P':

Pflag = 1;

Line 189

Line 188

Tflag = 1;

break;

case 't':

tflag = 1;

dflags |= D_EXPANDTABS;

break;

case 'U':

case 'u':

Line 203

Line 202

context = 3;

break;

case 'w':

wflag = 1;

dflags |= D_IGNOREBLANKS;

break;

case 'X':

read_excludes_file(optarg);