diff options
| author | ps <ps@FreeBSD.org> | 2001-03-27 06:24:08 +0000 |
|---|---|---|
| committer | ps <ps@FreeBSD.org> | 2001-03-27 06:24:08 +0000 |
| commit | 8b18de63df566be3be6d1961300d2c95705fad4b (patch) | |
| tree | 6ca650a284ca35292c23b933c42dfe1083f9ba93 | |
| parent | 24c4b1e75b8af36f530a3eabf2d1a17810637a5f (diff) | |
| download | FreeBSD-src-8b18de63df566be3be6d1961300d2c95705fad4b.zip FreeBSD-src-8b18de63df566be3be6d1961300d2c95705fad4b.tar.gz | |
Change the dump routines to only abort if control-c is pressed.
If any other key is pressed, print a message stating that control-c
is how to abort.
Reviewed by: peter
| -rw-r--r-- | sys/cam/scsi/scsi_da.c | 4 | ||||
| -rw-r--r-- | sys/dev/ata/ata-disk.c | 4 | ||||
| -rw-r--r-- | sys/dev/ida/ida_disk.c | 4 | ||||
| -rw-r--r-- | sys/dev/twe/twe_freebsd.c | 4 |
4 files changed, 12 insertions, 4 deletions
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index 3e9246b..2152fa4 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -736,8 +736,10 @@ dadump(dev_t dev) addr += PAGE_SIZE * dumppages; /* operator aborting dump? */ - if (cncheckc() != -1) + if (cncheckc() == 0x03) return (EINTR); + else + printf("[CTRL-C to abort] "); } /* diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c index 060ebac..8a4377f 100644 --- a/sys/dev/ata/ata-disk.c +++ b/sys/dev/ata/ata-disk.c @@ -352,8 +352,10 @@ addump(dev_t dev) blkno += blkcnt * dumppages; count -= blkcnt * dumppages; addr += PAGE_SIZE * dumppages; - if (cncheckc() != -1) + if (cncheckc() == 0x03) return EINTR; + else + printf("[CTRL-C to abort] "); } if (ata_wait(adp->controller, adp->unit, ATA_S_READY | ATA_S_DSC) < 0) diff --git a/sys/dev/ida/ida_disk.c b/sys/dev/ida/ida_disk.c index f307c68..d2d99f5 100644 --- a/sys/dev/ida/ida_disk.c +++ b/sys/dev/ida/ida_disk.c @@ -244,8 +244,10 @@ idad_dump(dev_t dev) count -= blkcnt * dumppages; addr += PAGE_SIZE * dumppages; - if (cncheckc() != -1) + if (cncheckc() == 0x03) return (EINTR); + else + printf("[CTRL-C to abort] "); } return (0); } diff --git a/sys/dev/twe/twe_freebsd.c b/sys/dev/twe/twe_freebsd.c index 6efac81..d5acfda 100644 --- a/sys/dev/twe/twe_freebsd.c +++ b/sys/dev/twe/twe_freebsd.c @@ -741,8 +741,10 @@ twed_dump(dev_t dev) count -= blkcnt * dumppages; addr += PAGE_SIZE * dumppages; - if (cncheckc() != -1) + if (cncheckc() == 0x03) return(EINTR); + else + printf("[CTRL-C to abort] "); } return(0); } |
