kfc.c: cleanup

Author: mcpcpc

kfc.c

@@ -1,3 +1,4 @@
+#define _POSIX_C_SOURCE 200809L
 #include <dirent.h>
 #include <getopt.h>
 #include <stdio.h>
@@ -8,7 +9,6 @@
 #include <unistd.h>
 #include "kfc.h"
 
-
 int
 find_palettes(void)
 {
@@ -88,7 +88,7 @@ list_palette(void)
 
 	if (p.dr == NULL)
 	{
-		printf("Could not open directory");
+		fprintf(stderr, "Could not open directory\n");
 		return 1;
 	}
 
@@ -109,7 +109,7 @@ random_palette(void)
 	p.randf = 0;
 	if (p.dr == NULL)
 	{
-		printf("Could not open directory");
+		fprintf(stderr, "Could not open directory\n");
 		return 1;
 	}
 
@@ -174,12 +174,12 @@ main(int argc, char **argv)
         exit(2);
     }
 	strcat(p.CONF, "/kfc");
-	sprintf(p.CCUR, "%s/current", p.CONF);
-	sprintf(p.CSEQ, "%s/sequence", p.CONF);
+	snprintf(p.CCUR, sizeof(p.CCUR), "%s/current", p.CONF);
+	snprintf(p.CSEQ, sizeof(p.CSEQ), "%s/sequence", p.CONF);
 
 	if ( mkdir(p.CONF,0777) == 0 )
 	{
-		printf("Created 'kfc' directory in XDG_CONFIG_HOME.");
+		puts("Created 'kfc' directory in XDG_CONFIG_HOME.");
 	}
 
     if (find_palettes() == 1)
@@ -193,12 +193,12 @@ main(int argc, char **argv)
         switch (p.cval)
         {
             case 'r':
-				sprintf(p.SEL, "%s/%s", p.SEQ, p.MODE);
+				snprintf(p.SEL, sizeof(p.SEL), "%s/%s", p.SEQ, p.MODE);
                 random_palette();
 				select_palette();
 				break;
             case 'l':
-				sprintf(p.SEL, "%s/%s", p.SEQ, p.MODE);
+				snprintf(p.SEL, sizeof(p.SEL), "%s/%s", p.SEQ, p.MODE);
 				list_palette();
                 break;
             case 'L':
@@ -211,7 +211,7 @@ main(int argc, char **argv)
                 p.errf++;
                 break;
             case 's':
-				sprintf(p.SEL, "%s/%s/%s", p.SEQ, p.MODE, optarg);
+				snprintf(p.SEL, sizeof(p.SEL), "%s/%s/%s", p.SEQ, p.MODE, optarg);
 				select_palette();
                 break;
             case 'p':

kfc.h

@@ -10,10 +10,10 @@ struct
 	size_t len;
 	char *MODE; // "light" or "dark"
     char *CONF; // configuration path
+    char SEQ[225];
     char CCUR[255]; // configuration path, current file
     char CSEQ[255]; // configuration path, sequence file
-    char SEL[1024]; // selected palette
-    char SEQ[1024];
-    char PRI[1024];
-	char CLI[1024];
+    char SEL[1025]; // selected palette
+    char PRI[1025];
+	char CLI[1025];
 } p;