version 1.153, 2009/04/29 12:56:15 |
version 1.154, 2009/06/06 14:17:27 |
|
|
|
|
void cvs_diff_local(struct cvs_file *); |
void cvs_diff_local(struct cvs_file *); |
|
|
|
static int dflags = 0; |
static int Nflag = 0; |
static int Nflag = 0; |
static int force_head = 0; |
static int force_head = 0; |
static char *koptstr; |
static char *koptstr; |
|
|
switch (ch) { |
switch (ch) { |
case 'a': |
case 'a': |
strlcat(diffargs, " -a", sizeof(diffargs)); |
strlcat(diffargs, " -a", sizeof(diffargs)); |
diff_aflag = 1; |
dflags |= D_FORCEASCII; |
break; |
break; |
case 'b': |
case 'b': |
strlcat(diffargs, " -b", sizeof(diffargs)); |
strlcat(diffargs, " -b", sizeof(diffargs)); |
diff_bflag = 1; |
dflags |= D_FOLDBLANKS; |
break; |
break; |
case 'c': |
case 'c': |
strlcat(diffargs, " -c", sizeof(diffargs)); |
strlcat(diffargs, " -c", sizeof(diffargs)); |
|
|
break; |
break; |
case 'd': |
case 'd': |
strlcat(diffargs, " -d", sizeof(diffargs)); |
strlcat(diffargs, " -d", sizeof(diffargs)); |
diff_dflag = 1; |
dflags |= D_MINIMAL; |
break; |
break; |
case 'D': |
case 'D': |
if (date1 == -1 && rev1 == NULL) { |
if (date1 == -1 && rev1 == NULL) { |
|
|
break; |
break; |
case 'i': |
case 'i': |
strlcat(diffargs, " -i", sizeof(diffargs)); |
strlcat(diffargs, " -i", sizeof(diffargs)); |
diff_iflag = 1; |
dflags |= D_IGNORECASE; |
break; |
break; |
case 'k': |
case 'k': |
koptstr = optarg; |
koptstr = optarg; |
|
|
break; |
break; |
case 'p': |
case 'p': |
strlcat(diffargs, " -p", sizeof(diffargs)); |
strlcat(diffargs, " -p", sizeof(diffargs)); |
diff_pflag = 1; |
dflags |= D_PROTOTYPE; |
break; |
break; |
case 'R': |
case 'R': |
flags |= CR_RECURSE_DIRS; |
flags |= CR_RECURSE_DIRS; |
|
|
" be specified"); |
" be specified"); |
} |
} |
break; |
break; |
|
case 't': |
|
strlcat(diffargs, " -t", sizeof(diffargs)); |
|
dflags |= D_EXPANDTABS; |
|
break; |
case 'u': |
case 'u': |
strlcat(diffargs, " -u", sizeof(diffargs)); |
strlcat(diffargs, " -u", sizeof(diffargs)); |
diff_format = D_UNIFIED; |
diff_format = D_UNIFIED; |
|
|
"and should not be used"); |
"and should not be used"); |
case 'w': |
case 'w': |
strlcat(diffargs, " -w", sizeof(diffargs)); |
strlcat(diffargs, " -w", sizeof(diffargs)); |
diff_wflag = 1; |
dflags |= D_IGNOREBLANKS; |
break; |
break; |
default: |
default: |
fatal("%s", cvs_cmdop == CVS_OP_DIFF ? |
fatal("%s", cvs_cmdop == CVS_OP_DIFF ? |
|
|
if (Nflag == 1) |
if (Nflag == 1) |
cvs_client_send_request("Argument -N"); |
cvs_client_send_request("Argument -N"); |
|
|
if (diff_pflag == 1) |
if (dflags & D_PROTOTYPE) |
cvs_client_send_request("Argument -p"); |
cvs_client_send_request("Argument -p"); |
|
|
if (rev1 != NULL) |
if (rev1 != NULL) |
|
|
} |
} |
|
|
if (cvs_diffreg(p1 != NULL ? cf->file_path : CVS_PATH_DEVNULL, |
if (cvs_diffreg(p1 != NULL ? cf->file_path : CVS_PATH_DEVNULL, |
p2 != NULL ? cf->file_path : CVS_PATH_DEVNULL, fd1, fd2, NULL) |
p2 != NULL ? cf->file_path : CVS_PATH_DEVNULL, fd1, fd2, NULL, |
== D_ERROR) |
dflags) == D_ERROR) |
fatal("cvs_diff_local: failed to get RCS patch"); |
fatal("cvs_diff_local: failed to get RCS patch"); |
|
|
close(fd1); |
close(fd1); |