Wildcard auditing

grep.c

@@ -187,10 +187,38 @@ int countlineswith(const char* str, const char* fname)
 	}
 
 	// Search through file
-	// getline reads a string from the specified file up to either a newline character or EOF
+	// getline reads a string from the specified file up to either a
+	// newline character or EOF
 	while(getline(&buffer, &size, fp) != -1)
-		if((strstr(buffer, str)) != NULL)
+	{
+		// Strip potential newline character at the end of line we just read
+		if(buffer[strlen(buffer)-1] == '\n')
+			buffer[strlen(buffer)-1] = '\0';
+
+		// Search for exact match
+		if(strcmp(buffer, str) == 0)
+		{
 			found++;
+			continue;
+		}
+
+		// If line starts with *, search for partial match of
+		// needle "buffer+1" in haystack "str"
+		if(buffer[0] == '*')
+		{
+			char * buf = strstr(str, buffer+1);
+			// The  strstr() function finds the first occurrence of
+			// the substring buffer+1 in the string str.
+			// These functions return a pointer to the beginning of
+			// the located substring, or NULL if the substring is not
+			// found. Hence, we compare the length of the substring to
+			// the wildcard entry to rule out the possiblity that
+			// there is anything behind the wildcard. This avoids that given
+			// "*example.com" "example.com.xxxxx" would also match.
+			if(buf != NULL && strlen(buf) == strlen(buffer+1))
+				found++;
+		}
+	}
 
 	// Free allocated memory
 	if(buffer != NULL)