git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update generator to emit each RESOLVE_DEVICE call
[libguestfs.git]
/
daemon
/
devsparts.c
diff --git
a/daemon/devsparts.c
b/daemon/devsparts.c
index
b89682c
..
c3b9756
100644
(file)
--- a/
daemon/devsparts.c
+++ b/
daemon/devsparts.c
@@
-40,7
+40,6
@@
foreach_block_device (block_dev_func_t func)
int size = 0, alloc = 0;
DIR *dir;
int size = 0, alloc = 0;
DIR *dir;
- struct dirent *d;
int err = 0;
dir = opendir ("/sys/block");
int err = 0;
dir = opendir ("/sys/block");
@@
-49,8
+48,11
@@
foreach_block_device (block_dev_func_t func)
return NULL;
}
return NULL;
}
- errno = 0;
- while ((d = readdir (dir)) != NULL) {
+ while(1) {
+ errno = 0;
+ struct dirent *d = readdir(dir);
+ if(NULL == d) break;
+
if (strncmp (d->d_name, "sd", 2) == 0 ||
strncmp (d->d_name, "hd", 2) == 0 ||
strncmp (d->d_name, "vd", 2) == 0 ||
if (strncmp (d->d_name, "sd", 2) == 0 ||
strncmp (d->d_name, "hd", 2) == 0 ||
strncmp (d->d_name, "vd", 2) == 0 ||
@@
-191,7
+193,7
@@
do_mkfs (char *fstype, char *device)
char *err;
int r;
char *err;
int r;
-
IS_DEVICE (device,
-1);
+
RESOLVE_DEVICE (device, return
-1);
r = command (NULL, &err, "/sbin/mkfs", "-t", fstype, device, NULL);
if (r == -1) {
r = command (NULL, &err, "/sbin/mkfs", "-t", fstype, device, NULL);
if (r == -1) {