2003-06-13 Andrew Cagney <cagney@redhat.com>

[deliverable/binutils-gdb.git] / gas / depend.c

diff --git a/gas/depend.c b/gas/depend.c
index f17c7c8e3a06fe7621a32012321652c43a00230f..3c6049d4c37fee412d421f8299025ed48f26ce99 100644 (file)
--- a/gas/depend.c
+++ b/gas/depend.c
@@ -1,5 +1,5 @@
 /* depend.c - Handle dependency tracking.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+   Copyright 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -21,16 +21,16 @@
 #include "as.h"
 
 /* The file to write to, or NULL if no dependencies being kept.  */
-static char *dep_file = NULL;
+static char * dep_file = NULL;
 
 struct dependency
-{
-  char *file;
-  struct dependency *next;
-};
+  {
+    char * file;
+    struct dependency * next;
+  };
 
 /* All the files we depend on.  */
-static struct dependency *dep_chain = NULL;
+static struct dependency * dep_chain = NULL;
 
 /* Current column in output file.  */
 static int column = 0;
@@ -40,9 +40,7 @@ static void wrap_output PARAMS ((FILE *, char *, int));
 
 /* Number of columns allowable.  */
 #define MAX_COLUMNS 72
-
 \f
-
 /* Start saving dependencies, to be written to FILENAME.  If this is
    never called, then dependency tracking is simply skipped.  */
 
@@ -66,7 +64,7 @@ register_dependency (filename)
 
   for (dep = dep_chain; dep != NULL; dep = dep->next)
     {
-      if (! strcmp (filename, dep->file))
+      if (!strcmp (filename, dep->file))
        return;
     }
 
@@ -89,9 +87,11 @@ quote_string_for_make (file, src)
 {
   char *p = src;
   int i = 0;
+
   for (;;)
     {
       char c = *p++;
+
       switch (c)
        {
        case '\0':
@@ -105,7 +105,8 @@ quote_string_for_make (file, src)
               the end of a file name; and backslashes in other
               contexts should not be doubled.  */
            char *q;
-           for (q = p - 1; src < q && q[-1] == '\\';  q--)
+
+           for (q = p - 1; src < q && q[-1] == '\\'; q--)
              {
                if (file)
                  putc ('\\', file);
@@ -118,7 +119,7 @@ quote_string_for_make (file, src)
            putc ('\\', file);
          i++;
          goto ordinary_char;
-         
+
        case '$':
          if (file)
            putc (c, file);
@@ -154,7 +155,11 @@ wrap_output (f, string, spacer)
   if (len == 0)
     return;
 
-  if (column && MAX_COLUMNS - 1 /*spacer*/ - 2 /*` \'*/ < column + len)
+  if (column
+      && (MAX_COLUMNS
+         - 1 /* spacer */
+         - 2 /* ` \'   */
+         < column + len))
     {
       fprintf (f, " \\\n ");
       column = 0;
@@ -189,10 +194,10 @@ print_dependencies ()
   if (dep_file == NULL)
     return;
 
-  f = fopen (dep_file, "w");
+  f = fopen (dep_file, FOPEN_WT);
   if (f == NULL)
     {
-      as_warn (_("Can't open `%s' for writing"), dep_file);
+      as_warn (_("can't open `%s' for writing"), dep_file);
       return;
     }
 
@@ -204,5 +209,5 @@ print_dependencies ()
   putc ('\n', f);
 
   if (fclose (f))
-    as_warn (_("Can't close `%s'"), dep_file);
+    as_warn (_("can't close `%s'"), dep_file);
 }