VesperOS/shadow
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib/getdate.y: get_date(): Fix calculation

Browse Source 
Instead of adding 1, we should add the value the we stored previously in
the variable.

Fixes: 45c6603cc8 ("[svn-upgrade] Integrating new upstream version, shadow (19990709)")
Closes: <https://github.com/shadow-maint/shadow/issues/939>
Link: <https://github.com/shadow-maint/shadow/pull/942>
Reported-by: Michael Vetter <jubalh@iodoru.org>
Reported-by: Gus Kenion <https://github.com/kenion>
Cc: Iker Pedrosa <ipedrosa@redhat.com>
Cc: Serge Hallyn <serge@hallyn.com>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
This commit is contained in:
Alejandro Colomar
2024-02-16 19:58:43 -06:00
committed by Serge Hallyn
parent e15aa5a8a6
commit 4d139ca466
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/getdate.y
+6 -6
View File
@@ -319,7 +319,7 @@ relunit : tUNUMBER tYEAR_UNIT {
yyRelYear += $1 * $2; yyRelYear += $1 * $2;
} }
| tYEAR_UNIT { | tYEAR_UNIT {
yyRelYear++; yyRelYear += $1;
} }
| tUNUMBER tMONTH_UNIT { | tUNUMBER tMONTH_UNIT {
yyRelMonth += $1 * $2; yyRelMonth += $1 * $2;
@@ -328,7 +328,7 @@ relunit : tUNUMBER tYEAR_UNIT {
yyRelMonth += $1 * $2; yyRelMonth += $1 * $2;
} }
| tMONTH_UNIT { | tMONTH_UNIT {
yyRelMonth++; yyRelMonth += $1;
} }
| tUNUMBER tDAY_UNIT { | tUNUMBER tDAY_UNIT {
yyRelDay += $1 * $2; yyRelDay += $1 * $2;
@@ -337,7 +337,7 @@ relunit : tUNUMBER tYEAR_UNIT {
yyRelDay += $1 * $2; yyRelDay += $1 * $2;
} }
| tDAY_UNIT { | tDAY_UNIT {
yyRelDay++; yyRelDay += $1;
} }
| tUNUMBER tHOUR_UNIT { | tUNUMBER tHOUR_UNIT {
yyRelHour += $1 * $2; yyRelHour += $1 * $2;
@@ -346,7 +346,7 @@ relunit : tUNUMBER tYEAR_UNIT {
yyRelHour += $1 * $2; yyRelHour += $1 * $2;
} }
| tHOUR_UNIT { | tHOUR_UNIT {
yyRelHour++; yyRelHour += $1;
} }
| tUNUMBER tMINUTE_UNIT { | tUNUMBER tMINUTE_UNIT {
yyRelMinutes += $1 * $2; yyRelMinutes += $1 * $2;
@@ -355,7 +355,7 @@ relunit : tUNUMBER tYEAR_UNIT {
yyRelMinutes += $1 * $2; yyRelMinutes += $1 * $2;
} }
| tMINUTE_UNIT { | tMINUTE_UNIT {
yyRelMinutes++; yyRelMinutes += $1;
} }
| tUNUMBER tSEC_UNIT { | tUNUMBER tSEC_UNIT {
yyRelSeconds += $1 * $2; yyRelSeconds += $1 * $2;
@@ -364,7 +364,7 @@ relunit : tUNUMBER tYEAR_UNIT {
yyRelSeconds += $1 * $2; yyRelSeconds += $1 * $2;
} }
| tSEC_UNIT { | tSEC_UNIT {
yyRelSeconds++; yyRelSeconds += $1;
} }
; ;