x86: allow windows CPUID dump import on Linux

bgoglin · bgoglin · commit 4e0c7175c6ca · 2024-09-06T16:29:23.000+02:00
Don't enforce \n since Windows puts a \r

Signed-off-by: Brice Goglin &lt;Brice.Goglin@inria.fr&gt;
diff --git a/hwloc/topology-x86.c b/hwloc/topology-x86.c
@@ -1825,7 +1825,7 @@ hwloc_x86_check_cpuiddump_input(const char *src_cpuiddump_path, hwloc_bitmap_t s
     goto out_with_path;
   }
   fclose(file);
-  if (strcmp(line, "Architecture: x86\n")) {
+  if (strncmp(line, "Architecture: x86", 17)) {
     fprintf(stderr, "hwloc/x86: Found non-x86 dumped cpuid summary in %s: %s\n", path, line);
     goto out_with_path;
   }

Original file line number	Diff line number	Diff line change
`@@ -1825,7 +1825,7 @@ hwloc_x86_check_cpuiddump_input(const char *src_cpuiddump_path, hwloc_bitmap_t s`
`1825`	`1825`	`goto out_with_path;`
`1826`	`1826`	`}`
`1827`	`1827`	`fclose(file);`
`1828`		`- if (strcmp(line, "Architecture: x86\n")) {`
	`1828`	`+ if (strncmp(line, "Architecture: x86", 17)) {`
`1829`	`1829`	`fprintf(stderr, "hwloc/x86: Found non-x86 dumped cpuid summary in %s: %s\n", path, line);`
`1830`	`1830`	`goto out_with_path;`
`1831`	`1831`	`}`