external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-13 19:52:20 +00:00
Code Issues Releases Wiki Activity

Rename functions within ToolTalk that conflict with the musl C library headers.

Browse source
This commit is contained in:
Lev Kujawski 2021-01-06 12:12:35 -07:00 committed by Jon Trulson
parent 5d5523fd6a
commit d14d956c00
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cde/lib/tt/bin/tttar/tttar_file_utils.C
View file

@ -231,8 +231,8 @@ realtrees( _Tt_string_list_ptr paths, bool_t follow_symlinks )
* symlink instead of the path of the * symlink instead of the path of the
* linked file. * linked file.
*/ */
char *dir = dirname( (char *)path ); char *dir = dirname_tt( (char *)path );
char *base = basename( (char *)path ); char *base = basename_tt( (char *)path );
resolved_path = _tt_get_realpath( dir, resolved_path = _tt_get_realpath( dir,
resolved_path_buf ); resolved_path_buf );
if (resolved_path != NULL) { if (resolved_path != NULL) {
@ -354,10 +354,9 @@ append_real_subtrees( _Tt_string_list_ptr realtrees, _Tt_string path )
} /* append_real_subtrees() */ } /* append_real_subtrees() */
/* /*
* basename() - Return the last component of a pathname. * basename_tt() - Return the last component of a pathname.
*/ */
#if !defined(__linux__) char *basename_tt( char *pathname ) {
char *basename( char *pathname ) {
char *the_basename; char *the_basename;
the_basename = strrchr( pathname, '/' ); the_basename = strrchr( pathname, '/' );
@ -368,14 +367,13 @@ char *basename( char *pathname ) {
} }
return the_basename; return the_basename;
} }
#endif
/* /*
* dirname() - Return the pathname minus the basename, or "." if the * dirname_tt() - Return the pathname minus the basename, or "." if the
* basename is all there is. Caller is responsible for free()ing * basename is all there is. Caller is responsible for free()ing
* the storage returned. * the storage returned.
*/ */
char *dirname( char *pathname ) { char *dirname_tt( char *pathname ) {
char *the_basename; char *the_basename;
char *the_dirname; char *the_dirname;

4
cde/lib/tt/bin/tttar/tttar_file_utils.h
View file

@ -49,7 +49,7 @@ _Tt_string_list_ptr realtrees( _Tt_string_list_ptr paths,
bool_t follow_symlinks ); bool_t follow_symlinks );
void append_real_subtrees( _Tt_string_list_ptr realtrees, void append_real_subtrees( _Tt_string_list_ptr realtrees,
_Tt_string path ); _Tt_string path );
char *basename( char *pathname ); char *basename_tt( char *pathname );
char *dirname( char *pathname ); char *dirname_tt( char *pathname );
#endif /* _LSTAR_FILE_UTILS_H */ #endif /* _LSTAR_FILE_UTILS_H */