d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for dealing with ENOSPC as the error code returned by a tape

Browse Source 
device hitting EOM on a write.
This commit is contained in:
gibbs 1998-09-15 10:25:50 +00:00
parent 439c46a17f
commit 3576feaf0b
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sbin/dump/dumprmt.c
View File

@ -36,7 +36,7 @@
static char sccsid[] = "@(#)dumprmt.c 8.3 (Berkeley) 4/28/95";
#endif
static const char rcsid[] =
"$Id: dumprmt.c,v 1.11 1998/06/15 06:58:09 charnier Exp $";
"$Id: dumprmt.c,v 1.12 1998/07/14 09:19:46 jkoshy Exp $";
#endif /* not lint */
#include <sys/param.h>
@ -250,19 +250,16 @@ rmtread(buf, count)
{
char line[30];
int n, i, cc;
extern errno;
(void)snprintf(line, sizeof (line), "R%d\n", count);
n = rmtcall("read", line);
if (n < 0) {
errno = n;
return (-1);
}
if (n < 0)
/* rmtcall() properly sets errno for us on errors. */
return (n);
for (i = 0; i < n; i += cc) {
cc = read(rmtape, buf+i, n - i);
if (cc <= 0) {
if (cc <= 0)
rmtconnaborted();
}
}
return (n);
}
@ -360,15 +357,15 @@ rmtreply(cmd)
{
register char *cp;
char code[30], emsg[BUFSIZ];
extern int errno;
rmtgets(code, sizeof (code));
if (*code == 'E' || *code == 'F') {
rmtgets(emsg, sizeof (emsg));
msg("%s: %s", cmd, emsg);
if (*code == 'F') {
errno = atoi(code + 1);
if (*code == 'F')
rmtstate = TS_CLOSED;
return (-1);
}
return (-1);
}
if (*code != 'A') {

14
sbin/dump/tape.c
View File

@ -36,7 +36,7 @@
static char sccsid[] = "@(#)tape.c 8.4 (Berkeley) 5/1/95";
#endif
static const char rcsid[] =
"$Id$";
"$Id: tape.c,v 1.9 1998/06/15 06:58:11 charnier Exp $";
#endif /* not lint */
#include <sys/param.h>
@ -822,13 +822,17 @@ doslave(cmd, slave_number)
slave_number, size, writesize);
#endif
/*
* Handle ENOSPC as an EOT condition.
*/
if (wrote < 0 && errno == ENOSPC) {
wrote = 0;
eot_count++;
}
if (eot_count > 0)
size = 0;
/*
* fixme: Pyramids running OSx return ENOSPC
* at EOT on 1/2 inch drives.
*/
if (wrote < 0) {
(void) kill(master, SIGUSR1);
for (;;)