X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=9d89c0106a3ed1e7afeb7d5cd23ad6d356ed1a98;hb=23234e3cf7be4d07c11b911d4ee9a86a99ef4e3e;hp=e2162e7f50b9313ccad3bc1e0ef074e5c08af9c7;hpb=9c7531a69c5b3ed3225559f5e699b26d240b97a9;p=psensor.git

diff --git a/src/main.c b/src/main.c
index e2162e7..9d89c01 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 jeanfi@gmail.com
+ * Copyright (C) 2010-2012 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
@@ -80,7 +80,7 @@ static void print_version()
 		 "This is free software: you are free to change and "
 		 " redistribute it.\n"
 		 "There is NO WARRANTY, to the extent permitted by law.\n"),
-	       "2010-2011");
+	       "2010-2012");
 }
 
 static void print_help()
@@ -99,7 +99,9 @@ static void print_help()
 
 	puts(_("  -u, --url=URL       "
 	       "the URL of the psensor-server, example: http://hostname:3131"));
-
+	puts(_("  --use-libatasmart   "
+	       "use atasmart library for disk monitoring "
+	       "instead of hddtemp daemon"));
 	puts("");
 
 	puts(_("  -d, --debug=LEVEL   "
@@ -347,6 +349,7 @@ static void log_init()
 }
 
 static struct option long_options[] = {
+	{"use-libatasmart", no_argument, 0, 0},
 	{"version", no_argument, 0, 'v'},
 	{"help", no_argument, 0, 'h'},
 	{"url", required_argument, 0, 'u'},
@@ -394,7 +397,7 @@ int main(int argc, char **argv)
 	struct ui_psensor ui;
 	GError *error;
 	GThread *thread;
-	int optc, cmdok;
+	int optc, cmdok, opti, use_libatasmart;
 	char *url = NULL;
 
 	program_name = argv[0];
@@ -406,10 +409,16 @@ int main(int argc, char **argv)
 	textdomain(PACKAGE);
 #endif
 
+	use_libatasmart = 0;
+
 	cmdok = 1;
 	while ((optc = getopt_long(argc, argv, "vhd:u:", long_options,
-				   NULL)) != -1) {
+				   &opti)) != -1) {
 		switch (optc) {
+		case 0:
+			if (!strcmp(long_options[opti].name, "use-libatasmart"))
+				use_libatasmart = 1;
+			break;
 		case 'u':
 			if (optarg)
 				url = strdup(optarg);
@@ -441,9 +450,8 @@ int main(int argc, char **argv)
 	log_glib_info();
 #if !(GLIB_CHECK_VERSION(2, 31, 0))
 	/*
-	 * Since GLib 2.32 g_thread_init call is deprecated and not
-	 * needed. Documentation of this method is not clear whether
-	 * it is also useless with 2.3.31.
+	 * Since GLib 2.31 g_thread_init call is deprecated and not
+	 * needed.
 	 */
 	log_debug("Calling g_thread_init(NULL)");
 	g_thread_init(NULL);
@@ -471,7 +479,7 @@ int main(int argc, char **argv)
 		exit(EXIT_FAILURE);
 #endif
 	} else {
-		ui.sensors = get_all_sensors(600);
+		ui.sensors = get_all_sensors(use_libatasmart, 600);
 #ifdef HAVE_NVIDIA
 		ui.sensors = nvidia_psensor_list_add(ui.sensors, 600);
 #endif