X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fstuff.c;h=1ce07efdd7bb847d3a6675ac95a31f8115873c7c;hb=5f7b2142595b3bea31925339543504bc3071ad49;hp=2ffdc972d1f42e22894a6905170dbc01f9bca6df;hpb=3c0c9328b9c299580bcf8cb6fdb3b71d5a0525ff;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/stuff.c b/gdb/stuff.c
index 2ffdc972d1..1ce07efdd7 100644
--- a/gdb/stuff.c
+++ b/gdb/stuff.c
@@ -3,19 +3,19 @@
 
 This file is part of GDB.
 
-GDB is free software; you can redistribute it and/or modify
+This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
-any later version.
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
 
-GDB is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GDB; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* Written 13-Mar-86 by David Bridgham. */
 
@@ -26,8 +26,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <sys/file.h>
 #include <varargs.h>
 
-extern char *sys_errlist[];
-
 main (argc, argv)
      int argc;
      char *argv[];
@@ -49,7 +47,7 @@ main (argc, argv)
   outfile = 0;
   for (i = 1; i < argc; i++)
     {
-      if (strcmp (argv[i], "-o") == 0)
+      if (STREQ (argv[i], "-o"))
 	outfile = argv[++i];
     }
   if (outfile == 0)
@@ -59,21 +57,22 @@ main (argc, argv)
 
   out_fd = open (outfile, O_WRONLY);
   if (out_fd < 0)
-    err ("Error opening %s for write: %s\n", outfile, sys_errlist[errno]);
+    err ("Error opening %s for write: %s\n", outfile, strerror (errno));
   if (lseek (out_fd, offset, 0) < 0)
-    err ("Error seeking to heap in %s: %s\n", outfile, sys_errlist[errno]);
+    err ("Error seeking to heap in %s: %s\n", outfile, strerror (errno));
 
   /* For each file listed on the command line, write it into the
    * 'heap' of the output file.  Make sure to skip the arguments
    * that name the output file. */
   for (i = 1; i < argc; i++)
     {
-      if (strcmp (argv[i], "-o") == 0)
+      if (STREQ (argv[i], "-o"))
 	continue;
       if ((in_fd = open (argv[i], O_RDONLY)) < 0)
-	err ("Error opening %s for read: %s\n", argv[i], sys_errlist[errno]);
+	err ("Error opening %s for read: %s\n", argv[i],
+	     strerror (errno));
       if (fstat (in_fd, &stat_buf) < 0)
-	err ("Error stat'ing %s: %s\n", argv[i], sys_errlist[errno]);
+	err ("Error stat'ing %s: %s\n", argv[i], strerror (errno));
       size = strlen (argv[i]);
       pad = 4 - (size & 3);
       size += pad + stat_buf.st_size + sizeof (int);
@@ -105,9 +104,9 @@ get_offset (file, sym_name)
 
   f = open (file, O_RDONLY);
   if (f < 0)
-    err ("Error opening %s: %s\n", file, sys_errlist[errno]);
+    err ("Error opening %s: %s\n", file, strerror (errno));
   if (read (f, &file_hdr, sizeof (file_hdr)) < 0)
-    err ("Error reading exec structure: %s\n", sys_errlist[errno]);
+    err ("Error reading exec structure: %s\n", strerror (errno));
   if (N_BADMAG (file_hdr))
     err ("File %s not an a.out file\n", file);
 
@@ -115,17 +114,18 @@ get_offset (file, sym_name)
   if ((symbol_table = (struct nlist *)malloc (file_hdr.a_syms)) == 0)
     err ("Couldn't allocate space for symbol table\n");
   if (lseek (f, N_SYMOFF (file_hdr), 0) == -1)
-    err ("lseek error: %s\n", sys_errlist[errno]);
+    err ("lseek error: %s\n", strerror (errno));
   if (read (f, symbol_table, file_hdr.a_syms) == -1)
-    err ("Error reading symbol table from %s: %s\n", file, sys_errlist[errno]);
+    err ("Error reading symbol table from %s: %s\n", file,
+	 strerror (errno));
 
   /* read in string table */
   if (read (f, &size, 4) == -1)
-    err ("reading string table size: %s\n", sys_errlist[errno]);
+    err ("reading string table size: %s\n", strerror (errno));
   if ((strings = (char *)malloc (size)) == 0)
     err ("Couldn't allocate memory for string table\n");
   if (read (f, strings, size - 4) == -1)
-    err ("reading string table: %s\n", sys_errlist[errno]);
+    err ("reading string table: %s\n", strerror (errno));
 
   /* Find the core address at which the first byte of kdb text segment
      should be loaded into core when kdb is run.  */
@@ -152,7 +152,7 @@ find_symbol (sym_name, symbol_table, length, strings)
       {
 	if ((sym->n_type & N_TYPE) != N_DATA) continue;
 	if (sym->n_un.n_strx == 0) continue;
-	if (strcmp (sym_name, strings + sym->n_un.n_strx - 4) == 0)
+	if (STREQ (sym_name, strings + sym->n_un.n_strx - 4))
 	  return sym->n_value;
       }
     err ("Data symbol %s not found in %s\n", sym_name, file);