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

Use snprintf instead of strlcpy to save on size if not available.

Browse Source
This commit is contained in:
Roy Marples 2009-01-12 08:31:03 +00:00
parent a33554ab18
commit 8a9a2d5fe9
2 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/includes/rc-misc.h
View File

@ -4,7 +4,7 @@
*/ */
/* /*
* Copyright 2007-2008 Roy Marples <roy@marples.name> * Copyright 2007-2009 Roy Marples <roy@marples.name>
* All rights reserved * All rights reserved
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -41,6 +41,7 @@
#define RC_LEVEL_DEFAULT "default" #define RC_LEVEL_DEFAULT "default"
#define RC_DEPTREE_CACHE RC_SVCDIR "/deptree" #define RC_DEPTREE_CACHE RC_SVCDIR "/deptree"
#define RC_DEPTREE_SKEWED RC_SVCDIR "/clock-skewed"
#define RC_KRUNLEVEL RC_SVCDIR "/krunlevel" #define RC_KRUNLEVEL RC_SVCDIR "/krunlevel"
#define RC_STARTING RC_SVCDIR "/rc.starting" #define RC_STARTING RC_SVCDIR "/rc.starting"
#define RC_STOPPING RC_SVCDIR "/rc.stopping" #define RC_STOPPING RC_SVCDIR "/rc.stopping"
@ -84,6 +85,11 @@
(var) = (tvar)) (var) = (tvar))
#endif #endif
#ifdef __GLIBC__
# if ! defined (__UCLIBC__) && ! defined (__dietlibc__)
# define strlcpy(dst, src, size) snprintf(dst, size, "%s", src)
# endif
#endif
_unused static void *xmalloc (size_t size) _unused static void *xmalloc (size_t size)
{ {

23
src/librc/librc-daemon.c
View File

@ -31,29 +31,6 @@
#include "librc.h" #include "librc.h"
#ifdef __GLIBC__
# if ! defined (__UCLIBC__) && ! defined (__dietlibc__)
static size_t strlcpy(char *dst, const char *src, size_t size)
{
const char *s = src;
size_t n = size;
if (n && --n)
do {
if (!(*dst++ = *src++))
break;
} while (--n);
if (!n) {
if (size)
*dst = '\0';
while (*src++);
}
return src - s - 1;
}
# endif
#endif
#if defined(__linux__) #if defined(__linux__)