version 1.62, 2006/05/08 09:48:12 |
version 1.63, 2006/05/08 09:59:09 |
|
|
status = D_SAME; |
status = D_SAME; |
|
|
if (strlcpy(diffargs, "diff", sizeof(diffargs)) >= sizeof(diffargs)) |
if (strlcpy(diffargs, "diff", sizeof(diffargs)) >= sizeof(diffargs)) |
errx(1, "diffargs too long"); |
errx(D_ERROR, "diffargs too long"); |
|
|
while ((ch = rcs_getopt(argc, argv, "ck:nqr:TuVx::z::")) != -1) { |
while ((ch = rcs_getopt(argc, argv, "ck:nqr:TuVx::z::")) != -1) { |
switch (ch) { |
switch (ch) { |
case 'c': |
case 'c': |
if (strlcat(diffargs, " -c", sizeof(diffargs)) >= |
if (strlcat(diffargs, " -c", sizeof(diffargs)) >= |
sizeof(diffargs)) |
sizeof(diffargs)) |
errx(1, "diffargs too long"); |
errx(D_ERROR, "diffargs too long"); |
diff_format = D_CONTEXT; |
diff_format = D_CONTEXT; |
break; |
break; |
case 'k': |
case 'k': |
|
|
case 'n': |
case 'n': |
if (strlcat(diffargs, " -n", sizeof(diffargs)) >= |
if (strlcat(diffargs, " -n", sizeof(diffargs)) >= |
sizeof(diffargs)) |
sizeof(diffargs)) |
errx(1, "diffargs too long"); |
errx(D_ERROR, "diffargs too long"); |
diff_format = D_RCSDIFF; |
diff_format = D_RCSDIFF; |
break; |
break; |
case 'q': |
case 'q': |
|
|
case 'u': |
case 'u': |
if (strlcat(diffargs, " -u", sizeof(diffargs)) >= |
if (strlcat(diffargs, " -u", sizeof(diffargs)) >= |
sizeof(diffargs)) |
sizeof(diffargs)) |
errx(1, "diffargs too long"); |
errx(D_ERROR, "diffargs too long"); |
diff_format = D_UNIFIED; |
diff_format = D_UNIFIED; |
break; |
break; |
case 'V': |
case 'V': |
|
|
|
|
if (rev_str1 != NULL) { |
if (rev_str1 != NULL) { |
if ((rev1 = rcs_getrevnum(rev_str1, file)) == NULL) |
if ((rev1 = rcs_getrevnum(rev_str1, file)) == NULL) |
errx(1, "bad revision number"); |
errx(D_ERROR, "bad revision number"); |
} |
} |
if (rev_str2 != NULL) { |
if (rev_str2 != NULL) { |
if ((rev2 = rcs_getrevnum(rev_str2, file)) == NULL) |
if ((rev2 = rcs_getrevnum(rev_str2, file)) == NULL) |
errx(1, "bad revision number"); |
errx(D_ERROR, "bad revision number"); |
} |
} |
|
|
if (!(flags & QUIET)) { |
if (!(flags & QUIET)) { |
|
|
|
|
/* XXX - GNU uses GMT */ |
/* XXX - GNU uses GMT */ |
if (fstat(fd, &st) == -1) |
if (fstat(fd, &st) == -1) |
err(1, "%s", filename); |
err(D_ERROR, "%s", filename); |
|
|
tb = gmtime(&st.st_mtime); |
tb = gmtime(&st.st_mtime); |
t = mktime(tb); |
t = mktime(tb); |