-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Attached a patch that might fix the problem (e.g. fixes it for me, but
I'm not sure if it doesn't add some other problems).

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iQIcBAEBCAAGBQJLH5PzAAoJENiBt8pXhJzG3SYQAKRK0yGCvmkpskCrnl2u9ueY
9QzuEEoKaQyNuzU86G6ZKDzQQMTUn7kkAwaRn0Gf3rsrC/Fa1Wo/va7HVGcRJGh9
Ax4pXuKd2ySukExcWYwi/6sAFP1a3mH0ohQGVjwTbEC9oe79DNWg5nkyI8YfYRmf
1nI0ee2QjleuqZ0bPg9zCj9vaOeIAWM6n61D5BD/j7XBXRVWS/gZmzNV0D1fQMO8
7rlokA8iLGC65bN6ZMaMefjPrgeF8lS8WFhjMjcWBKcoYSbAo43pMzluETEVJrnP
wsyVzKG5kSIQqj37gITgwosQxy78dprQyMM3m54UfkBkiPbdw2tHPI65VGECjSlD
OzY7DKJBa7S9JM+1EN1uc6q+wUnj1yxidlr2++aC+PvoCxdURKsvKQCZIs49LvSv
55XVNbBfLN46GrKoQ+c9cll9qvE1G/gnrr9IhmZSz54T2+cmwmxbx85S1XTkN9UR
J4NFoLwKRo8Y3f5UCic/AdYxx9hQijg7FcRhs6W2xisGxqjlGT7zdQvHig7J9zgM
z7o+7qf+lh1B/P1CWxQ/vddibwtcWEsNF5KbvVyNUbK+enm6k4GKITruXlK1MGPS
ZbkLFVbrEPEHSpBpC6fyo5e/KQ7oTVm3LlPKyGJyhfc0EHsIcmH6pidD4/4r0ikt
PeOxgz3p6wg3CnGQ4V9o
=vNP6
-----END PGP SIGNATURE-----
diff -rup conky-1.7.1.1-orig/src/linux.c conky-1.7.1.1/src/linux.c
--- conky-1.7.1.1-orig/src/linux.c	2009-06-10 21:44:37.000000000 +0500
+++ conky-1.7.1.1/src/linux.c	2009-12-09 16:04:46.290395631 +0400
@@ -866,13 +866,6 @@ int open_sysfs_sensor(const char *dir, c
 		}
 	}
 
-	/* At least the acpitz hwmon doesn't have a 'device' subdir,
-	 * so check it's existence and strip it from buf otherwise. */
-	snprintf(path, 255, "%s%s", dir, dev);
-	if (stat(path, &st)) {
-		buf[strlen(buf) - 7] = 0;
-	}
-
 	/* change vol to in, tempf to temp */
 	if (strcmp(type, "vol") == 0) {
 		type = "in";
@@ -883,6 +876,15 @@ int open_sysfs_sensor(const char *dir, c
 	snprintf(path, 255, "%s%s/%s%d_input", dir, dev, type, n);
 	strncpy(devtype, path, 255);
 
+	/* At least the acpitz hwmon doesn't have a 'device' subdir, so
+	 * check target file existence and strip 'device' from buf
+	 * otherwise. */
+	if (stat(path, &st)) {
+		buf[strlen(buf) - 7] = 0;
+		snprintf(path, 255, "%s%s/%s%d_input", dir, dev, type, n);
+		strncpy(devtype, path, 255);
+	}
+
 	/* open file */
 	fd = open(path, O_RDONLY);
 	if (fd < 0) {

Reply via email to