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

lib/string/strcpy/, lib/, src/, tests/: Move all copying APIs to a subdirectory

Browse Source 
Signed-off-by: Alejandro Colomar <alx@kernel.org>
This commit is contained in:
Alejandro Colomar
2024-06-27 11:48:16 +02:00
committed by Serge Hallyn
parent 22272347b6
commit 40ab806066
29 changed files with 88 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Makefile.am
+8 -6
View File
@@ -150,14 +150,16 @@ libshadow_la_SOURCES = \
string/sprintf/stpeprintf.h \
string/sprintf/xasprintf.c \
string/sprintf/xasprintf.h \
string/stpecpy.c \
string/stpecpy.h \
string/strcpy/stpecpy.c \
string/strcpy/stpecpy.h \
string/strcpy/strncpy.c \
string/strcpy/strncpy.h \
string/strcpy/strtcpy.c \
string/strcpy/strtcpy.h \
string/strcpy/zustr2stp.c \
string/strcpy/zustr2stp.h \
string/strftime.c \
string/strftime.h \
string/strncpy.h \
string/strtcpy.c \
string/strtcpy.h \
string/zustr2stp.h \
strtoday.c \
sub.c \
subordinateio.h \
lib/console.c
+1 -1
View File
@@ -13,7 +13,7 @@
#include <stdio.h>
#include "getdef.h"
#include "prototypes.h"
#include "string/strtcpy.h"
#include "string/strcpy/strtcpy.h"
#ident "$Id$"
lib/failure.c
+1 -1
View File
@@ -21,7 +21,7 @@
#include "memzero.h"
#include "prototypes.h"
#include "string/strftime.h"
#include "string/strtcpy.h"
#include "string/strcpy/strtcpy.h"
#define YEAR (365L*DAY)
lib/log.c
+2 -2
View File
@@ -19,8 +19,8 @@
#include <lastlog.h>
#include "memzero.h"
#include "prototypes.h"
#include "string/strncpy.h"
#include "string/strtcpy.h"
#include "string/strcpy/strncpy.h"
#include "string/strcpy/strtcpy.h"
/*
lib/string/stpecpy.c
-20
View File
@@ -1,20 +0,0 @@
/*
* SPDX-FileCopyrightText: 2022 - 2023, Alejandro Colomar <alx@kernel.org>
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <config.h>
#if !defined(HAVE_STPECPY)
#ident "$Id$"
#include "string/stpecpy.h"
extern inline char *stpecpy(char *dst, char *end, const char *restrict src);
#endif // !HAVE_STPECPY
lib/string/strcpy/stpecpy.c
+12
View File
@@ -0,0 +1,12 @@
// SPDX-FileCopyrightText: 2022-2024, Alejandro Colomar <alx@kernel.org>
// SPDX-License-Identifier: BSD-3-Clause
#include <config.h>
#include "string/strcpy/stpecpy.h"
#if !defined(HAVE_STPECPY)
extern inline char *stpecpy(char *dst, char *end, const char *restrict src);
#endif
lib/string/stpecpy.h → lib/string/strcpy/stpecpy.h
+8 -10
View File
@@ -1,18 +1,13 @@
/*
* SPDX-FileCopyrightText: 2022 - 2023, Alejandro Colomar <alx@kernel.org>
*
* SPDX-License-Identifier: BSD-3-Clause
*/
// SPDX-FileCopyrightText: 2022-2024, Alejandro Colomar <alx@kernel.org>
// SPDX-License-Identifier: BSD-3-Clause
#ifndef SHADOW_INCLUDE_LIB_STPECPY_H_
#define SHADOW_INCLUDE_LIB_STPECPY_H_
#ifndef SHADOW_INCLUDE_LIB_STRING_STRCPY_STPECPY_H_
#define SHADOW_INCLUDE_LIB_STRING_STRCPY_STPECPY_H_
#include <config.h>
#if !defined(HAVE_STPECPY)
#include <stdbool.h>
#include <stddef.h>
#include <string.h>
@@ -20,8 +15,10 @@
#include "attr.h"
#if !defined(HAVE_STPECPY)
ATTR_STRING(3)
inline char *stpecpy(char *dst, char *end, const char *restrict src);
#endif
/*
@@ -66,6 +63,7 @@ inline char *stpecpy(char *dst, char *end, const char *restrict src);
*/
#if !defined(HAVE_STPECPY)
inline char *
stpecpy(char *dst, char *end, const char *restrict src)
{
@@ -84,7 +82,7 @@ stpecpy(char *dst, char *end, const char *restrict src)
return stpcpy(mempcpy(dst, src, dlen), "") + trunc;
}
#endif
#endif // !HAVE_STPECPY
#endif // include guard
lib/string/strcpy/strncpy.c
+7
View File
@@ -0,0 +1,7 @@
// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
// SPDX-License-Identifier: BSD-3-Clause
#include <config.h>
#include "string/strcpy/strncpy.h"
lib/string/strcpy/strncpy.h
+19
View File
@@ -0,0 +1,19 @@
// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
// SPDX-License-Identifier: BSD-3-Clause
#ifndef SHADOW_INCLUDE_LIB_STRING_STRCPY_STRNCPY_H_
#define SHADOW_INCLUDE_LIB_STRING_STRCPY_STRNCPY_H_
#include <config.h>
#include <string.h>
#include "sizeof.h"
#define STRNCPY(dst, src) strncpy(dst, src, NITEMS(dst))
#endif // include guard
lib/string/strtcpy.c → lib/string/strcpy/strtcpy.c
+3 -7
View File
@@ -1,7 +1,5 @@
/*
* SPDX-FileCopyrightText: 2022-2023, Alejandro Colomar <alx@kernel.org>
* SPDX-License-Identifier: BSD-3-Clause
*/
// SPDX-FileCopyrightText: 2022-2024, Alejandro Colomar <alx@kernel.org>
// SPDX-License-Identifier: BSD-3-Clause
#include <config.h>
@@ -9,9 +7,7 @@
#include <stddef.h>
#include <sys/types.h>
#ident "$Id$"
#include "string/strtcpy.h"
#include "string/strcpy/strtcpy.h"
extern inline ssize_t strtcpy(char *restrict dst, const char *restrict src,
lib/string/strtcpy.h → lib/string/strcpy/strtcpy.h
+4 -7
View File
@@ -1,11 +1,9 @@
/*
* SPDX-FileCopyrightText: 2023, Alejandro Colomar <alx@kernel.org>
* SPDX-License-Identifier: BSD-3-Clause
*/
// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
// SPDX-License-Identifier: BSD-3-Clause
#ifndef SHADOW_INCLUDE_LIB_STRTCPY_H_
#define SHADOW_INCLUDE_LIB_STRTCPY_H_
#ifndef SHADOW_INCLUDE_LIB_STRING_STRCPY_STRTCPY_H_
#define SHADOW_INCLUDE_LIB_STRING_STRCPY_STRTCPY_H_
#include <config.h>
@@ -16,7 +14,6 @@
#include <sys/types.h>
#include "attr.h"
#include "defines.h"
#include "sizeof.h"
lib/string/zustr2stp.c → lib/string/strcpy/zustr2stp.c
+1 -1
View File
@@ -4,4 +4,4 @@
#include <config.h>
#include "string/zustr2stp.h"
#include "string/strcpy/zustr2stp.h"
lib/string/zustr2stp.h → lib/string/strcpy/zustr2stp.h
+2 -2
View File
@@ -2,8 +2,8 @@
// SPDX-License-Identifier: BSD-3-Clause
#ifndef SHADOW_INCLUDE_LIB_STRING_ZUSTR2STP_H_
#define SHADOW_INCLUDE_LIB_STRING_ZUSTR2STP_H_
#ifndef SHADOW_INCLUDE_LIB_STRING_STRCPY_ZUSTR2STP_H_
#define SHADOW_INCLUDE_LIB_STRING_STRCPY_ZUSTR2STP_H_
#include <config.h>
lib/string/strncpy.h
-21
View File
@@ -1,21 +0,0 @@
/*
* SPDX-FileCopyrightText: 2023, Alejandro Colomar <alx@kernel.org>
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef SHADOW_INCLUDE_LIB_STRNCPY_H_
#define SHADOW_INCLUDE_LIB_STRNCPY_H_
#include <config.h>
#include <string.h>
#include "sizeof.h"
#define STRNCPY(dst, src) strncpy(dst, src, NITEMS(dst))
#endif // include guard
lib/time/day_to_str.h
+1 -1
View File
@@ -13,7 +13,7 @@
#include "defines.h"
#include "sizeof.h"
#include "string/strtcpy.h"
#include "string/strcpy/strtcpy.h"
#define DAY_TO_STR(str, day) day_to_str(NITEMS(str), str, day)
lib/utmp.c
+3 -3
View File
@@ -24,9 +24,9 @@
#include "alloc.h"
#include "sizeof.h"
#include "string/strncpy.h"
#include "string/strtcpy.h"
#include "string/zustr2stp.h"
#include "string/strcpy/strncpy.h"
#include "string/strcpy/strtcpy.h"
#include "string/strcpy/zustr2stp.h"
#ident "$Id$"
src/chage.c
+1 -1
View File
@@ -35,8 +35,8 @@
#include "shadowio.h"
#include "shadowlog.h"
#include "string/sprintf/snprintf.h"
#include "string/strcpy/strtcpy.h"
#include "string/strftime.h"
#include "string/strtcpy.h"
#include "time/day_to_str.h"
/*@-exitarg@*/
#include "exitcodes.h"
src/chfn.c
+1 -1
View File
@@ -33,7 +33,7 @@
#include "exitcodes.h"
#include "shadowlog.h"
#include "string/sprintf/snprintf.h"
#include "string/strtcpy.h"
#include "string/strcpy/strtcpy.h"
/*
src/chsh.c
+2 -1
View File
@@ -31,7 +31,7 @@
/*@-exitarg@*/
#include "exitcodes.h"
#include "shadowlog.h"
#include "string/strtcpy.h"
#include "string/strcpy/strtcpy.h"
#ifndef SHELLS_FILE
#define SHELLS_FILE "/etc/shells"
@@ -43,6 +43,7 @@
#define ETCDIR "/etc"
#endif
/*
* Global variables
*/
src/gpasswd.c
+1 -1
View File
@@ -36,7 +36,7 @@
#include "exitcodes.h"
#include "shadowlog.h"
#include "string/sprintf/snprintf.h"
#include "string/strtcpy.h"
#include "string/strcpy/strtcpy.h"
/*
src/groupmod.c
+1 -1
View File
@@ -40,7 +40,7 @@
#endif
#include "shadowlog.h"
#include "string/sprintf/stpeprintf.h"
#include "string/stpecpy.h"
#include "string/strcpy/stpecpy.h"
/*
src/login.c
+1 -1
View File
@@ -39,8 +39,8 @@
#include "exitcodes.h"
#include "shadowlog.h"
#include "string/sprintf/snprintf.h"
#include "string/strcpy/strtcpy.h"
#include "string/strftime.h"
#include "string/strtcpy.h"
#ifdef USE_PAM
src/logoutd.c
+3 -1
View File
@@ -20,7 +20,9 @@
#include "prototypes.h"
#include "shadowlog.h"
#include "sizeof.h"
#include "string/zustr2stp.h"
#include "string/strcpy/zustr2stp.h"
/*
* Global variables
*/
src/passwd.c
+1 -1
View File
@@ -33,7 +33,7 @@
#include "pwio.h"
#include "shadowio.h"
#include "shadowlog.h"
#include "string/strtcpy.h"
#include "string/strcpy/strtcpy.h"
#include "time/day_to_str.h"
src/su.c
+1 -1
View File
@@ -60,7 +60,7 @@
#include "exitcodes.h"
#include "shadowlog.h"
#include "string/sprintf/snprintf.h"
#include "string/strtcpy.h"
#include "string/strcpy/strtcpy.h"
/*
tests/unit/Makefile.am
+1 -1
View File
@@ -104,7 +104,7 @@ test_strncpy_LDADD = \
$(NULL)
test_strtcpy_SOURCES = \
../../lib/string/strtcpy.c \
../../lib/string/strcpy/strtcpy.c \
test_strtcpy.c \
$(NULL)
test_strtcpy_CFLAGS = \
tests/unit/test_strncpy.c
+1 -1
View File
@@ -15,7 +15,7 @@
#include <cmocka.h>
#include "sizeof.h"
#include "string/strncpy.h"
#include "string/strcpy/strncpy.h"
static void test_STRNCPY_trunc(void **state);
tests/unit/test_strtcpy.c
+1 -1
View File
@@ -15,7 +15,7 @@
#include <cmocka.h>
#include "sizeof.h"
#include "string/strtcpy.h"
#include "string/strcpy/strtcpy.h"
static void test_STRTCPY_trunc(void **state);
tests/unit/test_zustr2stp.c
+1 -1
View File
@@ -13,7 +13,7 @@
#include <stdint.h> // Required by <cmocka.h>
#include <cmocka.h>
#include "string/zustr2stp.h"
#include "string/strcpy/zustr2stp.h"
static void test_ZUSTR2STP(void **state);