1 |
commit: cd7c5018d4bffa34bd5aab6848525fd83d392de7 |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Apr 1 10:20:12 2018 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 1 10:20:12 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=cd7c5018 |
7 |
|
8 |
read_portage_env_file: properly ignore backup files |
9 |
|
10 |
backup files are suffixed by '~', not prefixed |
11 |
|
12 |
main.c | 3 ++- |
13 |
1 file changed, 2 insertions(+), 1 deletion(-) |
14 |
|
15 |
diff --git a/main.c b/main.c |
16 |
index 85740b8..023b42e 100644 |
17 |
--- a/main.c |
18 |
+++ b/main.c |
19 |
@@ -670,7 +670,8 @@ read_portage_env_file(const char *configroot, const char *file, env_vars vars[]) |
20 |
/* recurse through all files */ |
21 |
for (di = 0; di < dentslen; di++) { |
22 |
d = dents[di]; |
23 |
- if (d->d_name[0] == '.' || d->d_name[0] == '~') |
24 |
+ if (d->d_name[0] == '.' || d->d_name[0] == '\0' || |
25 |
+ d->d_name[strlen(d->d_name) - 1] == '~') |
26 |
continue; |
27 |
snprintf(npath, sizeof(npath), "%s/%s", file, d->d_name); |
28 |
read_portage_env_file(configroot, npath, vars); |