Sat, 15 Oct 2011 14:52:12 +0200
Increased warning level, fixed resulting warnings, changed std form c99 to gnu99
/* * functions.c * * Created on: 23.05.2011 * Author: beckermi */ #include "scanner.h" #include "suffix_fnc.h" int scanDirectory(DIR *dir, const int spaces, char* currdir, settings_t* settings) { DIR *subdir; struct dirent *entry; int lines, a; int lineSum = 0; while ((entry = readdir(dir)) != NULL) { if (strcmp(entry->d_name, ".") != 0 && strcmp(entry->d_name, "..") != 0) { // Print occurence char entryname[strlen(entry->d_name)+spaces]; for (int t = 0 ; t < spaces ; t++) { entryname[t]=' '; } entryname[spaces] = 0; strcat(entryname, entry->d_name); char filename[(1+strlen(currdir)+strlen(entry->d_name))]; strcpy(filename, currdir); strncat(filename, &settings->fileSeparator, 1); strcat(filename, entry->d_name); // Check for subdirectory if ((subdir = opendir(filename)) != NULL) { printf("%-60s\n", entryname); if (settings->recursive) { lineSum += scanDirectory(subdir, spaces+1, filename, settings); } closedir(subdir); continue; } // Count lines lines = 0; if (testSuffix(filename, settings)) { FILE *file = fopen(filename, "r"); if (file == NULL) { perror(" File acces failed"); continue; } do { a = fgetc(file); if (a == 10) { lines++; } } while (a != EOF); fclose(file); // Print line count #ifdef _WIN32 printf("%-60s%13d lines\n", entryname, lines); #else printf("%-60s%14d lines\n", entryname, lines); #endif /* _WIN32 */ lineSum += lines; } else { if (!settings->matchesOnly) { // Print hint #ifdef _WIN32 printf("%-60s%19s\n", entryname, "no match"); #else printf("%-60s%20s\n", entryname, "no match"); #endif /* _WIN32 */ } } } } return lineSum; }