Commit bb13be51 authored by Rob Landley's avatar Rob Landley Committed by Sam Ravnborg

kbuild: stop docproc segfaulting when SRCTREE isn't set.

Prevent docproc from segfaulting when SRCTREE isn't set.
Signed-off-by: default avatarRob Landley <rob@landley.net>
Acked-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent 4b21960f
...@@ -66,12 +66,15 @@ FILELINE * entity_system; ...@@ -66,12 +66,15 @@ FILELINE * entity_system;
#define FUNCTION "-function" #define FUNCTION "-function"
#define NOFUNCTION "-nofunction" #define NOFUNCTION "-nofunction"
char *srctree;
void usage (void) void usage (void)
{ {
fprintf(stderr, "Usage: docproc {doc|depend} file\n"); fprintf(stderr, "Usage: docproc {doc|depend} file\n");
fprintf(stderr, "Input is read from file.tmpl. Output is sent to stdout\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, "doc: frontend when generating kernel documentation\n");
fprintf(stderr, "depend: generate list of files referenced within file\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) ...@@ -90,7 +93,7 @@ void exec_kernel_doc(char **svec)
exit(1); exit(1);
case 0: case 0:
memset(real_filename, 0, sizeof(real_filename)); 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, strncat(real_filename, KERNELDOCPATH KERNELDOC,
PATH_MAX - strlen(real_filename)); PATH_MAX - strlen(real_filename));
execvp(real_filename, svec); execvp(real_filename, svec);
...@@ -171,7 +174,7 @@ void find_export_symbols(char * filename) ...@@ -171,7 +174,7 @@ void find_export_symbols(char * filename)
if (filename_exist(filename) == NULL) { if (filename_exist(filename) == NULL) {
char real_filename[PATH_MAX + 1]; char real_filename[PATH_MAX + 1];
memset(real_filename, 0, sizeof(real_filename)); memset(real_filename, 0, sizeof(real_filename));
strncat(real_filename, getenv("SRCTREE"), PATH_MAX); strncat(real_filename, srctree, PATH_MAX);
strncat(real_filename, filename, strncat(real_filename, filename,
PATH_MAX - strlen(real_filename)); PATH_MAX - strlen(real_filename));
sym = add_new_file(filename); sym = add_new_file(filename);
...@@ -338,6 +341,10 @@ void parse_file(FILE *infile) ...@@ -338,6 +341,10 @@ void parse_file(FILE *infile)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
FILE * infile; FILE * infile;
srctree = getenv("SRCTREE");
if (!srctree)
srctree = getcwd(NULL, 0);
if (argc != 3) { if (argc != 3) {
usage(); usage();
exit(1); exit(1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment