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