debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into autotools-conversion

Browse Source 
Lost the ksh93 submodule so will re-add in a later commit.
This commit is contained in:
Jon Trulson
2021-01-30 19:04:10 -07:00
parent e18e2480dc 9a695e9411
commit ece5c0ea14
1044 changed files with 2966 additions and 197577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cde/lib/tt/bin/ttauth/ttauth.man
View File

@@ -18,7 +18,7 @@
.\" not be used in advertising or otherwise to promote the sale, use or
.\" other dealings in this Software without prior written authorization
.\" from The Open Group.
.TH TTAUTH 1 "Release 2.3.2a" "CDE"
.TH TTAUTH 1 "Release 2.3.2b" "CDE"
.SH NAME
ttauth \- ToolTalk authority file utility
.SH SYNOPSIS

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
* linked file.
*/
char *dir = dirname( (char *)path );
char *base = basename( (char *)path );
char *dir = dirname_tt( (char *)path );
char *base = basename_tt( (char *)path );
resolved_path = _tt_get_realpath( dir,
resolved_path_buf );
if (resolved_path != NULL) {
@@ -354,10 +354,9 @@ append_real_subtrees( _Tt_string_list_ptr realtrees, _Tt_string path )
} /* 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( char *pathname ) {
char *basename_tt( char *pathname ) {
char *the_basename;
the_basename = strrchr( pathname, '/' );
@@ -368,14 +367,13 @@ char *basename( char *pathname ) {
}
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
* the storage returned.
*/
char *dirname( char *pathname ) {
char *dirname_tt( char *pathname ) {
char *the_basename;
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 );
void append_real_subtrees( _Tt_string_list_ptr realtrees,
_Tt_string path );
char *basename( char *pathname );
char *dirname( char *pathname );
char *basename_tt( char *pathname );
char *dirname_tt( char *pathname );
#endif /* _LSTAR_FILE_UTILS_H */