X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fdevsparts.c;h=79da41b03dae4c127cd67df9fe1dc6930e2e375f;hp=c8f0256a351cdb0f69375ddf32f801f120898d12;hb=47412f137f2b09dbc2b44b78ba84c0b348e3f402;hpb=3ed8d5122026f37dd96cc7e8503c4f3ecf0afbb7

diff --git a/daemon/devsparts.c b/daemon/devsparts.c
index c8f0256..79da41b 100644
--- a/daemon/devsparts.c
+++ b/daemon/devsparts.c
@@ -89,6 +89,7 @@ foreach_block_device (block_dev_func_t func)
   if(0 != errno) {
     reply_with_perror ("readdir: /sys/block");
     free_stringslen(r, size);
+    closedir (dir);
     return NULL;
   }
 
@@ -175,6 +176,7 @@ add_partitions(const char *device,
   if(0 != errno) {
       reply_with_perror ("readdir: %s", devdir);
       free_stringslen(*r, *size);
+      closedir (dir);
       return -1;
   }
 
@@ -218,3 +220,28 @@ do_part_to_dev (const char *part)
 
   return r;
 }
+
+int
+do_part_to_partnum (const char *part)
+{
+  int err = 1;
+  size_t n = strlen (part);
+
+  while (n >= 1 && c_isdigit (part[n-1])) {
+    err = 0;
+    n--;
+  }
+
+  if (err) {
+    reply_with_error ("device name is not a partition");
+    return -1;
+  }
+
+  int r;
+  if (sscanf (&part[n], "%d", &r) != 1) {
+    reply_with_error ("could not parse number");
+    return -1;
+  }
+
+  return r;
+}