git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
appliance: udev-174 moves udevd to /lib/udev/udevd (instead of /sbin/udevd)
[libguestfs.git]
/
daemon
/
zero.c
diff --git
a/daemon/zero.c
b/daemon/zero.c
index
6e62e15
..
8fbd963
100644
(file)
--- a/
daemon/zero.c
+++ b/
daemon/zero.c
@@
-42,12
+42,14
@@
do_zero (const char *device)
memset (buf, 0, sizeof buf);
memset (buf, 0, sizeof buf);
- for (i = 0; i < 32; ++i)
+ for (i = 0; i < 32; ++i)
{
if (write (fd, buf, sizeof buf) != sizeof buf) {
reply_with_perror ("write: %s", device);
close (fd);
return -1;
}
if (write (fd, buf, sizeof buf) != sizeof buf) {
reply_with_perror ("write: %s", device);
close (fd);
return -1;
}
+ notify_progress ((uint64_t) i, 32);
+ }
if (close (fd) == -1) {
reply_with_perror ("close: %s", device);
if (close (fd) == -1) {
reply_with_perror ("close: %s", device);
@@
-60,9
+62,10
@@
do_zero (const char *device)
int
do_zero_device (const char *device)
{
int
do_zero_device (const char *device)
{
- int64_t size = do_blockdev_getsize64 (device);
- if (size == -1)
+ int64_t s
s
ize = do_blockdev_getsize64 (device);
+ if (s
s
ize == -1)
return -1;
return -1;
+ uint64_t size = (uint64_t) ssize;
int fd = open (device, O_WRONLY);
if (fd == -1) {
int fd = open (device, O_WRONLY);
if (fd == -1) {
@@
-73,8
+76,16
@@
do_zero_device (const char *device)
char buf[1024*1024];
memset (buf, 0, sizeof buf);
char buf[1024*1024];
memset (buf, 0, sizeof buf);
- while (size > 0) {
- size_t n = size > sizeof buf ? sizeof buf : size;
+ uint64_t pos = 0;
+
+ while (pos < size) {
+ uint64_t n64 = size - pos;
+ size_t n;
+ if (n64 > sizeof buf)
+ n = sizeof buf;
+ else
+ n = (size_t) n64; /* safe because of if condition */
+
ssize_t r = write (fd, buf, n);
if (r == -1) {
reply_with_perror ("write: %s (with %" PRId64 " bytes left to write)",
ssize_t r = write (fd, buf, n);
if (r == -1) {
reply_with_perror ("write: %s (with %" PRId64 " bytes left to write)",
@@
-82,7
+93,9
@@
do_zero_device (const char *device)
close (fd);
return -1;
}
close (fd);
return -1;
}
- size -= r;
+
+ pos += r;
+ notify_progress (pos, size);
}
if (close (fd) == -1) {
}
if (close (fd) == -1) {