Libguestfs - Aug 2010 - [PATCH febootstrap 0/2] febootstrap-supermin-helper should visit directory entries in order and ignore backup files

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
New in Fedora 11: Fedora Windows cross-compiler. Compile Windows
programs, test, and build Windows installers. Over 70 libraries supprt'd
http://fedoraproject.org/wiki/MinGW http://www.annexia.org/fedora_mingw

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
libguestfs lets you edit virtual machines.  Supports shell scripting,
bindings from many languages.  http://et.redhat.com/~rjones/libguestfs/
See what it can do: http://et.redhat.com/~rjones/libguestfs/recipes.html
-------------- next part --------------
>From 6066c3e245a28b55dd1c02d2dd1b524d83068ef3 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones at redhat.com>
Date: Fri, 27 Aug 2010 17:03:57 +0100
Subject: [PATCH 1/2] helper: Visit directory entries in order.

Previously in febootstrap-supermin-helper we would visit the
files in supermin.d in arbitrary (ie. readdir) order.  This has
caused a series of heisenbugs where some implicit dependency
between these files has not been honoured.  The latest one is
that '/etc/localtime' can be added to the appliance before
'/etc'
has been created (and this operation fails).

Instead of continuing to chase these, this commit forces us to
visit the files in filename order by sorting them before visiting
them.

Note that in libguestfs, the current order is sufficient, because
the files are called:

base.img
daemon.img
hostfiles
---
 helper/appliance.c |   40 +++++++++++++++++++++++++++++++---------
 1 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/helper/appliance.c b/helper/appliance.c
index 4cbebf4..e014b12 100644
--- a/helper/appliance.c
+++ b/helper/appliance.c
@@ -123,27 +123,28 @@ iterate_inputs (char **inputs, int nr_inputs, struct
writer *writer)
   }
 }
 
+static int
+string_compare (const void *p1, const void *p2)
+{
+  return strcmp (* (char * const *) p1, * (char * const *) p2);
+}
+
 static void
 iterate_input_directory (const char *dirname, int dirfd, struct writer *writer)
 {
-  char path[PATH_MAX];
-  strcpy (path, dirname);
-  size_t len = strlen (dirname);
-  path[len++] = '/';
-
-  char *inputs[] = { path };
-
   DIR *dir = fdopendir (dirfd);
   if (dir == NULL)
     error (EXIT_FAILURE, errno, "fdopendir: %s", dirname);
 
+  char **entries = NULL;
+  size_t nr_entries = 0, nr_alloc = 0;
+
   struct dirent *d;
   while ((errno = 0, d = readdir (dir)) != NULL) {
     if (d->d_name[0] == '.') /* ignore ., .. and any hidden files.
*/
       continue;
 
-    strcpy (&path[len], d->d_name);
-    iterate_inputs (inputs, 1, writer);
+    add_string (&entries, &nr_entries, &nr_alloc, d->d_name);
   }
 
   if (errno != 0)
@@ -151,6 +152,27 @@ iterate_input_directory (const char *dirname, int dirfd,
struct writer *writer)
 
   if (closedir (dir) == -1)
     error (EXIT_FAILURE, errno, "closedir: %s", dirname);
+
+  add_string (&entries, &nr_entries, &nr_alloc, NULL);
+
+  /* Visit directory entries in order.  In febootstrap <= 2.8 we
+   * didn't impose any order, but that led to some difficult
+   * heisenbugs.
+   */
+  sort (entries, string_compare);
+
+  char path[PATH_MAX];
+  strcpy (path, dirname);
+  size_t len = strlen (dirname);
+  path[len++] = '/';
+
+  char *inputs[] = { path };
+
+  size_t i;
+  for (i = 0; entries[i] != NULL; ++i) {
+    strcpy (&path[len], entries[i]);
+    iterate_inputs (inputs, 1, writer);
+  }
 }
 
 /* Copy kernel modules.
-- 
1.7.1

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming blog: http://rwmj.wordpress.com
Fedora now supports 80 OCaml packages (the OPEN alternative to F#)
http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora
-------------- next part --------------
>From 7d7d6e5814475dc4f97f9af8965462c8865e1ae1 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones at redhat.com>
Date: Fri, 27 Aug 2010 17:04:53 +0100
Subject: [PATCH 2/2] helper: Ignore editor backup (*~) files.

---
 helper/appliance.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/helper/appliance.c b/helper/appliance.c
index e014b12..85efd75 100644
--- a/helper/appliance.c
+++ b/helper/appliance.c
@@ -144,6 +144,11 @@ iterate_input_directory (const char *dirname, int dirfd,
struct writer *writer)
     if (d->d_name[0] == '.') /* ignore ., .. and any hidden files.
*/
       continue;
 
+    /* Ignore *~ files created by editors. */
+    size_t len = strlen (d->d_name);
+    if (len > 0 && d->d_name[len-1] == '~')
+      continue;
+
     add_string (&entries, &nr_entries, &nr_alloc, d->d_name);
   }
 
-- 
1.7.1

I've tested this with libguestfs from git and it worked.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
virt-p2v converts physical machines to virtual machines.  Boot with a
live CD or over the network (PXE) and turn machines into Xen guests.
http://et.redhat.com/~rjones/virt-p2v