Changeset 1375 in MondoRescue for branches/2.2.4/mondo/src/common/libmondo-tools.c

Timestamp:

Apr 30, 2007, 11:18:15 AM (17 years ago)

Author:

Bruno Cornec

Message:

• ARCH removed from configure.in as useless
• addition of get_uname_m (to give the underlying arch)
• get_architecture now returns correctly the built arch used (including x86_64)
• IA32 is defined for both i386 and x86_64. An additional vdefine X86_64 is also setup for tha later arch.

File:

• branches/2.2.4/mondo/src/common/libmondo-tools.c (modified) (3 diffs)

branches/2.2.4/mondo/src/common/libmondo-tools.c

@@ -184 +184 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <sys/utsname.h>
 
 /*@unused@*/
@@ -358 +359 @@
 
 
-char *get_architecture()
-{
+char *get_architecture(void) {
 #ifdef __IA32__
-    return ("i386");
+#   ifdef __X86_64__
+        return ("x86_64");
+#   else
+        return ("i386");
+#   endif
 #endif
 #ifdef __IA64__
@@ -370 +374 @@
 
 
-
-double get_kernel_version()
+char *get_uname_m(void) {
+
+    struct utsname utsn;
+    char *tmp = NULL;
+
+    uname(&utsn);
+    mr_asprintf(&tmp, utsn.machine);
+    return (tmp);
+}
+
+
+
+double get_kernel_version(void)
 {
     char *p, tmp[200];