Portability fix: Fix on libcs where st_mtime is not a macro (ie, ones lacking st_mtim.)

diff --git a/cprogs/cgi-fcgi-interp.c b/cprogs/cgi-fcgi-interp.c
index 7aef026037b82ea70be482517f76dfe706a88a4d..63db94b35fed7a1d3afb3f11c96858a31d3c70d7 100644 (file)
--- a/cprogs/cgi-fcgi-interp.c
+++ b/cprogs/cgi-fcgi-interp.c
@@ -441,12 +441,12 @@ static bool stab_isnewer(const struct stat *a, const struct stat *b) {
     fprintf(stderr,"stab_isnewer mtime %lu %lu\n",
            (unsigned long)a->st_mtime,
            (unsigned long)b->st_mtime);
     fprintf(stderr,"stab_isnewer mtime %lu %lu\n",
            (unsigned long)a->st_mtime,
            (unsigned long)b->st_mtime);

-  return a->st_mtime > &b->st_mtime;
+  return a->st_mtime > b->st_mtime;

 }
 
 static void stab_mtimenow(struct stat *out) {
   out->st_mtime = time(NULL);
 }
 
 static void stab_mtimenow(struct stat *out) {
   out->st_mtime = time(NULL);

-  if (baseline_time.st_mtime == (time_t)-1) diee("(stage2) time()");
+  if (out->st_mtime == (time_t)-1) diee("(stage2) time()");

   if (debugmode)
     fprintf(stderr,"stab_mtimenow mtime %lu\n",
            (unsigned long)out->st_mtime);
   if (debugmode)
     fprintf(stderr,"stab_mtimenow mtime %lu\n",
            (unsigned long)out->st_mtime);

diff --git a/debian/changelog b/debian/changelog
index 78dd0be17c9ec1415dd7874383aed26ae9b2d378..17463aacdecb0d4ce1766123b57f71a9d78eda54 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+chiark-utils (5.0.2) unstable; urgency=medium
+
+  * Portability fix: Fix on libcs where st_mtime is not a macro
+    (ie, ones lacking st_mtim.)
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 23 Jan 2017 18:12:52 +0000
+

 chiark-utils (5.0.1) unstable; urgency=medium
 
   * with-lock-ex: provide -l
 chiark-utils (5.0.1) unstable; urgency=medium
 
   * with-lock-ex: provide -l