diff options
| author | Paul Eggert <eggert@gnu.org> | 1993-09-28 00:23:58 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@gnu.org> | 1993-09-28 00:23:58 +0000 |
| commit | d4018fbf22bea208bc772d840cc3bb4948cd0654 (patch) | |
| tree | 9ee8767e3b2e045386451bcb2fdb7243f46fadaf | |
| parent | 99107e86f70870bb64f3712ab697aec39aae906b (diff) | |
| download | gcc-d4018fbf22bea208bc772d840cc3bb4948cd0654.zip gcc-d4018fbf22bea208bc772d840cc3bb4948cd0654.tar.gz gcc-d4018fbf22bea208bc772d840cc3bb4948cd0654.tar.bz2 | |
(FILE_NAME_JOINER): Default is "/".
(dbxout_init, dbxout_source_file): Quote special characters in file names.
From-SVN: r5495
| -rw-r--r-- | gcc/dbxout.c | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/gcc/dbxout.c b/gcc/dbxout.c index 29dda05..5c7f642 100644 --- a/gcc/dbxout.c +++ b/gcc/dbxout.c @@ -116,6 +116,10 @@ extern int errno; #define DBX_MEMPARM_STABS_LETTER 'p' #endif +#ifndef FILE_NAME_JOINER +#define FILE_NAME_JOINER "/" +#endif + /* Nonzero means if the type has methods, only output debugging information if methods are actually written to the asm file. */ @@ -403,13 +407,20 @@ dbxout_init (asm_file, input_file_name, syms) if (use_gnu_debug_info_extensions) #endif { - if (cwd || (cwd = getpwd ())) + if (!cwd && (cwd = getpwd ()) && (!*cwd || cwd[strlen (cwd) - 1] != '/')) + { + char *wdslash = xmalloc (strlen (cwd) + sizeof (FILE_NAME_JOINER)); + sprintf (wdslash, "%s%s", cwd, FILE_NAME_JOINER); + cwd = wdslash; + } + if (cwd) { #ifdef DBX_OUTPUT_MAIN_SOURCE_DIRECTORY DBX_OUTPUT_MAIN_SOURCE_DIRECTORY (asmfile, cwd); #else /* no DBX_OUTPUT_MAIN_SOURCE_DIRECTORY */ - fprintf (asmfile, "%s \"%s/\",%d,0,0,%s\n", ASM_STABS_OP, - cwd, N_SO, <ext_label_name[1]); + fprintf (asmfile, "%s ", ASM_STABS_OP); + output_quoted_string (asmfile, cwd); + fprintf (asmfile, ",%d,0,0,%s\n", N_SO, <ext_label_name[1]); #endif /* no DBX_OUTPUT_MAIN_SOURCE_DIRECTORY */ } } @@ -422,7 +433,9 @@ dbxout_init (asm_file, input_file_name, syms) /* We include outputting `Ltext:' here, because that gives you a way to override it. */ /* Used to put `Ltext:' before the reference, but that loses on sun 4. */ - fprintf (asmfile, "%s \"%s\",%d,0,0,%s\n", ASM_STABS_OP, input_file_name, + fprintf (asmfile, "%s ", ASM_STABS_OP); + output_quoted_string (asmfile, input_file_name); + fprintf (asmfile, ",%d,0,0,%s\n", N_SO, <ext_label_name[1]); text_section (); ASM_OUTPUT_INTERNAL_LABEL (asmfile, "Ltext", 0); @@ -496,8 +509,9 @@ dbxout_source_file (file, filename) DBX_OUTPUT_SOURCE_FILENAME (file, filename); #else ASM_GENERATE_INTERNAL_LABEL (ltext_label_name, "Ltext", 0); - fprintf (file, "%s \"%s\",%d,0,0,%s\n", ASM_STABS_OP, - filename, N_SOL, <ext_label_name[1]); + fprintf (file, "%s ", ASM_STABS_OP); + output_quoted_string (file, filename); + fprintf (file, ",%d,0,0,%s\n", N_SOL, <ext_label_name[1]); #endif lastfile = filename; } |