/* Additional macros for ease of use */
/* buf is expected to be atleast AFS_PATH_MAX bytes long */
#define AFSDIR_SERVER_DIRPATH(buf, dir) \
- strcompose(buf, AFSDIR_PATH_MAX, dirPathArray[AFSDIR_SERVER_AFS_DIRPATH_ID], "/", dir, NULL)
+ strcompose(buf, AFSDIR_PATH_MAX, serverPrefix, dir, NULL)
#define AFSDIR_SERVER_FILEPATH(buf, dir, file) \
- strcompose(buf, AFSDIR_PATH_MAX, dirPathArray[AFSDIR_SERVER_AFS_DIRPATH_ID], "/", dir, "/", file, NULL)
+ strcompose(buf, AFSDIR_PATH_MAX, serverPrefix, dir, "/", file, NULL)
#define AFSDIR_CLIENT_DIRPATH(buf, dir) \
- strcompose(buf, AFSDIR_PATH_MAX, dirPathArray[AFSDIR_CLIENT_VICE_DIRPATH_ID], "/", dir, NULL)
+ strcompose(buf, AFSDIR_PATH_MAX, clientPrefix, dir, NULL)
#define AFSDIR_CLIENT_FILEPATH(buf, dir, file) \
- strcompose(buf, AFSDIR_PATH_MAX, dirPathArray[AFSDIR_CLIENT_VICE_DIRPATH_ID], "/", dir, "/", file, NULL)
+ strcompose(buf, AFSDIR_PATH_MAX, clientPrefix, dir, "/", file, NULL)
/* initAFSDirPath() -- External users call this function to initialize
static void initDirPathArray(void)
{
char *pathp;
-
+ const char * clientPrefix = "";
+ const char * serverPrefix = "";
+
#ifdef AFS_NT40_ENV
char *buf;
int status;
strcpy(ntClientConfigDirShort, ntClientConfigDirLong);
}
FilepathNormalize(ntClientConfigDirShort);
+ clientPrefix = ntClientConfigDirShort;
/* setup the root server directory path (/usr/afs equivalent) */
strcpy(afsSrvDirPath, ntServerInstallDirShort);
/* setup top level dirpath (/usr equivalent); valid for server ONLY */
strcpy(dirPathArray[AFSDIR_USR_DIRPATH_ID], ntServerInstallDirShort);
+ serverPrefix = ntInstallDirShort;
strcat(dirPathArray[AFSDIR_USR_DIRPATH_ID], AFSDIR_CANONICAL_USR_DIRPATH);
#else /* AFS_NT40_ENV */
strcpy(dirPathArray[AFSDIR_SERVER_AFS_DIRPATH_ID], afsSrvDirPath);
pathp = dirPathArray[AFSDIR_SERVER_ETC_DIRPATH_ID];
- AFSDIR_SERVER_DIRPATH(pathp, AFSDIR_ETC_DIR);
+ AFSDIR_SERVER_DIRPATH(pathp, AFSDIR_SERVER_ETC_DIR);
pathp = dirPathArray[AFSDIR_SERVER_BIN_DIRPATH_ID];
- AFSDIR_SERVER_DIRPATH(pathp, AFSDIR_BIN_DIR);
+ AFSDIR_SERVER_DIRPATH(pathp, AFSDIR_SERVER_BIN_DIR);
pathp = dirPathArray[AFSDIR_SERVER_CORES_DIRPATH_ID];
AFSDIR_SERVER_DIRPATH(pathp, AFSDIR_CORES_DIR);
strcpy(dirPathArray[AFSDIR_CLIENT_VICE_DIRPATH_ID], afsClntDirPath);
pathp = dirPathArray[AFSDIR_CLIENT_ETC_DIRPATH_ID];
- AFSDIR_CLIENT_DIRPATH(pathp, AFSDIR_ETC_DIR);
+ AFSDIR_CLIENT_DIRPATH(pathp, AFSDIR_CLIENT_ETC_DIR);
#endif /* AFS_NT40_ENV */
/* server file paths */
pathp = dirPathArray[AFSDIR_SERVER_THISCELL_FILEPATH_ID];
- AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_ETC_DIR, AFSDIR_THISCELL_FILE);
+ AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_SERVER_ETC_DIR, AFSDIR_THISCELL_FILE);
pathp = dirPathArray[AFSDIR_SERVER_CELLSERVDB_FILEPATH_ID];
- AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_ETC_DIR, AFSDIR_CELLSERVDB_FILE);
+ AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_SERVER_ETC_DIR, AFSDIR_CELLSERVDB_FILE);
pathp = dirPathArray[AFSDIR_SERVER_NOAUTH_FILEPATH_ID];
AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_LOCAL_DIR, AFSDIR_NOAUTH_FILE);
AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_DB_DIR, AFSDIR_KADB_FILE);
pathp = dirPathArray[AFSDIR_SERVER_NTPD_FILEPATH_ID];
- AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_BIN_DIR, AFSDIR_NTPD_FILE);
+ AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_SERVER_BIN_DIR, AFSDIR_NTPD_FILE);
pathp = dirPathArray[AFSDIR_SERVER_PRDB_FILEPATH_ID];
AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_DB_DIR, AFSDIR_PRDB_FILE);
AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_LOGS_DIR, AFSDIR_PTLOG_FILE);
pathp = dirPathArray[AFSDIR_SERVER_KCONF_FILEPATH_ID];
- AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_ETC_DIR, AFSDIR_KCONF_FILE);
+ AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_SERVER_ETC_DIR, AFSDIR_KCONF_FILE);
pathp = dirPathArray[AFSDIR_SERVER_VLDB_FILEPATH_ID];
AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_DB_DIR, AFSDIR_VLDB_FILE);
AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_LOGS_DIR, AFSDIR_SLVGLOG_FILE);
pathp = dirPathArray[AFSDIR_SERVER_SALVAGER_FILEPATH_ID];
- AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_BIN_DIR, AFSDIR_SALVAGER_FILE);
+ AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_SERVER_BIN_DIR, AFSDIR_SALVAGER_FILE);
pathp = dirPathArray[AFSDIR_SERVER_SLVGLOCK_FILEPATH_ID];
AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_LOCAL_DIR, AFSDIR_SLVGLOCK_FILE);
pathp = dirPathArray[AFSDIR_SERVER_KEY_FILEPATH_ID];
- AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_ETC_DIR, AFSDIR_KEY_FILE);
+ AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_SERVER_ETC_DIR, AFSDIR_KEY_FILE);
pathp = dirPathArray[AFSDIR_SERVER_ULIST_FILEPATH_ID];
- AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_ETC_DIR, AFSDIR_ULIST_FILE);
+ AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_SERVER_ETC_DIR, AFSDIR_ULIST_FILE);
pathp = dirPathArray[AFSDIR_SERVER_BOZCONF_FILEPATH_ID];
- AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_LOCAL_DIR, AFSDIR_BOZCONF_FILE);
+ AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_BOSCONFIG_DIR, AFSDIR_BOZCONF_FILE);
pathp = dirPathArray[AFSDIR_SERVER_BOZCONFNEW_FILEPATH_ID];
- AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_LOCAL_DIR, AFSDIR_BOZCONFNEW_FILE);
+ AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_BOSCONFIG_DIR, AFSDIR_BOZCONFNEW_FILE);
pathp = dirPathArray[AFSDIR_SERVER_BOZLOG_FILEPATH_ID];
AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_LOGS_DIR, AFSDIR_BOZLOG_FILE);
pathp = dirPathArray[AFSDIR_SERVER_BOZINIT_FILEPATH_ID];
- AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_LOCAL_DIR, AFSDIR_BOZINIT_FILE);
+ AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_BOSCONFIG_DIR, AFSDIR_BOZINIT_FILE);
pathp = dirPathArray[AFSDIR_SERVER_BOSVR_FILEPATH_ID];
- AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_BIN_DIR, AFSDIR_BOSVR_FILE);
+ AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_BOSSERVER_DIR, AFSDIR_BOSVR_FILE);
pathp = dirPathArray[AFSDIR_SERVER_VOLSERLOG_FILEPATH_ID];
AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_LOGS_DIR, AFSDIR_VOLSERLOG_FILE);
pathp = dirPathArray[AFSDIR_SERVER_ROOTVOL_FILEPATH_ID];
- AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_ETC_DIR, AFSDIR_ROOTVOL_FILE);
+ AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_SERVER_ETC_DIR, AFSDIR_ROOTVOL_FILE);
pathp = dirPathArray[AFSDIR_SERVER_HOSTDUMP_FILEPATH_ID];
AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_LOCAL_DIR, AFSDIR_HOSTDUMP_FILE);
ntClientConfigDirShort, AFSDIR_CELLSERVDB_FILE_NTCLIENT);
#else
pathp = dirPathArray[AFSDIR_CLIENT_THISCELL_FILEPATH_ID];
- AFSDIR_CLIENT_FILEPATH(pathp, AFSDIR_ETC_DIR, AFSDIR_THISCELL_FILE);
+ AFSDIR_CLIENT_FILEPATH(pathp, AFSDIR_CLIENT_ETC_DIR, AFSDIR_THISCELL_FILE);
pathp = dirPathArray[AFSDIR_CLIENT_CELLSERVDB_FILEPATH_ID];
- AFSDIR_CLIENT_FILEPATH(pathp, AFSDIR_ETC_DIR, AFSDIR_CELLSERVDB_FILE);
+ AFSDIR_CLIENT_FILEPATH(pathp, AFSDIR_CLIENT_ETC_DIR, AFSDIR_CELLSERVDB_FILE);
#endif /* AFS_NT40_ENV */
pathp = dirPathArray[AFSDIR_CLIENT_NETINFO_FILEPATH_ID];
- AFSDIR_CLIENT_FILEPATH(pathp, AFSDIR_ETC_DIR, AFSDIR_NETINFO_FILE);
+ AFSDIR_CLIENT_FILEPATH(pathp, AFSDIR_CLIENT_ETC_DIR, AFSDIR_NETINFO_FILE);
pathp = dirPathArray[AFSDIR_CLIENT_NETRESTRICT_FILEPATH_ID];
- AFSDIR_CLIENT_FILEPATH(pathp, AFSDIR_ETC_DIR, AFSDIR_NETRESTRICT_FILE);
+ AFSDIR_CLIENT_FILEPATH(pathp, AFSDIR_CLIENT_ETC_DIR, AFSDIR_NETRESTRICT_FILE);
initFlag = 1; /* finished dirpath initialization */
return;
}
return (const char *)dirPathArray[string_id];
}
+/*
+ * LocalizePathHead() -- Make path relative to local part
+ *
+ * ConstructLocalPath takes a path and a directory that path should
+ * be considered relative to. This function checks the given path
+ * for a prefix that represents a canonical path. If such a prefix
+ * is found, the path is adjusted to remove the prefix and the path
+ * is considered relative to the local version of that path.
+ */
+
+/* The following array maps cannonical parts to local parts. It
+ * might seem reasonable to simply construct an array in parallel to
+ * dirpatharray but it turns out you don't want translations for all
+ local paths.
+*/
+
+struct canonmapping {
+ const char * canonical;
+ const char * local;
+};
+static struct canonmapping CanonicalTranslations[] = {
+ {AFSDIR_CANONICAL_SERVER_ETC_DIRPATH, AFSDIR_SERVER_ETC_DIR},
+ { AFSDIR_CANONICAL_SERVER_LOGS_DIRPATH, AFSDIR_LOGS_DIR},
+ { AFSDIR_CANONICAL_SERVER_LOCAL_DIRPATH, AFSDIR_LOCAL_DIR},
+ {AFSDIR_CANONICAL_SERVER_BIN_DIRPATH, AFSDIR_SERVER_BIN_DIR },
+ { NULL, NULL }
+};
+
+static void LocalizePathHead ( const char **path, const char **relativeTo)
+{
+ struct canonmapping *current;
+ for (current = CanonicalTranslations; current->local != NULL ; current++) {
+ int canonlength = strlen (current->canonical);
+ if (strncmp (*path, current->canonical, canonlength) == 0 ) {
+ (*path) += canonlength;
+ if (**path == '/')
+ (*path)++;
+ *relativeTo = current->local;
+ return;
+ }
+ }
+}
#ifdef AFS_NT40_ENV
* 2) If cpath begins with a drive letter but is not fully qualified,
* i.e., it is drive relative, then the function fails with EINVAL.
* 3) If cpath begins with '/' (or '\') then the path returned is the
- * concatenation AFS-server-install-dir + cpath.
+ * concatenation AFS-server-install-dir + cpath after translating for localization.
* 4) Otherwise the path returned is the concatenation
* AFS-server-install-dir + relativeTo + cpath.
*
cpath++;
}
+ LocalizePathHead (&cpath,&relativeTo);
if ((((*cpath >= 'a') && (*cpath <= 'z')) ||
((*cpath >= 'A') && (*cpath <= 'Z'))) &&
(*(cpath+1) == ':')) {
cpath++;
}
+ LocalizePathHead (&cpath, &relativeTo);
if (*cpath == '/') {
newPath = (char *)malloc(strlen(cpath) + 1);
if (!newPath) {
* storing AFS system files (binaries, logs, etc.) in a user-specified
* installation directory. This breaks from the traditional notion of
* all AFS system files being stored under /usr/afs or /usr/vice.
- *
- * The core concept is that there is a dynamically determined installation
+ * In addition, now that OpenAFs supports configure, it is desirable
+ * to support the configure options for manipulating directories and
+ * setting the compilation prefix.
+ * For NT, the core concept is that there is a dynamically determined installation
* directory that is the prefix to a well-known AFS tree. The structure
* of this well-known AFS tree remains unchanged. For example, AFS server
* binaries reside in <install dir>/usr/afs/bin, server configuration files
* reside in <install dir>/usr/afs/etc, etcetera. This scheme allows the
- * flexibility required by NT, without requiring file-location changes
- * on Unix (for which <install dir> can simply be null).
- *
+ * flexibility required by NT.
+ * On UNIX, this header file is generated by configure. Directory
+ * paths are substituted in based on options passed to configure.
+ * While the server and client roots are maintained in the dirpath
+ * array, they should never be used by the code as they tend to be
+ * meaningless.
* Thus file paths can no longer be hard-coded; rather, all file paths are
* specified via the macros provided by this package.
*
*
* Conversion functions are provided that translate canonical (wire-format)
* paths to fully qualified local paths; see the documentation in dirpath.c
- * for details. Note that these conversion functions also accomodate fully
- * qualified paths on the wire, for exceptional cases where this feature
- * may be required. Again, these conversion functions have been implemented
- * such that no file-location changes are required on Unix.
+ * for details. Note that these conversion functions also try to
+ * accomodate fully qualified paths on the wire, for exceptional
+ * cases where this feature may be required. Unfortunately there is
+ * no way to distinguish between canonical and fully qualified paths
+ * so if for example /usr/afs/bin is both a valid canonical and local
+ * path and they do not both map to the same place, then the canonical
+ * path is used.
*
* The path macros provided here are divided into local (AFSDIR_*) and
* canonical (AFSDIR_CANONICAL_*). The canonical macros MUST be used by
/* ----------------- Directory/file name macros ------------------ */
/* afs installation dir names */
-#define AFSDIR_ETC_DIR "etc"
-#define AFSDIR_BIN_DIR "bin"
+#define AFSDIR_SERVER_ETC_DIR "@afsconfdir"
+#define AFSDIR_CLIENT_ETC_DIR "@viceetcdir"
+#define AFSDIR_SERVER_BIN_DIR "@afssrvdir"
#define AFSDIR_CORES_DIR "cores"
-#define AFSDIR_DB_DIR "db"
-#define AFSDIR_LOGS_DIR "logs"
-#define AFSDIR_LOCAL_DIR "local"
-#define AFSDIR_BACKUP_DIR "backup"
-#define AFSDIR_MIGR_DIR "local/migrate"
-#define AFSDIR_BIN_FILE_DIR "local/migrate/bin_files"
+#define AFSDIR_DB_DIR "@afsdbdir"
+#define AFSDIR_LOGS_DIR "@afslogsdir"
+#define AFSDIR_LOCAL_DIR "@afslocaldir"
+#define AFSDIR_BACKUP_DIR "@afsbackupdir"
+#define AFSDIR_MIGR_DIR "@afslocaldir/migrate"
+#define AFSDIR_BIN_FILE_DIR "@afslocaldir/migrate/bin_files"
+#define AFSDIR_BOSCONFIG_DIR "@afsbosconfigdir"
+#define AFSDIR_BOSSERVER_DIR "@afsbosserverdir"
/* file names */
#define AFSDIR_THISCELL_FILE "ThisCell"
#endif
#define AFSDIR_CANONICAL_SERVER_BIN_DIRPATH \
-AFSDIR_CANONICAL_SERVER_AFS_DIRPATH "/" AFSDIR_BIN_DIR
+AFSDIR_CANONICAL_SERVER_AFS_DIRPATH "/bin"
#define AFSDIR_CANONICAL_SERVER_ETC_DIRPATH \
-AFSDIR_CANONICAL_SERVER_AFS_DIRPATH "/" AFSDIR_ETC_DIR
+AFSDIR_CANONICAL_SERVER_AFS_DIRPATH "/etc"
#define AFSDIR_CANONICAL_SERVER_LOGS_DIRPATH \
-AFSDIR_CANONICAL_SERVER_AFS_DIRPATH "/" AFSDIR_LOGS_DIR
+AFSDIR_CANONICAL_SERVER_AFS_DIRPATH "/logs"
#define AFSDIR_CANONICAL_SERVER_LOCAL_DIRPATH \
-AFSDIR_CANONICAL_SERVER_AFS_DIRPATH "/" AFSDIR_LOCAL_DIR
+AFSDIR_CANONICAL_SERVER_AFS_DIRPATH "/local"
#define AFSDIR_CANONICAL_SERVER_SALVAGER_FILEPATH \
git://git.openafs.org / openafs.git / commitdiff