X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fhdd_atasmart.c;h=b34564e8ff23527258062afe795cdca55c32a4a1;hb=d2fde10e73ef93a8084a4cc69fea35819ee19f74;hp=c15f06e177bc7d77e15e275b3f2bf7d939bf05d1;hpb=846861051028b3e5f09c51eed7eb729cc01b6387;p=psensor.git

diff --git a/src/lib/hdd_atasmart.c b/src/lib/hdd_atasmart.c
index c15f06e..b34564e 100644
--- a/src/lib/hdd_atasmart.c
+++ b/src/lib/hdd_atasmart.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2012 jeanfi@gmail.com
+ * Copyright (C) 2010-2014 jeanfi@gmail.com
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
+#define _LARGEFILE_SOURCE 1
+#include "config.h"
+
 #include <locale.h>
 #include <libintl.h>
 #define _(str) gettext(str)
@@ -24,14 +27,17 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>
 
-
 #include <atasmart.h>
+#include <linux/fs.h>
 
-#include "pio.h"
-#include "hdd.h"
-#include "log.h"
+#include <pio.h>
+#include <hdd.h>
+#include <plog.h>
 
 static int filter_sd(const char *p)
 {
@@ -42,9 +48,14 @@ static struct psensor *
 create_sensor(char *id, char *name, SkDisk *disk, int values_max_length)
 {
 	struct psensor *s;
+	int t;
+
+	t = SENSOR_TYPE_ATASMART | SENSOR_TYPE_HDD | SENSOR_TYPE_TEMP;
+
 	s = psensor_create(id,
 			   strdup(name),
-			   SENSOR_TYPE_HDD_TEMP_ATASMART,
+			   strdup(_("Disk")),
+			   t,
 			   values_max_length);
 
 	s->disk = disk;
@@ -52,20 +63,58 @@ create_sensor(char *id, char *name, SkDisk *disk, int values_max_length)
 	return s;
 }
 
+/*
+ * Performs the same tests than sk_disk_open and outputs the result.
+ */
 static void analyze_disk(const char *dname)
 {
 	int f;
+	struct stat st;
+	uint64_t size;
 
-	log_debug("Analyze error for disk: %s", dname);
+	log_debug("analyze_disk(hdd_atasmart): %s", dname);
 
 	f = open(dname, O_RDONLY|O_NOCTTY|O_NONBLOCK|O_CLOEXEC);
 
-	if (f != -1)
-		close(f);
-	else
-		log_debug("Could not open file %s: %s", dname, strerror(errno));
-}
+	if (f < 0) {
+		log_debug("analyze_disk(hdd_atasmart): Could not open file %s: %s",
+			  dname,
+			  strerror(errno));
+		goto fail;
+	}
 
+	if (fstat(f, &st) < 0) {
+		log_debug("analyze_disk(hdd_atasmart): fstat fails %s: %s",
+			  dname,
+			  strerror(errno));
+		goto fail;
+	}
+
+	if (!S_ISBLK(st.st_mode)) {
+		log_debug("analyze_disk(hdd_atasmart): !S_ISBLK fails %s",
+			  dname);
+		goto fail;
+	}
+
+	size = (uint64_t)-1;
+	/* So, it's a block device. Let's make sure the ioctls work */
+	if (ioctl(f, BLKGETSIZE64, &size) < 0) {
+		log_debug("analyze_disk(hdd_atasmart): ioctl fails %s: %s",
+			  dname,
+			  strerror(errno));
+		goto fail;
+	}
+
+	if (size <= 0 || size == (uint64_t) -1) {
+		log_debug("analyze_disk(hdd_atasmart): ioctl wrong size %s: %ld",
+			  dname,
+			  size);
+		goto fail;
+	}
+
+ fail:
+	close(f);
+}
 
 struct psensor **hdd_psensor_list_add(struct psensor **sensors,
 				      int values_max_length)
@@ -74,18 +123,18 @@ struct psensor **hdd_psensor_list_add(struct psensor **sensors,
 	SkDisk *disk;
 	struct psensor *sensor, **tmp_sensors, **result;
 
-	log_debug("hdd_psensor_list_add");
+	log_debug("hdd_psensor_list_add(hdd_atasmart)");
 
 	paths = dir_list("/dev", filter_sd);
 
 	result = sensors;
 	tmp = paths;
 	while (*tmp) {
-		log_debug("hdd_psensor_list_add open %s", *tmp);
+		log_debug("hdd_psensor_list_add(hdd_atasmart) open %s", *tmp);
 
 		if (!sk_disk_open(*tmp, &disk)) {
-			id = malloc(strlen("hdd at") + strlen(*tmp) + 1);
-			strcpy(id, "hdd at");
+			id = malloc(strlen("atasmart ") + strlen(*tmp) + 1);
+			strcpy(id, "atasmart ");
 			strcat(id, *tmp);
 
 			sensor = create_sensor(id,
@@ -100,7 +149,8 @@ struct psensor **hdd_psensor_list_add(struct psensor **sensors,
 
 			result = tmp_sensors;
 		} else {
-			log_err("sk_disk_open %s failure", *tmp);
+			log_err(_("atasmart: sk_disk_open() failure: %s."),
+				*tmp);
 			analyze_disk(*tmp);
 		}
 
@@ -122,7 +172,8 @@ void hdd_psensor_list_update(struct psensor **sensors)
 	cur = sensors;
 	while (*cur) {
 		s = *cur;
-		if (s->type == SENSOR_TYPE_HDD_TEMP_ATASMART) {
+		if (!(s->type & SENSOR_TYPE_REMOTE)
+		    && s->type & SENSOR_TYPE_ATASMART) {
 			ret = sk_disk_smart_read_data(s->disk);
 
 			if (!ret) {
@@ -132,7 +183,7 @@ void hdd_psensor_list_update(struct psensor **sensors)
 				if (!ret) {
 					c = (kelvin - 273150) / 1000;
 					psensor_set_current_value(s, c);
-					log_debug("hdd atasmart: %s %.2f",
+					log_debug("hdd_psensor_list_update(hdd_atasmart): %s %.2f",
 						  s->id,
 						  c);
 				}