[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] Changes to ccvs/src/difflib.c [signed-commits2]
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] Changes to ccvs/src/difflib.c [signed-commits2] |
Date: |
Thu, 01 Dec 2005 10:58:53 -0500 |
Index: ccvs/src/difflib.c
diff -u ccvs/src/difflib.c:1.1.2.3 ccvs/src/difflib.c:1.1.2.4
--- ccvs/src/difflib.c:1.1.2.3 Thu Dec 1 01:48:59 2005
+++ ccvs/src/difflib.c Thu Dec 1 15:58:44 2005
@@ -189,7 +189,6 @@
{
char *diffout;
int retval;
- bool save_noexec;
/* Remember that the first word in the `call_diff_setup' string is used
now only for diagnostic messages -- CVS no longer forks to run
@@ -218,23 +217,12 @@
else if (retval == 2)
error (1, 0, "diff3 failed.");
- save_noexec = noexec;
- noexec = false;
- copy_file (diffout, dest);
- noexec = save_noexec;
+ force_copy_file (diffout, dest);
/* Clean up. */
- {
- int save_noexec = noexec;
- noexec = 0;
- if (unlink_file (diffout) < 0)
- {
- if (!existence_error (errno))
- error (0, errno, "cannot remove temp file `%s'", diffout);
- }
- free (diffout);
- noexec = save_noexec;
- }
+ if (CVS_UNLINK (diffout) < 0 && !existence_error (errno))
+ error (0, errno, "cannot remove temp file `%s'", diffout);
+ free (diffout);
return retval;
}
- [Cvs-cvs] Changes to ccvs/src/difflib.c [signed-commits2],
Derek Robert Price <=