Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
a98aa666
Commit
a98aa666
authored
Jan 11, 2013
by
Denis Krjuchkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
string_util.c: provide fallback strndup() implementation
This patch also adds extern "C" { } wrapper around string_util.h to allow its usage in C++ code
parent
631a2689
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
50 additions
and
0 deletions
+50
-0
configure.ac
configure.ac
+2
-0
OpusReader.hxx
src/decoder/OpusReader.hxx
+1
-0
string_util.c
src/string_util.c
+21
-0
string_util.h
src/string_util.h
+26
-0
No files found.
configure.ac
View file @
a98aa666
...
...
@@ -135,6 +135,8 @@ AC_SEARCH_LIBS([gethostbyname], [nsl])
AC_CHECK_FUNCS(pipe2 accept4 eventfd)
AC_CHECK_FUNCS(strndup)
AC_SEARCH_LIBS([exp], [m],,
[AC_MSG_ERROR([exp() not found])])
...
...
src/decoder/OpusReader.hxx
View file @
a98aa666
...
...
@@ -21,6 +21,7 @@
#define MPD_OPUS_READER_HXX
#include "check.h"
#include "string_util.h"
#include <stdint.h>
#include <string.h>
...
...
src/string_util.c
View file @
a98aa666
...
...
@@ -20,6 +20,8 @@
#include "config.h"
#include "string_util.h"
#include <stdlib.h>
/* for malloc() */
#include <string.h>
/* for strnlen() */
#include <glib.h>
#include <assert.h>
...
...
@@ -45,3 +47,22 @@ string_array_contains(const char *const* haystack, const char *needle)
return
false
;
}
#if !defined(HAVE_STRNDUP)
char
*
strndup
(
const
char
*
str
,
size_t
n
)
{
assert
(
str
!=
NULL
);
size_t
len
=
strnlen
(
str
,
n
);
char
*
ret
=
(
char
*
)
malloc
(
len
+
1
);
if
(
ret
==
NULL
)
return
NULL
;
memcpy
(
ret
,
str
,
len
);
ret
[
len
]
=
'\0'
;
return
ret
;
}
#endif
src/string_util.h
View file @
a98aa666
...
...
@@ -23,6 +23,11 @@
#include "gcc.h"
#include <stdbool.h>
#include <stdlib.h>
/* for size_t */
#ifdef __cplusplus
extern
"C"
{
#endif
/**
* Remove the "const" attribute from a string pointer. This is a
...
...
@@ -78,4 +83,25 @@ strchug_fast(char *p)
bool
string_array_contains
(
const
char
*
const
*
haystack
,
const
char
*
needle
);
#if !defined(HAVE_STRNDUP)
/**
* Duplicates the string to a newly allocated buffer
* copying at most n characters.
*
* @param str a string to duplicate
* @param n maximal number of characters to copy
* @return a pointer to the duplicated string,
* or NULL if memory allocation failed.
*/
gcc_malloc
char
*
strndup
(
const
char
*
str
,
size_t
n
);
#endif
#ifdef __cplusplus
}
/* extern "C" */
#endif
#endif
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment