#include <roken.h>
+#include <ctype.h>
+
#if defined(AFS_AIX_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_LINUX26_ENV)
#include <dlfcn.h>
#endif
+#include <afs/tcdata.h>
#include "butc_xbsa.h"
#include <afs/butx.h>
+#include "butc_internal.h"
/* Global Definations */
#define APPLTYPE "afs-butc"
#define NOHANDLE 0
#define XAPI_FSINFO "FS for XOpen API"
#define DIR_DELIMITER '/'
-#define STR_DIR_DELIMITER '/'
+#define STR_DIR_DELIMITER "/"
xGlobal xopenGbl;
char traceStr[DSM_MAX_RC_MSG_LENGTH+1];
{
dsmLogExIn_t dsmLogIn;
dsmLogExOut_t dsmLogOut;
- dsInt16_t rc = 0;
memset(&dsmLogOut, '\0', sizeof(dsmLogExOut_t));
if (dsmHandle)
strcpy(dsmLogIn.appMsgID, appMsg);
dsmLogIn.message = message;
- rc = AFSdsmLogEventEx(dsmHandle, &dsmLogIn, &dsmLogOut);
+ AFSdsmLogEventEx(dsmHandle, &dsmLogIn, &dsmLogOut);
}
}
}
-afs_int32 dsm_MountLibrary()
+afs_int32 dsm_MountLibrary(void)
{
void * dynlib = NULL ;
strcat(msg, ".\n");
- sprintf(traceStr, msg);
+ strcpy(traceStr, msg);
}
*BSAHandleP = (long)dsmHandle;
}
dsmHandle = BSAHandle;
- sprintf(traceStr2, "BSATerminate ENTRY: BSAHandle is %d.",
+ sprintf(traceStr2, "BSATerminate ENTRY: BSAHandle is %ld.",
BSAHandle);
ourTrace(dsmHandle, TrFL, traceStr2);
dsmHandle = BSAHandle;
- sprintf(traceStr2, "BSAChangeToken ENTRY: BSAHandle:%d old:>%s< new:>%s<",
- BSAHandle,oldTokenP,newTokenP);
+ sprintf(traceStr2, "BSAChangeToken ENTRY: BSAHandle:%ld old:>%s< new:>%s<",
+ BSAHandle,*oldTokenP,*newTokenP);
ourTrace(dsmHandle, TrFL, traceStr2);
rc = AFSdsmChangePW(dsmHandle, (char *)oldTokenP, (char *)newTokenP);
#endif
}
- sprintf(traceStr2, "BSASetEnvironment ENTRY: BSAHandle:%d envP:>%p< ",
+ sprintf(traceStr2, "BSASetEnvironment ENTRY: BSAHandle:%ld envP:>%p< ",
BSAHandle,envP);
ourTrace(BSAHandle, TrFL, traceStr2);
XOPENRETURN(BSAHandle,"BSASetEnvironment",
char envString[ADSM_ENV_STRS][BSA_MAX_DESC];
char maxObjStr[6]; /* conversion field. value range is 16-256 */
dsUint32_t maxObjNum;
- dsInt16_t i, j;
+ dsInt16_t i;
if(!dsm_init)
{
{
memset(envString[i], 0x00, BSA_MAX_DESC);
}
- sprintf(traceStr2, "BSAGetEnvironment ENTRY: BSAHandle:%d ObjOwner:'%s' appOwner:'%s' envP:>%p<.",
+ sprintf(traceStr2, "BSAGetEnvironment ENTRY: BSAHandle:%ld ObjOwner:'%s' appOwner:'%s' envP:>%p<.",
BSAHandle,
objOwnerP->bsaObjectOwner,
objOwnerP->appObjectOwner,
strcpy(envString[1],"TSMMAXOBJ=");
maxObjNum = xopenGbl.dsmSessInfo.maxObjPerTxn; /* convert to 32 bit */
- sprintf(maxObjStr,"%lu", maxObjNum );
+ sprintf(maxObjStr,"%u", maxObjNum );
strcat(envString[1], maxObjStr);
strcpy(envString[2], "TSMSRVRSTANZA=");
#endif
}
- sprintf(traceStr2, "BSABeginTxn ENTRY: BSAHandle:%d", BSAHandle);
+ sprintf(traceStr2, "BSABeginTxn ENTRY: BSAHandle:%ld", BSAHandle);
ourTrace(BSAHandle, TrFL, traceStr2);
/*========================================================
don't actually issue BeginTxn yet, because we will do our
memset(rsMsg, '\0', DSM_MAX_RC_MSG_LENGTH + 1);
memset(ourMessage, '\0', DSM_MAX_RC_MSG_LENGTH + 1);
- sprintf(traceStr2, "BSAEndTxn ENTRY: BSAHandle:%d Vote:>%d<", BSAHandle, vote);
+ sprintf(traceStr2, "BSAEndTxn ENTRY: BSAHandle:%ld Vote:>%d<", BSAHandle, vote);
ourTrace(BSAHandle, TrFL, traceStr2);
dsmHandle = BSAHandle;
memset(&backupData, 0x00, sizeof(qryBackupData));
- sprintf(traceStr2, "BSAQueryObject ENTRY: BSAHandle:%d ObjOwner(qryDesc):'%s' appOwner(qryDesc):'%s' \n ObjName(qryDesc):'%.*s%.*s' \n copyType:%d ObjectType:%d status:%d ",
+ sprintf(traceStr2, "BSAQueryObject ENTRY: BSAHandle:%ld ObjOwner(qryDesc):'%s' appOwner(qryDesc):'%s' \n ObjName(qryDesc):'%.*s%.*s' \n copyType:%d ObjectType:%d status:%d ",
BSAHandle,
BSAqryDescP->owner.bsaObjectOwner,
BSAqryDescP->owner.appObjectOwner,
====================================================*/
if (strlen(BSAqryDescP->objName.objectSpaceName) > BSA_MAX_OSNAME)
{
- sprintf(traceStr2, "BSAQueryObject: objectSpaceName too long (%d).",
+ sprintf(traceStr2, "BSAQueryObject: objectSpaceName too long (%" AFS_SIZET_FMT ").",
strlen(BSAqryDescP->objName.objectSpaceName));
ourTrace(BSAHandle,TrFL, traceStr2);
bsaRC = BSA_RC_OBJNAME_TOO_LONG;
if (strlen(BSAqryDescP->objName.pathName) >
min(DSM_MAX_HL_LENGTH, BSA_MAX_PATHNAME))
{
- sprintf(traceStr2, "BSAQueryObject: pathName too long (%d)",
+ sprintf(traceStr2, "BSAQueryObject: pathName too long (%" AFS_SIZET_FMT ")",
strlen(BSAqryDescP->objName.pathName));
ourTrace(BSAHandle, TrFL, traceStr2);
bsaRC = BSA_RC_OBJNAME_TOO_LONG;
if (strlen(BSAqryDescP->desc) > ADSM_MAX_DESC)
{
- sprintf(traceStr2, "BSAQueryObject: description longer than ADSM max (%d). ", strlen(BSAqryDescP->desc));
+ sprintf(traceStr2, "BSAQueryObject: description longer than ADSM max (%" AFS_SIZET_FMT "). ", strlen(BSAqryDescP->desc));
ourTrace(BSAHandle,TrFL, traceStr2);
bsaRC = BSA_RC_DESC_TOO_LONG;
XOPENRETURN(BSAHandle, "BSAQueryObject",
if (rc == DSM_RC_OK)
{
- sprintf(traceStr2, "BSAQueryObject(AFSdsmGetNextQObj) rc = %d, ObjOwner(objDesc):'%s' appOwner(objDesc):'%s' \n ObjName(objDesc):'%.*s%.*s' \n copyType:%d copyId:'%d %d' cGName:'%s'",
+ sprintf(traceStr2, "BSAQueryObject(AFSdsmGetNextQObj) rc = %d, ObjOwner(objDesc):'%s' appOwner(objDesc):'%s' \n ObjName(objDesc):'%.*s%.*s' \n copyType:%d copyId:'%lu %lu' cGName:'%s'",
rc,
BSAobjDescP->Owner.bsaObjectOwner,
BSAobjDescP->Owner.appObjectOwner,
BSAobjDescP->copyType,
BSAobjDescP->copyId.left,
BSAobjDescP->copyId.right,
- BSAobjDescP->cGName == NULL ? "" : BSAobjDescP->cGName);
+ BSAobjDescP->cGName);
ourTrace(BSAHandle,TrFL, traceStr2);
}
)
{
dsInt16_t rc = 0;
- dsInt16_t rc1 = 0;
BSA_Int16 bsaRC = 0;
dsUint32_t dsmHandle;
DataBlk getBlk;
memset(errPrefix, '\0', DSM_MAX_RC_MSG_LENGTH + 1);
memset(ourMessage, '\0', DSM_MAX_RC_MSG_LENGTH + 1);
- sprintf(traceStr2, "BSAGetObject ENTRY: BSAHandle:%d version:%d copyType:%d copyId:'%d %d' \n bufferLen:%d numBytes:%d ",
+ sprintf(traceStr2, "BSAGetObject ENTRY: BSAHandle:%ld version:%lu copyType:%d copyId:'%lu %lu' \n bufferLen:%d numBytes:%d ",
BSAHandle,
BSAobjDescP->version,
BSAobjDescP->copyType,
if (BSAobjDescP->version != ObjectDescriptorVersion)
{
- sprintf(traceStr2,"Warning: BSAGetObject: objectDesc.version unexpected %d.", BSAobjDescP->version);
+ sprintf(traceStr2,"Warning: BSAGetObject: objectDesc.version unexpected %lu.", BSAobjDescP->version);
ourTrace(BSAHandle,TrFL, traceStr2);
/*==================================================================
don't treat this as an error now since it isn't defined in the spec
else
{
/*=== appl may call BSAEndData to clean up trxn but don't count on it... ===*/
- rc1 = AFSdsmEndGetObj(dsmHandle);
- rc1 = AFSdsmEndGetData(dsmHandle);
+ AFSdsmEndGetObj(dsmHandle);
+ AFSdsmEndGetData(dsmHandle);
xopenGbl.sessFlags =
(xopenGbl.sessFlags | FL_END_DATA_DONE); /* turn flag on */
}
)
{
dsInt16_t rc = 0;
- dsInt16_t rc1 = 0;
BSA_Int16 bsaRC = 0;
dsUint32_t dsmHandle;
DataBlk getBlk;
dsmHandle = BSAHandle;
- sprintf(traceStr2, "BSAGetData ENTRY: BSAHandle:%d, bufferLen:%d, numBytes:%d",
+ sprintf(traceStr2, "BSAGetData ENTRY: BSAHandle:%ld, bufferLen:%d, numBytes:%d",
BSAHandle,
BSAdataBlockP->bufferLen,
BSAdataBlockP->numBytes);
ourTrace(BSAHandle, TrFL,traceStr2);
/*=== appl may call BSAEndData to clean up trxn but don't count on it... ===*/
- rc1 = AFSdsmEndGetObj(dsmHandle);
- rc1 = AFSdsmEndGetData(dsmHandle);
+ AFSdsmEndGetObj(dsmHandle);
+ AFSdsmEndGetData(dsmHandle);
xopenGbl.sessFlags =
(xopenGbl.sessFlags | FL_END_DATA_DONE); /* turn flag on */
}
dsmHandle = BSAHandle;
- sprintf(traceStr2, "BSASendData ENTRY: BSAHandle:%d bufferLen: %d numBytes: %d ",
+ sprintf(traceStr2, "BSASendData ENTRY: BSAHandle:%ld bufferLen: %d numBytes: %d ",
BSAHandle,
BSAdataBlockP->bufferLen,
BSAdataBlockP->numBytes);
xopenGbl.sessFlags = (xopenGbl.sessFlags | FL_RC_WILL_ABORT);
}
BSAdataBlockP->numBytes = (BSA_UInt16)dataBlkArea.numBytes;
- sprintf(traceStr2, "BSASendData(AFSdsmSendData): BSAHandle:%d bufferLen: %d numBytes sent: %d ",
+ sprintf(traceStr2, "BSASendData(AFSdsmSendData): BSAHandle:%ld bufferLen: %d numBytes sent: %d ",
BSAHandle,
BSAdataBlockP->bufferLen,
BSAdataBlockP->numBytes);
)
{
dsInt16_t rc = 0;
- dsInt16_t rc1 = 0;
BSA_Int16 bsaRC = 0;
dsUint32_t dsmHandle;
dsmHandle = BSAHandle;
- sprintf(traceStr2, "BSAEndData ENTRY: BSAHandle:%d", BSAHandle);
+ sprintf(traceStr2, "BSAEndData ENTRY: BSAHandle:%ld", BSAHandle);
ourTrace(BSAHandle,TrFL, traceStr2);
/*=======================================================
if (BSAobjDescP != NULL && BSAdataBlockP != NULL)
{
- sprintf(traceStr2, "BSACreateObject ENTRY: BSAHandle:%d ObjOwner:'%s' appOwner:'%s' \n ObjName:'%.*s%.*s' \n objType:%d size:'%d %d' resourceType:'%s' \n bufferLen:%d numBytes:%d ",
+ sprintf(traceStr2, "BSACreateObject ENTRY: BSAHandle:%ld ObjOwner:'%s' appOwner:'%s' \n ObjName:'%.*s%.*s' \n objType:%d size:'%lu %lu' resourceType:'%s' \n bufferLen:%d numBytes:%d ",
BSAHandle,
BSAobjDescP->Owner.bsaObjectOwner[0] != '\0' ? BSAobjDescP->Owner.bsaObjectOwner : "",
XOPENRETURN(BSAHandle, "BSACreateObject",
bsaRC,__FILE__,__LINE__);
}
- sprintf(traceStr2, "BSACreateObject ENTRY: BSAHandle:%d", BSAHandle);
+ sprintf(traceStr2, "BSACreateObject ENTRY: BSAHandle:%ld", BSAHandle);
}
ourTrace(BSAHandle, TrFL, traceStr2);
/*=== check string lengths - if this too long, it won't fit in our objInfo ===*/
if (strlen(BSAobjDescP->desc) > ADSM_MAX_DESC)
{
- sprintf(traceStr2,"BSACreateObject: description longer than TSM max (%d). ",
+ sprintf(traceStr2,"BSACreateObject: description longer than TSM max (%" AFS_SIZET_FMT "). ",
strlen(BSAobjDescP->desc));
ourTrace(BSAHandle, TrFL, traceStr2);
bsaRC = BSA_RC_DESC_TOO_LONG;
}
if (strlen(BSAobjDescP->objectInfo) > ADSM_MAX_OBJINFO)
{
- sprintf(traceStr2,"BSACreateObject: objInfo longer than TSM max (%d).",
+ sprintf(traceStr2,"BSACreateObject: objInfo longer than TSM max (%" AFS_SIZET_FMT ").",
strlen(BSAobjDescP->objectInfo));
ourTrace(BSAHandle,TrFL, traceStr2);
bsaRC = BSA_RC_OBJINFO_TOO_LONG;
if (strlen(BSAobjDescP->objName.objectSpaceName) > BSA_MAX_OSNAME)
{
- sprintf(traceStr2, "BSACreateObject: objectSpaceName too long (%d)",
+ sprintf(traceStr2, "BSACreateObject: objectSpaceName too long (%" AFS_SIZET_FMT ")",
strlen(BSAobjDescP->objName.objectSpaceName));
ourTrace(BSAHandle, TrFL, traceStr2);
bsaRC = BSA_RC_OBJNAME_TOO_LONG;
if (strlen(BSAobjDescP->objName.pathName) >
min(DSM_MAX_HL_LENGTH, BSA_MAX_PATHNAME))
{
- sprintf(traceStr2, "BSACreateObject: pathName too long (%d)",
+ sprintf(traceStr2, "BSACreateObject: pathName too long (%" AFS_SIZET_FMT ")",
strlen(BSAobjDescP->objName.pathName));
ourTrace(BSAHandle,TrFL, traceStr2);
bsaRC = BSA_RC_OBJNAME_TOO_LONG;
dsmHandle = BSAHandle;
- sprintf(traceStr2, "BSADeleteObject ENTRY: BSAHandle:%d CopyType:%d \n ObjName:'%.*s%.*s' copyidP:'%d %d'.",
+ sprintf(traceStr2, "BSADeleteObject ENTRY: BSAHandle:%ld CopyType:%d \n ObjName:'%.*s%.*s' copyidP:'%lu %lu'.",
BSAHandle,
copyType,
100,BSAobjNameP->objectSpaceName,
memset(&delInfo, 0x00, sizeof(dsmDelInfo));
memset(&queryBuffer, 0x00, sizeof(qryBackupData));
- sprintf(traceStr2, "BSAMarkObjectInactive ENTRY: BSAHandle:%d \n ObjName:'%.*s%.*s'.",
+ sprintf(traceStr2, "BSAMarkObjectInactive ENTRY: BSAHandle:%ld \n ObjName:'%.*s%.*s'.",
BSAHandle,
100, BSAobjNameP->objectSpaceName,
100, BSAobjNameP->pathName);
if (strlen(BSAobjNameP->objectSpaceName) > DSM_MAX_FSNAME_LENGTH)
{
- sprintf(traceStr2, "BSAMarkObjectInactive: objectSpaceName too long (%d)", strlen(BSAobjNameP->objectSpaceName));
+ sprintf(traceStr2, "BSAMarkObjectInactive: objectSpaceName too long (%" AFS_SIZET_FMT ")", strlen(BSAobjNameP->objectSpaceName));
ourTrace(BSAHandle,TrFL, traceStr2);
bsaRC = BSA_RC_OBJNAME_TOO_LONG;
if (strlen(BSAobjNameP->pathName) >
min(DSM_MAX_HL_LENGTH, BSA_MAX_PATHNAME))
{
- sprintf(traceStr2, "BSAMarkObjectInactive: pathName too long (%d)",
+ sprintf(traceStr2, "BSAMarkObjectInactive: pathName too long (%" AFS_SIZET_FMT ")",
strlen(BSAobjNameP->pathName));
ourTrace(BSAHandle,TrFL, traceStr2);
bsaRC = BSA_RC_OBJNAME_TOO_LONG;
#include <dlfcn.h>
#endif
+#include <afs/tcdata.h>
#include "butc_xbsa.h"
#include <afs/butx.h>
#include <afs/bubasics.h>
+#include "butc_internal.h"
#include "error_macros.h"
extern int debugLevel;
BSA_Int16(*XBSAGetEnvironment) (BSA_UInt32, ObjectOwner *, char **);
#endif
+void
xbsa_error(int rc, struct butx_transactionInfo *info)
{
switch (rc) {
afs_int32
xbsa_MountLibrary(struct butx_transactionInfo *info, afs_int32 serverType)
{
+#ifndef NEW_XBSA
void *dynlib;
- int rc;
+#endif
if (debugLevel > 98) {
printf("\nxbsa_MountLibraray\n");
}
strcpy(info->objOwner.bsaObjectOwner, bsaObjectOwner);
} else {
- info->objOwner.bsaObjectOwner[0] = NULL;
+ info->objOwner.bsaObjectOwner[0] = '\0';
}
if (appObjectOwner) {
}
strcpy(info->objOwner.appObjectOwner, appObjectOwner);
} else {
- info->objOwner.appObjectOwner[0] = NULL;
+ info->objOwner.appObjectOwner[0] = '\0';
}
if (secToken) {
}
strcpy(info->secToken, secToken);
} else {
- info->secToken[0] = NULL;
+ info->secToken[0] = '\0';
}
rc = (int)XBSAInit(&(info->bsaHandle), &(info->secToken),
switch (XBSA_GET_SERVER_TYPE(info->serverType)) {
case XBSA_SERVER_TYPE_ADSM:
for (i = 0; i < XBSA_NUM_ENV_STRS; i++) {
- if (strncmp(envP[i], ADSMMaxObject, sizeof(ADSMMaxObject)) == 0) {
+ if (strncmp(envP[i], ADSMMaxObject, strlen(ADSMMaxObject)) == 0) {
tempStrPtr = envP[i];
tempStrPtr = tempStrPtr + strlen(ADSMMaxObject);
info->maxObjects = strtol(tempStrPtr, NULL, 10);
}
strcpy(queryDescriptor.objName.objectSpaceName, objectSpaceName);
} else {
- queryDescriptor.objName.objectSpaceName[0] = NULL;
+ queryDescriptor.objName.objectSpaceName[0] = '\0';
}
if (pathName) {
}
strcpy(queryDescriptor.objName.pathName, pathName);
} else {
- queryDescriptor.objName.pathName[0] = NULL;
+ queryDescriptor.objName.pathName[0] = '\0';
}
queryDescriptor.owner = info->objOwner;
char *objectInfo)
{
int rc;
- int length;
DataBlock dataBlock;
if (debugLevel > 98) {
}
strcpy(info->curObject.objName.objectSpaceName, objectSpaceName);
} else {
- info->curObject.objName.objectSpaceName[0] = NULL;
+ info->curObject.objName.objectSpaceName[0] = '\0';
}
if (pathName) {
}
strcpy(info->curObject.objName.pathName, pathName);
} else {
- info->curObject.objName.pathName[0] = NULL;
+ info->curObject.objName.pathName[0] = '\0';
}
if (lGName) {
}
strcpy(info->curObject.lGName, lGName);
} else {
- info->curObject.lGName[0] = NULL;
+ info->curObject.lGName[0] = '\0';
}
if (objectDescription) {
}
strcpy(info->curObject.desc, objectDescription);
} else {
- info->curObject.desc[0] = NULL;
+ info->curObject.desc[0] = '\0';
}
if (objectInfo) {
}
strcpy(info->curObject.objectInfo, objectInfo);
} else {
- info->curObject.objectInfo[0] = NULL;
+ info->curObject.objectInfo[0] = '\0';
}
if (info->numObjects == info->maxObjects) {
}
strcpy(objectName.objectSpaceName, objectSpaceName);
} else {
- objectName.objectSpaceName[0] = NULL;
+ objectName.objectSpaceName[0] = '\0';
}
if (pathName) {
}
strcpy(objectName.pathName, pathName);
} else {
- objectName.pathName[0] = NULL;
+ objectName.pathName[0] = '\0';
}
rc = (int)XBSAMarkObjectInactive(info->bsaHandle, &objectName);