diff options
author | Ján Sáreník <jajomojo@gmail.com> | 2021-06-05 18:24:57 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2021-06-05 18:40:58 +0200 |
commit | 8c1f8aa016faee3fa151d134c3544b2dd5bab832 (patch) | |
tree | 4ea9cb6f3e9080d4cfc2273b8a5f8ce78ca13273 | |
parent | 947a22b33262c93e5c50286b723b9086a33a4c1f (diff) | |
download | busybox-w32-8c1f8aa016faee3fa151d134c3544b2dd5bab832.tar.gz busybox-w32-8c1f8aa016faee3fa151d134c3544b2dd5bab832.tar.bz2 busybox-w32-8c1f8aa016faee3fa151d134c3544b2dd5bab832.zip |
run-parts: permit dot later in file name
See https://gist.github.com/andyshinn/3ae01fa13cb64c9d36e7#gistcomment-2044506
To test:
mkdir /tmp/testrp
printf "#!/bin/sh\necho test\n" > /tmp/testrp/test.sh
chmod a+x /tmp/testrp/*
busybox run-parts /tmp/testrp
test
mv /tmp/testrp/test.sh /tmp/testrp/.test.sh
busybox run-parts /tmp/testrp
# no output
function old new delta
act 190 200 +10
Signed-off-by: Ján Sáreník <jajomojo@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | debianutils/run_parts.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/debianutils/run_parts.c b/debianutils/run_parts.c index 585a4b58f..f528c88ff 100644 --- a/debianutils/run_parts.c +++ b/debianutils/run_parts.c | |||
@@ -113,13 +113,24 @@ enum { | |||
113 | }; | 113 | }; |
114 | 114 | ||
115 | /* Is this a valid filename (upper/lower alpha, digits, | 115 | /* Is this a valid filename (upper/lower alpha, digits, |
116 | * underscores, and hyphens only?) | 116 | * underscores, hyphens, and non-leading dots only?) |
117 | */ | 117 | */ |
118 | static bool invalid_name(const char *c) | 118 | static bool invalid_name(const char *c) |
119 | { | 119 | { |
120 | c = bb_basename(c); | 120 | c = bb_basename(c); |
121 | 121 | ||
122 | while (*c && (isalnum(*c) || *c == '_' || *c == '-')) | 122 | if (*c == '.') |
123 | return *c; | ||
124 | |||
125 | /* Debian run-parts 4.8.3, manpage: | ||
126 | * "...the names must consist entirely of ASCII letters, | ||
127 | * ASCII digits, ASCII underscores, and ASCII minus-hyphens. | ||
128 | * However, the name must not begin with a period." | ||
129 | * The last sentence is a giveaway that something is fishy | ||
130 | * (why mention leading dot if dots are not allowed anyway?). | ||
131 | * Yes, you guessed it right: in fact non-leading dots ARE allowed. | ||
132 | */ | ||
133 | while (isalnum(*c) || *c == '_' || *c == '-' || *c == '.') | ||
123 | c++; | 134 | c++; |
124 | 135 | ||
125 | return *c; /* TRUE (!0) if terminating NUL is not reached */ | 136 | return *c; /* TRUE (!0) if terminating NUL is not reached */ |