Thu, 26 May 2011 14:39:52 +0200
Moved some functions to functions.c
Replaced static variables by settings_t type
|
3
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
1 | #include "cline.h" |
|
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
2 | #include "functions.h" |
| 0 | 3 | |
|
3
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
4 | settings_t* new_settings_t() { |
|
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
5 | settings_t *settings = malloc(sizeof(settings_t*)); |
|
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
6 | #ifdef _WIN32 |
|
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
7 | settings->fileSeparator = '\\'; |
|
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
8 | #else |
|
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
9 | settings->fileSeparator = '/'; |
|
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
10 | #endif /* _WIN32 */ |
|
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
11 | settings->suffixc = 1; |
|
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
12 | settings->recursive = false; |
|
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
13 | settings->includeSuffixes = false; |
|
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
14 | settings->matchesOnly = false; |
| 0 | 15 | } |
| 16 | ||
| 1 | 17 | void printHelpText(const char* prgName) { |
| 0 | 18 | // Help text |
| 19 | const char* helpText = | |
| 1 | 20 | "\nUsage:" |
| 21 | "\n %s [-hrm][-s suffix][<directory>]" | |
| 22 | "\n %s [-hrm][-S suffix][<directory>]" | |
| 0 | 23 | "\n\nCounts the line terminator characters (\\n) within all" |
| 24 | " files in the specified\ndirectory." | |
| 25 | "\n\nOptions:" | |
| 26 | "\n -h, --help - this help text" | |
| 1 | 27 | "\n -m - print information about matching files only" |
| 28 | "\n -s <suffixes> - only count files with these suffixes (separated" | |
| 0 | 29 | "\n by commas)" |
| 1 | 30 | "\n -S <suffixes> - count any file except those with these suffixes" |
| 0 | 31 | "\n (separated by commas)" |
| 1 | 32 | "\n -r, -R - includes subdirectories" |
| 0 | 33 | "\n\n" |
| 1 | 34 | "The default call without any options is:" |
| 35 | "\n %s ./\n" | |
| 0 | 36 | "That means each file in each subdirectory is counted. If you want to count" |
| 37 | "\nC source code in your working directory and its subdirectories, type:" | |
| 1 | 38 | "\n %s -rs .c\n"; |
| 39 | ||
|
3
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
40 | printf(helpText, prgName, prgName, prgName, prgName); |
| 1 | 41 | } |
| 42 | ||
| 43 | int main(int argc, char** argv) { | |
| 0 | 44 | |
|
3
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
45 | // Settings |
|
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
46 | settings_t *settings = new_settings_t(); |
|
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
47 | |
| 0 | 48 | // Program name |
|
3
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
49 | char* prgName = strrchr(argv[0], settings->fileSeparator); |
| 1 | 50 | |
| 51 | if (prgName == NULL) { | |
| 0 | 52 | prgName = argv[0]; |
|
3
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
53 | } else { |
| 0 | 54 | prgName++; |
| 55 | } | |
| 56 | ||
| 57 | // Defaults | |
| 1 | 58 | char* _suffix = " "; |
| 59 | char _directory[3]; | |
| 60 | _directory[0] = '.'; | |
|
3
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
61 | _directory[1] = settings->fileSeparator; |
| 1 | 62 | _directory[2] = 0; |
| 0 | 63 | |
| 64 | // Get arguments | |
| 65 | char* directory; | |
| 66 | char* suffix; | |
| 67 | bool showHelp = false; | |
| 68 | char checked = 0; | |
| 69 | ||
| 1 | 70 | for (int t = 1 ; t < argc ; t++) { |
| 71 | ||
| 72 | int argflags = checkArgument(argv[t], "hsSrRm"); | |
| 73 | ||
| 74 | // s | |
| 75 | if ((argflags & 2) > 0) { | |
| 76 | if ((checked & 1) > 0) { | |
| 77 | printHelpText(prgName); | |
| 0 | 78 | return -1; |
| 79 | } | |
|
3
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
80 | settings->includeSuffixes = true; |
| 1 | 81 | t++; |
| 82 | if (t >= argc) { | |
| 83 | printHelpText(prgName); | |
| 84 | return -1; | |
| 85 | } | |
| 86 | suffix = argv[t]; | |
| 0 | 87 | checked |= 1; |
| 88 | } | |
| 1 | 89 | // S |
| 90 | if ((argflags & 4) > 0) { | |
| 91 | if ((checked & 1) > 0) { | |
| 92 | printHelpText(prgName); | |
| 0 | 93 | return -1; |
| 94 | } | |
|
3
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
95 | settings->includeSuffixes = false; |
| 1 | 96 | t++; |
| 97 | if (t >= argc) { | |
| 98 | printHelpText(prgName); | |
| 99 | return -1; | |
| 100 | } | |
| 101 | suffix = argv[t]; | |
| 0 | 102 | checked |= 1; |
| 103 | } | |
| 1 | 104 | // h |
| 105 | if ((argflags & 1) > 0 || strcmp(argv[t], "--help") == 0) { | |
| 106 | if ((checked & 2) > 0) { | |
| 107 | printHelpText(prgName); | |
| 0 | 108 | return -1; |
| 109 | } | |
| 110 | checked |= 2; | |
| 111 | showHelp = true; | |
| 112 | } | |
| 1 | 113 | // r, R |
| 114 | if ((argflags & 24) > 0) { | |
| 115 | if ((checked & 4) > 0) { | |
| 116 | printHelpText(prgName); | |
| 0 | 117 | return -1; |
| 118 | } | |
| 119 | checked |= 4; | |
|
3
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
120 | settings->recursive = true; |
| 0 | 121 | } |
| 1 | 122 | if ((argflags & 32) > 0) { |
| 123 | if ((checked & 32) > 0) { | |
| 124 | printHelpText(prgName); | |
| 0 | 125 | return -1; |
| 126 | } | |
| 1 | 127 | checked |= 32; |
|
3
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
128 | settings->matchesOnly = true; |
| 0 | 129 | } |
| 1 | 130 | // other |
| 131 | if (argflags == 0) { | |
| 132 | if ((checked & 8) > 0) { | |
| 133 | printHelpText(prgName); | |
| 0 | 134 | return -1; |
| 135 | } | |
| 1 | 136 | checked |= 8; |
| 0 | 137 | directory = argv[t]; |
| 138 | } | |
| 139 | } | |
| 140 | ||
| 141 | // Show help and quit | |
| 1 | 142 | if (showHelp) { |
| 143 | printHelpText(prgName); | |
| 0 | 144 | return 0; |
| 145 | } | |
| 146 | ||
| 147 | // Default values | |
| 1 | 148 | if ((checked & 1) == 0) { |
| 0 | 149 | suffix = _suffix; |
| 150 | } | |
| 151 | ||
| 1 | 152 | if ((checked & 8) == 0) { |
| 0 | 153 | directory = _directory; |
| 154 | } | |
| 155 | ||
| 156 | // Find tokens | |
| 157 | char* finder; | |
| 158 | finder = strchr(suffix, ','); | |
| 1 | 159 | while (finder != NULL) { |
|
3
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
160 | settings->suffixc++; |
| 0 | 161 | finder = strchr(finder+1, ','); |
| 162 | } | |
|
3
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
163 | settings->suffixv = (char**) malloc(sizeof(char**)*settings->suffixc); |
|
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
164 | if (settings->suffixv == NULL) { |
| 0 | 165 | fprintf(stderr, "Memory allocation failed.\n"); |
| 166 | return 1; | |
| 167 | } | |
| 168 | finder = strtok(suffix, ","); | |
| 169 | int c = 0; | |
| 1 | 170 | while (finder != NULL) { |
|
3
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
171 | settings->suffixv[c] = finder; |
| 0 | 172 | c++; |
| 173 | finder = strtok(NULL, ","); | |
| 174 | } | |
| 175 | ||
| 176 | // Open directory | |
| 177 | DIR *dir = opendir(directory); | |
| 1 | 178 | if (dir == NULL) { |
| 0 | 179 | perror("Operation failed"); |
|
3
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
180 | free(settings->suffixv); |
|
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
181 | free(settings); |
| 0 | 182 | return 1; |
| 183 | } | |
| 184 | ||
| 185 | // Scan directory | |
|
3
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
186 | int lines = scanDirectory(dir, 0, directory, settings); |
| 0 | 187 | |
| 188 | // Print double line and line count | |
| 1 | 189 | #ifdef _WIN32 |
|
3
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
190 | const int columns = 79; |
| 1 | 191 | #else |
|
3
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
192 | const int columns = 80; |
| 1 | 193 | #endif /* _WIN32 */ |
| 194 | ||
| 195 | for (int t = 0 ; t < columns ; t++) { | |
| 0 | 196 | printf("="); |
| 197 | } | |
| 1 | 198 | #ifdef _WIN32 |
|
3
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
199 | printf("\n%73d lines\n", lines); |
| 1 | 200 | #else |
|
3
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
201 | printf("\n%74d lines\n", lines); |
| 1 | 202 | #endif /* _WIN32 */ |
| 0 | 203 | |
| 204 | closedir(dir); | |
|
3
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
205 | free(settings->suffixv); |
|
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
206 | free(settings); |
| 0 | 207 | return 0; |
| 208 | } |