Changeset 465ac5e in mainline for uspace/app/date_cfg/date_cfg.c

Timestamp:

2025-04-12T15:49:45Z (3 days ago)

Author:

Wayne Thornton <wmthornton-dev@…>

Children:

1cea9c0

Parents:

b8b031f

Message:

Added international date format support

MM:DD:YYYY is now supported alongside current DD:MM:YYYY format.
Updated 'date' and 'date_cfg' to support changes.

File:

• uspace/app/date_cfg/date_cfg.c (modified) (3 diffs)

uspace/app/date_cfg/date_cfg.c

@@ -256 +256 @@
         const char *date_str = ui_entry_get_text(date_cfg->date_entry);
         const char *time_str = ui_entry_get_text(date_cfg->time_entry);
-        int day, month, year;
+        int first_num, second_num, year;
         int hour, min, sec;
 
-        if (sscanf(date_str, "%d/%d/%d", &day, &month, &year) != 3)
+        if (sscanf(date_str, "%d/%d/%d", &first_num, &second_num, &year) != 3)
                 return EINVAL;
 
@@ -265 +265 @@
                 return EINVAL;
 
-        if (day < 1 || day > 31 || month < 1 || month > 12 || year < 1900)
+        /* Determine format based on first number */
+        if (first_num > 12) {
+                /* First number is day (DD/MM/YYYY format) */
+                date_cfg->current_time.tm_mday = first_num;
+                date_cfg->current_time.tm_mon = second_num - 1;
+        } else if (second_num > 12) {
+                /* Second number is day (MM/DD/YYYY format) */
+                date_cfg->current_time.tm_mon = first_num - 1;
+                date_cfg->current_time.tm_mday = second_num;
+        } else {
+                /* Ambiguous case - assume DD/MM/YYYY format */
+                date_cfg->current_time.tm_mday = first_num;
+                date_cfg->current_time.tm_mon = second_num - 1;
+        }
+
+        if (date_cfg->current_time.tm_mday < 1 || date_cfg->current_time.tm_mday > 31 || 
+            date_cfg->current_time.tm_mon < 0 || date_cfg->current_time.tm_mon > 11 || 
+            year < 1900)
                 return EINVAL;
 
@@ -271 +288 @@
                 return EINVAL;
 
-        date_cfg->current_time.tm_mday = day;
-        date_cfg->current_time.tm_mon = month - 1;
         date_cfg->current_time.tm_year = year - 1900;
         date_cfg->current_time.tm_hour = hour;