FlexMeter.c

@@ -5,17 +5,16 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "config.h"
-#include "FlexMeter.h"
-#include <time.h>
 #include <sys/time.h>
-#include <dirent.h>
-#include "CRT.h"
-#include "Object.h"
-
-#include <unistd.h>
 #include <sys/types.h>
+#include <unistd.h>
+#include <dirent.h>
+#include <time.h>
 #include <pwd.h>
+#include "FlexMeter.h"
+#include "Object.h"
+#include "config.h"
+#include "CRT.h"
 
 #define FLEX_CFG_FOLDER ".config/htop/FlexMeter"
 
@@ -42,14 +41,6 @@ int check_for_meters(void);
 
 static int parse_input(char * line)
 {
-   for (int i = strlen(line);i>0;i--)
-   {
-      if ((line[i]=='\r') || (line[i]=='\n'))
-      {
-         line[i]='\0';
-      }
-   }
-
    if (!strncmp(line,"name=",5))
    {
       meter_list[meters_count].uiName = xStrdup(line+5);
@@ -76,17 +67,24 @@ static int parse_input(char * line)
 
 static int load_config(char * file)
 {
-   int ret=0;
-   char buff[2048];
-   memset(buff,0,2048);
+   int ret = -1;
+   char *buff;
    FILE *fp = fopen( file , "r");
-   while( NULL != fgets(buff, 2048, fp) )
-   {
-      parse_input(buff);
-      memset(buff,0,2048);
+
+   if (fp != NULL) {
+      while(1)
+      {
+         buff = String_readLine(fp);
+         if (buff!=NULL)
+            parse_input(buff);
+         else
+            break;
+      }
+
+      fclose(fp);
+      ret = 0;
    }
 
-   fclose(fp);
    return ret;
 }
 
@@ -101,16 +99,17 @@ int check_for_meters(void)
    // path to home folder 1 for zero 1 for slash
    char * home = (char * ) xCalloc(1,(strlen(homedir) + strlen(FLEX_CFG_FOLDER) + 2));
 
-   sprintf(home,"%s/%s",homedir,FLEX_CFG_FOLDER);
+   xSnprintf(home,(strlen(homedir) + strlen(FLEX_CFG_FOLDER) + 2),"%s/%s",homedir,FLEX_CFG_FOLDER);
 
    d = opendir(home);
    if (d) {
       while ((dir = readdir(d)) != NULL) {
-         if ( dir->d_name[0]!='.' && strcmp(".",dir->d_name) && strcmp("..",dir->d_name))
+         if ( dir->d_name[0]!='.')
          {
+            // We are ignoring all files starting with . like ".Template" and "." ".." directories
             meter_list[meters_count].name = xStrdup(dir->d_name);
             memset(path,0,80);
-            sprintf(path,"%s/%s",home,dir->d_name);
+            xSnprintf(path,400,"%s/%s",home,dir->d_name);
             if( 0 != load_config(path) )
             {
                break;
@@ -130,27 +129,7 @@ int check_for_meters(void)
    }
    else
    {
-      if (0 == mkdir(home,0777))
-      {
-         char template [4][40] =
-         {
-            "name=template",
-            "command=echo \"`uptime`\"",
-            "type=TEXT_METERMODE",
-            "caption=\"UPTIME\""
-         };
-
-         char  template_filename[500];
-         sprintf(template_filename,"%s/%s",home,".Template");
-         FILE * fp = fopen(template_filename,"w");
-         if (fp != NULL )
-         {
-            for (int i=0; i<4; i++)
-            {
-               fprintf(fp,"%s\n",template[i]);
-            }
-         }
-      }
+      mkdir(home,0700);
    }
 
    free(home);

docs/FlexMeter/Template

@@ -0,0 +1,4 @@
+name=template
+command=echo "`uptime`"
+type=TEXT_METERMODE
+caption="UPTIME"