![[BACK]](/icons/back.gif){kind=icon}
Return to diff3.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / cvs|
Return to diff3.c CVS log | Up to [local] / src / usr.bin / cvs |
| version 1.38, 2007/09/10 14:29:53 | version 1.39, 2007/09/17 10:07:21 | ||
|---|---|---|---|
|
|
||
| #include <string.h> | #include <string.h> | ||
| #include <unistd.h> | #include <unistd.h> | ||
| #include "atomicio.h" | |||
| #include "cvs.h" | #include "cvs.h" | ||
| #include "diff.h" | #include "diff.h" | ||
|
|
||
| if (lp->l_line == NULL) | if (lp->l_line == NULL) | ||
| continue; | continue; | ||
| if (write(cf->fd, lp->l_line, lp->l_len) == -1) | if (atomicio(vwrite, cf->fd, lp->l_line, lp->l_len) != | ||
| lp->l_len) | |||
| fatal("cvs_merge_file: %s", strerror(errno)); | fatal("cvs_merge_file: %s", strerror(errno)); | ||
| } | } | ||