mirrors/shadow
0
0
Fork 0
mirror of https://github.com/shadow-maint/shadow.git synced 2024-12-05 07:53:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

lib/time/day_to_str.[ch]: day_to_str(): Accept a day instead of a date, and rename function

Browse Source 
It was always being called with 'day * DAY', so do that internally and
simplify.  This grabs some code from print_day_as_date().

Cc: Tobias Stoeckmann <tobias@stoeckmann.org>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
This commit is contained in:
Alejandro Colomar 2024-01-29 15:34:20 +01:00 committed by Serge Hallyn
parent 8fee869e9a
commit 8fcf6cccff
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/time/day_to_str.c
View File

@ -1,4 +1,5 @@
// SPDX-FileCopyrightText: 2021-2024, Alejandro Colomar <alx@kernel.org>
// SPDX-FileCopyrightText: 2024, Tobias Stoeckmann <tobias@stoeckmann.org>
// SPDX-License-Identifier: BSD-3-Clause
@ -7,4 +8,4 @@
#include "time/day_to_str.h"
extern inline void date_to_str(size_t size, char buf[size], long date);
extern inline void day_to_str(size_t size, char buf[size], long day);

31
lib/time/day_to_str.h
View File

@ -1,7 +1,6 @@
/*
* SPDX-FileCopyrightText: 2021-2023, Alejandro Colomar <alx@kernel.org>
* SPDX-License-Identifier: BSD-3-Clause
*/
// SPDX-FileCopyrightText: 2021-2024, Alejandro Colomar <alx@kernel.org>
// SPDX-FileCopyrightText: 2024, Tobias Stoeckmann <tobias@stoeckmann.org>
// SPDX-License-Identifier: BSD-3-Clause
#ifndef SHADOW_INCLUDE_LIB_TIME_DAY_TO_STR_H_
@ -17,32 +16,36 @@
#include "string/strtcpy.h"
#define DAY_TO_STR(str, day) date_to_str(NITEMS(str), str, day * DAY)
#define DAY_TO_STR(str, day) day_to_str(NITEMS(str), str, day)
inline void date_to_str(size_t size, char buf[size], long date);
inline void day_to_str(size_t size, char buf[size], long day);
inline void
date_to_str(size_t size, char buf[size], long date)
day_to_str(size_t size, char buf[size], long day)
{
time_t t;
time_t date;
const struct tm *tm;
t = date;
if (date < 0) {
(void) strtcpy(buf, "never", size);
if (day < 0) {
strtcpy(buf, "never", size);
return;
}
tm = gmtime(&t);
if (__builtin_mul_overflow(day, DAY, &date)) {
strtcpy(buf, "future", size);
return;
}
tm = gmtime(&date);
if (tm == NULL) {
(void) strtcpy(buf, "future", size);
strtcpy(buf, "future", size);
return;
}
if (strftime(buf, size, "%Y-%m-%d", tm) == 0)
(void) strtcpy(buf, "future", size);
strtcpy(buf, "future", size);
}