lobo/isync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

static my_strndup() => extern nfstrndup()

Browse Source
This commit is contained in:
Oswald Buddenhagen 2015-03-26 17:16:37 +01:00
parent 4d638c3cf2
commit e00d0f1ac3
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common.h
View File

@ -112,6 +112,7 @@ time_t timegm( struct tm *tm );
void *nfmalloc( size_t sz ); void *nfmalloc( size_t sz );
void *nfcalloc( size_t sz ); void *nfcalloc( size_t sz );
void *nfrealloc( void *mem, size_t sz ); void *nfrealloc( void *mem, size_t sz );
char *nfstrndup( const char *str, size_t nchars );
char *nfstrdup( const char *str ); char *nfstrdup( const char *str );
int nfvasprintf( char **str, const char *fmt, va_list va ); int nfvasprintf( char **str, const char *fmt, va_list va );
int ATTR_PRINTFLIKE(2, 3) nfasprintf( char **str, const char *fmt, ... ); int ATTR_PRINTFLIKE(2, 3) nfasprintf( char **str, const char *fmt, ... );

26
src/util.c
View File

@ -354,14 +354,19 @@ nfrealloc( void *mem, size_t sz )
return ret; return ret;
} }
char *
nfstrndup( const char *str, size_t nchars )
{
char *ret = nfmalloc( nchars + 1 );
memcpy( ret, str, nchars );
ret[nchars] = 0;
return ret;
}
char * char *
nfstrdup( const char *str ) nfstrdup( const char *str )
{ {
char *ret; return nfstrndup( str, strlen( str ) );
if (!(ret = strdup( str )))
oom();
return ret;
} }
int int
@ -405,15 +410,6 @@ cur_user( void )
} }
*/ */
static char *
my_strndup( const char *s, size_t nchars )
{
char *r = nfmalloc( nchars + 1 );
memcpy( r, s, nchars );
r[nchars] = 0;
return r;
}
char * char *
expand_strdup( const char *s ) expand_strdup( const char *s )
{ {
@ -431,7 +427,7 @@ expand_strdup( const char *s )
q = Home; q = Home;
} else { } else {
if ((p = strchr( s, '/' ))) { if ((p = strchr( s, '/' ))) {
r = my_strndup( s, (int)(p - s) ); r = nfstrndup( s, (int)(p - s) );
pw = getpwnam( r ); pw = getpwnam( r );
free( r ); free( r );
} else } else