Sigh, should have updated the copyright date in the

[deliverable/binutils-gdb.git] / gdb / source.c

diff --git a/gdb/source.c b/gdb/source.c
index dab794fb731b9140df803d933f21a77c0c6c8efa..6a9bd5c4fa97d5e029980754c001a6e52e0b5dde 100644 (file)
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -1,6 +1,7 @@
 /* List lines of source files for GDB, the GNU debugger.
-   Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
-   1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
+   1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+   Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -42,9 +43,7 @@
 #include "linespec.h"
 #include "filenames.h"         /* for DOSish file names */
 #include "completer.h"
-#ifdef UI_OUT
 #include "ui-out.h"
-#endif
 
 #ifdef CRLF_SOURCE_FILES
 
@@ -626,22 +625,6 @@ done:
          xfree (f);
        }
     }
-  /* OBSOLETE #ifdef MPW  */
-  /* OBSOLETE This is a debugging hack that can go away when all combinations */
-  /* OBSOLETE of Mac and Unix names are handled reasonably.  */
-  /* OBSOLETE   { */
-  /* OBSOLETE     extern int debug_openp; */
-  /* OBSOLETE  */
-  /* OBSOLETE     if (debug_openp) */
-  /* OBSOLETE       { */
-  /* OBSOLETE  printf ("openp on %s, path %s mode %d prot %d\n  returned %d", */
-  /* OBSOLETE          string, path, mode, prot, fd); */
-  /* OBSOLETE  if (*filename_opened) */
-  /* OBSOLETE    printf (" (filename is %s)", *filename_opened); */
-  /* OBSOLETE  printf ("\n"); */
-  /* OBSOLETE       } */
-  /* OBSOLETE   } */
-  /* OBSOLETE #endif  *//* MPW */
 
   return fd;
 }
@@ -727,22 +710,6 @@ open_source_file (struct symtab *s)
       if (p != s->filename)
        result = openp (path, 0, p, OPEN_MODE, 0, &s->fullname);
     }
-  /* OBSOLETE #ifdef MPW */
-  /* OBSOLETE   if (result < 0) */
-  /* OBSOLETE     { */
-  /* OBSOLETE        *//* Didn't work.  Try using just the MPW basename. */
-  /* OBSOLETE       p = (char *) mpw_basename (s->filename); */
-  /* OBSOLETE       if (p != s->filename) */
-  /* OBSOLETE  result = openp (path, 0, p, OPEN_MODE, 0, &s->fullname); */
-  /* OBSOLETE     } */
-  /* OBSOLETE   if (result < 0) */
-  /* OBSOLETE     { */
-  /* OBSOLETE        *//* Didn't work.  Try using the mixed Unix/MPW basename. */
-  /* OBSOLETE       p = (char *) mpw_mixed_basename (s->filename); */
-  /* OBSOLETE       if (p != s->filename) */
-  /* OBSOLETE  result = openp (path, 0, p, OPEN_MODE, 0, &s->fullname); */
-  /* OBSOLETE     } */
-  /* OBSOLETE #endif MPW */
 
   if (result >= 0)
     {
@@ -1001,11 +968,9 @@ print_source_lines_base (struct symtab *s, int line, int stopline, int noerror)
   current_source_line = line;
   first_line_listed = line;
 
-#ifdef UI_OUT
   /* If printing of source lines is disabled, just print file and line number */
   if (ui_out_test_flags (uiout, ui_source_list))
     {
-#endif
       /* Only prints "No such file or directory" once */
       if ((s != last_source_visited) || (!last_source_error))
        {
@@ -1017,14 +982,12 @@ print_source_lines_base (struct symtab *s, int line, int stopline, int noerror)
          desc = last_source_error;
          noerror = 1;
        }
-#ifdef UI_OUT
     }
   else
     {
       desc = -1;
       noerror = 1;
     }
-#endif
 
   if (desc < 0)
     {
@@ -1037,14 +1000,10 @@ print_source_lines_base (struct symtab *s, int line, int stopline, int noerror)
          print_sys_errmsg (name, errno);
        }
       else
-#ifdef UI_OUT
        ui_out_field_int (uiout, "line", line);
       ui_out_text (uiout, "\tin ");
       ui_out_field_string (uiout, "file", s->filename);
       ui_out_text (uiout, "\n");
-#else
-       printf_filtered ("%d\tin %s\n", line, s->filename);
-#endif
 
       return;
     }
@@ -1072,7 +1031,6 @@ print_source_lines_base (struct symtab *s, int line, int stopline, int noerror)
 
   while (nlines-- > 0)
     {
-#ifdef UI_OUT
       char buf[20];
 
       c = fgetc (stream);
@@ -1109,29 +1067,6 @@ print_source_lines_base (struct symtab *s, int line, int stopline, int noerror)
            }
        }
       while (c != '\n' && (c = fgetc (stream)) >= 0);
-#else
-      c = fgetc (stream);
-      if (c == EOF)
-       break;
-      last_line_listed = current_source_line;
-      printf_filtered ("%d\t", current_source_line++);
-      do
-       {
-         if (c < 040 && c != '\t' && c != '\n' && c != '\r')
-           printf_filtered ("^%c", c + 0100);
-         else if (c == 0177)
-           printf_filtered ("^?");
-#ifdef CRLF_SOURCE_FILES
-         else if (c == '\r')
-           {
-             /* Just skip \r characters.  */
-           }
-#endif
-         else
-           printf_filtered ("%c", c);
-       }
-      while (c != '\n' && (c = fgetc (stream)) >= 0);
-#endif
     }
 
   fclose (stream);
@@ -1651,7 +1586,7 @@ With no argument, reset the search path to $cdir:$cwd, the default.",
   if (dbx_commands)
     add_com_alias ("use", "directory", class_files, 0);
 
-  c->completer = filename_completer;
+  set_cmd_completer (c, filename_completer);
 
   add_cmd ("directories", no_class, show_directories,
           "Current search path for finding source files.\n\