search for: guestfs___get_windows_systemroot

This change refactors guestfs___has_windows_systemroot to guestfs___get_windows_systemroot. The new function returns a dynamically allocated char * which must be freed. The new function is no less efficient than before, as it returns the result of guestfs___case_sensitive_path_silently, which is required anyway. The new code is slightly more efficient than before, as it re-uses the resu...

...ogus warning about missing /boot.ini. --- src/inspect-fs-windows.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inspect-fs-windows.c b/src/inspect-fs-windows.c index 4eea6a3..c67f164 100644 --- a/src/inspect-fs-windows.c +++ b/src/inspect-fs-windows.c @@ -154,7 +154,7 @@ guestfs___get_windows_systemroot (guestfs_h *g) * systemroot locations */ CLEANUP_FREE char *boot_ini_path = guestfs___case_sensitive_path_silently (g, "/boot.ini"); - if (boot_ini_path) { + if (boot_ini_path && guestfs_is_file (g, boot_ini_path)) { CLEANUP_FREE_STRING_LIST char **boot_ini =...

After adding /reactos as windows systemroot, virt-inspector identified OS as windows with product name ReactOS. Fixes RHBZ#709326. Related bug RHBZ#709327 seems to be already fixed in ReactOS 0.4. Maros Zatko (1): inspector: add /reactos as systemroot src/inspect-fs-windows.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.9.3

...s to be already fixed in ReactOS 0.4. --- src/inspect-fs-windows.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inspect-fs-windows.c b/src/inspect-fs-windows.c index 421a5b1..7f0f13d 100644 --- a/src/inspect-fs-windows.c +++ b/src/inspect-fs-windows.c @@ -107,7 +107,7 @@ guestfs___get_windows_systemroot (guestfs_h *g) { /* Check a predefined list of common windows system root locations */ static const char *systemroots[] = - { "/windows", "/winnt", "/win32", "/win", NULL }; + { "/windows", "/winnt", "/win32", "...

...rdisk\\((\\d+)\\)partition\\((\\d+)\\)([^=]+)=", 0); } static void free_regexps (void) { pcre_free (re_windows_version); + pcre_free (re_boot_ini_os_header); + pcre_free (re_boot_ini_os); } static int check_windows_arch (guestfs_h *g, struct inspect_fs *fs); @@ -143,6 +149,86 @@ guestfs___get_windows_systemroot (guestfs_h *g) } } + /* If the fs contains boot.ini, check it for non-standard + * systemroot locations */ + CLEANUP_FREE char *boot_ini_path = + guestfs___case_sensitive_path_silently (g, "/boot.ini"); + if (boot_ini_path) { + CLEANUP_FREE_STRING_LIST char **boot_ini...

libguestfs has used double and triple underscores in identifiers. These aren't valid for global names in C++. (http://stackoverflow.com/a/228797) These large but completely mechanical patches change the illegal identifiers to legal ones. Rich.