scripts: allow docproc invocation from external
PATCH 1/1 scripts: allow docproc invocation from external
- getcwd returns path without slash at the end, add the slash
- add KERNSRCTREE env, so that we can specify path for kernel (for knowing where to find scripts/kernel-doc) and SRCTREE (for searching files referenced in .tmpl) separately
Signed-off-by Jiri Slaby <[email protected]>
Cc Sam Ravnborg <[email protected]>
Cc Randy Dunlap <[email protected]>
--- scripts/basic/docproc.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-)
scripts/basic/docproc.c +9 -4
@@ -69,7 +69,7 @@ FILELINE * docsection;#define NOFUNCTION "-nofunction"#define NODOCSECTIONS "-no-doc-sections" -char *srctree; +static char *srctree, *kernsrctree;void usage (void ) {
@@ -77,7 +77,8 @@ void usage (void)fprintf (stderr,"Input is read from file.tmpl. Output is sent to stdout\n" );fprintf (stderr,"doc: frontend when generating kernel documentation\n" );fprintf (stderr,"depend: generate list of files referenced within file\n" ); -fprintf (stderr,"Environment variable SRCTREE: absolute path to kernel source tree.\n" ); +fprintf (stderr,"Environment variable SRCTREE: absolute path to sources.\n" ); +fprintf (stderr," KERNSRCTREE: absolute path to kernel source tree.\n" ); }/*
@@ -96,8 +97,8 @@ void exec_kernel_doc(char **svec)exit (1 );case 0 :memset (real_filename,0 ,sizeof (real_filename)); -strncat (real_filename, srctree,PATH_MAX ); - strncat(real_filename, KERNELDOCPATH KERNELDOC, +strncat (real_filename, kernsrctree,PATH_MAX ); +strncat (real_filename,"/" KERNELDOCPATH KERNELDOC ,PATH_MAX -strlen (real_filename));execvp (real_filename, svec);fprintf (stderr,"exec " );
@@ -178,6 +179,7 @@ void find_export_symbols(char * filename)char real_filename[PATH_MAX +1 ];memset (real_filename,0 ,sizeof (real_filename));strncat (real_filename, srctree,PATH_MAX ); +strncat (real_filename,"/" ,PATH_MAX -strlen (real_filename));strncat (real_filename, filename,PATH_MAX -strlen (real_filename)); sym =add_new_file (filename);
@@ -382,6 +384,9 @@ int main(int argc, char *argv[]) srctree =getenv ("SRCTREE" );if (!srctree) srctree =getcwd (NULL ,0 ); + kernsrctree =getenv ("KERNSRCTREE" ); +if (!kernsrctree) + kernsrctree = srctree;if (argc !=3 ) {usage ();exit (1 );
Signature · 1 line
1.6.0.6
Quoted 4 lines · Jiri Slaby
- getcwd returns path without slash at the end, add the slash
- add KERNSRCTREE env, so that we can specify path for kernel (for knowing where to findscripts/kernel-doc) and SRCTREE (for searching files referenced in .tmpl) separately
Kbuild already have:
KBUILD_SRC that point to the source treeKBUILD_OUTPUT that points to the output directory
Could we reuse these?
Sam
Quoted 68 lines
Signed-off-by Jiri Slaby <[email protected]>Cc Sam Ravnborg <[email protected]>Cc Randy Dunlap <[email protected]>--- scripts/basic/docproc.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-)scripts/basic/docproc.c +9
-4@@ -69,7 +69,7 @@ FILELINE * docsection;#define NOFUNCTION "-nofunction"#define NODOCSECTIONS "-no-doc-sections" -char *srctree; +static char *srctree, *kernsrctree;void usage (void ) {@@ -77,7 +77,8 @@ void usage (void)fprintf (stderr,"Input is read from file.tmpl. Output is sent to stdout\n" );fprintf (stderr,"doc: frontend when generating kernel documentation\n" );fprintf (stderr,"depend: generate list of files referenced within file\n" ); -fprintf (stderr,"Environment variable SRCTREE: absolute path to kernel source tree.\n" ); +fprintf (stderr,"Environment variable SRCTREE: absolute path to sources.\n" ); +fprintf (stderr," KERNSRCTREE: absolute path to kernel source tree.\n" ); }/* @@ -96,8 +97,8 @@ void exec_kernel_doc(char **svec)exit (1 );case 0 :memset (real_filename,0 ,sizeof (real_filename)); -strncat (real_filename, srctree,PATH_MAX ); - strncat(real_filename, KERNELDOCPATH KERNELDOC, +strncat (real_filename, kernsrctree,PATH_MAX ); +strncat (real_filename,"/" KERNELDOCPATH KERNELDOC ,PATH_MAX -strlen (real_filename));execvp (real_filename, svec);fprintf (stderr,"exec " );@@ -178,6 +179,7 @@ void find_export_symbols(char * filename)char real_filename[PATH_MAX +1 ];memset (real_filename,0 ,sizeof (real_filename));strncat (real_filename, srctree,PATH_MAX ); +strncat (real_filename,"/" ,PATH_MAX -strlen (real_filename));strncat (real_filename, filename,PATH_MAX -strlen (real_filename)); sym =add_new_file (filename);@@ -382,6 +384,9 @@ int main(int argc, char *argv[]) srctree =getenv ("SRCTREE" );if (!srctree) srctree =getcwd (NULL ,0 ); + kernsrctree =getenv ("KERNSRCTREE" ); +if (!kernsrctree) + kernsrctree = srctree;if (argc !=3 ) {usage ();exit (1 );Signature · 7 lines
1.6.0.6 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/