src/cline.c

Sun, 28 Jun 2026 15:57:44 +0200

author
Mike Becker <universe@uap-core.de>
date
Sun, 28 Jun 2026 15:57:44 +0200
changeset 90
9b541d22d649
parent 89
c80878da618c
permissions
-rw-r--r--

support dir exclusion part 1/2

part 1: option parser + preps
part 2: feature implementation

relates to #838

10
ecf787666f44 refactored sources
Mike Becker <universe@uap-core.de>
parents: 8
diff changeset
1 /*
79
e4592d0292e7 implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents: 66
diff changeset
2 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
57
68018eac46c3 adds simple tiny test suite and updates license headers
Mike Becker <universe@uap-core.de>
parents: 50
diff changeset
3 * Copyright 2018 Mike Becker. All rights reserved.
34
fa9bda32de17 moved src files to src subdirectory and added licence text
Mike Becker <universe@uap-core.de>
parents: 33
diff changeset
4 *
fa9bda32de17 moved src files to src subdirectory and added licence text
Mike Becker <universe@uap-core.de>
parents: 33
diff changeset
5 * Redistribution and use in source and binary forms, with or without
fa9bda32de17 moved src files to src subdirectory and added licence text
Mike Becker <universe@uap-core.de>
parents: 33
diff changeset
6 * modification, are permitted provided that the following conditions are met:
fa9bda32de17 moved src files to src subdirectory and added licence text
Mike Becker <universe@uap-core.de>
parents: 33
diff changeset
7 *
fa9bda32de17 moved src files to src subdirectory and added licence text
Mike Becker <universe@uap-core.de>
parents: 33
diff changeset
8 * 1. Redistributions of source code must retain the above copyright
fa9bda32de17 moved src files to src subdirectory and added licence text
Mike Becker <universe@uap-core.de>
parents: 33
diff changeset
9 * notice, this list of conditions and the following disclaimer.
fa9bda32de17 moved src files to src subdirectory and added licence text
Mike Becker <universe@uap-core.de>
parents: 33
diff changeset
10 *
fa9bda32de17 moved src files to src subdirectory and added licence text
Mike Becker <universe@uap-core.de>
parents: 33
diff changeset
11 * 2. Redistributions in binary form must reproduce the above copyright
fa9bda32de17 moved src files to src subdirectory and added licence text
Mike Becker <universe@uap-core.de>
parents: 33
diff changeset
12 * notice, this list of conditions and the following disclaimer in the
fa9bda32de17 moved src files to src subdirectory and added licence text
Mike Becker <universe@uap-core.de>
parents: 33
diff changeset
13 * documentation and/or other materials provided with the distribution.
fa9bda32de17 moved src files to src subdirectory and added licence text
Mike Becker <universe@uap-core.de>
parents: 33
diff changeset
14 *
fa9bda32de17 moved src files to src subdirectory and added licence text
Mike Becker <universe@uap-core.de>
parents: 33
diff changeset
15 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
fa9bda32de17 moved src files to src subdirectory and added licence text
Mike Becker <universe@uap-core.de>
parents: 33
diff changeset
16 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
fa9bda32de17 moved src files to src subdirectory and added licence text
Mike Becker <universe@uap-core.de>
parents: 33
diff changeset
17 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
fa9bda32de17 moved src files to src subdirectory and added licence text
Mike Becker <universe@uap-core.de>
parents: 33
diff changeset
18 * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
fa9bda32de17 moved src files to src subdirectory and added licence text
Mike Becker <universe@uap-core.de>
parents: 33
diff changeset
19 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
fa9bda32de17 moved src files to src subdirectory and added licence text
Mike Becker <universe@uap-core.de>
parents: 33
diff changeset
20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
fa9bda32de17 moved src files to src subdirectory and added licence text
Mike Becker <universe@uap-core.de>
parents: 33
diff changeset
21 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
fa9bda32de17 moved src files to src subdirectory and added licence text
Mike Becker <universe@uap-core.de>
parents: 33
diff changeset
22 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
fa9bda32de17 moved src files to src subdirectory and added licence text
Mike Becker <universe@uap-core.de>
parents: 33
diff changeset
23 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
57
68018eac46c3 adds simple tiny test suite and updates license headers
Mike Becker <universe@uap-core.de>
parents: 50
diff changeset
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
10
ecf787666f44 refactored sources
Mike Becker <universe@uap-core.de>
parents: 8
diff changeset
25 */
6
be923400164c encapsulated suffix list in type suffix_list_t
Mike Becker <universe@uap-core.de>
parents: 5
diff changeset
26
79
e4592d0292e7 implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents: 66
diff changeset
27 #ifndef VERSION
e4592d0292e7 implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents: 66
diff changeset
28 #error "VERSION macro must be set by build system"
e4592d0292e7 implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents: 66
diff changeset
29 #endif
e4592d0292e7 implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents: 66
diff changeset
30
e4592d0292e7 implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents: 66
diff changeset
31 #include "stdinc.h"
e4592d0292e7 implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents: 66
diff changeset
32 #include "settings.h"
10
ecf787666f44 refactored sources
Mike Becker <universe@uap-core.de>
parents: 8
diff changeset
33 #include "scanner.h"
12
902cb8d2053c removed dynamic programm name
Mike Becker <universe@uap-core.de>
parents: 11
diff changeset
34 #include "arguments.h"
27
95a958e3de88 added regexp_parser struct and compile function
Mike Becker <universe@uap-core.de>
parents: 26
diff changeset
35 #include "regex_parser.h"
0
518bfd1cc1e8 cline project init
Mike Becker <universe@uap-core.de>
parents:
diff changeset
36
79
e4592d0292e7 implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents: 66
diff changeset
37 static void printHelpText() {
34
fa9bda32de17 moved src files to src subdirectory and added licence text
Mike Becker <universe@uap-core.de>
parents: 33
diff changeset
38 printf(
1
34a5e235d16e cline version 2
Mike Becker <universe@uap-core.de>
parents: 0
diff changeset
39 "\nUsage:"
33
1a2d7298bc82 added multi-directory support
Mike Becker <universe@uap-core.de>
parents: 32
diff changeset
40 "\n cline [Options] [Directories...]"
0
518bfd1cc1e8 cline project init
Mike Becker <universe@uap-core.de>
parents:
diff changeset
41 "\n\nCounts the line terminator characters (\\n) within all"
33
1a2d7298bc82 added multi-directory support
Mike Becker <universe@uap-core.de>
parents: 32
diff changeset
42 " files in the specified\ndirectories."
0
518bfd1cc1e8 cline project init
Mike Becker <universe@uap-core.de>
parents:
diff changeset
43 "\n\nOptions:"
89
c80878da618c fix different capitalization in help text
Mike Becker <universe@uap-core.de>
parents: 82
diff changeset
44 "\n -b <level> - Binary file heuristics level (default medium)"
21
91e0890464b0 implemented bfile heuristics option + TODO: implement algorithm
Mike Becker <universe@uap-core.de>
parents: 20
diff changeset
45 "\n One of: ignore low medium high"
66
be2084398c37 new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
46 "\n -c - Count non-whitespace characters instead of lines"
79
e4592d0292e7 implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents: 66
diff changeset
47 "\n -d - Report only directory sums"
90
9b541d22d649 support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents: 89
diff changeset
48 "\n -D <path> - Excludes the directory at the specified <path>"
9b541d22d649 support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents: 89
diff changeset
49 "\n -D <name> - Excludes all directories with the given <name>"
28
72a98cbcb9f1 added regex parser
Mike Becker <universe@uap-core.de>
parents: 27
diff changeset
50 "\n -E <pattern> - Excludes any line matching the <pattern>"
27
95a958e3de88 added regexp_parser struct and compile function
Mike Becker <universe@uap-core.de>
parents: 26
diff changeset
51 "\n -e <start> <end> - Excludes lines between <start> and <end>"
28
72a98cbcb9f1 added regex parser
Mike Becker <universe@uap-core.de>
parents: 27
diff changeset
52 "\n You may use these options multiple times"
89
c80878da618c fix different capitalization in help text
Mike Becker <universe@uap-core.de>
parents: 82
diff changeset
53 "\n -h, --help - This help text"
c80878da618c fix different capitalization in help text
Mike Becker <universe@uap-core.de>
parents: 82
diff changeset
54 "\n -i - Print out individual sums per file extension"
61
9c8d768f0244 adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents: 60
diff changeset
55 "\n (cannot be used together with -V)"
89
c80878da618c fix different capitalization in help text
Mike Becker <universe@uap-core.de>
parents: 82
diff changeset
56 "\n -m - Print information about matching files only"
c80878da618c fix different capitalization in help text
Mike Becker <universe@uap-core.de>
parents: 82
diff changeset
57 "\n -s <suffixes> - Only count files with these suffixes (separated"
0
518bfd1cc1e8 cline project init
Mike Becker <universe@uap-core.de>
parents:
diff changeset
58 "\n by commas)"
89
c80878da618c fix different capitalization in help text
Mike Becker <universe@uap-core.de>
parents: 82
diff changeset
59 "\n -S <suffixes> - Count any file except those with these suffixes"
0
518bfd1cc1e8 cline project init
Mike Becker <universe@uap-core.de>
parents:
diff changeset
60 "\n (separated by commas)"
89
c80878da618c fix different capitalization in help text
Mike Becker <universe@uap-core.de>
parents: 82
diff changeset
61 "\n -r, -R - Includes subdirectories"
c80878da618c fix different capitalization in help text
Mike Becker <universe@uap-core.de>
parents: 82
diff changeset
62 "\n -v, --version - Print out version information"
c80878da618c fix different capitalization in help text
Mike Becker <universe@uap-core.de>
parents: 82
diff changeset
63 "\n -V - Turn verbose output off, print the result only"
31
27c3c1c6b768 added --exclude-cstyle-comments shortcut
Mike Becker <universe@uap-core.de>
parents: 30
diff changeset
64 "\n\nShortcuts:"
57
68018eac46c3 adds simple tiny test suite and updates license headers
Mike Becker <universe@uap-core.de>
parents: 50
diff changeset
65 "\n --exclude-cstyle-comments : -E '\\s*//' -e '\\s*/\\*' '\\*/\\s*'"
68018eac46c3 adds simple tiny test suite and updates license headers
Mike Becker <universe@uap-core.de>
parents: 50
diff changeset
66 "\n --exclude-blank-lines : -E '^\\s*$'"
0
518bfd1cc1e8 cline project init
Mike Becker <universe@uap-core.de>
parents:
diff changeset
67 "\n\n"
1
34a5e235d16e cline version 2
Mike Becker <universe@uap-core.de>
parents: 0
diff changeset
68 "The default call without any options is:"
28
72a98cbcb9f1 added regex parser
Mike Becker <universe@uap-core.de>
parents: 27
diff changeset
69 "\n cline ./\n\n"
7
1b55f3fa52c9 Fixed helpText and removed extra variables for default values
Mike Becker <universe@uap-core.de>
parents: 6
diff changeset
70 "So each file in the working directory is counted. If you want to count C"
1b55f3fa52c9 Fixed helpText and removed extra variables for default values
Mike Becker <universe@uap-core.de>
parents: 6
diff changeset
71 "\nsource code in your working directory and its subdirectories, type:"
27
95a958e3de88 added regexp_parser struct and compile function
Mike Becker <universe@uap-core.de>
parents: 26
diff changeset
72 "\n cline -rs .c\n"
28
72a98cbcb9f1 added regex parser
Mike Becker <universe@uap-core.de>
parents: 27
diff changeset
73 "\nIf you want to exclude comment lines, you may use the -e/-E option."
66
be2084398c37 new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
74 "\nAfter a line matches the regex pattern <start>, this and any following"
be2084398c37 new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
75 "\nline is not counted unless a line matches the <end> pattern. A line is"
be2084398c37 new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
76 "\nstill counted when it does not start or end with the respective pattern."
be2084398c37 new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
77 "\nPlease note, that cline does not trim the lines before matching against"
be2084398c37 new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
78 "\nthe pattern."
31
27c3c1c6b768 added --exclude-cstyle-comments shortcut
Mike Becker <universe@uap-core.de>
parents: 30
diff changeset
79 "\n\nExample (C without comments):"
36
a7ff583e153f updated copyright year + added make install + removed project files
Mike Becker <universe@uap-core.de>
parents: 35
diff changeset
80 "\n cline -s .c,.h --exclude-cstyle-comments"
a7ff583e153f updated copyright year + added make install + removed project files
Mike Becker <universe@uap-core.de>
parents: 35
diff changeset
81 "\n");
1
34a5e235d16e cline version 2
Mike Becker <universe@uap-core.de>
parents: 0
diff changeset
82 }
34a5e235d16e cline version 2
Mike Becker <universe@uap-core.de>
parents: 0
diff changeset
83
79
e4592d0292e7 implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents: 66
diff changeset
84 static int exit_with_version(settings_t* settings) {
48
0d2c13c24fd0 adds remaining autoconf files
Mike Becker <universe@uap-core.de>
parents: 44
diff changeset
85 printf("cline - Version: " VERSION "\n");
14
ee9333c91dda some minor fixes + makefile now injects revisionnumber into cline.h
Mike Becker <universe@uap-core.de>
parents: 12
diff changeset
86 destroy_settings_t(settings);
ee9333c91dda some minor fixes + makefile now injects revisionnumber into cline.h
Mike Becker <universe@uap-core.de>
parents: 12
diff changeset
87 return 0;
ee9333c91dda some minor fixes + makefile now injects revisionnumber into cline.h
Mike Becker <universe@uap-core.de>
parents: 12
diff changeset
88 }
ee9333c91dda some minor fixes + makefile now injects revisionnumber into cline.h
Mike Becker <universe@uap-core.de>
parents: 12
diff changeset
89
79
e4592d0292e7 implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents: 66
diff changeset
90 static int exit_with_help(settings_t* settings, int code) {
50
63477d92411d fixes headers missing in dist package
Mike Becker <universe@uap-core.de>
parents: 48
diff changeset
91 printf("cline - Version: " VERSION "\n");
12
902cb8d2053c removed dynamic programm name
Mike Becker <universe@uap-core.de>
parents: 11
diff changeset
92 printHelpText();
8
28319b20968c encapsulated common operations
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
93 destroy_settings_t(settings);
28319b20968c encapsulated common operations
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
94 return code;
28319b20968c encapsulated common operations
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
95 }
28319b20968c encapsulated common operations
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
96
79
e4592d0292e7 implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents: 66
diff changeset
97 static const char * sepline_double = "===============================================================================\n";
e4592d0292e7 implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents: 66
diff changeset
98 static const char * sepline_single = "-------------------------------------------------------------------------------\n";
e4592d0292e7 implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents: 66
diff changeset
99
1
34a5e235d16e cline version 2
Mike Becker <universe@uap-core.de>
parents: 0
diff changeset
100 int main(int argc, char** argv) {
0
518bfd1cc1e8 cline project init
Mike Becker <universe@uap-core.de>
parents:
diff changeset
101
22
4508da679ffb completed binary file heuristics
Mike Becker <universe@uap-core.de>
parents: 21
diff changeset
102 /* Settings */
3
510d6b198dde Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents: 1
diff changeset
103 settings_t *settings = new_settings_t();
5
9393eff3d2f9 Fixed memory leak when exiting the programm ahead of time
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
104 if (settings == NULL) {
9393eff3d2f9 Fixed memory leak when exiting the programm ahead of time
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
105 fprintf(stderr, "Memory allocation failed.\n");
9393eff3d2f9 Fixed memory leak when exiting the programm ahead of time
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
106 return 1;
9393eff3d2f9 Fixed memory leak when exiting the programm ahead of time
Mike Becker <universe@uap-core.de>
parents: 4
diff changeset
107 }
3
510d6b198dde Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents: 1
diff changeset
108
22
4508da679ffb completed binary file heuristics
Mike Becker <universe@uap-core.de>
parents: 21
diff changeset
109 /* Get arguments */
33
1a2d7298bc82 added multi-directory support
Mike Becker <universe@uap-core.de>
parents: 32
diff changeset
110 string_list_t *directories = new_string_list_t();
1a2d7298bc82 added multi-directory support
Mike Becker <universe@uap-core.de>
parents: 32
diff changeset
111 if (directories == NULL) {
1a2d7298bc82 added multi-directory support
Mike Becker <universe@uap-core.de>
parents: 32
diff changeset
112 fprintf(stderr, "Memory allocation failed.\n");
1a2d7298bc82 added multi-directory support
Mike Becker <universe@uap-core.de>
parents: 32
diff changeset
113 return 1;
1a2d7298bc82 added multi-directory support
Mike Becker <universe@uap-core.de>
parents: 32
diff changeset
114 }
30
d642fdb6745e allow parallel use of -s and -S
Mike Becker <universe@uap-core.de>
parents: 28
diff changeset
115 char* includeSuffix = NULL;
d642fdb6745e allow parallel use of -s and -S
Mike Becker <universe@uap-core.de>
parents: 28
diff changeset
116 char* excludeSuffix = NULL;
8
28319b20968c encapsulated common operations
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
117 int checked = 0;
0
518bfd1cc1e8 cline project init
Mike Becker <universe@uap-core.de>
parents:
diff changeset
118
1
34a5e235d16e cline version 2
Mike Becker <universe@uap-core.de>
parents: 0
diff changeset
119 for (int t = 1 ; t < argc ; t++) {
34a5e235d16e cline version 2
Mike Becker <universe@uap-core.de>
parents: 0
diff changeset
120
90
9b541d22d649 support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents: 89
diff changeset
121 int argflags = checkArgument(argv[t], "hsSrRmvVbeEicdD");
30
d642fdb6745e allow parallel use of -s and -S
Mike Becker <universe@uap-core.de>
parents: 28
diff changeset
122 int paropt = 0;
1
34a5e235d16e cline version 2
Mike Becker <universe@uap-core.de>
parents: 0
diff changeset
123
59
c5409c8be36f reorders processing of arguments (help text first)
Mike Becker <universe@uap-core.de>
parents: 57
diff changeset
124 /* h */
c5409c8be36f reorders processing of arguments (help text first)
Mike Becker <universe@uap-core.de>
parents: 57
diff changeset
125 if ((argflags & 1) > 0 || strcmp(argv[t], "--help") == 0) {
c5409c8be36f reorders processing of arguments (help text first)
Mike Becker <universe@uap-core.de>
parents: 57
diff changeset
126 return exit_with_help(settings, 0);
c5409c8be36f reorders processing of arguments (help text first)
Mike Becker <universe@uap-core.de>
parents: 57
diff changeset
127 }
30
d642fdb6745e allow parallel use of -s and -S
Mike Becker <universe@uap-core.de>
parents: 28
diff changeset
128 /* s */
d642fdb6745e allow parallel use of -s and -S
Mike Becker <universe@uap-core.de>
parents: 28
diff changeset
129 if ((argflags & 2) > 0) {
d642fdb6745e allow parallel use of -s and -S
Mike Becker <universe@uap-core.de>
parents: 28
diff changeset
130 if (!checkParamOpt(&paropt) || registerArgument(&checked, 2)) {
12
902cb8d2053c removed dynamic programm name
Mike Becker <universe@uap-core.de>
parents: 11
diff changeset
131 return exit_with_help(settings, 1);
0
518bfd1cc1e8 cline project init
Mike Becker <universe@uap-core.de>
parents:
diff changeset
132 }
1
34a5e235d16e cline version 2
Mike Becker <universe@uap-core.de>
parents: 0
diff changeset
133 t++;
34a5e235d16e cline version 2
Mike Becker <universe@uap-core.de>
parents: 0
diff changeset
134 if (t >= argc) {
12
902cb8d2053c removed dynamic programm name
Mike Becker <universe@uap-core.de>
parents: 11
diff changeset
135 return exit_with_help(settings, 1);
1
34a5e235d16e cline version 2
Mike Becker <universe@uap-core.de>
parents: 0
diff changeset
136 }
30
d642fdb6745e allow parallel use of -s and -S
Mike Becker <universe@uap-core.de>
parents: 28
diff changeset
137 includeSuffix = argv[t];
d642fdb6745e allow parallel use of -s and -S
Mike Becker <universe@uap-core.de>
parents: 28
diff changeset
138 }
d642fdb6745e allow parallel use of -s and -S
Mike Becker <universe@uap-core.de>
parents: 28
diff changeset
139 /* S */
d642fdb6745e allow parallel use of -s and -S
Mike Becker <universe@uap-core.de>
parents: 28
diff changeset
140 if ((argflags & 4) > 0) {
d642fdb6745e allow parallel use of -s and -S
Mike Becker <universe@uap-core.de>
parents: 28
diff changeset
141 if (!checkParamOpt(&paropt) || registerArgument(&checked, 4)) {
d642fdb6745e allow parallel use of -s and -S
Mike Becker <universe@uap-core.de>
parents: 28
diff changeset
142 return exit_with_help(settings, 1);
d642fdb6745e allow parallel use of -s and -S
Mike Becker <universe@uap-core.de>
parents: 28
diff changeset
143 }
d642fdb6745e allow parallel use of -s and -S
Mike Becker <universe@uap-core.de>
parents: 28
diff changeset
144 t++;
d642fdb6745e allow parallel use of -s and -S
Mike Becker <universe@uap-core.de>
parents: 28
diff changeset
145 if (t >= argc) {
d642fdb6745e allow parallel use of -s and -S
Mike Becker <universe@uap-core.de>
parents: 28
diff changeset
146 return exit_with_help(settings, 1);
d642fdb6745e allow parallel use of -s and -S
Mike Becker <universe@uap-core.de>
parents: 28
diff changeset
147 }
d642fdb6745e allow parallel use of -s and -S
Mike Becker <universe@uap-core.de>
parents: 28
diff changeset
148 excludeSuffix = argv[t];
0
518bfd1cc1e8 cline project init
Mike Becker <universe@uap-core.de>
parents:
diff changeset
149 }
22
4508da679ffb completed binary file heuristics
Mike Becker <universe@uap-core.de>
parents: 21
diff changeset
150 /* r, R */
1
34a5e235d16e cline version 2
Mike Becker <universe@uap-core.de>
parents: 0
diff changeset
151 if ((argflags & 24) > 0) {
8
28319b20968c encapsulated common operations
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
152 if (registerArgument(&checked, 24)) {
12
902cb8d2053c removed dynamic programm name
Mike Becker <universe@uap-core.de>
parents: 11
diff changeset
153 return exit_with_help(settings, 1);
0
518bfd1cc1e8 cline project init
Mike Becker <universe@uap-core.de>
parents:
diff changeset
154 }
3
510d6b198dde Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents: 1
diff changeset
155 settings->recursive = true;
0
518bfd1cc1e8 cline project init
Mike Becker <universe@uap-core.de>
parents:
diff changeset
156 }
22
4508da679ffb completed binary file heuristics
Mike Becker <universe@uap-core.de>
parents: 21
diff changeset
157 /* m */
1
34a5e235d16e cline version 2
Mike Becker <universe@uap-core.de>
parents: 0
diff changeset
158 if ((argflags & 32) > 0) {
8
28319b20968c encapsulated common operations
Mike Becker <universe@uap-core.de>
parents: 7
diff changeset
159 if (registerArgument(&checked, 32)) {
12
902cb8d2053c removed dynamic programm name
Mike Becker <universe@uap-core.de>
parents: 11
diff changeset
160 return exit_with_help(settings, 1);
0
518bfd1cc1e8 cline project init
Mike Becker <universe@uap-core.de>
parents:
diff changeset
161 }
3
510d6b198dde Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents: 1
diff changeset
162 settings->matchesOnly = true;
0
518bfd1cc1e8 cline project init
Mike Becker <universe@uap-core.de>
parents:
diff changeset
163 }
22
4508da679ffb completed binary file heuristics
Mike Becker <universe@uap-core.de>
parents: 21
diff changeset
164 /* v */
14
ee9333c91dda some minor fixes + makefile now injects revisionnumber into cline.h
Mike Becker <universe@uap-core.de>
parents: 12
diff changeset
165 if ((argflags & 64) > 0 || strcmp(argv[t], "--version") == 0) {
ee9333c91dda some minor fixes + makefile now injects revisionnumber into cline.h
Mike Becker <universe@uap-core.de>
parents: 12
diff changeset
166 return exit_with_version(settings);
ee9333c91dda some minor fixes + makefile now injects revisionnumber into cline.h
Mike Becker <universe@uap-core.de>
parents: 12
diff changeset
167 }
22
4508da679ffb completed binary file heuristics
Mike Becker <universe@uap-core.de>
parents: 21
diff changeset
168 /* V */
16
bc9a0fefd892 fixed makefile to run safely on compile errors + added -V option to cline
Mike Becker <universe@uap-core.de>
parents: 14
diff changeset
169 if ((argflags & 128) > 0) {
bc9a0fefd892 fixed makefile to run safely on compile errors + added -V option to cline
Mike Becker <universe@uap-core.de>
parents: 14
diff changeset
170 if (registerArgument(&checked, 128)) {
bc9a0fefd892 fixed makefile to run safely on compile errors + added -V option to cline
Mike Becker <universe@uap-core.de>
parents: 14
diff changeset
171 return exit_with_help(settings, 1);
bc9a0fefd892 fixed makefile to run safely on compile errors + added -V option to cline
Mike Becker <universe@uap-core.de>
parents: 14
diff changeset
172 }
bc9a0fefd892 fixed makefile to run safely on compile errors + added -V option to cline
Mike Becker <universe@uap-core.de>
parents: 14
diff changeset
173 settings->verbose = false;
bc9a0fefd892 fixed makefile to run safely on compile errors + added -V option to cline
Mike Becker <universe@uap-core.de>
parents: 14
diff changeset
174 }
22
4508da679ffb completed binary file heuristics
Mike Becker <universe@uap-core.de>
parents: 21
diff changeset
175 /* b */
21
91e0890464b0 implemented bfile heuristics option + TODO: implement algorithm
Mike Becker <universe@uap-core.de>
parents: 20
diff changeset
176 if ((argflags & 256) > 0) {
30
d642fdb6745e allow parallel use of -s and -S
Mike Becker <universe@uap-core.de>
parents: 28
diff changeset
177 if (!checkParamOpt(&paropt) || registerArgument(&checked, 256)) {
21
91e0890464b0 implemented bfile heuristics option + TODO: implement algorithm
Mike Becker <universe@uap-core.de>
parents: 20
diff changeset
178 return exit_with_help(settings, 1);
91e0890464b0 implemented bfile heuristics option + TODO: implement algorithm
Mike Becker <universe@uap-core.de>
parents: 20
diff changeset
179 }
91e0890464b0 implemented bfile heuristics option + TODO: implement algorithm
Mike Becker <universe@uap-core.de>
parents: 20
diff changeset
180 t++;
91e0890464b0 implemented bfile heuristics option + TODO: implement algorithm
Mike Becker <universe@uap-core.de>
parents: 20
diff changeset
181 if (t >= argc) {
91e0890464b0 implemented bfile heuristics option + TODO: implement algorithm
Mike Becker <universe@uap-core.de>
parents: 20
diff changeset
182 return exit_with_help(settings, 1);
91e0890464b0 implemented bfile heuristics option + TODO: implement algorithm
Mike Becker <universe@uap-core.de>
parents: 20
diff changeset
183 }
24
3963e8800a12 replaced stricmp with strcasecmp to stay standard compliant
Mike Becker <universe@uap-core.de>
parents: 23
diff changeset
184 if (strcasecmp(argv[t], "ignore") == 0) {
21
91e0890464b0 implemented bfile heuristics option + TODO: implement algorithm
Mike Becker <universe@uap-core.de>
parents: 20
diff changeset
185 settings->bfileHeuristics->level = BFILE_IGNORE;
24
3963e8800a12 replaced stricmp with strcasecmp to stay standard compliant
Mike Becker <universe@uap-core.de>
parents: 23
diff changeset
186 } else if (strcasecmp(argv[t], "low") == 0) {
21
91e0890464b0 implemented bfile heuristics option + TODO: implement algorithm
Mike Becker <universe@uap-core.de>
parents: 20
diff changeset
187 settings->bfileHeuristics->level = BFILE_LOW_ACCURACY;
24
3963e8800a12 replaced stricmp with strcasecmp to stay standard compliant
Mike Becker <universe@uap-core.de>
parents: 23
diff changeset
188 } else if (strcasecmp(argv[t], "medium") == 0) {
21
91e0890464b0 implemented bfile heuristics option + TODO: implement algorithm
Mike Becker <universe@uap-core.de>
parents: 20
diff changeset
189 settings->bfileHeuristics->level = BFILE_MEDIUM_ACCURACY;
24
3963e8800a12 replaced stricmp with strcasecmp to stay standard compliant
Mike Becker <universe@uap-core.de>
parents: 23
diff changeset
190 } else if (strcasecmp(argv[t], "high") == 0) {
21
91e0890464b0 implemented bfile heuristics option + TODO: implement algorithm
Mike Becker <universe@uap-core.de>
parents: 20
diff changeset
191 settings->bfileHeuristics->level = BFILE_HIGH_ACCURACY;
91e0890464b0 implemented bfile heuristics option + TODO: implement algorithm
Mike Becker <universe@uap-core.de>
parents: 20
diff changeset
192 } else {
91e0890464b0 implemented bfile heuristics option + TODO: implement algorithm
Mike Becker <universe@uap-core.de>
parents: 20
diff changeset
193 return exit_with_help(settings, 1);
91e0890464b0 implemented bfile heuristics option + TODO: implement algorithm
Mike Becker <universe@uap-core.de>
parents: 20
diff changeset
194 }
91e0890464b0 implemented bfile heuristics option + TODO: implement algorithm
Mike Becker <universe@uap-core.de>
parents: 20
diff changeset
195 }
28
72a98cbcb9f1 added regex parser
Mike Becker <universe@uap-core.de>
parents: 27
diff changeset
196 /* e */
27
95a958e3de88 added regexp_parser struct and compile function
Mike Becker <universe@uap-core.de>
parents: 26
diff changeset
197 if ((argflags & 512) > 0) {
30
d642fdb6745e allow parallel use of -s and -S
Mike Becker <universe@uap-core.de>
parents: 28
diff changeset
198 if (!checkParamOpt(&paropt) || t + 2 >= argc) {
27
95a958e3de88 added regexp_parser struct and compile function
Mike Becker <universe@uap-core.de>
parents: 26
diff changeset
199 return exit_with_help(settings, 1);
95a958e3de88 added regexp_parser struct and compile function
Mike Becker <universe@uap-core.de>
parents: 26
diff changeset
200 }
95a958e3de88 added regexp_parser struct and compile function
Mike Becker <universe@uap-core.de>
parents: 26
diff changeset
201 t++; add_string(settings->regex->pattern_list, argv[t]);
95a958e3de88 added regexp_parser struct and compile function
Mike Becker <universe@uap-core.de>
parents: 26
diff changeset
202 t++; add_string(settings->regex->pattern_list, argv[t]);
95a958e3de88 added regexp_parser struct and compile function
Mike Becker <universe@uap-core.de>
parents: 26
diff changeset
203 }
28
72a98cbcb9f1 added regex parser
Mike Becker <universe@uap-core.de>
parents: 27
diff changeset
204 /* E */
72a98cbcb9f1 added regex parser
Mike Becker <universe@uap-core.de>
parents: 27
diff changeset
205 if ((argflags & 1024) > 0) {
72a98cbcb9f1 added regex parser
Mike Becker <universe@uap-core.de>
parents: 27
diff changeset
206 t++;
30
d642fdb6745e allow parallel use of -s and -S
Mike Becker <universe@uap-core.de>
parents: 28
diff changeset
207 if (!checkParamOpt(&paropt) || t >= argc) {
28
72a98cbcb9f1 added regex parser
Mike Becker <universe@uap-core.de>
parents: 27
diff changeset
208 return exit_with_help(settings, 1);
72a98cbcb9f1 added regex parser
Mike Becker <universe@uap-core.de>
parents: 27
diff changeset
209 }
72a98cbcb9f1 added regex parser
Mike Becker <universe@uap-core.de>
parents: 27
diff changeset
210 add_string(settings->regex->pattern_list, argv[t]);
72a98cbcb9f1 added regex parser
Mike Becker <universe@uap-core.de>
parents: 27
diff changeset
211 add_string(settings->regex->pattern_list, "$");
72a98cbcb9f1 added regex parser
Mike Becker <universe@uap-core.de>
parents: 27
diff changeset
212 }
61
9c8d768f0244 adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents: 60
diff changeset
213 /* i */
60
69be673a4fd0 preparing changes for individual sum feature
Mike Becker <universe@uap-core.de>
parents: 59
diff changeset
214 if ((argflags & 2048) > 0) {
66
be2084398c37 new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
215 /* cannot be used together with -V */
79
e4592d0292e7 implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents: 66
diff changeset
216 if ((checked & 128) > 0) {
61
9c8d768f0244 adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents: 60
diff changeset
217 return exit_with_help(settings, 1);
9c8d768f0244 adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents: 60
diff changeset
218 }
9c8d768f0244 adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents: 60
diff changeset
219 settings->individual_sums = true;
60
69be673a4fd0 preparing changes for individual sum feature
Mike Becker <universe@uap-core.de>
parents: 59
diff changeset
220 }
79
e4592d0292e7 implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents: 66
diff changeset
221 /* c */
66
be2084398c37 new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
222 if ((argflags & 4096) > 0) {
be2084398c37 new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
223 if (registerArgument(&checked, 4096)) {
be2084398c37 new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
224 return exit_with_help(settings, 1);
be2084398c37 new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
225 }
be2084398c37 new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
226 settings->count_chars = true;
be2084398c37 new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
227 settings->regex->count_chars = true;
be2084398c37 new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents: 62
diff changeset
228 }
79
e4592d0292e7 implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents: 66
diff changeset
229 /* d */
e4592d0292e7 implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents: 66
diff changeset
230 if ((argflags & 8192) > 0) {
e4592d0292e7 implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents: 66
diff changeset
231 if (registerArgument(&checked, 8192)) {
e4592d0292e7 implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents: 66
diff changeset
232 return exit_with_help(settings, 1);
e4592d0292e7 implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents: 66
diff changeset
233 }
e4592d0292e7 implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents: 66
diff changeset
234 /* ignored together with -V */
e4592d0292e7 implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents: 66
diff changeset
235 if ((checked & 128) == 0) {
e4592d0292e7 implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents: 66
diff changeset
236 settings->dirsOnly = true;
e4592d0292e7 implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents: 66
diff changeset
237 }
e4592d0292e7 implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents: 66
diff changeset
238 }
90
9b541d22d649 support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents: 89
diff changeset
239 /* D */
9b541d22d649 support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents: 89
diff changeset
240 if ((argflags & 16384) > 0) {
9b541d22d649 support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents: 89
diff changeset
241 t++;
9b541d22d649 support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents: 89
diff changeset
242 if (!checkParamOpt(&paropt) || t >= argc) {
9b541d22d649 support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents: 89
diff changeset
243 return exit_with_help(settings, 1);
9b541d22d649 support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents: 89
diff changeset
244 }
9b541d22d649 support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents: 89
diff changeset
245 // TODO: normalize argument before adding to dir list
9b541d22d649 support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents: 89
diff changeset
246 // this makes it more efficient to compare dir names later
9b541d22d649 support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents: 89
diff changeset
247 add_string(settings->excludeDirs, argv[t]);
9b541d22d649 support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents: 89
diff changeset
248 }
1
34a5e235d16e cline version 2
Mike Becker <universe@uap-core.de>
parents: 0
diff changeset
249 if (argflags == 0) {
31
27c3c1c6b768 added --exclude-cstyle-comments shortcut
Mike Becker <universe@uap-core.de>
parents: 30
diff changeset
250 /* SHORTCUTS */
27c3c1c6b768 added --exclude-cstyle-comments shortcut
Mike Becker <universe@uap-core.de>
parents: 30
diff changeset
251 if (strcmp(argv[t], "--exclude-cstyle-comments") == 0) {
27c3c1c6b768 added --exclude-cstyle-comments shortcut
Mike Becker <universe@uap-core.de>
parents: 30
diff changeset
252 add_string(settings->regex->pattern_list, "\\s*//");
27c3c1c6b768 added --exclude-cstyle-comments shortcut
Mike Becker <universe@uap-core.de>
parents: 30
diff changeset
253 add_string(settings->regex->pattern_list, "$");
27c3c1c6b768 added --exclude-cstyle-comments shortcut
Mike Becker <universe@uap-core.de>
parents: 30
diff changeset
254 add_string(settings->regex->pattern_list, "\\s*/\\*");
27c3c1c6b768 added --exclude-cstyle-comments shortcut
Mike Becker <universe@uap-core.de>
parents: 30
diff changeset
255 add_string(settings->regex->pattern_list, "\\*/\\s*");
57
68018eac46c3 adds simple tiny test suite and updates license headers
Mike Becker <universe@uap-core.de>
parents: 50
diff changeset
256 } else if (strcmp(argv[t], "--exclude-blank-lines") == 0) {
68018eac46c3 adds simple tiny test suite and updates license headers
Mike Becker <universe@uap-core.de>
parents: 50
diff changeset
257 add_string(settings->regex->pattern_list, "^\\s*$");
68018eac46c3 adds simple tiny test suite and updates license headers
Mike Becker <universe@uap-core.de>
parents: 50
diff changeset
258 add_string(settings->regex->pattern_list, "$");
31
27c3c1c6b768 added --exclude-cstyle-comments shortcut
Mike Becker <universe@uap-core.de>
parents: 30
diff changeset
259 }
80
55dc85743dd1 do not treat unknown option as directory - fixes #635
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
260 /* Unknown option */
55dc85743dd1 do not treat unknown option as directory - fixes #635
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
261 else if (argv[t][0] == '-') {
55dc85743dd1 do not treat unknown option as directory - fixes #635
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
262 fprintf(stderr, "Unrecognized option: %s\n\n", argv[t]);
55dc85743dd1 do not treat unknown option as directory - fixes #635
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
263 return exit_with_help(settings, 1);
55dc85743dd1 do not treat unknown option as directory - fixes #635
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
264 }
31
27c3c1c6b768 added --exclude-cstyle-comments shortcut
Mike Becker <universe@uap-core.de>
parents: 30
diff changeset
265 /* Path */
33
1a2d7298bc82 added multi-directory support
Mike Becker <universe@uap-core.de>
parents: 32
diff changeset
266 else {
1a2d7298bc82 added multi-directory support
Mike Becker <universe@uap-core.de>
parents: 32
diff changeset
267 add_string(directories, argv[t]);
0
518bfd1cc1e8 cline project init
Mike Becker <universe@uap-core.de>
parents:
diff changeset
268 }
518bfd1cc1e8 cline project init
Mike Becker <universe@uap-core.de>
parents:
diff changeset
269 }
518bfd1cc1e8 cline project init
Mike Becker <universe@uap-core.de>
parents:
diff changeset
270 }
518bfd1cc1e8 cline project init
Mike Becker <universe@uap-core.de>
parents:
diff changeset
271
22
4508da679ffb completed binary file heuristics
Mike Becker <universe@uap-core.de>
parents: 21
diff changeset
272 /* Find tokens */
30
d642fdb6745e allow parallel use of -s and -S
Mike Becker <universe@uap-core.de>
parents: 28
diff changeset
273 parseCSL(includeSuffix, settings->includeSuffixes);
d642fdb6745e allow parallel use of -s and -S
Mike Becker <universe@uap-core.de>
parents: 28
diff changeset
274 parseCSL(excludeSuffix, settings->excludeSuffixes);
0
518bfd1cc1e8 cline project init
Mike Becker <universe@uap-core.de>
parents:
diff changeset
275
82
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
276 /* Compiler regular expressions, if any specified */
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
277 if (!regex_compile_all(settings->regex)) {
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
278 return 1;
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
279 }
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
280
33
1a2d7298bc82 added multi-directory support
Mike Becker <universe@uap-core.de>
parents: 32
diff changeset
281 /* Scan directories */
82
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
282 scanresult_t* result = new_scanresult_t(settings);
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
283 const char* result_type = settings->count_chars ? "chars" : "lines";
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
284 bool has_output = false;
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
285 unsigned total = 0;
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
286 if (directories->count == 0) {
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
287 add_string(directories, "./");
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
288 }
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
289 for (unsigned t = 0 ; t < directories->count ; t++) {
44
9574a181ec26 line sum per directory now displayed + directories without matching files are no longer displayed when -m is used + new buffering strategy replaces stream hack when -V is used
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
290 /* Don't waste memory when only the total sum is needed */
9574a181ec26 line sum per directory now displayed + directories without matching files are no longer displayed when -m is used + new buffering strategy replaces stream hack when -V is used
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
291 string_list_t *output = settings->verbose ? new_string_list_t() : NULL;
82
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
292 scanDirectory((scanner_t){directories->items[t], 0}, settings, output, result);
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
293 total += result->result;
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
294 if (settings->verbose) {
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
295 has_output |= output->count > 0;
44
9574a181ec26 line sum per directory now displayed + directories without matching files are no longer displayed when -m is used + new buffering strategy replaces stream hack when -V is used
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
296 for (int i = 0 ; i < output->count ; i++) {
9574a181ec26 line sum per directory now displayed + directories without matching files are no longer displayed when -m is used + new buffering strategy replaces stream hack when -V is used
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
297 printf("%s", output->items[i]);
9574a181ec26 line sum per directory now displayed + directories without matching files are no longer displayed when -m is used + new buffering strategy replaces stream hack when -V is used
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
298 free(output->items[i]);
9574a181ec26 line sum per directory now displayed + directories without matching files are no longer displayed when -m is used + new buffering strategy replaces stream hack when -V is used
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
299 }
82
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
300 destroy_string_list_t(output);
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
301 if (directories->count > 1) {
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
302 has_output = true;
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
303 fputs(sepline_single, stdout);
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
304 printf("%-63s%10u %s\n", directories->items[t],
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
305 result->result, result_type);
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
306 fputs(sepline_single, stdout);
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
307 }
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
308 }
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
309 }
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
310 destroy_string_list_t(directories);
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
311
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
312 /* Print result */
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
313 if (settings->verbose) {
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
314 if (result->ext) {
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
315 if (result->ext->count > 0) {
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
316 has_output = true;
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
317 fwrite(sepline_double, 1, 80, stdout);
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
318 printf("\nIndividual sums:\n");
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
319 for (unsigned t = 0 ; t < result->ext->count ; t++) {
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
320 printf(" %-62s%10u %s\n",
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
321 result->ext->extensions[t],
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
322 result->ext->result[t],
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
323 result_type);
61
9c8d768f0244 adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents: 60
diff changeset
324 }
9c8d768f0244 adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents: 60
diff changeset
325 }
82
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
326 }
79
e4592d0292e7 implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents: 66
diff changeset
327
82
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
328 if (has_output) {
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
329 fwrite(sepline_double, 1, 80, stdout);
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
330 printf("%73d %s\n", total, result_type);
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
331 } else {
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
332 /* If there was not any output so far, skip formatting */
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
333 printf("%d %s\n", total, result_type);
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
334 }
44
9574a181ec26 line sum per directory now displayed + directories without matching files are no longer displayed when -m is used + new buffering strategy replaces stream hack when -V is used
Mike Becker <universe@uap-core.de>
parents: 36
diff changeset
335
82
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
336 if (settings->confusing_lnlen &&
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
337 settings->regex->pattern_list->count > 0) {
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
338
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
339 printf("\nSome files contain too long lines.\n"
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
340 "The parser currently supports a maximum line length of %u."
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
341 "\nThe result might be wrong.\n", MAX_LINELENGTH);
28
72a98cbcb9f1 added regex parser
Mike Becker <universe@uap-core.de>
parents: 27
diff changeset
342 }
82
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
343 } else {
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
344 printf("%u", total);
16
bc9a0fefd892 fixed makefile to run safely on compile errors + added -V option to cline
Mike Becker <universe@uap-core.de>
parents: 14
diff changeset
345 }
82
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
346 destroy_scanresult_t(result);
44b3332dfe03 greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents: 80
diff changeset
347 destroy_settings_t(settings);
16
bc9a0fefd892 fixed makefile to run safely on compile errors + added -V option to cline
Mike Becker <universe@uap-core.de>
parents: 14
diff changeset
348
0
518bfd1cc1e8 cline project init
Mike Becker <universe@uap-core.de>
parents:
diff changeset
349 return 0;
518bfd1cc1e8 cline project init
Mike Becker <universe@uap-core.de>
parents:
diff changeset
350 }

mercurial