diff options
Diffstat (limited to 'usr.bin/cvs/diff3.c')
| -rw-r--r-- | usr.bin/cvs/diff3.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/cvs/diff3.c b/usr.bin/cvs/diff3.c index d076e47c139..e8e0512d85a 100644 --- a/usr.bin/cvs/diff3.c +++ b/usr.bin/cvs/diff3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff3.c,v 1.62 2016/10/18 21:06:52 millert Exp $ */ +/* $OpenBSD: diff3.c,v 1.63 2019/06/28 13:35:00 deraadt Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. @@ -207,11 +207,11 @@ cvs_merge_file(struct cvs_file *cf, int verbose) argv[argc++] = path2; argv[argc++] = path3; - if (lseek(fds[2], 0, SEEK_SET) < 0) + if (lseek(fds[2], 0, SEEK_SET) == -1) fatal("cvs_merge_file: lseek fds[2]: %s", strerror(errno)); - if (lseek(fds[3], 0, SEEK_SET) < 0) + if (lseek(fds[3], 0, SEEK_SET) == -1) fatal("cvs_merge_file: lseek fds[3]: %s", strerror(errno)); - if (lseek(fds[4], 0, SEEK_SET) < 0) + if (lseek(fds[4], 0, SEEK_SET) == -1) fatal("cvs_merge_file: lseek fds[4]: %s", strerror(errno)); diff3_conflicts = diff3_internal(argc, argv, cf->file_path, r2); |