| prutils.c (234623) | prutils.c (235945) |
|---|---|
| 1/****************************************************************************** 2 * 3 * Module Name: prutils - Preprocessor utilities 4 * 5 *****************************************************************************/ 6 7/* 8 * Copyright (C) 2000 - 2012, Intel Corp. --- 232 unchanged lines hidden (view full) --- 241void 242PrOpenIncludeFile ( 243 char *Filename) 244{ 245 FILE *IncludeFile; 246 ASL_INCLUDE_DIR *NextDir; 247 248 | 1/****************************************************************************** 2 * 3 * Module Name: prutils - Preprocessor utilities 4 * 5 *****************************************************************************/ 6 7/* 8 * Copyright (C) 2000 - 2012, Intel Corp. --- 232 unchanged lines hidden (view full) --- 241void 242PrOpenIncludeFile ( 243 char *Filename) 244{ 245 FILE *IncludeFile; 246 ASL_INCLUDE_DIR *NextDir; 247 248 |
| 249 /* 250 * start the actual include file on the next line 251 */ | 249 /* Start the actual include file on the next line */ 250 |
| 252 Gbl_CurrentLineOffset++; 253 254 /* Attempt to open the include file */ | 251 Gbl_CurrentLineOffset++; 252 253 /* Attempt to open the include file */ |
| 255 | |
| 256 /* If the file specifies an absolute path, just open it */ 257 258 if ((Filename[0] == '/') || 259 (Filename[0] == '\\') || 260 (Filename[1] == ':')) 261 { 262 IncludeFile = PrOpenIncludeWithPrefix ("", Filename); 263 if (!IncludeFile) --- 61 unchanged lines hidden (view full) --- 325 char *Filename) 326{ 327 FILE *IncludeFile; 328 char *Pathname; 329 330 331 /* Build the full pathname to the file */ 332 | 254 /* If the file specifies an absolute path, just open it */ 255 256 if ((Filename[0] == '/') || 257 (Filename[0] == '\\') || 258 (Filename[1] == ':')) 259 { 260 IncludeFile = PrOpenIncludeWithPrefix ("", Filename); 261 if (!IncludeFile) --- 61 unchanged lines hidden (view full) --- 323 char *Filename) 324{ 325 FILE *IncludeFile; 326 char *Pathname; 327 328 329 /* Build the full pathname to the file */ 330 |
| 333 Pathname = ACPI_ALLOCATE (strlen (PrefixDir) + strlen (Filename) + 1); | 331 Pathname = FlMergePathnames (PrefixDir, Filename); |
| 334 | 332 |
| 335 strcpy (Pathname, PrefixDir); 336 strcat (Pathname, Filename); 337 338 DbgPrint (ASL_PARSE_OUTPUT, "\n" PR_PREFIX_ID 339 "Opening include file: path %s\n", | 333 DbgPrint (ASL_PARSE_OUTPUT, PR_PREFIX_ID 334 "Include: Opening file - \"%s\"\n", |
| 340 Gbl_CurrentLineNumber, Pathname); 341 342 /* Attempt to open the file, push if successful */ 343 344 IncludeFile = fopen (Pathname, "r"); 345 if (IncludeFile) 346 { 347 /* Push the include file on the open input file stack */ --- 121 unchanged lines hidden --- | 335 Gbl_CurrentLineNumber, Pathname); 336 337 /* Attempt to open the file, push if successful */ 338 339 IncludeFile = fopen (Pathname, "r"); 340 if (IncludeFile) 341 { 342 /* Push the include file on the open input file stack */ --- 121 unchanged lines hidden --- |