[24062] in Source-Commits
/svn/athena r23666 - in trunk/athena/bin/delete: . debian
daemon@ATHENA.MIT.EDU (Evan Broder)
Sun Mar 29 15:56:52 2009
Date: Sun, 29 Mar 2009 15:56:42 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200903291956.n2TJugs4009353@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-03-29 15:56:42 -0400 (Sun, 29 Mar 2009)
New Revision: 23666
Modified:
trunk/athena/bin/delete/debian/changelog
trunk/athena/bin/delete/pattern.c
Log:
In delete:
* Apply patches from jik:
- Don't try to use symbolic links on platforms that don't have them.
Modified: trunk/athena/bin/delete/debian/changelog
===================================================================
--- trunk/athena/bin/delete/debian/changelog 2009-03-29 19:56:29 UTC (rev 23665)
+++ trunk/athena/bin/delete/debian/changelog 2009-03-29 19:56:42 UTC (rev 23666)
@@ -13,8 +13,9 @@
- Fix compiler nit by adding missing prototyle to directories.h
- Change the "st_chtime" structure member to "st_ctim" to avoid a
potential header file conflict.
+ - Don't try to use symbolic links on platforms that don't have them.
- -- Evan Broder <broder@mit.edu> Sun, 29 Mar 2009 15:03:56 -0400
+ -- Evan Broder <broder@mit.edu> Sun, 29 Mar 2009 15:07:52 -0400
debathena-delete (10.0.0-0debathena1) unstable; urgency=low
Modified: trunk/athena/bin/delete/pattern.c
===================================================================
--- trunk/athena/bin/delete/pattern.c 2009-03-29 19:56:29 UTC (rev 23665)
+++ trunk/athena/bin/delete/pattern.c 2009-03-29 19:56:42 UTC (rev 23666)
@@ -762,6 +762,7 @@
return error_code;
}
+#ifdef S_IFLNK
if (is_link(base, &statbuf)) {
/* Never follow deleted symlinks */
if (is_deleted(lastpart(base))) {
@@ -798,6 +799,7 @@
}
}
}
+#endif
if ((statbuf.st_mode & S_IFMT) != S_IFDIR)
return 0;
