if (!bsr && VolumeName) {
pm_strcpy(&jcr->VolumeName, VolumeName);
}
+ jcr->where = bstrdup("");
return jcr;
}
/*
* Device got an error, attempt to analyse it
*/
-void display_error_status(DEVICE *dev)
+void display_tape_error_status(JCR *jcr, DEVICE *dev)
{
uint32_t status;
- Emsg0(M_ERROR, 0, dev->errmsg);
+ Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
status_dev(dev, &status);
Dmsg1(20, "Device status: %x\n", status);
- if (status & MT_EOD)
- Emsg0(M_ERROR_TERM, 0, _("Unexpected End of Data\n"));
- else if (status & MT_EOT)
- Emsg0(M_ERROR_TERM, 0, _("Unexpected End of Tape\n"));
- else if (status & MT_EOF)
- Emsg0(M_ERROR_TERM, 0, _("Unexpected End of File\n"));
- else if (status & MT_DR_OPEN)
- Emsg0(M_ERROR_TERM, 0, _("Tape Door is Open\n"));
- else if (!(status & MT_ONLINE))
- Emsg0(M_ERROR_TERM, 0, _("Unexpected Tape is Off-line\n"));
+ if (status & BMT_EOD)
+ Jmsg(jcr, M_ERROR, 0, _("Unexpected End of Data\n"));
+ else if (status & BMT_EOT)
+ Jmsg(jcr, M_ERROR, 0, _("Unexpected End of Tape\n"));
+ else if (status & BMT_EOF)
+ Jmsg(jcr, M_ERROR, 0, _("Unexpected End of File\n"));
+ else if (status & BMT_DR_OPEN)
+ Jmsg(jcr, M_ERROR, 0, _("Tape Door is Open\n"));
+ else if (!(status & BMT_ONLINE))
+ Jmsg(jcr, M_ERROR, 0, _("Unexpected Tape is Off-line\n"));
else
- Emsg2(M_ERROR_TERM, 0, _("Read error on Record Header %s: %s\n"), dev_name(dev), strerror(errno));
-}
-
-
-extern char *getuser(uid_t uid);
-extern char *getgroup(gid_t gid);
-
-void print_ls_output(char *fname, char *link, int type, struct stat *statp)
-{
- char buf[1000];
- char ec1[30];
- char *p, *f;
- int n;
-
- p = encode_mode(statp->st_mode, buf);
- n = sprintf(p, " %2d ", (uint32_t)statp->st_nlink);
- p += n;
- n = sprintf(p, "%-8.8s %-8.8s", getuser(statp->st_uid), getgroup(statp->st_gid));
- p += n;
- n = sprintf(p, "%8.8s ", edit_uint64(statp->st_size, ec1));
- p += n;
- p = encode_time(statp->st_ctime, p);
- *p++ = ' ';
- *p++ = ' ';
- /* Copy file name */
- for (f=fname; *f && (p-buf) < (int)sizeof(buf); )
- *p++ = *f++;
- if (type == FT_LNK) {
- *p++ = ' ';
- *p++ = '-';
- *p++ = '>';
- *p++ = ' ';
- /* Copy link name */
- for (f=link; *f && (p-buf) < (int)sizeof(buf); )
- *p++ = *f++;
- }
- *p++ = '\n';
- *p = 0;
- fputs(buf, stdout);
+ Jmsg(jcr, M_ERROR, 0, _("Read error on Record Header %s: %s\n"), dev_name(dev), strerror(errno));
}