}
return 1;
case 2: /* client */
- client = select_client_resource(ua);
- purge_files_from_client(ua, client);
+ client = get_client_resource(ua);
+ if (client) {
+ purge_files_from_client(ua, client);
+ }
return 1;
case 3: /* Volume */
if (select_media_dbr(ua, &mr)) {
case 1:
switch(find_arg_keyword(ua, jobs_keywords)) {
case 0: /* client */
- client = select_client_resource(ua);
- purge_jobs_from_client(ua, client);
+ client = get_client_resource(ua);
+ if (client) {
+ purge_jobs_from_client(ua, client);
+ }
return 1;
case 1: /* Volume */
if (select_media_dbr(ua, &mr)) {
}
switch (do_keyword_prompt(ua, _("Choose item to purge"), keywords)) {
case 0: /* files */
- client = select_client_resource(ua);
- if (!client) {
- return 1;
+ client = get_client_resource(ua);
+ if (client) {
+ purge_files_from_client(ua, client);
}
- purge_files_from_client(ua, client);
break;
case 1: /* jobs */
- client = select_client_resource(ua);
- if (!client) {
- return 1;
+ client = get_client_resource(ua);
+ if (client) {
+ purge_jobs_from_client(ua, client);
}
- purge_jobs_from_client(ua, client);
break;
case 2: /* Volume */
if (select_media_dbr(ua, &mr)) {
memset(&cr, 0, sizeof(cr));
memset(&del, 0, sizeof(del));
- strcpy(cr.Name, client->hdr.name);
+ bstrncpy(cr.Name, client->hdr.name, sizeof(cr.Name));
if (!db_create_client_record(ua->jcr, ua->db, &cr)) {
return 0;
}
{
char *query = (char *)get_pool_memory(PM_MESSAGE);
- Mmsg(&query, "DELETE FROM File WHERE JobId=%d", jr->JobId);
+ Mmsg(&query, "DELETE FROM File WHERE JobId=%u", jr->JobId);
db_sql_query(ua->db, query, NULL, (void *)NULL);
- Mmsg(&query, "UPDATE Job Set PurgedFiles=1 WHERE JobId=%d", jr->JobId);
+ Mmsg(&query, "UPDATE Job Set PurgedFiles=1 WHERE JobId=%u", jr->JobId);
db_sql_query(ua->db, query, NULL, (void *)NULL);
free_pool_memory(query);
int i, stat = 0;
JOB_DBR jr;
+ stat = strcmp(mr->VolStatus, "Append") == 0 ||
+ strcmp(mr->VolStatus, "Full") == 0 ||
+ strcmp(mr->VolStatus, "Used") == 0 ||
+ strcmp(mr->VolStatus, "Error") == 0;
+ if (!stat) {
+ bsendmsg(ua, "\n");
+ bsendmsg(ua, _("Volume \"%s\" has VolStatus \"%s\" and cannot be purged.\n"
+ "The VolStatus must be: Append, Full, Used, or Error to be purged.\n"),
+ mr->VolumeName, mr->VolStatus);
+ goto bail_out;
+ }
+
memset(&jr, 0, sizeof(jr));
memset(&del, 0, sizeof(del));
cnt.count = 0;