emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libxbps: use xbps_strlc{at,py} everywhere.

Browse Source
This commit is contained in:
Juan RP 2016-04-17 20:17:37 +02:00
parent 048668b0fe
commit 2434b90d6e
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/download.c
View File

@ -36,9 +36,7 @@
#include <sys/time.h> #include <sys/time.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#define _BSD_SOURCE /* musl has strlcpy if _{BSD,GNU}_SOURCE is defined */
#include <string.h> #include <string.h>
#undef _BSD_SOURCE
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/wait.h> #include <sys/wait.h>
@ -118,7 +116,7 @@ xbps_fetch_file_dest(struct xbps_handle *xhp, const char *uri, const char *filen
memset(&fetch_flags, 0, sizeof(fetch_flags)); memset(&fetch_flags, 0, sizeof(fetch_flags));
if (flags != NULL) if (flags != NULL)
strlcpy(fetch_flags, flags, 7); xbps_strlcpy(fetch_flags, flags, 7);
tempfile = xbps_xasprintf("%s.part", filename); tempfile = xbps_xasprintf("%s.part", filename);
/* /*
@ -141,7 +139,7 @@ xbps_fetch_file_dest(struct xbps_handle *xhp, const char *uri, const char *filen
if (stat(filename, &st) == 0) { if (stat(filename, &st) == 0) {
refetch = true; refetch = true;
url->last_modified = st.st_mtime; url->last_modified = st.st_mtime;
strlcat(fetch_flags, "i", sizeof(fetch_flags)); xbps_strlcat(fetch_flags, "i", sizeof(fetch_flags));
} else { } else {
if (errno != ENOENT) { if (errno != ENOENT) {
rv = -1; rv = -1;

2
lib/external/dewey.c vendored
View File

@ -330,7 +330,7 @@ dewey_match(const char *pattern, const char *pkg)
if (sep2) { if (sep2) {
char ver[PKG_PATTERN_MAX]; char ver[PKG_PATTERN_MAX];
strlcpy(ver, sep, MIN((ssize_t)sizeof(ver), sep2-sep+1)); xbps_strlcpy(ver, sep, MIN((ssize_t)sizeof(ver), sep2-sep+1));
if (dewey_cmp(version, op, ver)) if (dewey_cmp(version, op, ver))
return 1; return 1;
} else { } else {

10
lib/initend.c
View File

@ -31,9 +31,7 @@
#endif #endif
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#define _BSD_SOURCE /* required by strlcpy with musl */
#include <string.h> #include <string.h>
#undef _BSD_SOURCE
#include <strings.h> #include <strings.h>
#include <errno.h> #include <errno.h>
#include <stdarg.h> #include <stdarg.h>
@ -124,7 +122,7 @@ store_preserved_file(struct xbps_handle *xhp, const char *file)
len = strlen(globbuf.gl_pathv[i]) - strlen(xhp->rootdir) + 1; len = strlen(globbuf.gl_pathv[i]) - strlen(xhp->rootdir) + 1;
p = malloc(len); p = malloc(len);
assert(p); assert(p);
strlcpy(p, globbuf.gl_pathv[i] + strlen(xhp->rootdir), len); xbps_strlcpy(p, globbuf.gl_pathv[i] + strlen(xhp->rootdir), len);
xbps_array_add_cstring(xhp->preserved_files, p); xbps_array_add_cstring(xhp->preserved_files, p);
xbps_dbg_printf(xhp, "Added preserved file: %s (expanded from %s)\n", p, file); xbps_dbg_printf(xhp, "Added preserved file: %s (expanded from %s)\n", p, file);
free(p); free(p);
@ -286,7 +284,7 @@ parse_file(struct xbps_handle *xhp, const char *cwd, const char *path, bool nest
continue; continue;
/* cwd to the dir containing the config file */ /* cwd to the dir containing the config file */
strlcpy(tmppath, path, sizeof(tmppath)); xbps_strlcpy(tmppath, path, sizeof(tmppath));
cfcwd = dirname(tmppath); cfcwd = dirname(tmppath);
if (chdir(cfcwd) == -1) { if (chdir(cfcwd) == -1) {
rv = errno; rv = errno;
@ -438,10 +436,10 @@ xbps_init(struct xbps_handle *xhp)
xhp->target_arch = getenv("XBPS_TARGET_ARCH"); xhp->target_arch = getenv("XBPS_TARGET_ARCH");
if ((native_arch = getenv("XBPS_ARCH")) != NULL) { if ((native_arch = getenv("XBPS_ARCH")) != NULL) {
strlcpy(xhp->native_arch, native_arch, sizeof(xhp->native_arch)); xbps_strlcpy(xhp->native_arch, native_arch, sizeof(xhp->native_arch));
} else { } else {
uname(&un); uname(&un);
strlcpy(xhp->native_arch, un.machine, sizeof(xhp->native_arch)); xbps_strlcpy(xhp->native_arch, un.machine, sizeof(xhp->native_arch));
} }
assert(xhp->native_arch); assert(xhp->native_arch);