X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=gas%2Fdepend.c;h=c6538ddfd0fbe40d1e5c176f20ede5c66fd8a5db;hb=f7e42eb4af140e0068476b586464eaed5569548d;hp=f17c7c8e3a06fe7621a32012321652c43a00230f;hpb=5b64ad42d36e6d487e1f7287d37fbc243a178e72;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/depend.c b/gas/depend.c index f17c7c8e3a..c6538ddfd0 100644 --- 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 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -23,8 +23,7 @@ /* The file to write to, or NULL if no dependencies being kept. */ static char *dep_file = NULL; -struct dependency -{ +struct dependency { char *file; struct dependency *next; }; @@ -40,9 +39,7 @@ static void wrap_output PARAMS ((FILE *, char *, int)); /* Number of columns allowable. */ #define MAX_COLUMNS 72 - - /* Start saving dependencies, to be written to FILENAME. If this is never called, then dependency tracking is simply skipped. */ @@ -66,7 +63,7 @@ register_dependency (filename) for (dep = dep_chain; dep != NULL; dep = dep->next) { - if (! strcmp (filename, dep->file)) + if (!strcmp (filename, dep->file)) return; } @@ -105,7 +102,7 @@ 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 +115,7 @@ quote_string_for_make (file, src) putc ('\\', file); i++; goto ordinary_char; - + case '$': if (file) putc (c, file); @@ -154,7 +151,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;