diff options
Diffstat (limited to 'coreutils/date.c')
-rw-r--r-- | coreutils/date.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/coreutils/date.c b/coreutils/date.c index e9ec51044..2d411ab31 100644 --- a/coreutils/date.c +++ b/coreutils/date.c | |||
@@ -91,23 +91,23 @@ static struct tm *date_conv_ftime(struct tm *tm_time, const char *t_string) | |||
91 | &t.tm_min) == 2) { | 91 | &t.tm_min) == 2) { |
92 | /* no adjustments needed */ | 92 | /* no adjustments needed */ |
93 | } else if (t = *tm_time, sscanf(t_string, "%d.%d-%d:%d:%d", &t.tm_mon, | 93 | } else if (t = *tm_time, sscanf(t_string, "%d.%d-%d:%d:%d", &t.tm_mon, |
94 | &t.tm_mday, &t.tm_hour, | 94 | &t.tm_mday, &t.tm_hour, |
95 | &t.tm_min, &t.tm_sec) == 5) { | 95 | &t.tm_min, &t.tm_sec) == 5) { |
96 | /* Adjust dates from 1-12 to 0-11 */ | 96 | /* Adjust dates from 1-12 to 0-11 */ |
97 | t.tm_mon -= 1; | 97 | t.tm_mon -= 1; |
98 | } else if (t = *tm_time, sscanf(t_string, "%d.%d-%d:%d", &t.tm_mon, | 98 | } else if (t = *tm_time, sscanf(t_string, "%d.%d-%d:%d", &t.tm_mon, |
99 | &t.tm_mday, | 99 | &t.tm_mday, |
100 | &t.tm_hour, &t.tm_min) == 4) { | 100 | &t.tm_hour, &t.tm_min) == 4) { |
101 | /* Adjust dates from 1-12 to 0-11 */ | 101 | /* Adjust dates from 1-12 to 0-11 */ |
102 | t.tm_mon -= 1; | 102 | t.tm_mon -= 1; |
103 | } else if (t = *tm_time, sscanf(t_string, "%d.%d.%d-%d:%d:%d", &t.tm_year, | 103 | } else if (t = *tm_time, sscanf(t_string, "%d.%d.%d-%d:%d:%d", &t.tm_year, |
104 | &t.tm_mon, &t.tm_mday, | 104 | &t.tm_mon, &t.tm_mday, |
105 | &t.tm_hour, &t.tm_min, | 105 | &t.tm_hour, &t.tm_min, |
106 | &t.tm_sec) == 6) { | 106 | &t.tm_sec) == 6) { |
107 | t.tm_year -= 1900; /* Adjust years */ | 107 | t.tm_year -= 1900; /* Adjust years */ |
108 | t.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */ | 108 | t.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */ |
109 | } else if (t = *tm_time, sscanf(t_string, "%d.%d.%d-%d:%d", &t.tm_year, | 109 | } else if (t = *tm_time, sscanf(t_string, "%d.%d.%d-%d:%d", &t.tm_year, |
110 | &t.tm_mon, &t.tm_mday, | 110 | &t.tm_mon, &t.tm_mday, |
111 | &t.tm_hour, &t.tm_min) == 5) { | 111 | &t.tm_hour, &t.tm_min) == 5) { |
112 | t.tm_year -= 1900; /* Adjust years */ | 112 | t.tm_year -= 1900; /* Adjust years */ |
113 | t.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */ | 113 | t.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */ |
@@ -119,9 +119,9 @@ static struct tm *date_conv_ftime(struct tm *tm_time, const char *t_string) | |||
119 | } | 119 | } |
120 | 120 | ||
121 | #define DATE_OPT_RFC2822 0x01 | 121 | #define DATE_OPT_RFC2822 0x01 |
122 | #define DATE_OPT_SET 0x02 | 122 | #define DATE_OPT_SET 0x02 |
123 | #define DATE_OPT_UTC 0x04 | 123 | #define DATE_OPT_UTC 0x04 |
124 | #define DATE_OPT_DATE 0x08 | 124 | #define DATE_OPT_DATE 0x08 |
125 | #define DATE_OPT_REFERENCE 0x10 | 125 | #define DATE_OPT_REFERENCE 0x10 |
126 | #ifdef CONFIG_FEATURE_DATE_ISOFMT | 126 | #ifdef CONFIG_FEATURE_DATE_ISOFMT |
127 | # define DATE_OPT_TIMESPEC 0x20 | 127 | # define DATE_OPT_TIMESPEC 0x20 |