-r and -t no longer need -s.

Author: CubedProgrammer

csloc.c

@@ -42,7 +42,7 @@ long
 cnt_single_file(const char *file, size_t cr)
 {
 	FILE *f = fopen(file, "r");
-	int cnt = 0;
+	long cnt = 0;
 
 	if(f == NULL)
 	{
@@ -51,7 +51,7 @@ cnt_single_file(const char *file, size_t cr)
 		goto fini;
 	}
 
-	char curr;
+	int curr;
 	int ne = 0;
 	cr += cr == 0;
 

csloc.h

@@ -18,9 +18,9 @@
 #define CSLOC_QUIET 1
 #define CSLOC_IGNDOT 2
 #define CSLOC_SIF 4
-#define CSLOC_SORT 010
+#define CSLOC_SORT 014
 #define CSLOC_FSIZE 020
-#define CSLOC_RSORT 050
+#define CSLOC_RSORT 054
 struct csloc_file_entry
 {
 	size_t val;

main.c

@@ -17,7 +17,7 @@
 #endif
 #include"csloc.h"
 #define VERSION_MINOR "8"
-#define VERSION_PATCH "1"
+#define VERSION_PATCH "2"
 int main(int argl,char*argv[])
 {
 	if(argl==1)
@@ -33,6 +33,7 @@ int main(int argl,char*argv[])
 		puts("-f to count file size instead.");
 		puts("-t to sort the files by number of lines.");
 		puts("-s to show the sloc of individual files.");
+		puts("The options -r and -t automatically enable -s, -rs and -st are now redundant.");
 		puts("-h to not count files beginning with a ., such files are considered hidden on linux.");
 		puts("-cNUM specifies that NUM non-whitespace characters are required to count as a valid line.");
 		puts("-q to not output complete sentences.");