From: nasm-bot f. C. G. <gor...@gm...> - 2018-10-25 22:33:17
|
Commit-ID: fe2e1d469ac163a076e5cbc760cc3f4f051ee615 Gitweb: http://repo.or.cz/w/nasm.git?a=commitdiff;h=fe2e1d469ac163a076e5cbc760cc3f4f051ee615 Author: Cyrill Gorcunov <gor...@gm...> AuthorDate: Thu, 25 Oct 2018 23:40:42 +0300 Committer: Cyrill Gorcunov <gor...@gm...> CommitDate: Fri, 26 Oct 2018 01:29:52 +0300 doc: Clarify %include search directory semantics Signed-off-by: Cyrill Gorcunov <gor...@gm...> --- doc/changes.src | 2 +- doc/nasmdoc.src | 16 ++++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/doc/changes.src b/doc/changes.src index 7da6662..efed8a1 100644 --- a/doc/changes.src +++ b/doc/changes.src @@ -9,7 +9,7 @@ since 2007. \S{cl-2.14} Version 2.14 -\b Fixed \c{-I} option handling when ending slash is not present. +\b Changed \c{-I} option semantics by adding a trailing path separator unconditionally. \b Fixed null dereference in corrupted invalid single line macros. diff --git a/doc/nasmdoc.src b/doc/nasmdoc.src index fb140e9..782914d 100644 --- a/doc/nasmdoc.src +++ b/doc/nasmdoc.src @@ -628,16 +628,12 @@ library}, for example, by typing (As usual, a space between \c{-i} and the path name is allowed, and optional). -NASM, in the interests of complete source-code portability, does not -understand the file naming conventions of the OS it is running on; -the string you provide as an argument to the \c{-i} option will be -prepended exactly as written to the name of the include file. -Therefore the trailing backslash in the above example is necessary. -Under Unix, a trailing forward slash is similarly necessary. - -(You can use this to your advantage, if you're really \i{perverse}, -by noting that the option \c{-ifoo} will cause \c{%include "bar.i"} -to search for the file \c{foobar.i}...) +Prior NASM 2.14 a path provided in the option has been considered as +a verbatim copy and providing a path separator been up to a caller. +One could implicitly concatenate a search path together with a filename. +Still this was rather a trick than something useful. Now the trailing +path separator is made to always present, thus \c{-ifoo} will be +considered as the \c{-ifoo/} directory. If you want to define a \e{standard} \i{include search path}, similar to \c{/usr/include} on Unix systems, you should place one or |