diff options
author | Richard Jones <rjones@redhat.com> | 2010-06-01 14:04:51 +0100 |
---|---|---|
committer | Richard Jones <rjones@redhat.com> | 2010-06-01 15:30:13 +0100 |
commit | da4812ab6b44c29cb3cf181c7aa896420ecb8aa6 (patch) | |
tree | 183f6e9d704a4dbd35af040cf52906423ed241d0 /daemon/ext2.c | |
parent | 27b730a6820b80a49a4da1af9f4c8e8a952f735e (diff) | |
download | libguestfs-da4812ab6b44c29cb3cf181c7aa896420ecb8aa6.tar.gz libguestfs-da4812ab6b44c29cb3cf181c7aa896420ecb8aa6.tar.xz libguestfs-da4812ab6b44c29cb3cf181c7aa896420ecb8aa6.zip |
Fix and deprecate get_e2label and get_e2uuid (RHBZ#597112).
Fix these calls (see description in RHBZ#597112), but also
deprecate them since the new calls vfs_label and vfs_uuid can
work on any filesystem type.
This also adds a regression test for the original bug reported
in RHBZ#597112.
Diffstat (limited to 'daemon/ext2.c')
-rw-r--r-- | daemon/ext2.c | 84 |
1 files changed, 2 insertions, 82 deletions
diff --git a/daemon/ext2.c b/daemon/ext2.c index 3a075e56..7f9d2e02 100644 --- a/daemon/ext2.c +++ b/daemon/ext2.c @@ -170,29 +170,7 @@ do_set_e2label (const char *device, const char *label) char * do_get_e2label (const char *device) { - int r, len; - char *out, *err; - - char prog[] = "e2label"; - if (e2prog (prog) == -1) - return NULL; - - r = command (&out, &err, prog, device, NULL); - if (r == -1) { - reply_with_error ("%s", err); - free (out); - free (err); - return NULL; - } - - free (err); - - /* Remove any trailing \n from the label. */ - len = strlen (out); - if (len > 0 && out[len-1] == '\n') - out[len-1] = '\0'; - - return out; /* caller frees */ + return do_vfs_label (device); } int @@ -219,65 +197,7 @@ do_set_e2uuid (const char *device, const char *uuid) char * do_get_e2uuid (const char *device) { - int r; - char *out, *err, *p, *q; - - /* It's not so straightforward to get the volume UUID. We have - * to use tune2fs -l and then look for a particular string in - * the output. - */ - char prog[] = "tune2fs"; - if (e2prog (prog) == -1) - return NULL; - - r = command (&out, &err, prog, "-l", device, NULL); - if (r == -1) { - reply_with_error ("%s", err); - free (out); - free (err); - return NULL; - } - - free (err); - - /* Look for /\nFilesystem UUID:\s+/ in the output. */ - p = strstr (out, "\nFilesystem UUID:"); - if (p == NULL) { - reply_with_error ("no Filesystem UUID in the output of tune2fs -l"); - free (out); - return NULL; - } - - p += 17; - while (*p && c_isspace (*p)) - p++; - if (!*p) { - reply_with_error ("malformed Filesystem UUID in the output of tune2fs -l"); - free (out); - return NULL; - } - - /* Now 'p' hopefully points to the start of the UUID. */ - q = p; - while (*q && (c_isxdigit (*q) || *q == '-')) - q++; - if (!*q) { - reply_with_error ("malformed Filesystem UUID in the output of tune2fs -l"); - free (out); - return NULL; - } - - *q = '\0'; - - p = strdup (p); - if (!p) { - reply_with_perror ("strdup"); - free (out); - return NULL; - } - - free (out); - return p; /* caller frees */ + return do_vfs_uuid (device); } int |