summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Configure1
-rw-r--r--scripts/Menuconfig1
-rw-r--r--scripts/header.tk1
-rw-r--r--scripts/kernel-doc9
4 files changed, 10 insertions, 2 deletions
diff --git a/scripts/Configure b/scripts/Configure
index f931c4cbfd04..58375f239bbc 100644
--- a/scripts/Configure
+++ b/scripts/Configure
@@ -92,6 +92,7 @@ ${var}:\\
/^#/b
/^[^ ]/q
+ /<file:\\([^>]*\\)>/s//\\1/g
p
}" Documentation/Configure.help)
if [ -z "$text" ]
diff --git a/scripts/Menuconfig b/scripts/Menuconfig
index b1d21bb0b666..b48d36bcb974 100644
--- a/scripts/Menuconfig
+++ b/scripts/Menuconfig
@@ -376,6 +376,7 @@ ${var}:\\
/^#/b
/^[^ ]/q
s/^ //
+ /<file:\\([^>]*\\)>/s//\\1/g
p
}" Documentation/Configure.help)
diff --git a/scripts/header.tk b/scripts/header.tk
index 94963425a9a5..2cc9c7e534e9 100644
--- a/scripts/header.tk
+++ b/scripts/header.tk
@@ -466,6 +466,7 @@ ${var}:\\
/^#/b
/^\[^ \]/q
s/^ //
+ /<file:\\(\[^>\]*\\)>/s//\\1/g
p
}
" Documentation/Configure.help]
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 32e4d97929e4..1f9a4bdf3a25 100644
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -18,6 +18,11 @@ use strict;
# Functions prototyped as foo(void) same as foo()
# Stop eval'ing where we don't need to.
# -- huggie@earth.li
+
+# 27/06/2001 - Allowed whitespace after initial "/**" and
+# allowed comments before function declarations.
+# -- Christian Kreibich <ck@whoop.org>
+
# Still to do:
# - add perldoc documentation
# - Look more closely at some of the scarier bits :)
@@ -825,7 +830,7 @@ $section = "";
$doc_special = "\@\%\$\&";
-$doc_start = "^/\\*\\*\$";
+$doc_start = "^/\\*\\*\\s*\$"; # Allow whitespace at end of comment start.
$doc_end = "\\*/";
$doc_com = "\\s*\\*\\s*";
$doc_func = $doc_com."(\\w+):?";
@@ -975,7 +980,7 @@ sub process_file($) {
elsif (/([^\{]*)/) {
$prototype .= $1;
}
- if (/\{/ || /\#/) { # added for #define AK
+ if (/\{/ || /\#/ || /;/) { # added for #define AK, ';' added for declarations.
$prototype =~ s@/\*.*?\*/@@gos; # strip comments.
$prototype =~ s@[\r\n]+@ @gos; # strip newlines/cr's.
$prototype =~ s@^ +@@gos; # strip leading spaces