diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-05-19 05:44:32 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2012-05-19 05:44:32 +0000 |
| commit | fa948a817cf9dae39dc632f9bf48a8af37244a0e (patch) | |
| tree | 83fbd480537714dcce335edc4aed3216f4e57816 /source/compiler/prutils.c | |
| parent | b43c4dd5abdb09fe2e7f73f186586b962c9dc9f5 (diff) | |
Notes
Diffstat (limited to 'source/compiler/prutils.c')
| -rw-r--r-- | source/compiler/prutils.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/source/compiler/prutils.c b/source/compiler/prutils.c index a7c65bf54e38..b0e1e14626ec 100644 --- a/source/compiler/prutils.c +++ b/source/compiler/prutils.c @@ -246,13 +246,11 @@ PrOpenIncludeFile ( ASL_INCLUDE_DIR *NextDir; - /* - * start the actual include file on the next line - */ + /* Start the actual include file on the next line */ + Gbl_CurrentLineOffset++; /* Attempt to open the include file */ - /* If the file specifies an absolute path, just open it */ if ((Filename[0] == '/') || @@ -330,13 +328,10 @@ PrOpenIncludeWithPrefix ( /* Build the full pathname to the file */ - Pathname = ACPI_ALLOCATE (strlen (PrefixDir) + strlen (Filename) + 1); + Pathname = FlMergePathnames (PrefixDir, Filename); - strcpy (Pathname, PrefixDir); - strcat (Pathname, Filename); - - DbgPrint (ASL_PARSE_OUTPUT, "\n" PR_PREFIX_ID - "Opening include file: path %s\n", + DbgPrint (ASL_PARSE_OUTPUT, PR_PREFIX_ID + "Include: Opening file - \"%s\"\n", Gbl_CurrentLineNumber, Pathname); /* Attempt to open the file, push if successful */ |