Changeset 2768

Timestamp:

11/21/04 22:36:10 (9 years ago)

Author:

khali

Message:

Simplify the configuration file opening code.

Files:

• lm-sensors/trunk/prog/sensors/main.c (modified) (6 diffs)

lm-sensors/trunk/prog/sensors/main.c

@@ -36 +36 @@
 #define DEFAULT_CONFIG_FILE_NAME "sensors.conf"
 
-static char *config_file_name = NULL;
 FILE *config_file;
 extern const char *libsensors_version;
@@ -44 +43 @@
 static void print_long_help(void);
 static void print_version(void);
-static void open_config_file(void);
-static int open_this_config_file(char *filename);
 static void do_a_print(sensors_chip_name name);
 static int do_a_set(sensors_chip_name name);
@@ -95 +92 @@
 /* This examines global var config_file, and leaves the name there too. 
    It also opens config_file. */
-void open_config_file(void)
-{
-#define MAX_FILENAME_LEN 1024
-  char *filename;
-  char buffer[MAX_FILENAME_LEN];
-  int res;
-
-  if (config_file_name && !strcmp(config_file_name,"-")) {
+void open_config_file(const char* config_file_name)
+{
+  if (!strcmp(config_file_name,"-")) {
     config_file = stdin;
     return;
-  } else if (config_file_name && index(config_file_name,'/')) {
-    if ((res = open_this_config_file(config_file_name))) {
-      fprintf(stderr,"Could not locate or open config file\n");
-      fprintf(stderr,"%s: %s\n",config_file_name,strerror(-res));
-      exit(1);
-    }
-  }
-  else {
-    if (config_file_name)
-      filename = config_file_name;
-    else
-      filename = DEFAULT_CONFIG_FILE_NAME;
-    if ((snprintf(buffer,MAX_FILENAME_LEN,
-                  "%s/%s", ETCDIR, filename)) < 1) {
-      fprintf(stderr,
-              "open_config_file: ridiculous long config file name!\n");
-      exit(1);
-    }
-    if (!open_this_config_file(buffer)) {
-      free(config_file_name);
-      config_file_name = strdup(buffer);
-      return;
-    }
-    fprintf(stderr,"Could not locate or open config file!\n");
+  }
+
+  config_file = fopen(config_file_name, "r");
+  if (!config_file) {
+    fprintf(stderr, "Could not open config file\n");
+    perror(config_file_name);
     exit(1);
   }
 }
     
-int open_this_config_file(char *filename)
-{
-  config_file = fopen(filename,"r");
-  if (! config_file)
-    return -errno;
-  return 0;
-}
-
-void close_config_file(void)
-{
-  if (fclose(config_file)) {
+void close_config_file(const char* config_file_name)
+{
+  if (fclose(config_file) == EOF) {
     fprintf(stderr,"Could not close config file\n");
-    fprintf(stderr,"%s: %s\n",config_file_name,strerror(errno));
-  }
-  
-  free(config_file_name);
+    perror(config_file_name);
+  }
 }
 
@@ -179 +143 @@
 {
   int c,res,i,error;
+  char *config_file_name = NULL;
 
   struct option long_opts[] =  {
@@ -259 +224 @@
 
 
-  open_config_file();
+  if (config_file_name == NULL)
+    config_file_name = strdup(ETCDIR "/" DEFAULT_CONFIG_FILE_NAME);
+  open_config_file(config_file_name);
 
   if ((res = sensors_init(config_file))) {
@@ -272 +239 @@
   }
 
-  close_config_file();
+  close_config_file(config_file_name);
+  free(config_file_name);
 
   /* build the degrees string */