X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/d436bd52989e64f8c3cb8a543f446136b6ab1ac4..refs/heads/master:/lib/dateparse.c

diff --git a/lib/dateparse.c b/lib/dateparse.c
index 45de40c..a620f81 100644
--- a/lib/dateparse.c
+++ b/lib/dateparse.c
@@ -2,28 +2,25 @@
  * This file is part of DisOrder
  * Copyright (C) 2008 Richard Kettlewell
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file lib/dateparse.c
  * @brief Date parsing
  */
 
-#include <config.h>
-#include "types.h"
+#include "common.h"
 
 #include <time.h>
 
@@ -35,10 +32,17 @@
  * This set of patterns is designed to parse a specific time of a specific day,
  * since that's what the scheduler needs.  Other requirements might need other
  * pattern lists.
+ *
+ * NB DisOrder now uses my_strptime() instead of the system strptime().  This
+ * has some bits missing.  Therefore check carefuly before adding to this
+ * table.
  */
 static const char *const datemsk[] = {
   /* ISO format */
   "%Y-%m-%d %H:%M:%S",
+  /* Generic time, same day */
+  "%H:%M:%S",
+  "%H:%M",
   /* "%Y-%m-%d %H:%M:%S %Z" - no, not sensibly supported anywhere */
   /* Locale-specific date + time */
   "%c",
@@ -46,9 +50,6 @@ static const char *const datemsk[] = {
   /* Locale-specific time, same day */
   "%X",
   "%EX",
-  /* Generic time, same day */
-  "%H:%M",
-  "%H:%M:%S",
   NULL,
 };
 
@@ -61,11 +62,11 @@ time_t dateparse(const char *s) {
   case 0:
     return mktime(&t);
   case 7:
-    fatal(0, "date string '%s' not in a recognized format", s);
+    disorder_fatal(0, "date string '%s' not in a recognized format", s);
   case 8:
-    fatal(0, "date string '%s' not representable", s);
+    disorder_fatal(0, "date string '%s' not representable", s);
   default:
-    fatal(0, "date string '%s' produced unexpected error %d", s, rc);
+    disorder_fatal(0, "date string '%s' produced unexpected error %d", s, rc);
   }
 }