[24061] in Source-Commits
/svn/athena r23665 - in trunk/athena/bin/delete: . debian
daemon@ATHENA.MIT.EDU (Evan Broder)
Sun Mar 29 15:56:51 2009
X-Barracuda-Envelope-From: broder@mit.edu
Date: Sun, 29 Mar 2009 15:56:29 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200903291956.n2TJuTwH009329@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:29 -0400 (Sun, 29 Mar 2009)
New Revision: 23665
Modified:
trunk/athena/bin/delete/debian/changelog
trunk/athena/bin/delete/directories.c
trunk/athena/bin/delete/directories.h
trunk/athena/bin/delete/util.c
Log:
In delete:
* Apply patches from jik:
- Change the "st_chtime" structure member to "st_ctim" to avoid a
potential header file conflict.
Modified: trunk/athena/bin/delete/debian/changelog
===================================================================
--- trunk/athena/bin/delete/debian/changelog 2009-03-29 19:56:16 UTC (rev 23664)
+++ trunk/athena/bin/delete/debian/changelog 2009-03-29 19:56:29 UTC (rev 23665)
@@ -11,8 +11,10 @@
- Fix a double free in lsdel
- Fix compiler nit by including <string.h> in stack.c
- 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.
- -- Evan Broder <broder@mit.edu> Sun, 29 Mar 2009 15:02:58 -0400
+ -- Evan Broder <broder@mit.edu> Sun, 29 Mar 2009 15:03:56 -0400
debathena-delete (10.0.0-0debathena1) unstable; urgency=low
Modified: trunk/athena/bin/delete/directories.c
===================================================================
--- trunk/athena/bin/delete/directories.c 2009-03-29 19:56:16 UTC (rev 23664)
+++ trunk/athena/bin/delete/directories.c 2009-03-29 19:56:29 UTC (rev 23665)
@@ -222,7 +222,7 @@
specs->st_ino = realspecs.st_ino;
specs->st_mode = realspecs.st_mode;
specs->st_size = realspecs.st_size;
- specs->st_chtime = realspecs.st_ctime;
+ specs->st_ctim = realspecs.st_ctime;
specs->st_blocks = realspecs.st_blocks;
return 0;
Modified: trunk/athena/bin/delete/directories.h
===================================================================
--- trunk/athena/bin/delete/directories.h 2009-03-29 19:56:16 UTC (rev 23664)
+++ trunk/athena/bin/delete/directories.h 2009-03-29 19:56:29 UTC (rev 23665)
@@ -34,7 +34,7 @@
ino_t st_ino;
unsigned short st_mode;
off_t st_size;
- time_t st_chtime;
+ time_t st_ctim;
long st_blocks;
} mystat;
Modified: trunk/athena/bin/delete/util.c
===================================================================
--- trunk/athena/bin/delete/util.c 2009-03-29 19:56:16 UTC (rev 23664)
+++ trunk/athena/bin/delete/util.c 2009-03-29 19:56:29 UTC (rev 23665)
@@ -226,7 +226,7 @@
filerec *file_ent;
time_t current_time, min_days;
{
- if ((current_time - file_ent->specs.st_chtime) / 86400 >= min_days)
+ if ((current_time - file_ent->specs.st_ctim) / 86400 >= min_days)
return(1);
else
return(0);
