Tue, 30 Jun 2026 14:19:08 +0200
support dir exclusion part 2/2
tests with MSVC are still open
resolves issue #838 (at least for non-Windows)
| 10 | 1 | /* |
|
34
fa9bda32de17
moved src files to src subdirectory and added licence text
Mike Becker <universe@uap-core.de>
parents:
30
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:
54
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:
30
diff
changeset
|
4 | * |
|
fa9bda32de17
moved src files to src subdirectory and added licence text
Mike Becker <universe@uap-core.de>
parents:
30
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:
30
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:
30
diff
changeset
|
7 | * |
|
fa9bda32de17
moved src files to src subdirectory and added licence text
Mike Becker <universe@uap-core.de>
parents:
30
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:
30
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:
30
diff
changeset
|
10 | * |
|
fa9bda32de17
moved src files to src subdirectory and added licence text
Mike Becker <universe@uap-core.de>
parents:
30
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:
30
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:
30
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:
30
diff
changeset
|
14 | * |
|
fa9bda32de17
moved src files to src subdirectory and added licence text
Mike Becker <universe@uap-core.de>
parents:
30
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:
30
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:
30
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:
30
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:
30
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:
30
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:
30
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:
30
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:
30
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:
54
diff
changeset
|
24 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 10 | 25 | */ |
|
3
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
26 | |
|
8
28319b20968c
encapsulated common operations
Mike Becker <universe@uap-core.de>
parents:
6
diff
changeset
|
27 | |
| 10 | 28 | #include "scanner.h" |
|
21
91e0890464b0
implemented bfile heuristics option + TODO: implement algorithm
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
29 | #include "bfile_heuristics.h" |
|
27
95a958e3de88
added regexp_parser struct and compile function
Mike Becker <universe@uap-core.de>
parents:
25
diff
changeset
|
30 | #include "regex_parser.h" |
|
23
778388400f7b
encapsulated scanner arguments + enabled optimizer + empty file is no bfile
Mike Becker <universe@uap-core.de>
parents:
22
diff
changeset
|
31 | #include <sys/stat.h> |
|
66
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
32 | #include <ctype.h> |
|
3
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
33 | |
|
95
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
34 | #ifdef _MSC_VER |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
35 | #include <windows.h> |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
36 | #include <shlwapi.h> |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
37 | |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
38 | void get_working_dir(const char** out_ptr, size_t *out_len) { |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
39 | static char cwd[MAX_PATH]; |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
40 | if (GetCurrentDirectory(MAX_PATH, cwd) == 0) { |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
41 | fprintf(stderr, "Could not get current working directory.\n"); |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
42 | exit(1); |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
43 | } |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
44 | size_t len = strlen(cwd); |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
45 | if (cwd[len - 1] != '/') { |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
46 | cwd[len++] = '/'; |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
47 | cwd[len] = '\0'; |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
48 | } |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
49 | *out_ptr = cwd; |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
50 | *out_len = len; |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
51 | } |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
52 | bool path_is_relative(const char *path) { |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
53 | return PathIsRelative(path); |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
54 | } |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
55 | int pathcmp(const char *p1, const char *p2) { |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
56 | return strcasecmp(p1, p2); |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
57 | } |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
58 | #else |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
59 | #include <unistd.h> |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
60 | void get_working_dir(const char** out_ptr, size_t *out_len) { |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
61 | static char cwd[PATH_MAX]; |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
62 | if (getcwd(cwd, sizeof(cwd)) == NULL) { |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
63 | fprintf(stderr, "Could not get current working directory.\n"); |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
64 | exit(1); |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
65 | } |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
66 | size_t len = strlen(cwd); |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
67 | if (cwd[len - 1] != '/') { |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
68 | cwd[len++] = '/'; |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
69 | cwd[len] = '\0'; |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
70 | } |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
71 | *out_ptr = cwd; |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
72 | *out_len = len; |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
73 | } |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
74 | bool path_is_relative(const char *path) { |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
75 | return path[0] != '/'; |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
76 | } |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
77 | int pathcmp(const char *p1, const char *p2) { |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
78 | return strcmp(p1, p2); |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
79 | } |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
80 | #endif |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
81 | |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
82 | typedef struct filelist filelist_t; |
|
23
778388400f7b
encapsulated scanner arguments + enabled optimizer + empty file is no bfile
Mike Becker <universe@uap-core.de>
parents:
22
diff
changeset
|
83 | |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
84 | struct filelist { |
|
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
85 | char *displayname; |
|
66
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
86 | unsigned displayname_len; |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
87 | char *filename; |
|
61
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
88 | char *ext; |
|
66
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
89 | unsigned st_mode; |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
90 | filelist_t *next; |
|
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
91 | }; |
|
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
92 | |
|
61
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
93 | static bool testSuffix(char* filename, string_list_t* list) { |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
94 | bool ret = false; |
|
66
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
95 | size_t tokenlen, fnamelen = strlen(filename); |
|
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
96 | for (size_t t = 0 ; t < list->count ; t++) { |
|
61
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
97 | tokenlen = strlen(list->items[t]); |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
98 | if (fnamelen >= tokenlen && tokenlen > 0) { |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
99 | if (strncmp(filename+fnamelen-tokenlen, |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
100 | list->items[t], tokenlen) == 0) { |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
101 | ret = true; |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
102 | break; |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
103 | } |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
104 | } |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
105 | } |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
106 | return ret; |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
107 | } |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
108 | |
|
66
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
109 | static void addResultPerExtension(scanresult_ext_t* result, |
|
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
110 | char* ext, unsigned value) { |
|
61
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
111 | if (!result) return; |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
112 | |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
113 | if (!ext) ext = "w/o"; |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
114 | |
|
66
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
115 | for (unsigned i = 0 ; i < result->count ; i++) { |
|
61
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
116 | if (strcasecmp(result->extensions[i], ext) == 0) { |
|
66
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
117 | result->result[i] += value; |
|
61
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
118 | return; |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
119 | } |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
120 | } |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
121 | |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
122 | if (result->count == result->capacity) { |
|
66
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
123 | unsigned newcap = result->capacity+8; |
|
61
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
124 | char** extarr = realloc(result->extensions, newcap*sizeof(char*)); |
|
66
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
125 | unsigned* resultarr = realloc(result->result, newcap*sizeof(unsigned)); |
|
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
126 | if (!extarr || !resultarr) { |
|
61
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
127 | fprintf(stderr, "Memory allocation error.\n"); |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
128 | abort(); |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
129 | } |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
130 | result->extensions = extarr; |
|
66
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
131 | result->result = resultarr; |
|
61
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
132 | result->capacity = newcap; |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
133 | } |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
134 | |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
135 | result->extensions[result->count] = strdup(ext); |
|
66
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
136 | result->result[result->count] = value; |
|
61
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
137 | result->count++; |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
138 | } |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
139 | |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
140 | scanresult_t* new_scanresult_t(settings_t* settings) { |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
141 | scanresult_t* result = calloc(1, sizeof(scanresult_t)); |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
142 | if (settings->individual_sums) { |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
143 | result->ext = calloc(1, sizeof(scanresult_ext_t)); |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
144 | } |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
145 | return result; |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
146 | } |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
147 | |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
148 | void destroy_scanresult_t(scanresult_t* result) { |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
149 | if (result->ext) { |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
150 | if (result->ext->count > 0) { |
|
66
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
151 | for (unsigned i = 0 ; i < result->ext->count ; i++) { |
|
61
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
152 | free(result->ext->extensions[i]); |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
153 | } |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
154 | free(result->ext->extensions); |
|
66
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
155 | free(result->ext->result); |
|
61
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
156 | } |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
157 | free(result->ext); |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
158 | } |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
159 | free(result); |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
160 | } |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
161 | |
|
66
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
162 | static filelist_t *buildFileList(scanner_t scanner, settings_t* settings) { |
|
61
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
163 | |
|
66
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
164 | filelist_t* list = NULL; |
|
23
778388400f7b
encapsulated scanner arguments + enabled optimizer + empty file is no bfile
Mike Becker <universe@uap-core.de>
parents:
22
diff
changeset
|
165 | DIR *dirf; |
|
3
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
166 | struct dirent *entry; |
|
23
778388400f7b
encapsulated scanner arguments + enabled optimizer + empty file is no bfile
Mike Becker <universe@uap-core.de>
parents:
22
diff
changeset
|
167 | struct stat statbuf; |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
168 | |
|
23
778388400f7b
encapsulated scanner arguments + enabled optimizer + empty file is no bfile
Mike Becker <universe@uap-core.de>
parents:
22
diff
changeset
|
169 | if ((dirf = opendir(scanner.dir)) == NULL) { |
|
58
bb512754aaf3
fixes error message when directory access fails
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
170 | fprintf(stderr, "%s - ", scanner.dir); |
|
bb512754aaf3
fixes error message when directory access fails
Mike Becker <universe@uap-core.de>
parents:
57
diff
changeset
|
171 | perror("Directory access failed"); |
|
23
778388400f7b
encapsulated scanner arguments + enabled optimizer + empty file is no bfile
Mike Becker <universe@uap-core.de>
parents:
22
diff
changeset
|
172 | return 0; |
|
778388400f7b
encapsulated scanner arguments + enabled optimizer + empty file is no bfile
Mike Becker <universe@uap-core.de>
parents:
22
diff
changeset
|
173 | } |
|
778388400f7b
encapsulated scanner arguments + enabled optimizer + empty file is no bfile
Mike Becker <universe@uap-core.de>
parents:
22
diff
changeset
|
174 | |
|
778388400f7b
encapsulated scanner arguments + enabled optimizer + empty file is no bfile
Mike Becker <universe@uap-core.de>
parents:
22
diff
changeset
|
175 | while ((entry = readdir(dirf)) != NULL) { |
|
3
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
176 | if (strcmp(entry->d_name, ".") != 0 && strcmp(entry->d_name, "..") != 0) { |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
177 | |
|
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
178 | /* Create new filelist entry */ |
|
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
179 | filelist_t *newentry = (filelist_t*) malloc(sizeof(filelist_t)); |
| 42 | 180 | newentry->next = NULL; |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
181 | |
| 42 | 182 | newentry->displayname_len = strlen(entry->d_name); |
| 183 | newentry->displayname = (char*) malloc(newentry->displayname_len+1); | |
| 184 | memcpy(newentry->displayname, entry->d_name, newentry->displayname_len); | |
| 185 | newentry->displayname[newentry->displayname_len] = 0; | |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
186 | |
| 42 | 187 | newentry->st_mode = 0; |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
188 | |
|
40
5938a9b74e8e
improved printing the results and fixed bug where the filename was displayed as an empty string
Mike Becker <universe@uap-core.de>
parents:
36
diff
changeset
|
189 | /* Construct absolute pathname string */ |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
190 | size_t dirnamelen = strlen(scanner.dir); |
| 42 | 191 | char *filename = (char*) malloc(2+dirnamelen+newentry->displayname_len); |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
192 | memcpy(filename, scanner.dir, dirnamelen); |
|
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
193 | filename[dirnamelen] = settings->fileSeparator; |
| 42 | 194 | memcpy(filename+dirnamelen+1, entry->d_name, newentry->displayname_len); |
| 195 | filename[1+dirnamelen+newentry->displayname_len] = 0; | |
| 196 | newentry->filename = filename; | |
|
61
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
197 | |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
198 | /* Obtain file extension */ |
|
9c8d768f0244
adds option to compute individual sums
Mike Becker <universe@uap-core.de>
parents:
60
diff
changeset
|
199 | newentry->ext = strrchr(newentry->displayname, '.'); |
|
14
ee9333c91dda
some minor fixes + makefile now injects revisionnumber into cline.h
Mike Becker <universe@uap-core.de>
parents:
10
diff
changeset
|
200 | |
|
22
4508da679ffb
completed binary file heuristics
Mike Becker <universe@uap-core.de>
parents:
21
diff
changeset
|
201 | /* Check for subdirectory */ |
|
23
778388400f7b
encapsulated scanner arguments + enabled optimizer + empty file is no bfile
Mike Becker <universe@uap-core.de>
parents:
22
diff
changeset
|
202 | if (stat(filename, &statbuf) == 0) { |
| 42 | 203 | newentry->st_mode = statbuf.st_mode; |
|
23
778388400f7b
encapsulated scanner arguments + enabled optimizer + empty file is no bfile
Mike Becker <universe@uap-core.de>
parents:
22
diff
changeset
|
204 | } else { |
|
778388400f7b
encapsulated scanner arguments + enabled optimizer + empty file is no bfile
Mike Becker <universe@uap-core.de>
parents:
22
diff
changeset
|
205 | perror(" Error in stat call"); |
|
3
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
206 | continue; |
|
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
207 | } |
| 42 | 208 | |
| 209 | if (list) { | |
|
66
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
210 | /* create fake root to have a pointer on the true root */ |
| 42 | 211 | filelist_t root; |
| 212 | root.next = list; | |
| 213 | filelist_t *parent = &root; | |
| 214 | while (parent->next && | |
| 215 | (strcasecmp(parent->next->displayname, newentry->displayname) < 0 || | |
| 216 | (!S_ISDIR(newentry->st_mode) && S_ISDIR(parent->next->st_mode)) | |
| 217 | ) && | |
| 218 | (!S_ISDIR(newentry->st_mode) || S_ISDIR(parent->next->st_mode)) | |
| 219 | ) { | |
| 220 | parent = parent->next; | |
| 221 | } | |
| 222 | newentry->next = parent->next; | |
| 223 | parent->next = newentry; | |
| 224 | list = root.next; | |
| 225 | } else { | |
| 226 | list = newentry; | |
| 227 | } | |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
228 | } |
|
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
229 | } |
|
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
230 | |
|
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
231 | closedir(dirf); |
|
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
232 | |
|
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
233 | return list; |
|
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
234 | } |
|
3
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
235 | |
|
95
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
236 | static bool is_dir_excluded(settings_t* settings, const char* dir) { |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
237 | const string_list_t * const list = settings->excludeDirs; |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
238 | |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
239 | for (size_t i = 0 ; i < list->count ; i++) { |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
240 | /* determine if the list item is a path or a name */ |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
241 | if (strchr(list->items[i], settings->fileSeparator) == NULL) { |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
242 | /* compare only the name */ |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
243 | const char *dirpart = strrchr(dir, settings->fileSeparator); |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
244 | if (dirpart == NULL) { |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
245 | dirpart = dir; |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
246 | } else { |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
247 | dirpart++; |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
248 | } |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
249 | if (pathcmp(list->items[i], dirpart) == 0) { |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
250 | return true; |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
251 | } |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
252 | } else { |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
253 | /* compare the full paths */ |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
254 | char* absdir = make_path_absolute(dir); |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
255 | if (pathcmp(list->items[i], absdir) == 0) { |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
256 | free(absdir); |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
257 | return true; |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
258 | } |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
259 | free(absdir); |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
260 | } |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
261 | } |
|
90
9b541d22d649
support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents:
82
diff
changeset
|
262 | return false; |
|
9b541d22d649
support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents:
82
diff
changeset
|
263 | } |
|
9b541d22d649
support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents:
82
diff
changeset
|
264 | |
|
60
69be673a4fd0
preparing changes for individual sum feature
Mike Becker <universe@uap-core.de>
parents:
58
diff
changeset
|
265 | void scanDirectory(scanner_t scanner, settings_t* settings, |
|
69be673a4fd0
preparing changes for individual sum feature
Mike Becker <universe@uap-core.de>
parents:
58
diff
changeset
|
266 | string_list_t* output, scanresult_t* result) { |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
267 | |
|
66
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
268 | result->result = 0; |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
269 | bool bfile; |
|
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:
43
diff
changeset
|
270 | char *outbuf; |
|
66
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
271 | const char *result_type = settings->count_chars ? "chars" : "lines"; |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
272 | |
|
66
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
273 | filelist_t *filelist = buildFileList(scanner, settings); |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
274 | |
|
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
275 | while (filelist != NULL) { |
|
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
276 | |
|
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
277 | /* Scan subdirectories */ |
| 42 | 278 | if (!S_ISREG(filelist->st_mode)) { |
|
79
e4592d0292e7
implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
279 | if (S_ISDIR(filelist->st_mode)) { |
|
e4592d0292e7
implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
280 | if (settings->recursive) { |
|
95
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
281 | if (is_dir_excluded(settings, filelist->filename)) { |
|
90
9b541d22d649
support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents:
82
diff
changeset
|
282 | if (!settings->matchesOnly && settings->verbose) { |
|
95
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
283 | /* Print hint */ |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
284 | outbuf = malloc(81); |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
285 | snprintf(outbuf, 81, "%*s%*s%19s\n", |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
286 | filelist->displayname_len + scanner.spaces, |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
287 | filelist->displayname, |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
288 | 60 - filelist->displayname_len - scanner.spaces, |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
289 | "", "no match"); |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
290 | add_string(output, outbuf); |
|
79
e4592d0292e7
implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
291 | } |
|
90
9b541d22d649
support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents:
82
diff
changeset
|
292 | } else { |
|
9b541d22d649
support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents:
82
diff
changeset
|
293 | string_list_t *recoutput = settings->verbose ? new_string_list_t() : NULL; |
|
9b541d22d649
support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents:
82
diff
changeset
|
294 | scanresult_t recresult; |
|
9b541d22d649
support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents:
82
diff
changeset
|
295 | recresult.ext = result->ext; |
|
9b541d22d649
support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents:
82
diff
changeset
|
296 | scanDirectory( |
|
9b541d22d649
support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents:
82
diff
changeset
|
297 | (scanner_t) {filelist->filename, scanner.spaces+1}, |
|
9b541d22d649
support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents:
82
diff
changeset
|
298 | settings, recoutput, &recresult); |
|
9b541d22d649
support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents:
82
diff
changeset
|
299 | result->result += recresult.result; |
|
9b541d22d649
support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents:
82
diff
changeset
|
300 | if (settings->verbose && (!settings->matchesOnly || recresult.result > 0)) { |
|
9b541d22d649
support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents:
82
diff
changeset
|
301 | outbuf = (char*) malloc(81); |
|
9b541d22d649
support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents:
82
diff
changeset
|
302 | snprintf(outbuf, 81, "%*s/%*s%13u %s\n", |
|
9b541d22d649
support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents:
82
diff
changeset
|
303 | filelist->displayname_len+scanner.spaces, filelist->displayname, |
|
9b541d22d649
support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents:
82
diff
changeset
|
304 | 60-filelist->displayname_len-scanner.spaces-1, "", |
|
9b541d22d649
support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents:
82
diff
changeset
|
305 | recresult.result, result_type); |
|
9b541d22d649
support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents:
82
diff
changeset
|
306 | add_string(output, outbuf); |
|
9b541d22d649
support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents:
82
diff
changeset
|
307 | for (unsigned i = 0 ; i < recoutput->count ; i++) { |
|
9b541d22d649
support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents:
82
diff
changeset
|
308 | add_string(output, recoutput->items[i]); |
|
9b541d22d649
support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents:
82
diff
changeset
|
309 | } |
|
9b541d22d649
support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents:
82
diff
changeset
|
310 | } |
|
9b541d22d649
support dir exclusion part 1/2
Mike Becker <universe@uap-core.de>
parents:
82
diff
changeset
|
311 | destroy_string_list_t(recoutput); |
|
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:
43
diff
changeset
|
312 | } |
|
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:
43
diff
changeset
|
313 | } |
|
82
44b3332dfe03
greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
314 | } else if (!settings->matchesOnly && settings->verbose) { |
|
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:
43
diff
changeset
|
315 | outbuf = (char*) malloc(81); |
|
66
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
316 | snprintf(outbuf, 81, "%*s\n", |
|
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
317 | filelist->displayname_len+scanner.spaces, |
|
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
318 | filelist->displayname); |
|
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:
43
diff
changeset
|
319 | add_string(output, outbuf); |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
320 | } |
|
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
321 | } else { |
|
30
d642fdb6745e
allow parallel use of -s and -S
Mike Becker <universe@uap-core.de>
parents:
28
diff
changeset
|
322 | if ((settings->includeSuffixes->count == 0 |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
323 | || testSuffix(filelist->displayname, settings->includeSuffixes)) |
|
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
324 | && !testSuffix(filelist->displayname, settings->excludeSuffixes)) { |
|
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
325 | |
|
66
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
326 | /* Count */ |
|
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
327 | unsigned res_value = 0; |
|
25
802c5382f499
Added line buffer (and warning message - there is no regexp parser, though)
Mike Becker <universe@uap-core.de>
parents:
23
diff
changeset
|
328 | bfile = false; |
|
802c5382f499
Added line buffer (and warning message - there is no regexp parser, though)
Mike Becker <universe@uap-core.de>
parents:
23
diff
changeset
|
329 | bfile_reset(settings->bfileHeuristics); |
|
54
76d46533b9a9
regex parser was not properly reset before each file, sometimes resulting in wrong line counts, when the previous scanned file ended with a match
Mike Becker <universe@uap-core.de>
parents:
48
diff
changeset
|
330 | regex_parser_reset(settings->regex); |
|
76
d11c154e33e1
fix zero-terminator written to wrong position when encountering too long lines - fixes #490
Mike Becker <universe@uap-core.de>
parents:
66
diff
changeset
|
331 | char line_buffer[MAX_LINELENGTH + 1]; |
|
66
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
332 | unsigned line_buffer_pos = 0; |
|
25
802c5382f499
Added line buffer (and warning message - there is no regexp parser, though)
Mike Becker <universe@uap-core.de>
parents:
23
diff
changeset
|
333 | |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
334 | FILE *file = fopen(filelist->filename, "r"); |
|
3
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
335 | if (file == NULL) { |
|
82
44b3332dfe03
greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
336 | fprintf(stderr, "Error: %s", filelist->displayname); |
|
3
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
337 | perror(" File acces failed"); |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
338 | } else { |
|
66
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
339 | int a; |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
340 | do { |
|
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
341 | a = fgetc(file); |
|
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
342 | |
|
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
343 | bfile = bfile_check(settings->bfileHeuristics, a); |
|
3
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
344 | |
|
66
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
345 | /* ignore carriage return completely */ |
|
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
346 | if (a == 13) continue; |
|
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
347 | |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
348 | if (a == 10 || a == EOF) { |
|
66
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
349 | line_buffer[line_buffer_pos] = 0; |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
350 | if (regex_parser_do(settings->regex, line_buffer) == 0) { |
|
66
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
351 | /* Subtract excluded lines/chars when matching has finished */ |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
352 | if (!regex_parser_matching(settings->regex)) { |
|
66
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
353 | res_value -= settings->regex->matched_counted; |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
354 | } |
|
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
355 | } |
|
21
91e0890464b0
implemented bfile heuristics option + TODO: implement algorithm
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
356 | |
|
66
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
357 | if (settings->count_chars) { |
|
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
358 | for (size_t i = 0 ; i < line_buffer_pos ; i++) { |
|
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
359 | if (!isspace(line_buffer[i])) res_value++; |
|
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
360 | } |
|
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
361 | } else { |
|
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
362 | res_value++; |
|
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
363 | } |
|
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
364 | line_buffer_pos = 0; |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
365 | } else { |
|
66
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
366 | if (line_buffer_pos < MAX_LINELENGTH) { |
|
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
367 | line_buffer[line_buffer_pos] = (char) a; |
|
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
368 | line_buffer_pos++; |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
369 | } else { |
|
76
d11c154e33e1
fix zero-terminator written to wrong position when encountering too long lines - fixes #490
Mike Becker <universe@uap-core.de>
parents:
66
diff
changeset
|
370 | line_buffer[line_buffer_pos] = 0; |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
371 | settings->confusing_lnlen = true; |
| 28 | 372 | } |
| 373 | } | |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
374 | } while (!bfile && a != EOF); |
|
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
375 | fclose(file); |
|
25
802c5382f499
Added line buffer (and warning message - there is no regexp parser, though)
Mike Becker <universe@uap-core.de>
parents:
23
diff
changeset
|
376 | |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
377 | /* Print and sum line count */ |
|
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
378 | if (bfile) { |
|
82
44b3332dfe03
greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
379 | if (!settings->matchesOnly && !settings->dirsOnly && settings->verbose) { |
|
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:
43
diff
changeset
|
380 | outbuf = (char*) malloc(81); |
|
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:
43
diff
changeset
|
381 | snprintf(outbuf, 81, |
|
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:
43
diff
changeset
|
382 | "%*s%*s%19s\n", filelist->displayname_len+scanner.spaces, |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
383 | filelist->displayname, |
|
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
384 | 60-filelist->displayname_len-scanner.spaces, "", "binary"); |
|
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:
43
diff
changeset
|
385 | add_string(output, outbuf); |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
386 | } |
|
25
802c5382f499
Added line buffer (and warning message - there is no regexp parser, though)
Mike Becker <universe@uap-core.de>
parents:
23
diff
changeset
|
387 | } else { |
|
66
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
388 | addResultPerExtension(result->ext, filelist->ext, res_value); |
|
be2084398c37
new feature: count non-whitespace characters
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
389 | result->result += res_value; |
|
82
44b3332dfe03
greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
390 | if (!settings->dirsOnly && settings->verbose) { |
|
79
e4592d0292e7
implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
391 | outbuf = (char*) malloc(81); |
|
e4592d0292e7
implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
392 | snprintf(outbuf, 81, "%*s%*s%13u %s\n", |
|
e4592d0292e7
implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
393 | filelist->displayname_len+scanner.spaces, |
|
e4592d0292e7
implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
394 | filelist->displayname, |
|
e4592d0292e7
implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
395 | 60-filelist->displayname_len-scanner.spaces, |
|
e4592d0292e7
implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
396 | "", |
|
e4592d0292e7
implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
397 | res_value, |
|
e4592d0292e7
implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
398 | result_type |
|
e4592d0292e7
implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
399 | ); |
|
e4592d0292e7
implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
400 | add_string(output, outbuf); |
|
e4592d0292e7
implement -d option (issue #489) and various improvements
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
401 | } |
|
3
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
402 | } |
|
21
91e0890464b0
implemented bfile heuristics option + TODO: implement algorithm
Mike Becker <universe@uap-core.de>
parents:
20
diff
changeset
|
403 | } |
|
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
|
404 | } else { |
|
82
44b3332dfe03
greatly improve memory usage - fixes #634
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
405 | if (!settings->matchesOnly && !settings->dirsOnly && settings->verbose) { |
|
22
4508da679ffb
completed binary file heuristics
Mike Becker <universe@uap-core.de>
parents:
21
diff
changeset
|
406 | /* Print hint */ |
|
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:
43
diff
changeset
|
407 | outbuf = (char*) malloc(81); |
|
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:
43
diff
changeset
|
408 | snprintf(outbuf, 81, "%*s%*s%19s\n", |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
409 | filelist->displayname_len+scanner.spaces, filelist->displayname, |
|
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
410 | 60-filelist->displayname_len-scanner.spaces, "", "no match"); |
|
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:
43
diff
changeset
|
411 | add_string(output, outbuf); |
|
3
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
412 | } |
|
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
413 | } |
|
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
414 | } |
|
41
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
415 | |
|
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
416 | free(filelist->filename); |
|
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
417 | free(filelist->displayname); |
|
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
418 | filelist_t *freethis = filelist; |
|
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
419 | filelist = filelist->next; |
|
c2e73e175341
replaced direct scanning of directories with a two-step approach (first: create filename list, second: scan)
Mike Becker <universe@uap-core.de>
parents:
40
diff
changeset
|
420 | free(freethis); |
|
3
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
421 | } |
|
510d6b198dde
Moved some functions to functions.c
Mike Becker <universe@uap-core.de>
parents:
1
diff
changeset
|
422 | } |
|
95
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
423 | |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
424 | char *make_path_absolute(const char *path) { |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
425 | static const char *cwd = NULL; |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
426 | static size_t cwdlen = 0; |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
427 | #ifdef _WIN32 |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
428 | static char fs = '\\'; |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
429 | #else |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
430 | static char fs = '/'; |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
431 | #endif /* _WIN32 */ |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
432 | if (path_is_relative(path)) { |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
433 | if (cwdlen == 0) { |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
434 | get_working_dir(&cwd, &cwdlen); |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
435 | } |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
436 | size_t pathlen = strlen(path); |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
437 | char *result = malloc(pathlen+cwdlen+1); |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
438 | const char *part = path; |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
439 | size_t partlen = pathlen; |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
440 | if (part[0] == '.' && part[1] == fs) { |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
441 | part += 2; |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
442 | partlen -= 2; |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
443 | } |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
444 | memcpy(result, cwd, cwdlen); |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
445 | memcpy(result+cwdlen, part, partlen); |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
446 | result[cwdlen+partlen] = '\0'; |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
447 | return result; |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
448 | } else { |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
449 | return strdup(path); |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
450 | } |
|
8a20001544c1
support dir exclusion part 2/2
Mike Becker <universe@uap-core.de>
parents:
90
diff
changeset
|
451 | } |