}
}
}
-#define fopen afsconf_fopen
-#define fclose afsconf_fclose
-#define fgets afsconf_fgets
-#else
-#define afsconf_FILE FILE
-#endif /* AFS_SUN5_ENV && ! __sparcv9 */
+
+#else /* AFS_SUN5_ENV && !__sparcv9 */
+
+/*
+ * On all other platforms, we use the native stdio functions. We still go
+ * through our afsconf_f* wrappers here, to still do compile-time checks to
+ * make sure we don't mix afsconf_fopen with real stdio calls.
+ */
+struct afsconf_iobuffer;
+
+typedef struct afsconf_iobuffer afsconf_FILE;
+
+static afsconf_FILE *
+afsconf_fopen(const char *fname, const char *fmode)
+{
+ return (afsconf_FILE*)fopen(fname, fmode);
+}
+
+static int
+afsconf_fclose(afsconf_FILE *iop)
+{
+ FILE *fh = (FILE *)iop;
+ return fclose(fh);
+}
+
+static char *
+afsconf_fgets(char *s, int n, afsconf_FILE *iop)
+{
+ FILE *fh = (FILE *)iop;
+ return fgets(s, n, fh);
+}
+
+#endif /* AFS_SUN5_ENV && !__sparcv9 */
/* return port number in network byte order in the low 16 bits of a long; return -1 if not found */
afs_int32
#ifdef AFS_NT40_ENV
static void
-_afsconf_CellServDBPath(struct afsconf_dir *adir, char **path)
+_afsconf_CellServDBPath(const char *dirname, char **path)
{
char *p;
/* NT client CellServDB has different file name than NT server or Unix */
- if (_afsconf_IsClientConfigDirectory(adir->name)) {
+ if (_afsconf_IsClientConfigDirectory(dirname)) {
if (!afssw_GetClientCellServDBDir(&p)) {
if (asprintf(path, "%s/%s", p, AFSDIR_CELLSERVDB_FILE_NTCLIENT) < 0)
*path = NULL;
free(p);
} else {
- if (asprintf(path, "%s/%s", adir->name,
+ if (asprintf(path, "%s/%s", dirname,
AFSDIR_CELLSERVDB_FILE_NTCLIENT) < 0)
*path = NULL;
}
} else {
- if (asprintf(path, "%s/%s", adir->name, AFSDIR_CELLSERVDB_FILE) < 0)
+ if (asprintf(path, "%s/%s", dirname, AFSDIR_CELLSERVDB_FILE) < 0)
*path = NULL;
}
return;
}
#else
static void
-_afsconf_CellServDBPath(struct afsconf_dir *adir, char **path)
+_afsconf_CellServDBPath(const char *dirname, char **path)
{
- if (asprintf(path, "%s/%s", adir->name, AFSDIR_CELLSERVDB_FILE) < 0)
+ if (asprintf(path, "%s/%s", dirname, AFSDIR_CELLSERVDB_FILE) < 0)
*path = NULL;
}
#endif /* AFS_NT40_ENV */
afsconf_FILE *fp;
size_t len = 0;
- fp = fopen(pathname, "r");
+ fp = afsconf_fopen(pathname, "r");
if (!fp)
return ENOENT;
- if (fgets(buffer, sizeof(buffer), fp) != NULL)
+ if (afsconf_fgets(buffer, sizeof(buffer), fp) != NULL)
len = strlen(buffer);
- fclose(fp);
+ afsconf_fclose(fp);
if (len == 0)
return EIO;
/* Trim the trailing newline, if one. */
strcompose(tbuffer, 256, adir->name, "/", AFSDIR_THISCELL_FILE,
(char *)NULL);
- fp = fopen(tbuffer, "r");
+ fp = afsconf_fopen(tbuffer, "r");
if (fp == 0) {
return -1;
}
- rc = fgets(tbuffer, 256, fp);
- fclose(fp);
+ rc = afsconf_fgets(tbuffer, 256, fp);
+ afsconf_fclose(fp);
if (rc == NULL)
return -1;
/* now parse the individual lines */
curEntry = 0;
- _afsconf_CellServDBPath(adir, &adir->cellservDB);
+ _afsconf_CellServDBPath(adir->name, &adir->cellservDB);
#ifdef AFS_NT40_ENV
if (_afsconf_IsClientConfigDirectory(adir->name))
adir->timeRead = 0;
}
- tf = fopen(adir->cellservDB, "r");
+ tf = afsconf_fopen(adir->cellservDB, "r");
if (!tf) {
return -1;
}
*/
while (1) {
- tp = fgets(tbuffer, sizeof(tbuffer), tf);
+ tp = afsconf_fgets(tbuffer, sizeof(tbuffer), tf);
if (!tp)
break;
TrimLine(tbuffer, sizeof tbuffer); /* remove white space */
ParseCellLine(tbuffer, curEntry->cellInfo.name, linkedcell);
if (code) {
UnloadConfig(adir);
- fclose(tf);
+ afsconf_fclose(tf);
free(curEntry);
return -1;
}
/* new host in the current cell */
if (!curEntry) {
UnloadConfig(adir);
- fclose(tf);
+ afsconf_fclose(tf);
return -1;
}
i = curEntry->cellInfo.numServers;
tbuffer, adir->cellservDB);
}
free(curEntry);
- fclose(tf);
+ afsconf_fclose(tf);
UnloadConfig(adir);
return -1;
}
}
}
}
- fclose(tf); /* close the file now */
+ afsconf_fclose(tf); /* close the file now */
/* end the last partially-completed cell */
if (curEntry) {
strcompose(tbuffer, 256, adir->name, "/", AFSDIR_CELLALIAS_FILE,
(char *)NULL);
- tf = fopen(tbuffer, "r");
+ tf = afsconf_fopen(tbuffer, "r");
while (tf) {
char *aliasPtr;
- tp = fgets(tbuffer, sizeof(tbuffer), tf);
+ tp = afsconf_fgets(tbuffer, sizeof(tbuffer), tf);
if (!tp)
break;
TrimLine(tbuffer, sizeof tbuffer); /* remove white space */
}
if (tf != NULL)
- fclose(tf);
+ afsconf_fclose(tf);
/* now read the fs keys, if possible */
code = _afsconf_LoadKeys(adir);
return code;
}
-/* write ThisCell and CellServDB containing exactly one cell's info specified
- by acellInfo parm. Useful only on the server (which describes only one cell).
-*/
-
static int
VerifyEntries(struct afsconf_cell *aci)
{
return 0;
}
-/* Changed the interface to accept the afsconf_dir datastructure.
- This is a handle to the internal cache that is maintained by the bosserver.
- */
-
+/**
+ * Set cell information (deprecated)
+ *
+ * Write ThisCell and CellServDB containing exactly one cell's info specified
+ * by acellInfo param. Useful only on the server (which describes only one
+ * cell).
+ *
+ * @param adir cell configuation data; may be NULL
+ * @param apath cell configuration path
+ * @param acellInfo cell information
+ *
+ * @note This interface was changed at some point to optionally accept the
+ * afsconf_dir data structure. This is a handle to the internal cache
+ * that is maintained by the bosserver.
+ *
+ * @return 0 on success
+ */
int
afsconf_SetCellInfo(struct afsconf_dir *adir, const char *apath,
struct afsconf_cell *acellInfo)
return code;
}
+/**
+ * Set cell information
+ *
+ * Write ThisCell and CellServDB containing exactly one cell's info specified
+ * by acellInfo param. Useful only on the server (which describes only one
+ * cell).
+ *
+ * @param adir cell configuation data; may be NULL
+ * @param apath cell configuration path
+ * @param acellInfo cell information
+ * @param clones array of booleans to indicate which hosts are clones
+ *
+ * @return 0 on success
+ */
int
afsconf_SetExtendedCellInfo(struct afsconf_dir *adir,
const char *apath,
FILE *tf;
afs_int32 i;
+ opr_Assert(apath);
+ opr_Assert(acellInfo);
+
LOCK_GLOBAL_MUTEX;
/* write ThisCell file */
strcompose(tbuffer, 1024, apath, "/", AFSDIR_THISCELL_FILE, (char *)NULL);
i = (int)strlen(acellInfo->name);
code = write(fd, acellInfo->name, i);
if (code != i) {
+ close(fd);
UNLOCK_GLOBAL_MUTEX;
return AFSCONF_FAILURE;
}
}
/* write CellServDB */
- tf = fopen(adir->cellservDB, "w");
+ if (adir) {
+ tf = fopen(adir->cellservDB, "w");
+ } else {
+ char *cellservDB = NULL;
+ _afsconf_CellServDBPath(apath, &cellservDB);
+ if (cellservDB)
+ tf = fopen(cellservDB, "w");
+ else
+ tf = NULL;
+ free(cellservDB);
+ }
if (!tf) {
UNLOCK_GLOBAL_MUTEX;
return AFSCONF_NOTFOUND;
git://git.openafs.org / openafs.git / blobdiff