Handles symlinks properly.

Author: CubedProgrammer

README.md

@@ -1,16 +1,28 @@
 # Count Source Lines Of Code
 ## Counts lines of code of certain file types in a directory in Linux
-Simply compiling the C files directly will do. The older versions may work on windows.
+Simply compiling the C files directly will do.
+
+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.
+
+To install on Microsoft 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.
 ```
-gcc -O3 -c csloc.c get_sub_dir.c main.c
-gcc -static -o csloc csloc.o get_sub_dir.o main.o
+clang -O3 -c csloc.c get_sub_dir.c main.c
+clang -o csloc csloc.o get_sub_dir.o main.o
 ```
 This is a command line tool, it has no GUI of any sort.
 
 Run with no args to get a help screen.
 
 This repository can now be configured to be built into a shared library, include csloc.h in your code to use it.
 ```
-gcc -O3 -c csloc.c get_sub_dir.c -fPIC
-gcc -shared -o libcsloc csloc.o get_sub_dir.o
+clang -O3 -c csloc.c get_sub_dir.c -fPIC
+clang -shared -o libcsloc csloc.o get_sub_dir.o
 ```

csloc.c

@@ -184,7 +184,7 @@ long
 csloc(const char *dir, csloc_filenp *dat, size_t *sz, unsigned ops, size_t cr, const char *const*fexts, size_t fel)
 {
 	// prepare to get the files and subdirectories
-	char subdir[3000];
+	char subdir[3000], lnpath[3000];
 	size_t len=strlen(dir), cnt=0;//csloc____cnt_sub_dirs(dir);
 	strcpy(subdir, dir);
 #ifdef _WIN32
@@ -258,6 +258,7 @@ csloc(const char *dir, csloc_filenp *dat, size_t *sz, unsigned ops, size_t cr, c
 			strcpy(subdir + len + 1, names[i]);
 
 			// get rid of hidden files if enabled
+			redirect:
 			if(CSLOC_ISIGNDOT(ops) && names[i][0] == '.')
 				continue;
 
@@ -313,26 +314,45 @@ csloc(const char *dir, csloc_filenp *dat, size_t *sz, unsigned ops, size_t cr, c
 				}
 				continue;
 			}
+			else if(DIRECTORY==tps[i])
+			{
+				// get rid of parent and self
+				if(strcmp(".", names[i]) == 0 || strcmp("..", names[i]) == 0)
+					continue;
 
-			// get rid of parent and self
-			if(strcmp(".", names[i]) == 0 || strcmp("..", names[i]) == 0)
-				continue;
+				if(fcnt==rm)
+				{
+					stack=realloc(stack, (rm+olr)*sizeof(char*));
+					csloc_check_pointer(stack);
+					fcnt=olr;
+					olr=rm;
+					rm+=fcnt;
+					fcnt=olr;
+				}
 
-			if(fcnt==rm)
+				stack[fcnt]=malloc(strlen(subdir) + 2);
+				csloc_check_pointer(stack[fcnt]);
+				strcpy(stack[fcnt], subdir);
+				fcnt++;
+				free(names[i]);
+			}
+			else if(CSLOCSYMLINK==tps[i])
 			{
-				stack=realloc(stack, (rm+olr)*sizeof(char*));
-				csloc_check_pointer(stack);
-				fcnt=olr;
-				olr=rm;
-				rm+=fcnt;
-				fcnt=olr;
+				realpath(subdir, lnpath);
+				strcpy(subdir, lnpath);
+				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);
 			}
-
-			stack[fcnt]=malloc(len + strlen(names[i]) + 2);
-			csloc_check_pointer(stack[fcnt]);
-			strcpy(stack[fcnt], subdir);
-			fcnt++;
-			free(names[i]);
 		}
 
 		free(names);

get_sub_dir.c

@@ -100,8 +100,22 @@ void csloc____get_sub_dirs(const char *dir,char *names[],enum cfs____file_or_dir
 		if(de->d_type == DT_DIR)
 #endif
 			fd[cnt]=DIRECTORY;
-		else
+		else if
+#ifdef _WIN32
+		(wff.dwFileAttributes & FILE_ATTRIBUTE_NORMAL)
+#else
+		(de->d_type == DT_REG)
+#endif
 			fd[cnt]=NFILE;
+		else if
+#ifdef _WIN32
+		(wff.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)
+#else
+		(de->d_type == DT_LNK)
+#endif
+			fd[cnt]=CSLOCSYMLINK;
+		else
+			fd[cnt]=CSLOCOTHER;
 		++cnt;
 #ifndef _WIN32
 		de = readdir(dr);

get_sub_dir.h

@@ -11,7 +11,7 @@
 #define GET_SUB_DIR_H_
 #define csloc_check_pointer(ptr)if(ptr == NULL)fprintf(stderr, "%s is NULL at %s, line %i\n", #ptr, __FILE__, __LINE__)
 enum cfs____file_or_directory
-{NFILE = 997, DIRECTORY};
+{NFILE = 997, DIRECTORY, CSLOCSYMLINK, CSLOCOTHER};
 int csloc____cnt_sub_dirs(const char *dir);
 void csloc____get_sub_dirs(const char *dir,char *names[],enum cfs____file_or_directory *fd);
 #endif