From: Randy Dunlap <rdunlap@xenotime.net>
Date: Thu, 7 Jul 2005 22:39:26 +0000 (-0700)
Subject: [PATCH] scripts/kernel-doc: don't use uninitialized SRCTREE
X-Git-Tag: v2.6.14-rc1~750^2~31
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2283a117f65650352f2a9fd6b9af4cdbf5478d14;p=linux-2.6-omap-h63xx.git

[PATCH] scripts/kernel-doc: don't use uninitialized SRCTREE

Current kernel-doc (perl) script generates this warning:
Use of uninitialized value in concatenation (.) or string at scripts/kernel-doc line 1668.

So explicitly check for SRCTREE in the ENV before using it,
and then if it is set, append a '/' to the end of it, otherwise
the SRCTREE + filename can (will) be missing the intermediate '/'.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---

diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 0835dc2a8aa..8aaf74e6418 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1665,11 +1665,17 @@ sub xml_escape($) {
 }
 
 sub process_file($) {
-    my ($file) = "$ENV{'SRCTREE'}@_";
+    my $file;
     my $identifier;
     my $func;
     my $initial_section_counter = $section_counter;
 
+    if (defined($ENV{'SRCTREE'})) {
+	$file = "$ENV{'SRCTREE'}" . "/" . "@_";
+    }
+    else {
+	$file = "@_";
+    }
     if (defined($source_map{$file})) {
 	$file = $source_map{$file};
     }