From 10caff7c0c37ecb9ad9357d1a15afb9bdb052a59 Mon Sep 17 00:00:00 2001 From: Benjamin Kaduk Date: Sat, 5 May 2018 15:42:51 -0500 Subject: [PATCH] Rename getDirPath to afs_getDirPath in preparation for export The symbol name getDirPath is rather generic and we probably shouldn't squat on it in the application's namespace. In preparation for exporting this functionality from the Unix shared libraries, rename it to afs_getDirPath. Retain a Windows-only wrapper getDirPath that can continue to be exported from libafsauthent on Windows, for ABI compatibility. New consumers should use afs_getDirPath. Reviewed-on: https://gerrit.openafs.org/13058 Tested-by: BuildBot Reviewed-by: Anders Kaseorg Tested-by: Anders Kaseorg Reviewed-by: Michael Meffie Reviewed-by: Benjamin Kaduk (cherry picked from commit 554c38473d1465af4c4613209229c274807fffd8) Change-Id: If527d3f6d619e8bc41914353d28d5d74cb683637 Reviewed-on: https://gerrit.openafs.org/13145 Tested-by: BuildBot Reviewed-by: Benjamin Kaduk --- src/util/afsutil_prototypes.h | 2 +- src/util/dirpath.c | 14 +++- src/util/dirpath.hin | 140 +++++++++++++++++----------------- src/util/dirpath_nt.h | 136 +++++++++++++++++---------------- src/util/liboafs_util.la.sym | 2 +- 5 files changed, 153 insertions(+), 141 deletions(-) diff --git a/src/util/afsutil_prototypes.h b/src/util/afsutil_prototypes.h index b91e6fb7f..d2ea5a96b 100644 --- a/src/util/afsutil_prototypes.h +++ b/src/util/afsutil_prototypes.h @@ -29,7 +29,7 @@ extern int base64_to_int(char *s); /* dirpath.c */ extern unsigned int initAFSDirPath(void); -extern const char *getDirPath(afsdir_id_t string_id); +extern const char *afs_getDirPath(afsdir_id_t string_id); extern int ConstructLocalPath(const char *cpath, const char *relativeTo, char **fullPathBufp); extern int ConstructLocalBinPath(const char *cpath, char **fullPathBufp); diff --git a/src/util/dirpath.c b/src/util/dirpath.c index 90f053de5..3957611b9 100644 --- a/src/util/dirpath.c +++ b/src/util/dirpath.c @@ -428,12 +428,12 @@ initDirPathArray(void) return; } -/* getDirPath - returns a const char pointer to the requested string +/* afs_getDirPath - returns a const char pointer to the requested string * from the internal path array. * string_id - index into the path array */ const char * -getDirPath(afsdir_id_t string_id) +afs_getDirPath(afsdir_id_t string_id) { /* check if the array has been initialized */ if (initFlag == 0) { /* no it's not, so initialize */ @@ -446,6 +446,16 @@ getDirPath(afsdir_id_t string_id) return (const char *)dirPathArray[string_id]; } +#ifdef AFS_NT40_ENV +/* getDirPath - present for ABI compatibility on Windows systems; + * Unix systems should not use it. */ +const char * +getDirPath(afsdir_id_t string_id) +{ + return afs_getDirPath(string_id); +} +#endif + /* * LocalizePathHead() -- Make path relative to local part * diff --git a/src/util/dirpath.hin b/src/util/dirpath.hin index 165e6975c..7d8c1e742 100644 --- a/src/util/dirpath.hin +++ b/src/util/dirpath.hin @@ -298,86 +298,86 @@ typedef enum afsdir_id { AFSDIR_SERVER_RXKAD_KEYTAB_FILEPATH_ID, AFSDIR_PATHSTRING_MAX } afsdir_id_t; -/* getDirPath() returns a pointer to a string from an internal array of path strings +/* afs_getDirPath() returns a pointer to a string from an internal array of path strings */ -const char *getDirPath(afsdir_id_t string_id); +const char *afs_getDirPath(afsdir_id_t string_id); /* Top level usr dir */ -#define AFSDIR_USR_DIRPATH getDirPath(AFSDIR_USR_DIRPATH_ID) +#define AFSDIR_USR_DIRPATH afs_getDirPath(AFSDIR_USR_DIRPATH_ID) /* server subdir paths */ -#define AFSDIR_SERVER_AFS_DIRPATH getDirPath(AFSDIR_SERVER_AFS_DIRPATH_ID) -#define AFSDIR_SERVER_ETC_DIRPATH getDirPath(AFSDIR_SERVER_ETC_DIRPATH_ID) -#define AFSDIR_SERVER_BIN_DIRPATH getDirPath(AFSDIR_SERVER_BIN_DIRPATH_ID) -#define AFSDIR_SERVER_CORES_DIRPATH getDirPath(AFSDIR_SERVER_CORES_DIRPATH_ID) -#define AFSDIR_SERVER_DB_DIRPATH getDirPath(AFSDIR_SERVER_DB_DIRPATH_ID) -#define AFSDIR_SERVER_LOGS_DIRPATH getDirPath(AFSDIR_SERVER_LOGS_DIRPATH_ID) -#define AFSDIR_SERVER_LOCAL_DIRPATH getDirPath(AFSDIR_SERVER_LOCAL_DIRPATH_ID) -#define AFSDIR_SERVER_BACKUP_DIRPATH getDirPath(AFSDIR_SERVER_BACKUP_DIRPATH_ID) -#define AFSDIR_SERVER_LOCAL_DIRPATH getDirPath(AFSDIR_SERVER_LOCAL_DIRPATH_ID) -#define AFSDIR_SERVER_MIGRATE_DIRPATH getDirPath(AFSDIR_SERVER_MIGRATE_DIRPATH_ID) -#define AFSDIR_SERVER_MIGRATE_DIRPATH getDirPath(AFSDIR_SERVER_MIGRATE_DIRPATH_ID) +#define AFSDIR_SERVER_AFS_DIRPATH afs_getDirPath(AFSDIR_SERVER_AFS_DIRPATH_ID) +#define AFSDIR_SERVER_ETC_DIRPATH afs_getDirPath(AFSDIR_SERVER_ETC_DIRPATH_ID) +#define AFSDIR_SERVER_BIN_DIRPATH afs_getDirPath(AFSDIR_SERVER_BIN_DIRPATH_ID) +#define AFSDIR_SERVER_CORES_DIRPATH afs_getDirPath(AFSDIR_SERVER_CORES_DIRPATH_ID) +#define AFSDIR_SERVER_DB_DIRPATH afs_getDirPath(AFSDIR_SERVER_DB_DIRPATH_ID) +#define AFSDIR_SERVER_LOGS_DIRPATH afs_getDirPath(AFSDIR_SERVER_LOGS_DIRPATH_ID) +#define AFSDIR_SERVER_LOCAL_DIRPATH afs_getDirPath(AFSDIR_SERVER_LOCAL_DIRPATH_ID) +#define AFSDIR_SERVER_BACKUP_DIRPATH afs_getDirPath(AFSDIR_SERVER_BACKUP_DIRPATH_ID) +#define AFSDIR_SERVER_LOCAL_DIRPATH afs_getDirPath(AFSDIR_SERVER_LOCAL_DIRPATH_ID) +#define AFSDIR_SERVER_MIGRATE_DIRPATH afs_getDirPath(AFSDIR_SERVER_MIGRATE_DIRPATH_ID) +#define AFSDIR_SERVER_MIGRATE_DIRPATH afs_getDirPath(AFSDIR_SERVER_MIGRATE_DIRPATH_ID) /* client subdir paths */ -#define AFSDIR_CLIENT_VICE_DIRPATH getDirPath(AFSDIR_CLIENT_VICE_DIRPATH_ID) -#define AFSDIR_CLIENT_ETC_DIRPATH getDirPath(AFSDIR_CLIENT_ETC_DIRPATH_ID) -#define AFSDIR_CLIENT_DATA_DIRPATH getDirPath(AFSDIR_CLIENT_DATA_DIRPATH_ID) -#define AFSDIR_SERVER_BIN_FILE_DIRPATH getDirPath(AFSDIR_SERVER_BIN_FILE_DIRPATH_ID) +#define AFSDIR_CLIENT_VICE_DIRPATH afs_getDirPath(AFSDIR_CLIENT_VICE_DIRPATH_ID) +#define AFSDIR_CLIENT_ETC_DIRPATH afs_getDirPath(AFSDIR_CLIENT_ETC_DIRPATH_ID) +#define AFSDIR_CLIENT_DATA_DIRPATH afs_getDirPath(AFSDIR_CLIENT_DATA_DIRPATH_ID) +#define AFSDIR_SERVER_BIN_FILE_DIRPATH afs_getDirPath(AFSDIR_SERVER_BIN_FILE_DIRPATH_ID) /* server file paths */ -#define AFSDIR_SERVER_THISCELL_FILEPATH getDirPath(AFSDIR_SERVER_THISCELL_FILEPATH_ID) -#define AFSDIR_SERVER_CELLSERVDB_FILEPATH getDirPath(AFSDIR_SERVER_CELLSERVDB_FILEPATH_ID) -#define AFSDIR_SERVER_NOAUTH_FILEPATH getDirPath(AFSDIR_SERVER_NOAUTH_FILEPATH_ID) -#define AFSDIR_SERVER_KEY_FILEPATH getDirPath(AFSDIR_SERVER_KEY_FILEPATH_ID) -#define AFSDIR_SERVER_ULIST_FILEPATH getDirPath(AFSDIR_SERVER_ULIST_FILEPATH_ID) -#define AFSDIR_SERVER_BUDBLOG_FILEPATH getDirPath(AFSDIR_SERVER_BUDBLOG_FILEPATH_ID) -#define AFSDIR_SERVER_TAPECONFIG_FILEPATH getDirPath(AFSDIR_SERVER_TAPECONFIG_FILEPATH_ID) -#define AFSDIR_SERVER_KALOGDB_FILEPATH getDirPath(AFSDIR_SERVER_KALOGDB_FILEPATH_ID) -#define AFSDIR_SERVER_KALOG_FILEPATH getDirPath(AFSDIR_SERVER_KALOG_FILEPATH_ID) -#define AFSDIR_SERVER_KADB_FILEPATH getDirPath(AFSDIR_SERVER_KADB_FILEPATH_ID) -#define AFSDIR_SERVER_NTPD_FILEPATH getDirPath(AFSDIR_SERVER_NTPD_FILEPATH_ID) -#define AFSDIR_SERVER_PRDB_FILEPATH getDirPath(AFSDIR_SERVER_PRDB_FILEPATH_ID) -#define AFSDIR_SERVER_PTLOG_FILEPATH getDirPath(AFSDIR_SERVER_PTLOG_FILEPATH_ID) -#define AFSDIR_SERVER_KCONF_FILEPATH getDirPath(AFSDIR_SERVER_KCONF_FILEPATH_ID) -#define AFSDIR_SERVER_VLDB_FILEPATH getDirPath(AFSDIR_SERVER_VLDB_FILEPATH_ID) -#define AFSDIR_SERVER_VLOG_FILEPATH getDirPath(AFSDIR_SERVER_VLOG_FILEPATH_ID) -#define AFSDIR_SERVER_CORELOG_FILEPATH getDirPath(AFSDIR_SERVER_CORELOG_FILEPATH_ID) -#define AFSDIR_SERVER_SLVGLOG_FILEPATH getDirPath(AFSDIR_SERVER_SLVGLOG_FILEPATH_ID) -#define AFSDIR_SERVER_SALSRVLOG_FILEPATH getDirPath(AFSDIR_SERVER_SALSRVLOG_FILEPATH_ID) -#define AFSDIR_SERVER_SALVAGER_FILEPATH getDirPath(AFSDIR_SERVER_SALVAGER_FILEPATH_ID) -#define AFSDIR_SERVER_SALSRV_FILEPATH getDirPath(AFSDIR_SERVER_SALSRV_FILEPATH_ID) -#define AFSDIR_SERVER_BOZCONF_FILEPATH getDirPath(AFSDIR_SERVER_BOZCONF_FILEPATH_ID) -#define AFSDIR_SERVER_BOZCONFNEW_FILEPATH getDirPath(AFSDIR_SERVER_BOZCONFNEW_FILEPATH_ID) -#define AFSDIR_SERVER_BOZINIT_FILEPATH getDirPath(AFSDIR_SERVER_BOZINIT_FILEPATH_ID) -#define AFSDIR_SERVER_BOZLOG_FILEPATH getDirPath(AFSDIR_SERVER_BOZLOG_FILEPATH_ID) -#define AFSDIR_SERVER_BOZRXBIND_FILEPATH getDirPath(AFSDIR_SERVER_BOZRXBIND_FILEPATH_ID) -#define AFSDIR_SERVER_BOSVR_FILEPATH getDirPath(AFSDIR_SERVER_BOSVR_FILEPATH_ID) -#define AFSDIR_SERVER_SLVGLOCK_FILEPATH getDirPath(AFSDIR_SERVER_SLVGLOCK_FILEPATH_ID) -#define AFSDIR_SERVER_VOLSERLOG_FILEPATH getDirPath(AFSDIR_SERVER_VOLSERLOG_FILEPATH_ID) -#define AFSDIR_SERVER_ROOTVOL_FILEPATH getDirPath(AFSDIR_SERVER_ROOTVOL_FILEPATH_ID) -#define AFSDIR_SERVER_HOSTDUMP_FILEPATH getDirPath(AFSDIR_SERVER_HOSTDUMP_FILEPATH_ID) -#define AFSDIR_SERVER_CLNTDUMP_FILEPATH getDirPath(AFSDIR_SERVER_CLNTDUMP_FILEPATH_ID) -#define AFSDIR_SERVER_CBKDUMP_FILEPATH getDirPath(AFSDIR_SERVER_CBKDUMP_FILEPATH_ID) -#define AFSDIR_SERVER_OLDSYSID_FILEPATH getDirPath(AFSDIR_SERVER_OLDSYSID_FILEPATH_ID) -#define AFSDIR_SERVER_SYSID_FILEPATH getDirPath(AFSDIR_SERVER_SYSID_FILEPATH_ID) -#define AFSDIR_SERVER_FILELOG_FILEPATH getDirPath(AFSDIR_SERVER_FILELOG_FILEPATH_ID) -#define AFSDIR_SERVER_AUDIT_FILEPATH getDirPath(AFSDIR_SERVER_AUDIT_FILEPATH_ID) -#define AFSDIR_SERVER_NETINFO_FILEPATH getDirPath(AFSDIR_SERVER_NETINFO_FILEPATH_ID) -#define AFSDIR_SERVER_NETRESTRICT_FILEPATH getDirPath(AFSDIR_SERVER_NETRESTRICT_FILEPATH_ID) -#define AFSDIR_SERVER_WEIGHTING_CONSTANTS_FILEPATH getDirPath(AFSDIR_SERVER_WEIGHTING_CONSTANTS_FILEPATH_ID) -#define AFSDIR_SERVER_THRESHOLD_CONSTANTS_FILEPATH getDirPath(AFSDIR_SERVER_THRESHOLD_CONSTANTS_FILEPATH_ID) -#define AFSDIR_SERVER_MIGRATELOG_FILEPATH getDirPath(AFSDIR_SERVER_MIGRATELOG_FILEPATH_ID) -#define AFSDIR_SERVER_KRB_EXCL_FILEPATH getDirPath(AFSDIR_SERVER_KRB_EXCL_FILEPATH_ID) -#define AFSDIR_SERVER_FSSTATE_FILEPATH getDirPath(AFSDIR_SERVER_FSSTATE_FILEPATH_ID) -#define AFSDIR_SERVER_CONFIG_FILE_FILEPATH getDirPath(AFSDIR_SERVER_CONFIG_FILE_FILEPATH_ID) -#define AFSDIR_SERVER_RXKAD_KEYTAB_FILEPATH getDirPath(AFSDIR_SERVER_RXKAD_KEYTAB_FILEPATH_ID) +#define AFSDIR_SERVER_THISCELL_FILEPATH afs_getDirPath(AFSDIR_SERVER_THISCELL_FILEPATH_ID) +#define AFSDIR_SERVER_CELLSERVDB_FILEPATH afs_getDirPath(AFSDIR_SERVER_CELLSERVDB_FILEPATH_ID) +#define AFSDIR_SERVER_NOAUTH_FILEPATH afs_getDirPath(AFSDIR_SERVER_NOAUTH_FILEPATH_ID) +#define AFSDIR_SERVER_KEY_FILEPATH afs_getDirPath(AFSDIR_SERVER_KEY_FILEPATH_ID) +#define AFSDIR_SERVER_ULIST_FILEPATH afs_getDirPath(AFSDIR_SERVER_ULIST_FILEPATH_ID) +#define AFSDIR_SERVER_BUDBLOG_FILEPATH afs_getDirPath(AFSDIR_SERVER_BUDBLOG_FILEPATH_ID) +#define AFSDIR_SERVER_TAPECONFIG_FILEPATH afs_getDirPath(AFSDIR_SERVER_TAPECONFIG_FILEPATH_ID) +#define AFSDIR_SERVER_KALOGDB_FILEPATH afs_getDirPath(AFSDIR_SERVER_KALOGDB_FILEPATH_ID) +#define AFSDIR_SERVER_KALOG_FILEPATH afs_getDirPath(AFSDIR_SERVER_KALOG_FILEPATH_ID) +#define AFSDIR_SERVER_KADB_FILEPATH afs_getDirPath(AFSDIR_SERVER_KADB_FILEPATH_ID) +#define AFSDIR_SERVER_NTPD_FILEPATH afs_getDirPath(AFSDIR_SERVER_NTPD_FILEPATH_ID) +#define AFSDIR_SERVER_PRDB_FILEPATH afs_getDirPath(AFSDIR_SERVER_PRDB_FILEPATH_ID) +#define AFSDIR_SERVER_PTLOG_FILEPATH afs_getDirPath(AFSDIR_SERVER_PTLOG_FILEPATH_ID) +#define AFSDIR_SERVER_KCONF_FILEPATH afs_getDirPath(AFSDIR_SERVER_KCONF_FILEPATH_ID) +#define AFSDIR_SERVER_VLDB_FILEPATH afs_getDirPath(AFSDIR_SERVER_VLDB_FILEPATH_ID) +#define AFSDIR_SERVER_VLOG_FILEPATH afs_getDirPath(AFSDIR_SERVER_VLOG_FILEPATH_ID) +#define AFSDIR_SERVER_CORELOG_FILEPATH afs_getDirPath(AFSDIR_SERVER_CORELOG_FILEPATH_ID) +#define AFSDIR_SERVER_SLVGLOG_FILEPATH afs_getDirPath(AFSDIR_SERVER_SLVGLOG_FILEPATH_ID) +#define AFSDIR_SERVER_SALSRVLOG_FILEPATH afs_getDirPath(AFSDIR_SERVER_SALSRVLOG_FILEPATH_ID) +#define AFSDIR_SERVER_SALVAGER_FILEPATH afs_getDirPath(AFSDIR_SERVER_SALVAGER_FILEPATH_ID) +#define AFSDIR_SERVER_SALSRV_FILEPATH afs_getDirPath(AFSDIR_SERVER_SALSRV_FILEPATH_ID) +#define AFSDIR_SERVER_BOZCONF_FILEPATH afs_getDirPath(AFSDIR_SERVER_BOZCONF_FILEPATH_ID) +#define AFSDIR_SERVER_BOZCONFNEW_FILEPATH afs_getDirPath(AFSDIR_SERVER_BOZCONFNEW_FILEPATH_ID) +#define AFSDIR_SERVER_BOZINIT_FILEPATH afs_getDirPath(AFSDIR_SERVER_BOZINIT_FILEPATH_ID) +#define AFSDIR_SERVER_BOZLOG_FILEPATH afs_getDirPath(AFSDIR_SERVER_BOZLOG_FILEPATH_ID) +#define AFSDIR_SERVER_BOZRXBIND_FILEPATH afs_getDirPath(AFSDIR_SERVER_BOZRXBIND_FILEPATH_ID) +#define AFSDIR_SERVER_BOSVR_FILEPATH afs_getDirPath(AFSDIR_SERVER_BOSVR_FILEPATH_ID) +#define AFSDIR_SERVER_SLVGLOCK_FILEPATH afs_getDirPath(AFSDIR_SERVER_SLVGLOCK_FILEPATH_ID) +#define AFSDIR_SERVER_VOLSERLOG_FILEPATH afs_getDirPath(AFSDIR_SERVER_VOLSERLOG_FILEPATH_ID) +#define AFSDIR_SERVER_ROOTVOL_FILEPATH afs_getDirPath(AFSDIR_SERVER_ROOTVOL_FILEPATH_ID) +#define AFSDIR_SERVER_HOSTDUMP_FILEPATH afs_getDirPath(AFSDIR_SERVER_HOSTDUMP_FILEPATH_ID) +#define AFSDIR_SERVER_CLNTDUMP_FILEPATH afs_getDirPath(AFSDIR_SERVER_CLNTDUMP_FILEPATH_ID) +#define AFSDIR_SERVER_CBKDUMP_FILEPATH afs_getDirPath(AFSDIR_SERVER_CBKDUMP_FILEPATH_ID) +#define AFSDIR_SERVER_OLDSYSID_FILEPATH afs_getDirPath(AFSDIR_SERVER_OLDSYSID_FILEPATH_ID) +#define AFSDIR_SERVER_SYSID_FILEPATH afs_getDirPath(AFSDIR_SERVER_SYSID_FILEPATH_ID) +#define AFSDIR_SERVER_FILELOG_FILEPATH afs_getDirPath(AFSDIR_SERVER_FILELOG_FILEPATH_ID) +#define AFSDIR_SERVER_AUDIT_FILEPATH afs_getDirPath(AFSDIR_SERVER_AUDIT_FILEPATH_ID) +#define AFSDIR_SERVER_NETINFO_FILEPATH afs_getDirPath(AFSDIR_SERVER_NETINFO_FILEPATH_ID) +#define AFSDIR_SERVER_NETRESTRICT_FILEPATH afs_getDirPath(AFSDIR_SERVER_NETRESTRICT_FILEPATH_ID) +#define AFSDIR_SERVER_WEIGHTING_CONSTANTS_FILEPATH afs_getDirPath(AFSDIR_SERVER_WEIGHTING_CONSTANTS_FILEPATH_ID) +#define AFSDIR_SERVER_THRESHOLD_CONSTANTS_FILEPATH afs_getDirPath(AFSDIR_SERVER_THRESHOLD_CONSTANTS_FILEPATH_ID) +#define AFSDIR_SERVER_MIGRATELOG_FILEPATH afs_getDirPath(AFSDIR_SERVER_MIGRATELOG_FILEPATH_ID) +#define AFSDIR_SERVER_KRB_EXCL_FILEPATH afs_getDirPath(AFSDIR_SERVER_KRB_EXCL_FILEPATH_ID) +#define AFSDIR_SERVER_FSSTATE_FILEPATH afs_getDirPath(AFSDIR_SERVER_FSSTATE_FILEPATH_ID) +#define AFSDIR_SERVER_CONFIG_FILE_FILEPATH afs_getDirPath(AFSDIR_SERVER_CONFIG_FILE_FILEPATH_ID) +#define AFSDIR_SERVER_RXKAD_KEYTAB_FILEPATH afs_getDirPath(AFSDIR_SERVER_RXKAD_KEYTAB_FILEPATH_ID) /* client file paths */ -#define AFSDIR_CLIENT_CONFIG_FILE_FILEPATH getDirPath(AFSDIR_CLIENT_CONFIG_FILE_FILEPATH_ID) -#define AFSDIR_CLIENT_THISCELL_FILEPATH getDirPath(AFSDIR_CLIENT_THISCELL_FILEPATH_ID) -#define AFSDIR_CLIENT_CELLSERVDB_FILEPATH getDirPath(AFSDIR_CLIENT_CELLSERVDB_FILEPATH_ID) -#define AFSDIR_CLIENT_CELLALIAS_FILEPATH getDirPath(AFSDIR_CLIENT_CELLALIAS_FILEPATH_ID) -#define AFSDIR_CLIENT_NETINFO_FILEPATH getDirPath(AFSDIR_CLIENT_NETINFO_FILEPATH_ID) -#define AFSDIR_CLIENT_NETRESTRICT_FILEPATH getDirPath(AFSDIR_CLIENT_NETRESTRICT_FILEPATH_ID) +#define AFSDIR_CLIENT_CONFIG_FILE_FILEPATH afs_getDirPath(AFSDIR_CLIENT_CONFIG_FILE_FILEPATH_ID) +#define AFSDIR_CLIENT_THISCELL_FILEPATH afs_getDirPath(AFSDIR_CLIENT_THISCELL_FILEPATH_ID) +#define AFSDIR_CLIENT_CELLSERVDB_FILEPATH afs_getDirPath(AFSDIR_CLIENT_CELLSERVDB_FILEPATH_ID) +#define AFSDIR_CLIENT_CELLALIAS_FILEPATH afs_getDirPath(AFSDIR_CLIENT_CELLALIAS_FILEPATH_ID) +#define AFSDIR_CLIENT_NETINFO_FILEPATH afs_getDirPath(AFSDIR_CLIENT_NETINFO_FILEPATH_ID) +#define AFSDIR_CLIENT_NETRESTRICT_FILEPATH afs_getDirPath(AFSDIR_CLIENT_NETRESTRICT_FILEPATH_ID) #endif /* _DIRPATH_H */ diff --git a/src/util/dirpath_nt.h b/src/util/dirpath_nt.h index e08932d77..5a978821c 100644 --- a/src/util/dirpath_nt.h +++ b/src/util/dirpath_nt.h @@ -284,84 +284,86 @@ typedef enum afsdir_id { AFSDIR_PATHSTRING_MAX } afsdir_id_t; -/* getDirPath() returns a pointer to a string from an internal array of path strings +/* afs_getDirPath() returns a pointer to a string from an internal array of path strings */ +const char *afs_getDirPath(afsdir_id_t string_id); +/* For ABI compatibility with historical versions. */ const char *getDirPath(afsdir_id_t string_id); /* Top level usr dir */ -#define AFSDIR_USR_DIRPATH getDirPath(AFSDIR_USR_DIRPATH_ID) +#define AFSDIR_USR_DIRPATH afs_getDirPath(AFSDIR_USR_DIRPATH_ID) /* server subdir paths */ -#define AFSDIR_SERVER_AFS_DIRPATH getDirPath(AFSDIR_SERVER_AFS_DIRPATH_ID) -#define AFSDIR_SERVER_ETC_DIRPATH getDirPath(AFSDIR_SERVER_ETC_DIRPATH_ID) -#define AFSDIR_SERVER_BIN_DIRPATH getDirPath(AFSDIR_SERVER_BIN_DIRPATH_ID) -#define AFSDIR_SERVER_CORES_DIRPATH getDirPath(AFSDIR_SERVER_CORES_DIRPATH_ID) -#define AFSDIR_SERVER_DB_DIRPATH getDirPath(AFSDIR_SERVER_DB_DIRPATH_ID) -#define AFSDIR_SERVER_LOGS_DIRPATH getDirPath(AFSDIR_SERVER_LOGS_DIRPATH_ID) -#define AFSDIR_SERVER_LOCAL_DIRPATH getDirPath(AFSDIR_SERVER_LOCAL_DIRPATH_ID) -#define AFSDIR_SERVER_BACKUP_DIRPATH getDirPath(AFSDIR_SERVER_BACKUP_DIRPATH_ID) -#define AFSDIR_SERVER_LOCAL_DIRPATH getDirPath(AFSDIR_SERVER_LOCAL_DIRPATH_ID) -#define AFSDIR_SERVER_MIGRATE_DIRPATH getDirPath(AFSDIR_SERVER_MIGRATE_DIRPATH_ID) -#define AFSDIR_SERVER_MIGRATE_DIRPATH getDirPath(AFSDIR_SERVER_MIGRATE_DIRPATH_ID) +#define AFSDIR_SERVER_AFS_DIRPATH afs_getDirPath(AFSDIR_SERVER_AFS_DIRPATH_ID) +#define AFSDIR_SERVER_ETC_DIRPATH afs_getDirPath(AFSDIR_SERVER_ETC_DIRPATH_ID) +#define AFSDIR_SERVER_BIN_DIRPATH afs_getDirPath(AFSDIR_SERVER_BIN_DIRPATH_ID) +#define AFSDIR_SERVER_CORES_DIRPATH afs_getDirPath(AFSDIR_SERVER_CORES_DIRPATH_ID) +#define AFSDIR_SERVER_DB_DIRPATH afs_getDirPath(AFSDIR_SERVER_DB_DIRPATH_ID) +#define AFSDIR_SERVER_LOGS_DIRPATH afs_getDirPath(AFSDIR_SERVER_LOGS_DIRPATH_ID) +#define AFSDIR_SERVER_LOCAL_DIRPATH afs_getDirPath(AFSDIR_SERVER_LOCAL_DIRPATH_ID) +#define AFSDIR_SERVER_BACKUP_DIRPATH afs_getDirPath(AFSDIR_SERVER_BACKUP_DIRPATH_ID) +#define AFSDIR_SERVER_LOCAL_DIRPATH afs_getDirPath(AFSDIR_SERVER_LOCAL_DIRPATH_ID) +#define AFSDIR_SERVER_MIGRATE_DIRPATH afs_getDirPath(AFSDIR_SERVER_MIGRATE_DIRPATH_ID) +#define AFSDIR_SERVER_MIGRATE_DIRPATH afs_getDirPath(AFSDIR_SERVER_MIGRATE_DIRPATH_ID) /* client subdir paths */ -#define AFSDIR_CLIENT_VICE_DIRPATH getDirPath(AFSDIR_CLIENT_VICE_DIRPATH_ID) -#define AFSDIR_CLIENT_ETC_DIRPATH getDirPath(AFSDIR_CLIENT_ETC_DIRPATH_ID) -#define AFSDIR_SERVER_BIN_FILE_DIRPATH getDirPath(AFSDIR_SERVER_BIN_FILE_DIRPATH_ID) +#define AFSDIR_CLIENT_VICE_DIRPATH afs_getDirPath(AFSDIR_CLIENT_VICE_DIRPATH_ID) +#define AFSDIR_CLIENT_ETC_DIRPATH afs_getDirPath(AFSDIR_CLIENT_ETC_DIRPATH_ID) +#define AFSDIR_SERVER_BIN_FILE_DIRPATH afs_getDirPath(AFSDIR_SERVER_BIN_FILE_DIRPATH_ID) /* server file paths */ -#define AFSDIR_SERVER_THISCELL_FILEPATH getDirPath(AFSDIR_SERVER_THISCELL_FILEPATH_ID) -#define AFSDIR_SERVER_CELLSERVDB_FILEPATH getDirPath(AFSDIR_SERVER_CELLSERVDB_FILEPATH_ID) -#define AFSDIR_SERVER_NOAUTH_FILEPATH getDirPath(AFSDIR_SERVER_NOAUTH_FILEPATH_ID) -#define AFSDIR_SERVER_KEY_FILEPATH getDirPath(AFSDIR_SERVER_KEY_FILEPATH_ID) -#define AFSDIR_SERVER_ULIST_FILEPATH getDirPath(AFSDIR_SERVER_ULIST_FILEPATH_ID) -#define AFSDIR_SERVER_BUDBLOG_FILEPATH getDirPath(AFSDIR_SERVER_BUDBLOG_FILEPATH_ID) -#define AFSDIR_SERVER_TAPECONFIG_FILEPATH getDirPath(AFSDIR_SERVER_TAPECONFIG_FILEPATH_ID) -#define AFSDIR_SERVER_KALOGDB_FILEPATH getDirPath(AFSDIR_SERVER_KALOGDB_FILEPATH_ID) -#define AFSDIR_SERVER_KALOG_FILEPATH getDirPath(AFSDIR_SERVER_KALOG_FILEPATH_ID) -#define AFSDIR_SERVER_KADB_FILEPATH getDirPath(AFSDIR_SERVER_KADB_FILEPATH_ID) -#define AFSDIR_SERVER_NTPD_FILEPATH getDirPath(AFSDIR_SERVER_NTPD_FILEPATH_ID) -#define AFSDIR_SERVER_PRDB_FILEPATH getDirPath(AFSDIR_SERVER_PRDB_FILEPATH_ID) -#define AFSDIR_SERVER_PTLOG_FILEPATH getDirPath(AFSDIR_SERVER_PTLOG_FILEPATH_ID) -#define AFSDIR_SERVER_KCONF_FILEPATH getDirPath(AFSDIR_SERVER_KCONF_FILEPATH_ID) -#define AFSDIR_SERVER_VLDB_FILEPATH getDirPath(AFSDIR_SERVER_VLDB_FILEPATH_ID) -#define AFSDIR_SERVER_VLOG_FILEPATH getDirPath(AFSDIR_SERVER_VLOG_FILEPATH_ID) -#define AFSDIR_SERVER_CORELOG_FILEPATH getDirPath(AFSDIR_SERVER_CORELOG_FILEPATH_ID) -#define AFSDIR_SERVER_SLVGLOG_FILEPATH getDirPath(AFSDIR_SERVER_SLVGLOG_FILEPATH_ID) -#define AFSDIR_SERVER_SALSRVLOG_FILEPATH getDirPath(AFSDIR_SERVER_SALSRVLOG_FILEPATH_ID) -#define AFSDIR_SERVER_SALVAGER_FILEPATH getDirPath(AFSDIR_SERVER_SALVAGER_FILEPATH_ID) -#define AFSDIR_SERVER_SALSRV_FILEPATH getDirPath(AFSDIR_SERVER_SALSRV_FILEPATH_ID) -#define AFSDIR_SERVER_BOZCONF_FILEPATH getDirPath(AFSDIR_SERVER_BOZCONF_FILEPATH_ID) -#define AFSDIR_SERVER_BOZCONFNEW_FILEPATH getDirPath(AFSDIR_SERVER_BOZCONFNEW_FILEPATH_ID) -#define AFSDIR_SERVER_BOZINIT_FILEPATH getDirPath(AFSDIR_SERVER_BOZINIT_FILEPATH_ID) -#define AFSDIR_SERVER_BOZLOG_FILEPATH getDirPath(AFSDIR_SERVER_BOZLOG_FILEPATH_ID) -#define AFSDIR_SERVER_BOZRXBIND_FILEPATH getDirPath(AFSDIR_SERVER_BOZRXBIND_FILEPATH_ID) -#define AFSDIR_SERVER_BOSVR_FILEPATH getDirPath(AFSDIR_SERVER_BOSVR_FILEPATH_ID) -#define AFSDIR_SERVER_SLVGLOCK_FILEPATH getDirPath(AFSDIR_SERVER_SLVGLOCK_FILEPATH_ID) -#define AFSDIR_SERVER_VOLSERLOG_FILEPATH getDirPath(AFSDIR_SERVER_VOLSERLOG_FILEPATH_ID) -#define AFSDIR_SERVER_ROOTVOL_FILEPATH getDirPath(AFSDIR_SERVER_ROOTVOL_FILEPATH_ID) -#define AFSDIR_SERVER_HOSTDUMP_FILEPATH getDirPath(AFSDIR_SERVER_HOSTDUMP_FILEPATH_ID) -#define AFSDIR_SERVER_CLNTDUMP_FILEPATH getDirPath(AFSDIR_SERVER_CLNTDUMP_FILEPATH_ID) -#define AFSDIR_SERVER_CBKDUMP_FILEPATH getDirPath(AFSDIR_SERVER_CBKDUMP_FILEPATH_ID) -#define AFSDIR_SERVER_OLDSYSID_FILEPATH getDirPath(AFSDIR_SERVER_OLDSYSID_FILEPATH_ID) -#define AFSDIR_SERVER_SYSID_FILEPATH getDirPath(AFSDIR_SERVER_SYSID_FILEPATH_ID) -#define AFSDIR_SERVER_FILELOG_FILEPATH getDirPath(AFSDIR_SERVER_FILELOG_FILEPATH_ID) -#define AFSDIR_SERVER_AUDIT_FILEPATH getDirPath(AFSDIR_SERVER_AUDIT_FILEPATH_ID) -#define AFSDIR_SERVER_NETINFO_FILEPATH getDirPath(AFSDIR_SERVER_NETINFO_FILEPATH_ID) -#define AFSDIR_SERVER_NETRESTRICT_FILEPATH getDirPath(AFSDIR_SERVER_NETRESTRICT_FILEPATH_ID) -#define AFSDIR_SERVER_WEIGHTING_CONSTANTS_FILEPATH getDirPath(AFSDIR_SERVER_WEIGHTING_CONSTANTS_FILEPATH_ID) -#define AFSDIR_SERVER_THRESHOLD_CONSTANTS_FILEPATH getDirPath(AFSDIR_SERVER_THRESHOLD_CONSTANTS_FILEPATH_ID) -#define AFSDIR_SERVER_MIGRATELOG_FILEPATH getDirPath(AFSDIR_SERVER_MIGRATELOG_FILEPATH_ID) -#define AFSDIR_SERVER_KRB_EXCL_FILEPATH getDirPath(AFSDIR_SERVER_KRB_EXCL_FILEPATH_ID) -#define AFSDIR_SERVER_FSSTATE_FILEPATH getDirPath(AFSDIR_SERVER_FSSTATE_FILEPATH_ID) -#define AFSDIR_SERVER_CONFIG_FILE_FILEPATH getDirPath(AFSDIR_SERVER_CONFIG_FILE_FILEPATH_ID) -#define AFSDIR_SERVER_RXKAD_KEYTAB_FILEPATH getDirPath(AFSDIR_SERVER_RXKAD_KEYTAB_FILEPATH_ID) +#define AFSDIR_SERVER_THISCELL_FILEPATH afs_getDirPath(AFSDIR_SERVER_THISCELL_FILEPATH_ID) +#define AFSDIR_SERVER_CELLSERVDB_FILEPATH afs_getDirPath(AFSDIR_SERVER_CELLSERVDB_FILEPATH_ID) +#define AFSDIR_SERVER_NOAUTH_FILEPATH afs_getDirPath(AFSDIR_SERVER_NOAUTH_FILEPATH_ID) +#define AFSDIR_SERVER_KEY_FILEPATH afs_getDirPath(AFSDIR_SERVER_KEY_FILEPATH_ID) +#define AFSDIR_SERVER_ULIST_FILEPATH afs_getDirPath(AFSDIR_SERVER_ULIST_FILEPATH_ID) +#define AFSDIR_SERVER_BUDBLOG_FILEPATH afs_getDirPath(AFSDIR_SERVER_BUDBLOG_FILEPATH_ID) +#define AFSDIR_SERVER_TAPECONFIG_FILEPATH afs_getDirPath(AFSDIR_SERVER_TAPECONFIG_FILEPATH_ID) +#define AFSDIR_SERVER_KALOGDB_FILEPATH afs_getDirPath(AFSDIR_SERVER_KALOGDB_FILEPATH_ID) +#define AFSDIR_SERVER_KALOG_FILEPATH afs_getDirPath(AFSDIR_SERVER_KALOG_FILEPATH_ID) +#define AFSDIR_SERVER_KADB_FILEPATH afs_getDirPath(AFSDIR_SERVER_KADB_FILEPATH_ID) +#define AFSDIR_SERVER_NTPD_FILEPATH afs_getDirPath(AFSDIR_SERVER_NTPD_FILEPATH_ID) +#define AFSDIR_SERVER_PRDB_FILEPATH afs_getDirPath(AFSDIR_SERVER_PRDB_FILEPATH_ID) +#define AFSDIR_SERVER_PTLOG_FILEPATH afs_getDirPath(AFSDIR_SERVER_PTLOG_FILEPATH_ID) +#define AFSDIR_SERVER_KCONF_FILEPATH afs_getDirPath(AFSDIR_SERVER_KCONF_FILEPATH_ID) +#define AFSDIR_SERVER_VLDB_FILEPATH afs_getDirPath(AFSDIR_SERVER_VLDB_FILEPATH_ID) +#define AFSDIR_SERVER_VLOG_FILEPATH afs_getDirPath(AFSDIR_SERVER_VLOG_FILEPATH_ID) +#define AFSDIR_SERVER_CORELOG_FILEPATH afs_getDirPath(AFSDIR_SERVER_CORELOG_FILEPATH_ID) +#define AFSDIR_SERVER_SLVGLOG_FILEPATH afs_getDirPath(AFSDIR_SERVER_SLVGLOG_FILEPATH_ID) +#define AFSDIR_SERVER_SALSRVLOG_FILEPATH afs_getDirPath(AFSDIR_SERVER_SALSRVLOG_FILEPATH_ID) +#define AFSDIR_SERVER_SALVAGER_FILEPATH afs_getDirPath(AFSDIR_SERVER_SALVAGER_FILEPATH_ID) +#define AFSDIR_SERVER_SALSRV_FILEPATH afs_getDirPath(AFSDIR_SERVER_SALSRV_FILEPATH_ID) +#define AFSDIR_SERVER_BOZCONF_FILEPATH afs_getDirPath(AFSDIR_SERVER_BOZCONF_FILEPATH_ID) +#define AFSDIR_SERVER_BOZCONFNEW_FILEPATH afs_getDirPath(AFSDIR_SERVER_BOZCONFNEW_FILEPATH_ID) +#define AFSDIR_SERVER_BOZINIT_FILEPATH afs_getDirPath(AFSDIR_SERVER_BOZINIT_FILEPATH_ID) +#define AFSDIR_SERVER_BOZLOG_FILEPATH afs_getDirPath(AFSDIR_SERVER_BOZLOG_FILEPATH_ID) +#define AFSDIR_SERVER_BOZRXBIND_FILEPATH afs_getDirPath(AFSDIR_SERVER_BOZRXBIND_FILEPATH_ID) +#define AFSDIR_SERVER_BOSVR_FILEPATH afs_getDirPath(AFSDIR_SERVER_BOSVR_FILEPATH_ID) +#define AFSDIR_SERVER_SLVGLOCK_FILEPATH afs_getDirPath(AFSDIR_SERVER_SLVGLOCK_FILEPATH_ID) +#define AFSDIR_SERVER_VOLSERLOG_FILEPATH afs_getDirPath(AFSDIR_SERVER_VOLSERLOG_FILEPATH_ID) +#define AFSDIR_SERVER_ROOTVOL_FILEPATH afs_getDirPath(AFSDIR_SERVER_ROOTVOL_FILEPATH_ID) +#define AFSDIR_SERVER_HOSTDUMP_FILEPATH afs_getDirPath(AFSDIR_SERVER_HOSTDUMP_FILEPATH_ID) +#define AFSDIR_SERVER_CLNTDUMP_FILEPATH afs_getDirPath(AFSDIR_SERVER_CLNTDUMP_FILEPATH_ID) +#define AFSDIR_SERVER_CBKDUMP_FILEPATH afs_getDirPath(AFSDIR_SERVER_CBKDUMP_FILEPATH_ID) +#define AFSDIR_SERVER_OLDSYSID_FILEPATH afs_getDirPath(AFSDIR_SERVER_OLDSYSID_FILEPATH_ID) +#define AFSDIR_SERVER_SYSID_FILEPATH afs_getDirPath(AFSDIR_SERVER_SYSID_FILEPATH_ID) +#define AFSDIR_SERVER_FILELOG_FILEPATH afs_getDirPath(AFSDIR_SERVER_FILELOG_FILEPATH_ID) +#define AFSDIR_SERVER_AUDIT_FILEPATH afs_getDirPath(AFSDIR_SERVER_AUDIT_FILEPATH_ID) +#define AFSDIR_SERVER_NETINFO_FILEPATH afs_getDirPath(AFSDIR_SERVER_NETINFO_FILEPATH_ID) +#define AFSDIR_SERVER_NETRESTRICT_FILEPATH afs_getDirPath(AFSDIR_SERVER_NETRESTRICT_FILEPATH_ID) +#define AFSDIR_SERVER_WEIGHTING_CONSTANTS_FILEPATH afs_getDirPath(AFSDIR_SERVER_WEIGHTING_CONSTANTS_FILEPATH_ID) +#define AFSDIR_SERVER_THRESHOLD_CONSTANTS_FILEPATH afs_getDirPath(AFSDIR_SERVER_THRESHOLD_CONSTANTS_FILEPATH_ID) +#define AFSDIR_SERVER_MIGRATELOG_FILEPATH afs_getDirPath(AFSDIR_SERVER_MIGRATELOG_FILEPATH_ID) +#define AFSDIR_SERVER_KRB_EXCL_FILEPATH afs_getDirPath(AFSDIR_SERVER_KRB_EXCL_FILEPATH_ID) +#define AFSDIR_SERVER_FSSTATE_FILEPATH afs_getDirPath(AFSDIR_SERVER_FSSTATE_FILEPATH_ID) +#define AFSDIR_SERVER_CONFIG_FILE_FILEPATH afs_getDirPath(AFSDIR_SERVER_CONFIG_FILE_FILEPATH_ID) +#define AFSDIR_SERVER_RXKAD_KEYTAB_FILEPATH afs_getDirPath(AFSDIR_SERVER_RXKAD_KEYTAB_FILEPATH_ID) /* client file paths */ -#define AFSDIR_CLIENT_CONFIG_FILE_FILEPATH getDirPath(AFSDIR_CLIENT_CONFIG_FILE_FILEPATH_ID) -#define AFSDIR_CLIENT_THISCELL_FILEPATH getDirPath(AFSDIR_CLIENT_THISCELL_FILEPATH_ID) -#define AFSDIR_CLIENT_CELLSERVDB_FILEPATH getDirPath(AFSDIR_CLIENT_CELLSERVDB_FILEPATH_ID) -#define AFSDIR_CLIENT_NETINFO_FILEPATH getDirPath(AFSDIR_CLIENT_NETINFO_FILEPATH_ID) -#define AFSDIR_CLIENT_NETRESTRICT_FILEPATH getDirPath(AFSDIR_CLIENT_NETRESTRICT_FILEPATH_ID) +#define AFSDIR_CLIENT_CONFIG_FILE_FILEPATH afs_getDirPath(AFSDIR_CLIENT_CONFIG_FILE_FILEPATH_ID) +#define AFSDIR_CLIENT_THISCELL_FILEPATH afs_getDirPath(AFSDIR_CLIENT_THISCELL_FILEPATH_ID) +#define AFSDIR_CLIENT_CELLSERVDB_FILEPATH afs_getDirPath(AFSDIR_CLIENT_CELLSERVDB_FILEPATH_ID) +#define AFSDIR_CLIENT_NETINFO_FILEPATH afs_getDirPath(AFSDIR_CLIENT_NETINFO_FILEPATH_ID) +#define AFSDIR_CLIENT_NETRESTRICT_FILEPATH afs_getDirPath(AFSDIR_CLIENT_NETRESTRICT_FILEPATH_ID) #endif /* _DIRPATH_H */ diff --git a/src/util/liboafs_util.la.sym b/src/util/liboafs_util.la.sym index aa57732ea..07a280def 100644 --- a/src/util/liboafs_util.la.sym +++ b/src/util/liboafs_util.la.sym @@ -25,7 +25,7 @@ afs_uuid_equal afs_uuid_hash afs_uuid_is_nil flipbase64_to_int64 -getDirPath +afs_getDirPath gettmpdir grmutex hostutil_GetHostByName -- 2.39.5