gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 10:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove dependency of strlcpy()

Browse Source 
There was only one place where `strlcpy` was still used.

Signed-off-by: Antonio Niño Díaz <antonio_nd@outlook.com>
This commit is contained in:
Antonio Niño Díaz
2018-01-27 00:02:44 +00:00
parent f9f3bb7761
commit c6187be210
5 changed files with 5 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
LICENSE.rst
View File

@@ -26,6 +26,3 @@ Other
extern/reallocarray.c is derived from the OpenBSD Project, extern/reallocarray.c is derived from the OpenBSD Project,
http://www.openbsd.org, and is released under the ISC license. http://www.openbsd.org, and is released under the ISC license.
extern/strlcpy.c is derived from the OpenBSD Project, http://www.openbsd.org,
and is released under the BSD license.

1
Makefile
View File

@@ -58,7 +58,6 @@ rgbasm_obj := \
src/asm/symbol.o \ src/asm/symbol.o \
src/extern/err.o \ src/extern/err.o \
src/extern/reallocarray.o \ src/extern/reallocarray.o \
src/extern/strlcpy.o \
src/extern/utf8decoder.o \ src/extern/utf8decoder.o \
src/extern/version.o src/extern/version.o

23
include/extern/strl.h vendored
View File

@@ -1,23 +0,0 @@
/*
* This file is part of RGBDS.
*
* Copyright (c) 2015-2018, RGBDS contributors.
*
* SPDX-License-Identifier: MIT
*/
#ifndef EXTERN_STRL_H
#define EXTERN_STRL_H
#ifdef STRL_IN_LIBC
#include <string.h>
#else /* STRL_IN_LIBC */
#define strlcpy rgbds_strlcpy
size_t strlcpy(char *dst, const char *src, size_t dsize);
#endif /* STRL_IN_LIBC */
#endif /* EXTERN_STRL_H */

7
src/asm/fstack.c
View File

@@ -24,7 +24,6 @@
#include "asm/symbol.h" #include "asm/symbol.h"
#include "extern/err.h" #include "extern/err.h"
#include "extern/strl.h"
#include "types.h" #include "types.h"
@@ -226,8 +225,12 @@ void fstk_AddIncludePath(char *s)
if (NextIncPath == MAXINCPATHS) if (NextIncPath == MAXINCPATHS)
fatalerror("Too many include directories passed from command line"); fatalerror("Too many include directories passed from command line");
if (strlcpy(IncludePaths[NextIncPath++], s, _MAX_PATH) >= _MAX_PATH) if (strlen(s) >= sizeof(IncludePaths[0]))
fatalerror("Include path too long '%s'", s); fatalerror("Include path too long '%s'", s);
strncpy(IncludePaths[NextIncPath], s, sizeof(IncludePaths[0]));
NextIncPath++;
} }
FILE *fstk_FindFile(char *fname) FILE *fstk_FindFile(char *fname)

52
src/extern/strlcpy.c vendored
View File

@@ -1,52 +0,0 @@
/* $OpenBSD: strlcpy.c,v 1.12 2015/01/15 03:54:12 millert Exp $ */
/*
* Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <string.h>
#include <sys/types.h>
/*
* Copy string src to buffer dst of size dsize. At most dsize-1
* chars will be copied. Always NUL terminates (unless dsize == 0).
* Returns strlen(src); if retval >= dsize, truncation occurred.
*/
size_t rgbds_strlcpy(char *dst, const char *src, size_t dsize)
{
const char *osrc = src;
size_t nleft = dsize;
/* Copy as many bytes as will fit. */
if (nleft != 0) {
while (--nleft != 0) {
char n = *src++;
*dst++ = n;
if (n == '\0')
break;
}
}
/* Not enough room in dst, add NUL and traverse rest of src. */
if (nleft == 0) {
if (dsize != 0)
*dst = '\0'; /* NUL-terminate dst */
while (*src++)
;
}
return (src - osrc - 1); /* count does not include NUL */
}