git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
inspection: Return root devices sorted.
[libguestfs.git]
/
src
/
inspect.c
diff --git
a/src/inspect.c
b/src/inspect.c
index
62cbc85
..
67eb65f
100644
(file)
--- a/
src/inspect.c
+++ b/
src/inspect.c
@@
-123,6
+123,15
@@
guestfs__inspect_os (guestfs_h *g)
return ret;
}
return ret;
}
+static int
+compare_strings (const void *vp1, const void *vp2)
+{
+ const char *s1 = * (char * const *) vp1;
+ const char *s2 = * (char * const *) vp2;
+
+ return strcmp (s1, s2);
+}
+
char **
guestfs__inspect_get_roots (guestfs_h *g)
{
char **
guestfs__inspect_get_roots (guestfs_h *g)
{
@@
-151,6
+160,8
@@
guestfs__inspect_get_roots (guestfs_h *g)
}
ret[count] = NULL;
}
ret[count] = NULL;
+ qsort (ret, count, sizeof (char *), compare_strings);
+
return ret;
}
return ret;
}
@@
-163,9
+174,10
@@
guestfs__inspect_get_type (guestfs_h *g, const char *root)
char *ret;
switch (fs->type) {
char *ret;
switch (fs->type) {
+ case OS_TYPE_FREEBSD: ret = safe_strdup (g, "freebsd"); break;
case OS_TYPE_LINUX: ret = safe_strdup (g, "linux"); break;
case OS_TYPE_LINUX: ret = safe_strdup (g, "linux"); break;
+ case OS_TYPE_NETBSD: ret = safe_strdup (g, "netbsd"); break;
case OS_TYPE_WINDOWS: ret = safe_strdup (g, "windows"); break;
case OS_TYPE_WINDOWS: ret = safe_strdup (g, "windows"); break;
- case OS_TYPE_FREEBSD: ret = safe_strdup (g, "freebsd"); break;
case OS_TYPE_UNKNOWN: default: ret = safe_strdup (g, "unknown"); break;
}
case OS_TYPE_UNKNOWN: default: ret = safe_strdup (g, "unknown"); break;
}
@@
-456,6
+468,7
@@
guestfs__inspect_get_package_format (guestfs_h *g, const char *root)
case OS_PACKAGE_FORMAT_PACMAN: ret = safe_strdup (g, "pacman"); break;
case OS_PACKAGE_FORMAT_EBUILD: ret = safe_strdup (g, "ebuild"); break;
case OS_PACKAGE_FORMAT_PISI: ret = safe_strdup (g, "pisi"); break;
case OS_PACKAGE_FORMAT_PACMAN: ret = safe_strdup (g, "pacman"); break;
case OS_PACKAGE_FORMAT_EBUILD: ret = safe_strdup (g, "ebuild"); break;
case OS_PACKAGE_FORMAT_PISI: ret = safe_strdup (g, "pisi"); break;
+ case OS_PACKAGE_FORMAT_PKGSRC: ret = safe_strdup (g, "pkgsrc"); break;
case OS_PACKAGE_FORMAT_UNKNOWN:
default:
ret = safe_strdup (g, "unknown");
case OS_PACKAGE_FORMAT_UNKNOWN:
default:
ret = safe_strdup (g, "unknown");