* least something usable.
*/
-#define DUMPNAME(dumpname, name, dbDumpId) \
- if (dbDumpId == 0) \
- sprintf(dumpname, "%s", name); \
- else \
- sprintf(dumpname, "%s (DumpId %u)", name, dbDumpId);
-
struct dumpRock {
/* status only */
int tapeSeq;
afs_uint32 statuscount = statusSize, tsize = 0, esize;
afs_hyper_t estSize;
- char dumpIdStr[XBSA_MAX_OSNAME];
char volumeNameStr[XBSA_MAX_PATHNAME];
static char *dumpDescription = "AFS volume dump";
static char *objectDescription = "XBSA - butc";
dparamsPtr->curVolStartPos = tapeInfoPtr->position;
/* Tell XBSA what the name and size of volume to write */
- strcpy(dumpIdStr, butcdumpIdStr); /* "backup_afs_volume_dumps" */
- sprintf(volumeNameStr, "/%d", dparamsPtr->databaseDumpId);
- strcat(volumeNameStr, "/");
- strcat(volumeNameStr, curDump->name); /* <dumpid>/<volname> */
+ snprintf(volumeNameStr, sizeof(volumeNameStr), "/%d/%s",
+ dparamsPtr->databaseDumpId, curDump->name);
hset32(estSize, esize);
hshlft(estSize, 10); /* Multiply by 1024 so its in KB */
- rc = xbsa_WriteObjectBegin(&butxInfo, dumpIdStr, volumeNameStr,
+ rc = xbsa_WriteObjectBegin(&butxInfo, butcdumpIdStr, volumeNameStr,
xbsalGName, estSize, dumpDescription,
objectDescription);
if (rc != XBSA_SUCCESS) {
hostVolumeHeader.contd = 0;
volumeHeader_hton(&hostVolumeHeader, (struct volumeHeader *)buffer);
- rc = xbsa_WriteObjectData(&butxInfo, (struct volumeHeader *)buffer,
+ rc = xbsa_WriteObjectData(&butxInfo, buffer,
sizeof(struct volumeHeader), &bytesWritten);
if (rc != XBSA_SUCCESS) {
ErrorLog(1, taskId, rc, 0,
bytesWritten = sizeof(struct volumeHeader);
if (bytesWritten != sizeof(struct volumeHeader)) {
ErrorLog(1, taskId, rc, 0,
- "The size of VolumeHeader written (%d) does not equal its actual size (%d)\n",
+ "The size of VolumeHeader written (%d) does not equal its actual size (%" AFS_SIZET_FMT ")\n",
bytesWritten, sizeof(struct volumeHeader));
ERROR_EXIT(TC_INTERNALERROR);
}
hostVolumeHeader.contd = 0;
hostVolumeHeader.magic = TC_VOLENDMAGIC;
hostVolumeHeader.endTime = time(0);
- volumeHeader_hton(&hostVolumeHeader, &buffer[bytesread]);
+ volumeHeader_hton(&hostVolumeHeader, (struct volumeHeader *)&buffer[bytesread]);
bytesread += sizeof(hostVolumeHeader);
/* End the dump and transaction with the volserver. We end it now, before
switch (curDump->vtype) {
case BACKVOL:
- if (!(vldbEntry.flags & BACK_EXISTS)) {
+ if (!(vldbEntry.flags & VLF_BACKEXISTS)) {
ErrorLog(0, taskId, 0, 0,
"Volume %s (%u) failed - Backup volume no longer exists\n",
curDump->name, curDump->vid);
case RWVOL:
for (e = 0; e < vldbEntry.nServers; e++) { /* Find the RW volume */
- if (vldbEntry.serverFlags[e] & ITSRWVOL)
+ if (vldbEntry.serverFlags[e] & VLSF_RWVOL)
break;
}
break;
if (e >= vldbEntry.nServers) { /* Didn't find RO volume */
for (e = 0; e < vldbEntry.nServers; e++) { /* Find the first RO volume */
- if (vldbEntry.serverFlags[e] & ITSROVOL)
+ if (vldbEntry.serverFlags[e] & VLSF_ROVOL)
break;
}
}
int dumpedvolumes = 0;
int nodumpvolumes = 0;
char strlevel[5];
- char msg[20];
- char finishedMsg1[50];
- char finishedMsg2[50];
+ char msg[128];
+ char finishedMsg1[128];
+ char finishedMsg2[128];
time_t startTime = 0;
time_t endTime = 0;
afs_int32 allocbufferSize;
* Used when requesting a tape. Done now because once we create the dump, the
* routine will then find the newly created dump.
*/
- sprintf(strlevel, "%d", nodePtr->level);
+ snprintf(strlevel, sizeof(strlevel), "%d", nodePtr->level);
code =
bcdb_FindLatestDump(nodePtr->volumeSetName, strlevel,
&dparams.lastDump);
lastPass = 1; /* In case we aborted */
- DUMPNAME(finishedMsg1, nodePtr->dumpSetName, dparams.databaseDumpId);
- sprintf(finishedMsg2, "%d volumes dumped", dumpedvolumes);
+ /* Format and log finished message. */
+ snprintf(finishedMsg1, sizeof(finishedMsg1), "%s", nodePtr->dumpSetName);
+ if (dparams.databaseDumpId != 0) {
+ snprintf(msg, sizeof(msg), " (DumpId %u)", dparams.databaseDumpId);
+ strlcat(finishedMsg1, msg, sizeof(finishedMsg1));
+ }
+ snprintf(finishedMsg2, sizeof(finishedMsg2),
+ "%d volumes dumped", dumpedvolumes);
if (failedvolumes) {
- sprintf(msg, ", %d failed", failedvolumes);
- strcat(finishedMsg2, msg);
+ snprintf(msg, sizeof(msg), ", %d failed", failedvolumes);
+ strlcat(finishedMsg2, msg, sizeof(finishedMsg2));
}
if (nodumpvolumes) {
- sprintf(msg, ", %d unchanged", nodumpvolumes);
- strcat(finishedMsg2, msg);
+ snprintf(msg, sizeof(msg), ", %d unchanged", nodumpvolumes);
+ strlcat(finishedMsg2, msg, sizeof(finishedMsg2));
}
if (code == TC_ABORTEDBYREQUEST) {
if (centralLogIO && startTime) {
long timediff;
afs_int32 hrs, min, sec, tmp;
- char line[1024];
+ char *line = NULL;
struct tm tmstart, tmend;
localtime_r(&startTime, &tmstart);
min = tmp / 60;
sec = tmp % 60;
- sprintf(line,
+ code = asprintf(&line,
"%-5d %02d/%02d/%04d %02d:%02d:%02d "
"%02d/%02d/%04d %02d:%02d:%02d " "%02d:%02d:%02d "
"%s %d of %d volumes dumped (%lu KB)\n", taskId,
nodePtr->volumeSetName, dumpedvolumes,
dumpedvolumes + failedvolumes,
afs_printable_uint32_lu(dparams.tapeInfoPtr->kBytes + 1));
-
- fwrite(line, strlen(line), 1, centralLogIO);
- fflush(centralLogIO);
+ if (code < 0)
+ line = NULL;
+ if (line != NULL) {
+ fwrite(line, strlen(line), 1, centralLogIO);
+ fflush(centralLogIO);
+ }
+ free(line);
}
setStatus(taskId, TASK_DONE);
code = bcdb_FindDumpByID(dmp, &de);
if (code)
break;
- sprintf(strlevel, "%d", de.level);
+ snprintf(strlevel, sizeof(strlevel), "%d", de.level);
code =
bcdb_FindLatestDump(de.volumeSetName, strlevel,
&de2);
extern struct udbHandleS udbHandle;
extern struct deviceSyncNode *deviceLatch;
+ dumpid = ptr->dumpID;
+ taskId = ptr->taskId; /* Get task Id */
+
afs_pthread_setname_self("deletedump");
setStatus(taskId, DRIVE_WAIT);
EnterDeviceQueue(deviceLatch);
clearStatus(taskId, DRIVE_WAIT);
- dumpid = ptr->dumpID;
- taskId = ptr->taskId; /* Get task Id */
-
printf("\n\n");
TapeLog(2, taskId, 0, 0, "Delete Dump %u\n", dumpid);
for (i = 0; i < vl.budb_volumeList_len; i++) {
if (dumpEntry.flags & BUDB_DUMP_BUTA) {
/* dump was from buta, use old buta style names */
- sprintf(dumpIdStr, "/%d", dumpid);
- strcpy(volumeNameStr, "/");
- strcat(volumeNameStr, (char *)vl.budb_volumeList_val[i].name);
+ snprintf(dumpIdStr, sizeof(dumpIdStr), "/%d", dumpid);
+ snprintf(volumeNameStr, sizeof(volumeNameStr), "/%s",
+ (char *)vl.budb_volumeList_val[i].name);
} else { /* BUDB_DUMP_ADSM */
/* dump was from butc to ADSM, use butc names */
- strcpy(dumpIdStr, butcdumpIdStr);
- sprintf(volumeNameStr, "/%d", dumpid);
- strcat(volumeNameStr, "/");
- strcat(volumeNameStr, (char *)vl.budb_volumeList_val[i].name);
+ snprintf(dumpIdStr, sizeof(dumpIdStr), "%s", butcdumpIdStr);
+ snprintf(volumeNameStr, sizeof(volumeNameStr), "/%d/%s",
+ dumpid, (char *)vl.budb_volumeList_val[i].name);
}
rc = xbsa_DeleteObject(&butxInfo, dumpIdStr, volumeNameStr);
code = BUTX_DELETENOVOL;
setStatus(taskId, TASK_ERROR);
}
- return (void *)(code);
+ return (void *)(uintptr_t)(code);
}
#endif
git://git.openafs.org / openafs.git / blobdiff