And be a bitmore careful about matching: if we don't recognize a word
or a number, we skip the whole thing, rather than trying the next character
in that word/number.
Finally: since ctime() adds the final '\n', don't add another one in test-date.
+static int skip_alpha(const char *date)
+{
+ int i = 0;
+ do {
+ i++;
+ } while (isalpha(date[i]));
+ return i;
+}
+
/*
* Parse month, weekday, or timezone name
*/
/*
* Parse month, weekday, or timezone name
*/
+ if (match_string(date, "PM") == 2) {
+ if (tm->tm_hour > 0 && tm->tm_hour < 12)
+ tm->tm_hour += 12;
+ return 2;
+ }
+
+ return skip_alpha(date);
}
static int is_date(int year, int month, int day, struct tm *tm)
}
static int is_date(int year, int month, int day, struct tm *tm)
* a valid minute. We might want to check that the minutes
* are divisible by 30 or something too.
*/
* a valid minute. We might want to check that the minutes
* are divisible by 30 or something too.
*/
- if (min >= 60 || n < 3)
- return 0;
+ if (min < 60 && n > 2) {
+ offset = hour*60+min;
+ if (*date == '-')
+ offset = -offset;
- offset = hour*60+min;
- if (*date == '-')
- offset = -offset;
-
- *offp = offset;
memcpy(result, "bad", 4);
parse_date(argv[i], result, sizeof(result));
t = strtoul(result, NULL, 0);
memcpy(result, "bad", 4);
parse_date(argv[i], result, sizeof(result));
t = strtoul(result, NULL, 0);
- printf("%s -> %s -> %s\n", argv[i], result, ctime(&t));
+ printf("%s -> %s -> %s", argv[i], result, ctime(&t));