diff options
author | Martijn Dekker <martijn@inlv.org> | 2016-09-06 03:24:01 +0200 |
---|---|---|
committer | Martijn Dekker <martijn@inlv.org> | 2016-09-06 03:24:01 +0200 |
commit | 54cc0c80600035b3ac09f2a50a60f1cfb33b3942 (patch) | |
tree | f80e29151bf057e7368914db3c544e936b9317f7 /.body_begin.template | |
parent | d1a84d6eecdb1a45be6521751bec6afd18db601b (diff) |
More code refactoring. Limit word splitting and disable globbing by default.
- Globally, now do word splitting (IFS) only on newline (which also makes
"$*" expand with newline separator instead of space).
- Disable globbing (pathmame expansion), to be re-enabled locally using
'set +f' where needed (typically in a subshell).
These changes help eliminate unexpected snags and security vulnerabilities
in case someone forgets to quote a variable somewhere. They should also make
the code "just work" with spaces and other special characters in file names
and tags (as long as they're not newline characters, but that can't happen
with regular use of the script as the newline is the separator). This means
that, as of this change, editing or completely emptying the convert_filename
filter should no longer pose any problems as far as bb.sh is concerned.
The changes to adapt the code to the above are mainly:
- Now that we do word splitting on newline only, we can go back to iterating
through files in a "for" loop instead of using "read" with a here-document,
which is more readable. However, to enable globbing locally, a technique
adaptation is needed, like:
for file in $(set +f; printf '%s\n' *.html)
or
for file in $(set +f; ls -t -- *.html) # sort by date, newest first
Given IFS=$'\n' and globbing disabled globally, this technique is robust
for all special characters in file names except for newlines.
- invoke_editor() function replaces direct $EDITOR calls, because we need to
locally word-split $EDITOR on spaces in case it contains arguments.
- parse_file(): rewrite tag parsing to handle possible spaces in tags
- tags_in_post(): output line-separated instead of space-separated tags;
further adjust sed script to handle possible spaces in tags
- rebuild_tags(): this function was refactored to use an array internally.
Instead of two combined strings, it now takes HTML files and tags as
separate arguments, separated by a single "--tag" argument. This allows
for spaces and other special characters in both file names and tags. (See
also commit a674ec5, which started this but didn't finish it).
Diffstat (limited to '.body_begin.template')
0 files changed, 0 insertions, 0 deletions