From 398902df0f1408bf3c48fed0583948df7ed9a933 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Tue, 9 Oct 2007 01:25:18 -0500 Subject: [PATCH] --- yaml --- r: 71659 b: refs/heads/master c: bb13be5145e18cfb3a2f9cc6091aa048d032a3cd h: refs/heads/master i: 71657: 40cdffa0e4f08ae6be5acf10ac16242d03db0ef9 71655: 03f66a9e0b843ace99e730f69ebd0065dd2fbaa8 v: v3 --- [refs] | 2 +- trunk/scripts/basic/docproc.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7ebd09b9c957..edac57e14dc4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b21960f90d4d011e49e386d0525b1e89f320658 +refs/heads/master: bb13be5145e18cfb3a2f9cc6091aa048d032a3cd diff --git a/trunk/scripts/basic/docproc.c b/trunk/scripts/basic/docproc.c index e5c6ac7bde9b..0e4bd5459df4 100644 --- a/trunk/scripts/basic/docproc.c +++ b/trunk/scripts/basic/docproc.c @@ -66,12 +66,15 @@ FILELINE * entity_system; #define FUNCTION "-function" #define NOFUNCTION "-nofunction" +char *srctree; + void usage (void) { fprintf(stderr, "Usage: docproc {doc|depend} file\n"); 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"); } /* @@ -90,7 +93,7 @@ void exec_kernel_doc(char **svec) exit(1); case 0: memset(real_filename, 0, sizeof(real_filename)); - strncat(real_filename, getenv("SRCTREE"), PATH_MAX); + strncat(real_filename, srctree, PATH_MAX); strncat(real_filename, KERNELDOCPATH KERNELDOC, PATH_MAX - strlen(real_filename)); execvp(real_filename, svec); @@ -171,7 +174,7 @@ void find_export_symbols(char * filename) if (filename_exist(filename) == NULL) { char real_filename[PATH_MAX + 1]; memset(real_filename, 0, sizeof(real_filename)); - strncat(real_filename, getenv("SRCTREE"), PATH_MAX); + strncat(real_filename, srctree, PATH_MAX); strncat(real_filename, filename, PATH_MAX - strlen(real_filename)); sym = add_new_file(filename); @@ -338,6 +341,10 @@ void parse_file(FILE *infile) int main(int argc, char *argv[]) { FILE * infile; + + srctree = getenv("SRCTREE"); + if (!srctree) + srctree = getcwd(NULL, 0); if (argc != 3) { usage(); exit(1);