![[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.44, 2008/02/29 21:43:57 | version 1.45, 2008/03/01 14:40:23 | ||
|---|---|---|---|
|
|
||
| } | } | ||
| (void)close(cf->fd); | (void)close(cf->fd); | ||
| cf->fd = open(cf->file_path, O_CREAT | O_WRONLY | O_TRUNC); | cf->fd = open(cf->file_path, O_CREAT | O_RDWR | O_TRUNC, 0644); | ||
| if (cf->fd == -1) { | if (cf->fd == -1) { | ||
| fatal("cvs_merge_file: failed to reopen fd for writing: %s", | fatal("cvs_merge_file: failed to reopen fd for writing: %s", | ||
| strerror(errno)); | strerror(errno)); |