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

Return to diff.c CVS log

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

Diff for /src/usr.bin/cvs/diff.c between version 1.55 and 1.56

version 1.55, 2005/08/14 19:49:18

version 1.56, 2005/10/05 23:11:06

Line 143

#include "buf.h"

#include "cvs.h"

#include "diff.h"

#include "log.h"

#include "proto.h"

#define CVS_DIFF_DEFCTX 3 /* default context length */

* Output format options

#define D_NORMAL 0 /* Normal output */

#define D_CONTEXT 1 /* Diff with context */

#define D_UNIFIED 2 /* Unified context diff */

#define D_IFDEF 3 /* Diff with merged #ifdef's */

#define D_BRIEF 4 /* Say if the files differ */

#define D_RCSDIFF 5 /* Reverse editor output: RCS format */

* Status values for print_status() and diffreg() return values

#define D_SAME 0 /* Files are the same */

#define D_DIFFER 1 /* Files are different */

#define D_BINARY 2 /* Binary files are different */

#define D_COMMON 3 /* Subdirectory common to both dirs */

#define D_ONLY 4 /* Only exists in one directory */

#define D_MISMATCH1 5 /* path1 was a dir, path2 a file */

#define D_MISMATCH2 6 /* path1 was a file, path2 a dir */

#define D_ERROR 7 /* An error occurred */

#define D_SKIPPED1 8 /* path1 was a special file */

#define D_SKIPPED2 9 /* path2 was a special file */

struct cand {

int x;

int y;

Line 204

Line 177

char *date2;

};

#if !defined(RCSPROG)

static int cvs_diff_init(struct cvs_cmd *, int, char **, int *);

static int cvs_diff_remote(CVSFILE *, void *);

static int cvs_diff_local(CVSFILE *, void *);

static int cvs_diff_pre_exec(struct cvsroot *);

static int cvs_diff_cleanup(void);

int cvs_diffreg(const char *, const char *);

#endif

static void output(const char *, FILE *, const char *, FILE *);

static void check(FILE *, FILE *);

Line 240

Line 213

static char *preadline(int, size_t, off_t);

static int aflag, bflag, dflag, iflag, Nflag, pflag, tflag, Tflag, wflag;

#if !defined(RCSPROG)

static int Nflag;

static char diffargs[128];

#endif

static int aflag, bflag, dflag, iflag, pflag, tflag, Tflag, wflag;

static int context;

static int format = D_NORMAL;

static struct stat stb1, stb2;

static char *ifdefname, *ignore_pats, diffargs[128];

static char *ifdefname, *ignore_pats;

static const char *diff_file;

regex_t ignore_re;

Line 272

Line 249

static char lastbuf[FUNCTION_CONTEXT_SIZE];

static int lastline;

static int lastmatchline;

* chrtran points to one of 2 translation tables: cup2low if folding upper to

* lower case clow2low if not folding case

Line 332

Line 307

0xfd, 0xfe, 0xff

};

#if !defined(RCSPROG)

struct cvs_cmd cvs_cmd_diff = {

CVS_OP_DIFF, CVS_REQ_DIFF, "diff",

{ "di", "dif" },

Line 369

Line 344

cvs_diff_cleanup,

CVS_CMD_SENDARGS2 | CVS_CMD_ALLOWSPEC | CVS_CMD_SENDDIR

};

#endif

#if !defined(RCSPROG)

static struct diff_arg *dap = NULL;

static int recurse;

Line 698

Line 675

return (0);

}

#endif

int