Symbolic links are not counted twice.

Author: CubedProgrammer

README.md

@@ -6,13 +6,19 @@ Theoretically, version 1.8.2 and older work on windows.
 
 To install, simply copy the executable file to /usr/bin or /usr/local/bin on BSD, Linux, or OS X.
 
-On Microsoft Windows, there is no folder for storing executables, unless you count System32.
+On Windows, there is no predefined folder for storing executables, unless you count System32 and related.
 
-To install on Microsoft Windows, copy the executable file to a folder in the PATH enviornment variable.
+To install on Windows, copy the executable file to a folder in the PATH enviornment variable.
 
 You may need to modify the PATH variable in the settings and create a new directory if there is no suitable directory.
 
 You may put the executable in a system directory such as System32, and that may work, but is inadvisable.
+
+Having symbolic links may cause an infinite loop.
+
+If original directory to count is ~/u, and ~/u/v is a symbolic link to ~/v, and ~/v/x/y is a symbolic link to ~/v, there will be a loop.
+
+However, if all symbolic links to the files in the same directory, then there will be no infinite loop, and no file is counted twice.
 ```
 clang -O3 -c csloc.c get_sub_dir.c main.c
 clang -o csloc csloc.o get_sub_dir.o main.o

csloc.c

@@ -34,6 +34,22 @@ static inline int has_file_extension(const char *fname, const char *ext)
 		return status;
 	}
 }
+int csloc____ispref(const char *pref, const char *str)
+{
+	int p = 1;
+	for(; *pref != '\0'; ++pref, ++str)
+	{
+		if(*str == '\0')
+		{
+			p = 0;
+			pref = str - 1;
+		}
+		else if(*pref != *str)
+			p = 0;
+
+	}
+	return p;
+}
 #ifdef _WIN32
 long long
 #else
@@ -185,6 +201,7 @@ csloc(const char *dir, csloc_filenp *dat, size_t *sz, unsigned ops, size_t cr, c
 {
 	// prepare to get the files and subdirectories
 	char subdir[3000], lnpath[3000];
+	char *apath=NULL;
 	size_t len=strlen(dir), cnt=0;//csloc____cnt_sub_dirs(dir);
 	strcpy(subdir, dir);
 #ifdef _WIN32
@@ -238,12 +255,6 @@ csloc(const char *dir, csloc_filenp *dat, size_t *sz, unsigned ops, size_t cr, c
 		len=strlen(currf), cnt=csloc____cnt_sub_dirs(currf);
 		if(cnt <= 2)
 			continue;
-		strcpy(subdir, currf);
-#ifdef _WIN32
-		subdir[len]='\\';
-#else
-		subdir[len]='/';
-#endif
 
 		// get subdirectories and files
 		names=malloc(sizeof(char*)*cnt);
@@ -255,12 +266,21 @@ csloc(const char *dir, csloc_filenp *dat, size_t *sz, unsigned ops, size_t cr, c
 		// put all subdirectories in
 		for(size_t i = 0; i < cnt; ++i)
 		{
+			strcpy(subdir, currf);
+#ifdef _WIN32
+			subdir[len]='\\';
+#else
+			subdir[len]='/';
+#endif
 			strcpy(subdir + len + 1, names[i]);
 
 			// get rid of hidden files if enabled
 			redirect:
 			if(CSLOC_ISIGNDOT(ops) && names[i][0] == '.')
+			{
+				free(names[i]);
 				continue;
+			}
 
 			if(NFILE==tps[i])
 			{
@@ -312,54 +332,71 @@ csloc(const char *dir, csloc_filenp *dat, size_t *sz, unsigned ops, size_t cr, c
 					}
 					sloc += sfl;
 				}
-				continue;
 			}
 			else if(DIRECTORY==tps[i])
 			{
 				// get rid of parent and self
-				if(strcmp(".", names[i]) == 0 || strcmp("..", names[i]) == 0)
-					continue;
-
-				if(fcnt==rm)
+				if(strcmp(".", names[i]) != 0 && strcmp("..", names[i]) != 0)
 				{
-					stack=realloc(stack, (rm+olr)*sizeof(char*));
-					csloc_check_pointer(stack);
-					fcnt=olr;
-					olr=rm;
-					rm+=fcnt;
-					fcnt=olr;
-				}
+					realpath(subdir, lnpath);
+					if(apath==NULL)
+						apath=realpath(dir,apath);
 
-				stack[fcnt]=malloc(strlen(subdir) + 2);
-				csloc_check_pointer(stack[fcnt]);
-				strcpy(stack[fcnt], subdir);
-				fcnt++;
-				free(names[i]);
+					if(strcmp(apath, lnpath) != 0)
+					{
+						if(fcnt==rm)
+						{
+							stack=realloc(stack, (rm+olr)*sizeof(char*));
+							csloc_check_pointer(stack);
+							fcnt=olr;
+							olr=rm;
+							rm+=fcnt;
+							fcnt=olr;
+						}
+
+						stack[fcnt]=malloc(strlen(subdir) + 2);
+						csloc_check_pointer(stack[fcnt]);
+						strcpy(stack[fcnt], subdir);
+						fcnt++;
+					}
+				}
 			}
 			else if(CSLOCSYMLINK==tps[i])
 			{
 				realpath(subdir, lnpath);
-				strcpy(subdir, lnpath);
-				if(stat(subdir, &fdat) == 0)
+				if(apath==NULL)
+					apath=realpath(dir,apath);
+				if(!csloc____ispref(apath, lnpath))
 				{
-					if(S_ISDIR(fdat.st_mode))
-						tps[i]=DIRECTORY;
-					else if(S_ISREG(fdat.st_mode))
-						tps[i]=NFILE;
-					else
-						tps[i]=CSLOCOTHER;
-					goto redirect;
+					strcpy(subdir, lnpath);
+					realpath(currf, lnpath);
+					if(!csloc____ispref(lnpath, subdir))
+					{
+						if(stat(subdir, &fdat)==0)
+						{
+							if(S_ISDIR(fdat.st_mode))
+								tps[i]=DIRECTORY;
+							else if(S_ISREG(fdat.st_mode))
+								tps[i]=NFILE;
+							else
+								tps[i]=CSLOCOTHER;
+							goto redirect;
+						}
+						else
+							fprintf(stderr, "Could not stat %s.\n", subdir);
+					}
 				}
-				else
-					fprintf(stderr, "Could not stat %s.\n", subdir);
 			}
+			free(names[i]);
 		}
 
 		free(names);
 		free(tps);
 		free(currf);
 	}
 	free(stack);
+	if(apath)
+		free(apath);
 	if(CSLOC_ISSIF(ops))
 	{
 		csloc_sort_filen(CSLOC_ISSORT(ops), d, datsz);

csloc.h

@@ -28,6 +28,7 @@ struct csloc_file_entry
 };
 typedef struct csloc_file_entry csloc_filen;
 typedef struct csloc_file_entry *csloc_filenp;
+int csloc____ispref(const char *pref, const char *str);
 int csloc____case_insensitive_strcmp(const char *xstr, const char *ystr);
 void csloc_sort_filen(int val, csloc_filenp arr, size_t sz);
 #ifdef _WIN32

main.c

@@ -17,7 +17,7 @@
 #endif
 #include"csloc.h"
 #define VERSION_MINOR "8"
-#define VERSION_PATCH "2"
+#define VERSION_PATCH "3"
 int main(int argl,char*argv[])
 {
 	if(argl==1)
@@ -31,7 +31,7 @@ int main(int argl,char*argv[])
 		puts("-n to list the number before the path in -qs mode.");
 		puts("-r to sort least to greatest.");
 		puts("-f to count file size instead.");
-		puts("-t to sort the files by number of lines.");
+		puts("-t to sort the files by number of lines or size.");
 		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.");