summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2006-08-26 16:21:15 +0000
committerJim Meyering <jim@meyering.net>2006-08-26 16:21:15 +0000
commit96940eb05b859b0aca459f1432da252741dc6363 (patch)
tree53fcad9a3e99198989927495174eef134eeaf816
parentc8e02f478fadcd818c0ab341bcfaf9883689f52c (diff)
downloadcoreutils-96940eb05b859b0aca459f1432da252741dc6363.tar.xz
* src/c99-to-c89.diff: Remove hunk for copy.c; no longer needed.
-rw-r--r--ChangeLog2
-rw-r--r--src/c99-to-c89.diff24
2 files changed, 2 insertions, 24 deletions
diff --git a/ChangeLog b/ChangeLog
index ed1d787b6..ec0896926 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2006-08-26 Jim Meyering <jim@meyering.net>
+ * src/c99-to-c89.diff: Remove hunk for copy.c; no longer needed.
+
* Makefile.am (EXTRA_DIST): Remove these files here, too:
.x-sc_no_if_have_config_h, .x-sc_prohibit_assert_without_use,
.x-sc_two_space_separator_in_usage.
diff --git a/src/c99-to-c89.diff b/src/c99-to-c89.diff
index 22723b7b4..214e5eba6 100644
--- a/src/c99-to-c89.diff
+++ b/src/c99-to-c89.diff
@@ -1,27 +1,3 @@
-Index: src/copy.c
-===================================================================
-RCS file: /fetish/cu/src/copy.c,v
-retrieving revision 1.203
-diff -u -p -r1.203 copy.c
---- src/copy.c 29 Jul 2006 17:13:28 -0000 1.203
-+++ src/copy.c 17 Aug 2006 09:18:52 -0000
-@@ -1168,7 +1168,7 @@ copy_internal (char const *src_name, cha
- return false;
- }
- }
--
-+ {
- bool backup_directories = true;
- if (x->backup_type != no_backups
- && (!S_ISDIR (dst_sb.st_mode) || backup_directories))
-@@ -1235,6 +1235,7 @@ copy_internal (char const *src_name, cha
- }
- new_dst = true;
- }
-+ }
- }
- }
-
Index: src/remove.c
===================================================================
RCS file: /fetish/cu/src/remove.c,v