kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 23:08:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

add experimental ast_copy_string() function to be used in place of strncpy() (see discussion on asterisk-dev)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5547 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-05-02 00:27:54 +00:00
parent 405000c897
commit abec217a1b
2 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
include/asterisk/utils.h
View File

@@ -9,18 +9,20 @@
* the GNU General Public License * the GNU General Public License
*/ */
#ifndef _ASTERISK_UTIL_H #ifndef _ASTERISK_UTILS_H
#define _ASTERISK_UTIL_H #define _ASTERISK_UTILS_H
#ifdef SOLARIS #ifdef SOLARIS
#include <solaris-compat/compat.h> #include <solaris-compat/compat.h>
#endif #endif
#include <netinet/in.h> #include <netinet/in.h>
#include <netdb.h> #include <netdb.h>
#include <pthread.h> #include <pthread.h>
#include "asterisk/lock.h"
#include <limits.h> #include <limits.h>
#include "asterisk/lock.h"
/* Note: /* Note:
It is very important to use only unsigned variables to hold It is very important to use only unsigned variables to hold
bit flags, as otherwise you can fall prey to the compiler's bit flags, as otherwise you can fall prey to the compiler's
@@ -166,10 +168,33 @@ struct ast_realloca {
#define AST_STACKSIZE 256 * 1024 #define AST_STACKSIZE 256 * 1024
#define ast_pthread_create(a,b,c,d) ast_pthread_create_stack(a,b,c,d,0) #define ast_pthread_create(a,b,c,d) ast_pthread_create_stack(a,b,c,d,0)
extern int ast_pthread_create_stack(pthread_t *thread, pthread_attr_t *attr, void *(*start_routine)(void *), void *data, size_t stacksize);
#ifdef __linux__ #ifdef __linux__
#define ast_strcasestr strcasestr #define ast_strcasestr strcasestr
#else #else
extern char *ast_strcasestr(const char *, const char *); extern char *ast_strcasestr(const char *, const char *);
#endif /* __linux__ */ #endif /* __linux__ */
extern int ast_pthread_create_stack(pthread_t *thread, pthread_attr_t *attr, void *(*start_routine)(void *), void *data, size_t stacksize);
#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
#define __builtin_expect(exp, c) (exp)
#endif #endif
/*!
\brief Size-limited null-terminating string copy.
\param dst The destination buffer.
\param src The source string
\param size The size of the destination buffer
This is similar to \a strncpy, with two important differences:
- the destination buffer will \b always be null-terminated
- the destination buffer is not filled with zeros past the copied string length
These differences make it slightly more efficient, and safer to use since it will
not leave the destination buffer unterminated. There is no need to pass an artificially
reduced buffer size to this function (unlike \a strncpy), and the buffer does not need
to be initialized to zeroes prior to calling this function.
No return value.
*/
void ast_copy_string(char *dst, const char *src, size_t size);
#endif /* _ASTERISK_UTILS_H */

9
utils.c
View File

@@ -418,6 +418,15 @@ int ast_wait_for_input(int fd, int ms)
return poll(pfd, 1, ms); return poll(pfd, 1, ms);
} }
void ast_copy_string(char *dst, const char *src, size_t size)
{
while (*src && size--)
*dst++ = *src++;
if (__builtin_expect(!size, 0))
dst--;
*dst = '\0';
}
/* Case-insensitive substring matching */ /* Case-insensitive substring matching */
#ifndef LINUX #ifndef LINUX
static char *upper(const char *orig, char *buf, int bufsize) static char *upper(const char *orig, char *buf, int bufsize)