Import Debian changes 0.4.1-3

hardinfo (0.4.1-3) unstable; urgency=low

  * Changed libz path (Closes: #391963)
  * added support to alpha arm ia64 m68k s390

4 files changed, 234 insertions, 2 deletions

diff --git a/arch/linux/alpha/processor.h b/arch/linux/alpha/processor.h
new file mode 100644
index 00000000..ef73c922
--- /dev/null
+++ b/arch/linux/alpha/processor.h
@@ -0,0 +1,82 @@
+/*
+ *    HardInfo - Displays System Information
+ *    Copyright (C) 2003-2006 Leandro A. F. Pereira <leandro@linuxmag.com.br>
+ *
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 2.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+static Processor *
+computer_get_processor(void)
+{
+    Processor *processor;
+    FILE *cpuinfo;
+    gchar buffer[128];
+
+    cpuinfo = fopen("/proc/cpuinfo", "r");
+    if (!cpuinfo)
+	return NULL;
+
+    processor = g_new0(Processor, 1);
+    while (fgets(buffer, 128, cpuinfo)) {
+	gchar **tmp = g_strsplit(buffer, ":", 2);
+
+	if (tmp[0] && tmp[1]) {
+	    tmp[0] = g_strstrip(tmp[0]);
+	    tmp[1] = g_strstrip(tmp[1]);
+
+	    get_str("cpu", processor->model);
+	    get_str("cpu model", processor->model_name);
+	    get_int("page size [bytes]", processor->page_size);
+	    get_int("cycle frequency [Hz]", processor->cycle_frequency);
+	    get_int("timer frequency [Hz]", processor->timer_frequency);
+	    get_float("BogoMIPS", processor->bogomips);
+	    get_float("platform string", processor->plataform);
+
+	}
+	g_strfreev(tmp);
+    }
+    
+    gchar *tmp = g_strconcat(processor->model, processor->model_name, NULL);
+    g_free(processor->model);
+    g_free(processor->model_name);
+    processor->model_name = tmp;
+
+    fclose(cpuinfo);
+
+    return processor;
+}
+
+static gchar *
+processor_get_info(Processor *processor)
+{
+	return g_strdup_printf("[Processor]\n"
+	                       "Page Size=%s\n"
+	                       "Plataform String=%s\n"
+	                       "Cycle Frequency=%.2fMHz\n"
+	                       "Timer Frequency=%.2fMHz\n"
+	                       "BogoMips=%.2f"
+	                       "Byte Order=%s\n",
+			       processor->model_name,
+			       processor->page_size,
+			       processor->plataform,
+			       processor->cycle_frequency,
+			       processor->timer_frequency,
+			       processor->bogomips,
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+                               "Little Endian"
+#else
+                               "Big Endian"
+#endif
+                              );
+}
diff --git a/arch/linux/ia64/processor.h b/arch/linux/ia64/processor.h
new file mode 100644
index 00000000..9cbc3377
--- /dev/null
+++ b/arch/linux/ia64/processor.h
@@ -0,0 +1,82 @@
+/*
+ *    HardInfo - Displays System Information
+ *    Copyright (C) 2003-2006 Leandro A. F. Pereira <leandro@linuxmag.com.br>
+ *
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 2.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+static Processor *
+computer_get_processor(void)
+{
+    Processor *processor;
+    FILE *cpuinfo;
+    gchar buffer[128];
+
+    cpuinfo = fopen("/proc/cpuinfo", "r");
+    if (!cpuinfo)
+	return NULL;
+
+    processor = g_new0(Processor, 1);
+    while (fgets(buffer, 128, cpuinfo)) {
+	gchar **tmp = g_strsplit(buffer, ":", 2);
+
+	if (tmp[0] && tmp[1]) {
+	    tmp[0] = g_strstrip(tmp[0]);
+	    tmp[1] = g_strstrip(tmp[1]);
+
+	    get_str("vendor", processor->vendor);
+	    get_str("arch", processor->arch);
+	    get_str("family", processor->family);
+	    get_str("features", processor->features);
+	    get_str("cpu MHz", processor->cpu_mhz);
+	    get_str("itc MHz", processor->itc_mhz);
+	    get_float("BogoMIPS", processor->bogomips);
+
+	}
+	g_strfreev(tmp);
+    }
+    
+    gchar *tmp = g_strconcat(processor->vendor, processor->arch, NULL);
+    g_free(processor->vendor);
+    g_free(processor->arch);
+    processor->model_name = tmp;
+
+    fclose(cpuinfo);
+
+    return processor;
+}
+
+static gchar *
+processor_get_info(Processor *processor)
+{
+	return g_strdup_printf("[Processor]\n"
+	                       "Family=%s\n"
+	                       "Features=%.2f\n"
+	                       "CPU Mhz=%.2fMHz\n"
+	                       "ITC MHz=%.2f"
+			       "BogoMips=%.2f"
+	                       "Byte Order=%s\n",
+			       processor->model_name,
+			       processor->family;
+			       processor->features,
+			       processor->cpu_mhz,
+			       processor->itc_mhz,
+			       processor->bogomips,
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+                               "Little Endian"
+#else
+                               "Big Endian"
+#endif
+                              );
+}
diff --git a/arch/linux/s390/processor.h b/arch/linux/s390/processor.h
new file mode 100644
index 00000000..604b3514
--- /dev/null
+++ b/arch/linux/s390/processor.h
@@ -0,0 +1,70 @@
+/*
+ *    HardInfo - Displays System Information
+ *    Copyright (C) 2003-2006 Leandro A. F. Pereira <leandro@linuxmag.com.br>
+ *
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 2.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+static Processor *
+computer_get_processor(void)
+{
+    Processor *processor;
+    FILE *cpuinfo;
+    gchar buffer[128];
+
+    cpuinfo = fopen("/proc/cpuinfo", "r");
+    if (!cpuinfo)
+	return NULL;
+
+    processor = g_new0(Processor, 1);
+    while (fgets(buffer, 128, cpuinfo)) {
+	gchar **tmp = g_strsplit(buffer, ":", 2);
+
+	if (tmp[0] && tmp[1]) {
+	    tmp[0] = g_strstrip(tmp[0]);
+	    tmp[1] = g_strstrip(tmp[1]);
+
+	    get_str("vendor_id", processor->vendor_id);
+	    get_float("# processors", processor->processors);
+	    get_int("bogomips per cpu", processor->bogomips);
+
+	}
+	g_strfreev(tmp);
+    }
+    
+    gchar *tmp = g_strconcat("S390 ", processor->vendor_id, NULL);
+    processor->model_name = tmp;
+
+    fclose(cpuinfo);
+
+    return processor;
+}
+
+static gchar *
+processor_get_info(Processor *processor)
+{
+	return g_strdup_printf("[Processor]\n"
+	                       "Processors=%d\n"
+	                       "BogoMips per CPU=%.2f"
+	                       "Byte Order=%s\n",
+			       processor->model_name,
+			       processor->processors,
+			       processor->bogomips,
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+                               "Little Endian"
+#else
+                               "Big Endian"
+#endif
+                              );
+}
diff --git a/arch/linux/sparc/processor.h b/arch/linux/sparc/processor.h
index 211ea56b..3aaff41d 100644
--- a/arch/linux/sparc/processor.h
+++ b/arch/linux/sparc/processor.h
@@ -41,8 +41,6 @@ computer_get_processor(void)
 	g_strfreev(tmp);
     }
 
-    get_processor_strfamily(processor);
-
     fclose(cpuinfo);
 
     return processor;