/* Adjust hour from AM/PM. Just for the record, the sequence goes
11:00AM, 12:00PM, 01:00PM ... 11:00PM, 12:00AM, 01:00AM . */
tok+=2;
- if ((*tok == 'A') && (hour == 12)) hour = 0;
- else if ((*tok == 'P') && (hour < 12)) hour += 12;
+ if (hour == 12) hour = 0;
+ if (*tok == 'P') hour += 12;
DEBUGP(("YYYY/MM/DD HH:MM - %d/%02d/%02d %02d:%02d\n",
year+1900, month, day, hour, min));
/* Line loop to end of file: */
while ((line = read_whole_line (fp)))
{
+ char *p;
i = clean_line (line);
if (!i) break;
year = atoi(tok)-1900;
DEBUGP(("date parsed\n"));
- /* Fourth/Third column: Time hh:mm:ss */
- tok = strtok(NULL, ":");
- hour = atoi(tok);
- tok = strtok(NULL, ":");
- min = atoi(tok);
- tok = strtok(NULL, " ");
- sec = atoi(tok);
+ /* Fourth/Third column: Time hh:mm[:ss] */
+ tok = strtok (NULL, " ");
+ hour = min = sec = 0;
+ p = tok;
+ hour = atoi (p);
+ for (; *p && *p != ':'; ++p);
+ if (*p)
+ min = atoi (++p);
+ for (; *p && *p != ':'; ++p);
+ if (*p)
+ sec = atoi (++p);
DEBUGP(("YYYY/MM/DD HH:MM:SS - %d/%02d/%02d %02d:%02d:%02d\n",
year+1900, month, day, hour, min, sec));