Changeset 465ac5e in mainline

Timestamp:

2025-04-12T15:49:45Z (45 hours 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.

Files:

• .gitignore (modified) (1 diff)
• .vscode/settings.json (added)
• uspace/app/date/date.c (modified) (5 diffs)
• uspace/app/date_cfg/date_cfg.c (modified) (3 diffs)

.gitignore

@@ -9 +9 @@
 tools/xcw/demo/viewer
 /.cache
+/PKG
+/downloads
+/amd64-helenos
+.cursorignore

uspace/app/date/date.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Wayne Michael Thornton (WMT) <wmthornton-dev@outlook.com>
  * Copyright (c) 2012 Maurizio Lombardi
  * All rights reserved.
@@ -195 +196 @@
 
 /** Read the day, month and year from a string
- *  with the following format: DD/MM/YYYY
+ *  with the following format: DD/MM/YYYY or MM/DD/YYYY
  */
 static errno_t
@@ -202 +203 @@
         errno_t rc;
         uint32_t tmp;
+        uint32_t first_num;
+        uint32_t second_num;
 
         if (str_size(wdate) != 10) /* str_size("DD/MM/YYYY") == 10 */
@@ -211 +214 @@
         }
 
-        rc = str_uint32_t(&wdate[0], NULL, 10, false, &tmp);
-        if (rc != EOK)
-                return rc;
-
-        t->tm_mday = tmp;
-
-        rc = str_uint32_t(&wdate[3], NULL, 10, false, &tmp);
-        if (rc != EOK)
-                return rc;
-
-        t->tm_mon = tmp - 1;
+        /* Parse first number */
+        rc = str_uint32_t(&wdate[0], NULL, 10, false, &first_num);
+        if (rc != EOK)
+                return rc;
+
+        /* Parse second number */
+        rc = str_uint32_t(&wdate[3], NULL, 10, false, &second_num);
+        if (rc != EOK)
+                return rc;
+
+        /* Determine format based on first number */
+        if (first_num > 12) {
+                /* First number is day (DD/MM/YYYY format) */
+                t->tm_mday = first_num;
+                t->tm_mon = second_num - 1;
+        } else if (second_num > 12) {
+                /* Second number is day (MM/DD/YYYY format) */
+                t->tm_mon = first_num - 1;
+                t->tm_mday = second_num;
+        } else {
+                /* Ambiguous case - assume DD/MM/YYYY format */
+                t->tm_mday = first_num;
+                t->tm_mon = second_num - 1;
+        }
 
         rc = str_uint32_t(&wdate[6], NULL, 10, false, &tmp);
+        if (rc != EOK)
+                return rc;
+
         t->tm_year = tmp - 1900;
 
-        return rc;
+        return EOK;
 }
 
@@ -331 +350 @@
 usage(void)
 {
-        printf("Usage: date [-d DD/MM/YYYY] [-t HH:MM[:SS]]\n");
-        printf("       -d   Change the current date\n");
+        printf("Usage: date [-d DD/MM/YYYY|MM/DD/YYYY] [-t HH:MM[:SS]]\n");
+        printf("       -d   Change the current date (supports both DD/MM/YYYY and MM/DD/YYYY formats)\n");
         printf("       -t   Change the current time\n");
         printf("       -h   Display this information\n");

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;