diff --git a/NEWS b/NEWS
index f66e549a57975f98faa281457e2f358bdaaec6dc..74b491de86c9b752a6ab86125f3afb946b02aa07 100644
--- a/NEWS
+++ b/NEWS
@@ -6,8 +6,10 @@ documents those changes that are of interest to users and admins.
-- Modify sfree (BGL command) so that --all option no longer requires
an argument.
-- Modify smap so it shows all nodes and partitions by default (even
- nodess that the user can't access, otherwise there are holes in
+ nodes that the user can't access, otherwise there are holes in
its maps).
+ -- Added module to parse time string (src/common/parse_time.c) for
+ future use.
* Changes in SLURM 0.6.0-pre4
=============================
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 84fdad84ccf207087402e235f0143cb27b6aea4e..20d1818bccc23b681105a13f91cb66cd53f5221d 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -72,6 +72,7 @@ libcommon_la_SOURCES = \
hostlist.c hostlist.h \
dist_tasks.c dist_tasks.h \
checkpoint.c checkpoint.h \
+ parse_time.c parse_time.h \
slurm_xlator.h
EXTRA_libcommon_la_SOURCES = \
diff --git a/src/common/parse_time.c b/src/common/parse_time.c
new file mode 100644
index 0000000000000000000000000000000000000000..af98266b5fdfd4efef82f8d71843710f11b2cff7
--- /dev/null
+++ b/src/common/parse_time.c
@@ -0,0 +1,324 @@
+/*****************************************************************************\
+ * src/common/parse_time.c - time parsing utility functions
+ * $Id$
+ *****************************************************************************
+ * Copyright (C) 2005 The Regents of the University of California.
+ * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+ * Written by Morris Jette <jette1@llnl.gov>.
+ * UCRL-CODE-2002-040.
+ *
+ * This file is part of SLURM, a resource management program.
+ * For details, see <http://www.llnl.gov/linux/slurm/>.
+ *
+ * SLURM 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 (at your option)
+ * any later version.
+ *
+ * SLURM 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 SLURM; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+\*****************************************************************************/
+
+#include <stdio.h>
+#include <time.h>
+
+#define _RUN_STAND_ALONE 0
+
+/* convert time differential string into a number of seconds
+ * time_str (in): string to parse
+ * pos (in/out): position of parse start/end
+ * delta (out): delta in seconds
+ * RET: -1 on error, 0 otherwise
+ */
+static int _get_delta(char *time_str, int *pos, long *delta)
+{
+ int i, offset, rc = 0;
+ long cnt = 0;
+
+ offset = (*pos) + 1;
+ for ( ; ((time_str[offset]!='\0')&&(time_str[offset]!='\n')); offset++) {
+ if (isspace(time_str[offset]))
+ continue;
+ if (strncasecmp(time_str+offset, "minutes", 7) == 0) {
+ cnt *= 60;
+ offset +=7;
+ break;
+ }
+ if (strncasecmp(time_str+offset, "hours", 5) == 0) {
+ cnt *= (60 * 60);
+ offset += 5;
+ break;
+ }
+ if (strncasecmp(time_str+offset, "days", 4) == 0) {
+ cnt *= (24 * 60 * 60);
+ offset += 4;
+ break;
+ }
+ if (strncasecmp(time_str+offset, "weeks", 5) == 0) {
+ cnt *= (7 * 24 * 60 * 60);
+ offset += 5;
+ break;
+ }
+ if ((time_str[offset] >= '0') && (time_str[offset] <= '9')) {
+ cnt = (cnt * 10) + (time_str[offset] - '0');
+ continue;
+ }
+ goto prob;
+ }
+ *pos = offset - 1;
+ *delta = cnt;
+ return 0;
+
+ prob: *pos = offset - 1;
+ return -1;
+}
+
+/* convert "HH:MM [AM|PM]" string to numeric values
+ * time_str (in): string to parse
+ * pos (in/out): position of parse start/end
+ * hour, minute (out): numberic values
+ * RET: -1 on error, 0 otherwise
+ */
+static int _get_time(char *time_str, int *pos, int *hour, int *minute)
+{
+ int hr, min;
+ int offset = *pos;
+
+ /* get hour */
+ if ((time_str[offset] < '0') || (time_str[offset] > '9'))
+ goto prob;
+ hr = time_str[offset++] - '0';
+ if ((time_str[offset] < '0') || (time_str[offset] > '9'))
+ goto prob;
+ hr = (hr * 10) + time_str[offset++] - '0';
+ if (time_str[offset] != ':')
+ goto prob;
+ offset++;
+
+ /* get minute */
+ if ((time_str[offset] < '0') || (time_str[offset] > '9'))
+ goto prob;
+ min = time_str[offset++] - '0';
+ if ((time_str[offset] < '0') || (time_str[offset] > '9'))
+ goto prob;
+ min = (min * 10) + time_str[offset++] - '0';
+
+ while (isspace(time_str[offset])) {
+ offset++;
+ }
+ if (strncasecmp(time_str+offset, "pm", 2)== 0) {
+ hr += 12;
+ offset += 2;
+ } else if (strncasecmp(time_str+offset, "am", 2) == 0) {
+ offset += 2;
+ }
+
+ *pos = offset - 1;
+ *hour = hr;
+ *minute = min;
+ return 0;
+
+ prob: *pos = offset - 1;
+ return -1;
+}
+
+/* convert "MMDDYY" "MM.DD.YY" or "MM/DD/YY" string to numeric values
+ * time_str (in): string to parse
+ * pos (in/out): position of parse start/end
+ * month, mday, year (out): numberic values
+ * RET: -1 on error, 0 otherwise
+ */
+static int _get_date(char *time_str, int *pos, int *month, int *mday, int *year)
+{
+ int mon, day, yr;
+ int offset = *pos;
+
+ /* get month */
+ mon = time_str[offset++] - '0';
+ if ((time_str[offset] >= '0') && (time_str[offset] <= '9'))
+ mon = (mon * 10) + time_str[offset++] - '0';
+ if ((time_str[offset] == '.') || (time_str[offset] == '/'))
+ offset++;
+
+ /* get day */
+ if ((time_str[offset] < '0') || (time_str[offset] > '9'))
+ goto prob;
+ day = time_str[offset++] - '0';
+ if ((time_str[offset] >= '0') && (time_str[offset] <= '9'))
+ day = (day * 10) + time_str[offset++] - '0';
+ if ((time_str[offset] == '.') || (time_str[offset] == '/'))
+ offset++;
+
+ /* get year */
+ if ((time_str[offset] < '0') || (time_str[offset] > '9'))
+ goto prob;
+ yr = time_str[offset++] - '0';
+ if ((time_str[offset] < '0') || (time_str[offset] > '9'))
+ goto prob;
+ yr = (yr * 10) + time_str[offset++] - '0';
+
+ *pos = offset - 1;
+ *month = mon - 1; /* zero origin */
+ *mday = day;
+ *year = yr + 100; /* 1900 == "00" */
+ return 0;
+
+ prob: *pos = offset;
+ return -1;
+}
+
+
+/* Convert string to equivalent time value
+ * input formats:
+ * today or tomorrow
+ * midnight, noon, teatime (4PM)
+ * HH:MM [AM|PM]
+ * MMDDYY or MM/DD/YY or MM.DD.YY
+ * now + count [minutes | hours | days | weeks]
+ *
+ * Invalid input results in message to stderr and return value of zero
+ */
+extern time_t parse_time(char *time_str)
+{
+ time_t delta = (time_t) 0;
+ time_t now = time(NULL);
+ struct tm now_tm;
+ int hour = -1, minute = -1, second = 0;
+ int month = -1, mday = -1, year = -1;
+ int num = 0, pos = 0;
+
+ for (pos=0; ((time_str[pos] != '\0')&&(time_str[pos] != '\n')); pos++) {
+ if (isblank(time_str[pos]))
+ continue;
+ if (strncasecmp(time_str+pos, "today", 5) == 0) {
+ struct tm *now_tm = localtime(&now);
+ month = now_tm->tm_mon;
+ mday = now_tm->tm_mday;
+ year = now_tm->tm_year;
+ pos += 4;
+ continue;
+ }
+ if (strncasecmp(time_str+pos, "tomorrow", 8) == 0) {
+ time_t later = now + (24 * 60 * 60);
+ struct tm *now_tm = localtime(&later);
+ month = now_tm->tm_mon;
+ mday = now_tm->tm_mday;
+ year = now_tm->tm_year;
+ pos += 7;
+ continue;
+ }
+ if (strncasecmp(time_str+pos, "midnight", 8) == 0) {
+ hour = 23;
+ minute = 59;
+ second = 60;
+ pos += 7;
+ continue;
+ }
+ if (strncasecmp(time_str+pos, "noon", 4) == 0) {
+ hour = 12;
+ minute = 0;
+ pos += 3;
+ continue;
+ }
+ if (strncasecmp(time_str+pos, "teatime", 7) == 0) {
+ hour = 16;
+ minute = 0;
+ pos += 6;
+ continue;
+ }
+ if (strncasecmp(time_str+pos, "now", 3) == 0) {
+ int i;
+ long delta = 0;
+ time_t later;
+ struct tm *now_tm;
+ for (i=(pos+3);((time_str[i]!='\0')&&(time_str[i]!='\n')); i++) {
+ if (time_str[i] == '+') {
+ pos += i;
+ if (_get_delta(time_str, &pos, &delta))
+ goto prob;
+ break;
+ }
+ if (isblank(time_str[i]))
+ continue;
+ if ((time_str[i] == '\0') || (time_str[i] == '\n')) {
+ pos += (i-1);
+ break;
+ }
+ pos += i;
+ goto prob;
+ }
+ later = now + delta;
+ now_tm = localtime(&later);
+ month = now_tm->tm_mon;
+ mday = now_tm->tm_mday;
+ year = now_tm->tm_year;
+ hour = now_tm->tm_hour;
+ minute = now_tm->tm_min;
+ second = now_tm->tm_sec;
+ continue;
+ }
+ if ((time_str[pos] < '0') || (time_str[pos] > '9')) /* invalid */
+ goto prob;
+ /* We have some numeric value to process */
+ if (time_str[pos+2] == ':') { /* time */
+ if (_get_time(time_str, &pos, &hour, &minute))
+ goto prob;
+ continue;
+ }
+ if (_get_date(time_str, &pos, &month, &mday, &year))
+ goto prob;
+ }
+ /* printf("%d/%d/%d %d:%d\n",month+1,mday,year+1900,hour+1,minute); */
+
+
+ /* now convert the time into time_t format */
+ if ((hour == -1) && (year == -1)) /* nothing specified */
+ return (time_t) 0;
+ if (hour == -1) { /* no time implies 00:00 */
+ hour = 0;
+ minute = 0;
+ }
+ if (year == -1) { /* no date implies today */
+ struct tm *now_tm = localtime(&now);
+ month = now_tm->tm_mon;
+ mday = now_tm->tm_mday;
+ year = now_tm->tm_year;
+ }
+ bzero(&now_tm, sizeof(now_tm));
+ now_tm.tm_sec = second;
+ now_tm.tm_min = minute;
+ now_tm.tm_hour = hour;
+ now_tm.tm_mday = mday;
+ now_tm.tm_mon = month;
+ now_tm.tm_year = year;
+ now_tm.tm_isdst = 1;
+ return mktime(&now_tm);;
+
+ prob: fprintf(stderr, "Invalid time specification (pos=%d): %s", pos, time_str);
+ return (time_t) 0;
+}
+
+#if _RUN_STAND_ALONE
+int main(int argc, char *argv[])
+{
+ char in_line[128];
+ time_t when;
+
+ while (1) {
+ printf("time> ");
+ if ((fgets(in_line, sizeof(in_line), stdin) == NULL)
+ || (in_line[0] == '\n'))
+ break;
+ when = parse_time(in_line);
+ if (when)
+ printf("%s", asctime(localtime(&when)));
+ }
+}
+#endif
+
diff --git a/src/common/parse_time.h b/src/common/parse_time.h
new file mode 100644
index 0000000000000000000000000000000000000000..9e15cbf5e20ec9d3829a772fd956833c115c73da
--- /dev/null
+++ b/src/common/parse_time.h
@@ -0,0 +1,45 @@
+/*****************************************************************************\
+ * src/common/parse_time.h - time parsing utility functions
+ * $Id$
+ *****************************************************************************
+ * Copyright (C) 2005 The Regents of the University of California.
+ * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+ * Written by Morris Jette <jette1@llnl.gov>.
+ * UCRL-CODE-2002-040.
+ *
+ * This file is part of SLURM, a resource management program.
+ * For details, see <http://www.llnl.gov/linux/slurm/>.
+ *
+ * SLURM 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 (at your option)
+ * any later version.
+ *
+ * SLURM 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 SLURM; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+\*****************************************************************************/
+
+#ifndef _PARSE_TIME_H_
+#define _PARSE_TIME_H_
+
+#include <time.h>
+
+/* Convert string to equivalent time value
+ * input formats:
+ * today or tomorrow
+ * midnight, noon, teatime (4PM)
+ * HH:MM [AM|PM]
+ * MMDDYY or MM/DD/YY or MM.DD.YY
+ * now + count [minutes | hours | days | weeks]
+ *
+ * Invalid input results in message to stderr and return value of zero
+ */
+extern time_t parse_time(char *time_str);
+
+#endif