/* Protoize program - Original version by Ron Guilmette (rfg@segfault.us.com).
Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
- 1999, 2000 Free Software Foundation, Inc.
+ 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
This file is part of GCC.
#include "config.h"
#include "system.h"
+#include "coretypes.h"
+#include "tm.h"
#include "intl.h"
+#include "cppdefault.h"
#include <setjmp.h>
#include <signal.h>
static const char * const target_machine = DEFAULT_TARGET_MACHINE;
static const char * const target_version = DEFAULT_TARGET_VERSION;
-#ifndef GET_ENV_PATH_LIST
-#define GET_ENV_PATH_LIST(VAR,NAME) do { (VAR) = getenv (NAME); } while (0)
-#endif
-
#endif /* !defined (UNPROTOIZE) */
/* Suffix of aux_info files. */
static const char * const save_suffix = SAVE_SUFFIX;
+#ifndef UNPROTOIZE
+
/* String to attach to C filenames renamed to C++. */
static const char * const cplus_suffix = CPLUS_FILE_SUFFIX;
-#ifndef UNPROTOIZE
-
/* File name of the file which contains descriptions of standard system
routines. Note that we never actually do anything with this file per se,
but we do read in its corresponding aux_info file. */
/* Type of the structure that holds information about macro unexpansions. */
struct unexpansion_struct {
- const char *expanded;
- const char *contracted;
+ const char *const expanded;
+ const char *const contracted;
};
typedef struct unexpansion_struct unexpansion;
static const int hash_mask = (HASH_TABLE_SIZE - 1);
-/* Make a table of default system include directories
- just as it is done in cpp. */
-
-#ifndef STANDARD_INCLUDE_DIR
-#define STANDARD_INCLUDE_DIR "/usr/include"
-#endif
-
-#ifndef LOCAL_INCLUDE_DIR
-#define LOCAL_INCLUDE_DIR "/usr/local/include"
-#endif
-
-struct default_include { const char *fname;
- const char *component;
- int x1, x2; } include_defaults[]
-#ifdef INCLUDE_DEFAULTS
- = INCLUDE_DEFAULTS;
-#else
- = {
- /* Pick up GNU C++ specific include files. */
- { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1 },
-#ifdef CROSS_COMPILE
- /* This is the dir for fixincludes. Put it just before
- the files that we fix. */
- { GCC_INCLUDE_DIR, "GCC", 0, 0 },
- /* For cross-compilation, this dir name is generated
- automatically in Makefile.in. */
- { CROSS_INCLUDE_DIR, 0, 0, 0 },
- /* This is another place that the target system's headers might be. */
- { TOOL_INCLUDE_DIR, "BINUTILS", 0, 0 },
-#else /* not CROSS_COMPILE */
- /* This should be /use/local/include and should come before
- the fixincludes-fixed header files. */
- { LOCAL_INCLUDE_DIR, 0, 0, 1 },
- /* This is here ahead of GCC_INCLUDE_DIR because assert.h goes here.
- Likewise, behind LOCAL_INCLUDE_DIR, where glibc puts its assert.h. */
- { TOOL_INCLUDE_DIR, "BINUTILS", 0, 0 },
- /* This is the dir for fixincludes. Put it just before
- the files that we fix. */
- { GCC_INCLUDE_DIR, "GCC", 0, 0 },
- /* Some systems have an extra dir of include files. */
-#ifdef SYSTEM_INCLUDE_DIR
- { SYSTEM_INCLUDE_DIR, 0, 0, 0 },
-#endif
- { STANDARD_INCLUDE_DIR, 0, 0, 0},
-#endif /* not CROSS_COMPILE */
- { 0, 0, 0, 0}
- };
-#endif /* no INCLUDE_DEFAULTS */
/* Datatype for lists of directories or filenames. */
struct string_list
static const char *pname;
-/* Error counter. Will be non-zero if we should give up at the next convenient
+/* Error counter. Will be nonzero if we should give up at the next convenient
stopping point. */
static int errors = 0;
static void
notice VPARAMS ((const char *msgid, ...))
{
-#ifndef ANSI_PROTOTYPES
- const char *msgid;
-#endif
- va_list ap;
-
- VA_START (ap, msgid);
-
-#ifndef ANSI_PROTOTYPES
- msgid = va_arg (ap, const char *);
-#endif
+ VA_OPEN (ap, msgid);
+ VA_FIXEDARG (ap, const char *, msgid);
vfprintf (stderr, _(msgid), ap);
- va_end (ap);
+ VA_CLOSE (ap);
}
\f
int c;
for (p1 = s1, p2 = s2; (c = *p2); p1++, p2++)
- if (*p1 != c)
- goto outer;
+ if (*p1 != c)
+ goto outer;
return s1;
outer:
;
}
if (nchars == 0)
break;
- /* Arithmetic on void pointers is a gcc extention. */
+ /* Arithmetic on void pointers is a gcc extension. */
ptr = (char *) ptr + nchars;
left -= nchars;
}
pname, shortpath (NULL, out_fname), xstrerror (errno_val));
return;
}
- /* Arithmetic on void pointers is a gcc extention. */
+ /* Arithmetic on void pointers is a gcc extension. */
ptr = (char *) ptr + written;
len -= written;
}
is_id_char (ch)
int ch;
{
- return (ISALNUM (ch) || (ch == '_') || (ch == '$'));
+ return (ISIDNUM (ch) || (ch == '$'));
}
/* Give a message indicating the proper way to invoke this program and then
- exit with non-zero status. */
+ exit with nonzero status. */
static void
usage ()
in_system_include_dir (path)
const char *path;
{
- struct default_include *p;
+ const struct default_include *p;
if (! is_abspath (path))
abort (); /* Must be an absolutized filename. */
- for (p = include_defaults; p->fname; p++)
+ for (p = cpp_include_defaults; p->fname; p++)
if (!strncmp (path, p->fname, strlen (p->fname))
&& IS_DIR_SEPARATOR (path[strlen (p->fname)]))
return 1;
{
char *slash;
- slash = strrchr (dir_last_slash ? dir_last_slash : dir_name,
- DIR_SEPARATOR_2);
+ slash = strrchr (dir_last_slash ? dir_last_slash : dir_name,
+ DIR_SEPARATOR_2);
if (slash)
dir_last_slash = slash;
}
{
char *slash;
- slash = strrchr (dir_last_slash ? dir_last_slash : dir_name,
- DIR_SEPARATOR_2);
+ slash = strrchr (dir_last_slash ? dir_last_slash : dir_name,
+ DIR_SEPARATOR_2);
if (slash)
dir_last_slash = slash;
}
if (access (path, R_OK))
{
if (!quiet_flag)
- notice ("%s: warning: no read access for file `%s'\n",
+ notice ("%s: warning: no read access for file `%s'\n",
pname, shortpath (NULL, path));
return 0;
}
if (access (path, W_OK))
{
if (!quiet_flag)
- notice ("%s: warning: no write access for file `%s'\n",
+ notice ("%s: warning: no write access for file `%s'\n",
pname, shortpath (NULL, path));
return 0;
}
if (access (dir_name, W_OK))
{
if (!quiet_flag)
- notice ("%s: warning: no write access for dir containing `%s'\n",
+ notice ("%s: warning: no write access for dir containing `%s'\n",
pname, shortpath (NULL, path));
return 0;
}
#endif /* defined (UNPROTOIZE) */
)
- /* ... then the containing file needs converting. */
- return -1;
+ /* ... then the containing file needs converting. */
+ return -1;
return 0;
}
for (primary = hash_tab_p; primary < &hash_tab_p[HASH_TABLE_SIZE]; primary++)
if (primary->symbol)
{
- hash_table_entry *second;
+ hash_table_entry *second;
- (*func)(primary);
- for (second = primary->hash_next; second; second = second->hash_next)
- (*func) (second);
+ (*func)(primary);
+ for (second = primary->hash_next; second; second = second->hash_next)
+ (*func) (second);
}
}
{
p = p->hash_next;
if (!strcmp (p->symbol, search_symbol))
- return p;
+ return p;
}
p->hash_next = (hash_table_entry *) xmalloc (sizeof (hash_table_entry));
p = p->hash_next;
for (curr = p->f_list_chain; curr; curr = next)
{
- next = curr->chain_next;
- free ((NONCONST PTR) curr);
+ next = curr->chain_next;
+ free ((NONCONST PTR) curr);
}
}
#endif /* !defined (UNPROTOIZE) */
for (s = aux_info_line; *s != '\n'; )
{
for (unexp_p = unexpansions; unexp_p->expanded; unexp_p++)
- {
- const char *in_p = unexp_p->expanded;
- size_t len = strlen (in_p);
+ {
+ const char *in_p = unexp_p->expanded;
+ size_t len = strlen (in_p);
- if (*s == *in_p && !strncmp (s, in_p, len) && !is_id_char (s[len]))
- {
+ if (*s == *in_p && !strncmp (s, in_p, len) && !is_id_char (s[len]))
+ {
int size = strlen (unexp_p->contracted);
- got_unexpanded = 1;
+ got_unexpanded = 1;
if (copy_p + size - line_buf >= line_buf_size)
{
int offset = copy_p - line_buf;
line_buf = (char *) xrealloc (line_buf, line_buf_size);
copy_p = line_buf + offset;
}
- strcpy (copy_p, unexp_p->contracted);
- copy_p += size;
+ strcpy (copy_p, unexp_p->contracted);
+ copy_p += size;
- /* Assume the there will not be another replacement required
- within the text just replaced. */
+ /* Assume that there will not be another replacement required
+ within the text just replaced. */
- s += len;
- goto continue_outer;
- }
- }
+ s += len;
+ goto continue_outer;
+ }
+ }
if (copy_p - line_buf == line_buf_size)
{
int offset = copy_p - line_buf;
{
return (IS_DIR_SEPARATOR (path[0])
#ifdef HAVE_DOS_BASED_FILE_SYSTEM
- /* Check for disk name on MS-DOS-based systems. */
- || (path[0] && path[1] == ':' && IS_DIR_SEPARATOR (path[2]))
+ /* Check for disk name on MS-DOS-based systems. */
+ || (path[0] && path[1] == ':' && IS_DIR_SEPARATOR (path[2]))
#endif
- );
+ );
}
\f
/* Return the absolutized filename for the given relative
const char *rel_filename;
{
/* Setup the current working directory as needed. */
- const char *cwd2 = (cwd) ? cwd : cwd_buffer;
+ const char *const cwd2 = (cwd) ? cwd : cwd_buffer;
char *const abs_buffer
= (char *) alloca (strlen (cwd2) + strlen (rel_filename) + 2);
char *endp = abs_buffer;
if (! is_abspath (rel_filename))
{
- src_p = cwd2;
- while ((*endp++ = *src_p++))
- continue;
- *(endp-1) = DIR_SEPARATOR; /* overwrite null */
+ src_p = cwd2;
+ while ((*endp++ = *src_p++))
+ continue;
+ *(endp-1) = DIR_SEPARATOR; /* overwrite null */
}
#ifdef HAVE_DOS_BASED_FILE_SYSTEM
else if (IS_DIR_SEPARATOR (rel_filename[0]))
{
- /* A path starting with a directory separator is considered absolute
- for dos based filesystems, but it's really not -- it's just the
+ /* A path starting with a directory separator is considered absolute
+ for dos based filesystems, but it's really not -- it's just the
convention used throughout GCC and it works. However, in this
case, we still need to prepend the drive spec from cwd_buffer. */
*endp++ = cwd2[0];
for (;;)
{
if (!inp[0])
- break;
+ break;
else if (IS_DIR_SEPARATOR (inp[0]) && IS_DIR_SEPARATOR (outp[-1]))
- {
- inp++;
- continue;
- }
+ {
+ inp++;
+ continue;
+ }
else if (inp[0] == '.' && IS_DIR_SEPARATOR (outp[-1]))
- {
- if (!inp[1])
- break;
- else if (IS_DIR_SEPARATOR (inp[1]))
- {
- inp += 2;
- continue;
- }
- else if ((inp[1] == '.') && (inp[2] == 0
+ {
+ if (!inp[1])
+ break;
+ else if (IS_DIR_SEPARATOR (inp[1]))
+ {
+ inp += 2;
+ continue;
+ }
+ else if ((inp[1] == '.') && (inp[2] == 0
|| IS_DIR_SEPARATOR (inp[2])))
- {
- inp += (IS_DIR_SEPARATOR (inp[2])) ? 3 : 2;
- outp -= 2;
- while (outp >= abs_buffer && ! IS_DIR_SEPARATOR (*outp))
- outp--;
- if (outp < abs_buffer)
- {
- /* Catch cases like /.. where we try to backup to a
- point above the absolute root of the logical file
- system. */
-
- notice ("%s: invalid file name: %s\n",
- pname, rel_filename);
- exit (FATAL_EXIT_CODE);
- }
- *++outp = '\0';
- continue;
- }
- }
+ {
+ inp += (IS_DIR_SEPARATOR (inp[2])) ? 3 : 2;
+ outp -= 2;
+ while (outp >= abs_buffer && ! IS_DIR_SEPARATOR (*outp))
+ outp--;
+ if (outp < abs_buffer)
+ {
+ /* Catch cases like /.. where we try to backup to a
+ point above the absolute root of the logical file
+ system. */
+
+ notice ("%s: invalid file name: %s\n",
+ pname, rel_filename);
+ exit (FATAL_EXIT_CODE);
+ }
+ *++outp = '\0';
+ continue;
+ }
+ }
*outp++ = *inp++;
}
{
/* whole pwd matched */
if (!*path_p) /* input *is* the current path! */
- return ".";
+ return ".";
else
- return ++path_p;
+ return ++path_p;
}
else
{
if (*path_p)
- {
- --cwd_p;
- --path_p;
- while (! IS_DIR_SEPARATOR (*cwd_p)) /* backup to last slash */
- {
- --cwd_p;
- --path_p;
- }
- cwd_p++;
- path_p++;
- unmatched_slash_count++;
- }
+ {
+ --cwd_p;
+ --path_p;
+ while (! IS_DIR_SEPARATOR (*cwd_p)) /* backup to last slash */
+ {
+ --cwd_p;
+ --path_p;
+ }
+ cwd_p++;
+ path_p++;
+ unmatched_slash_count++;
+ }
/* Find out how many directory levels in cwd were *not* matched. */
while (*cwd_p++)
- if (IS_DIR_SEPARATOR (*(cwd_p-1)))
+ if (IS_DIR_SEPARATOR (*(cwd_p-1)))
unmatched_slash_count++;
/* Now we know how long the "short name" will be.
/* For each of them, put a `../' at the beginning of the short name. */
while (unmatched_slash_count--)
- {
+ {
/* Give up if the result gets to be longer
than the absolute path name. */
if (rel_buffer + filename_len <= rel_buf_p + 3)
return filename;
- *rel_buf_p++ = '.';
- *rel_buf_p++ = '.';
- *rel_buf_p++ = DIR_SEPARATOR;
- }
+ *rel_buf_p++ = '.';
+ *rel_buf_p++ = '.';
+ *rel_buf_p++ = DIR_SEPARATOR;
+ }
/* Then tack on the unmatched part of the desired file's name. */
do
--rel_buf_p;
if (IS_DIR_SEPARATOR (*(rel_buf_p-1)))
- *--rel_buf_p = '\0';
+ *--rel_buf_p = '\0';
return rel_buffer;
}
}
file_info *file_p = (file_info *) xmalloc (sizeof (file_info));
/* If we cannot get status on any given source file, give a warning
- and then just set its time of last modification to infinity. */
+ and then just set its time of last modification to infinity. */
if (do_not_stat)
- stat_buf.st_mtime = (time_t) 0;
+ stat_buf.st_mtime = (time_t) 0;
else
- {
- if (stat (filename, &stat_buf) == -1)
- {
+ {
+ if (stat (filename, &stat_buf) == -1)
+ {
int errno_val = errno;
- notice ("%s: %s: can't get status: %s\n",
+ notice ("%s: %s: can't get status: %s\n",
pname, shortpath (NULL, filename),
xstrerror (errno_val));
- stat_buf.st_mtime = (time_t) -1;
- }
- }
+ stat_buf.st_mtime = (time_t) -1;
+ }
+ }
hash_entry_p->fip = file_p;
file_p->hash_entry = hash_entry_p;
for (paren_depth = 1, q = p-1; paren_depth; q--)
{
switch (*q)
- {
- case ')':
- paren_depth++;
- break;
- case '(':
- paren_depth--;
- break;
- }
+ {
+ case ')':
+ paren_depth++;
+ break;
+ case '(':
+ paren_depth--;
+ break;
+ }
}
return ++q;
}
/* Given a line from an aux info file, and a time at which the aux info
file it came from was created, check to see if the item described in
the line comes from a file which has been modified since the aux info
- file was created. If so, return non-zero, else return zero. */
+ file was created. If so, return nonzero, else return zero. */
static int
referenced_file_is_newer (l, aux_info_mtime)
while (*p != ':'
#ifdef HAVE_DOS_BASED_FILE_SYSTEM
- || (*p == ':' && *p && *(p+1) && IS_DIR_SEPARATOR (*(p+1)))
+ || (*p == ':' && *p && *(p+1) && IS_DIR_SEPARATOR (*(p+1)))
#endif
- )
+ )
p++;
filename = (char *) alloca ((size_t) (p - filename_start) + 1);
strncpy (filename, filename_start, (size_t) (p - filename_start));
while (*p != ':'
#ifdef HAVE_DOS_BASED_FILE_SYSTEM
- || (*p == ':' && *p && *(p+1) && IS_DIR_SEPARATOR (*(p+1)))
+ || (*p == ':' && *p && *(p+1) && IS_DIR_SEPARATOR (*(p+1)))
#endif
- )
+ )
p++;
filename = (char *) alloca ((size_t) (p - filename_start) + 1);
strncpy (filename, filename_start, (size_t) (p - filename_start));
which contained this particular def or dec item. Note that this call
may cause a new file_info record to be created if this is the first time
that we have ever known about this particular file.
-
+
Note that we started out by forcing all of the base source file names
(i.e. the names of the aux_info files with the .X stripped off) into the
filenames hash table, and we simultaneously setup file_info records for
act as file_info records for the "original" (i.e. un-included) files
which were submitted to gcc for compilation (when the -aux-info
option was used). */
-
+
def_dec_p->file = find_file (abspath (invocation_filename, filename), is_syscalls);
}
while (*p != ':'
#ifdef HAVE_DOS_BASED_FILE_SYSTEM
- || (*p == ':' && *p && *(p+1) && IS_DIR_SEPARATOR (*(p+1)))
+ || (*p == ':' && *p && *(p+1) && IS_DIR_SEPARATOR (*(p+1)))
#endif
- )
+ )
p++;
strncpy (line_number, line_number_start, (size_t) (p - line_number_start));
line_number[p-line_number_start] = '\0';
const char *left_paren_p = find_corresponding_lparen (p);
#ifndef UNPROTOIZE
{
- f_list_chain_item *cip
+ f_list_chain_item *cip
= (f_list_chain_item *) xmalloc (sizeof (f_list_chain_item));
- cip->formals_list
+ cip->formals_list
= dupnstr (left_paren_p + 1, (size_t) (p - (left_paren_p+1)));
-
- /* Add the new chain item at the head of the current list. */
- cip->chain_next = def_dec_p->f_list_chain;
- def_dec_p->f_list_chain = cip;
+ /* Add the new chain item at the head of the current list. */
+
+ cip->chain_next = def_dec_p->f_list_chain;
+ def_dec_p->f_list_chain = cip;
}
#endif /* !defined (UNPROTOIZE) */
def_dec_p->f_list_count++;
p = left_paren_p - 2;
/* p must now point either to another right paren, or to the last
- character of the name of the function that was declared/defined.
- If p points to another right paren, then this indicates that we
- are dealing with multiple formals lists. In that case, there
- really should be another right paren preceding this right paren. */
+ character of the name of the function that was declared/defined.
+ If p points to another right paren, then this indicates that we
+ are dealing with multiple formals lists. In that case, there
+ really should be another right paren preceding this right paren. */
if (*p != ')')
- break;
+ break;
else
- check_aux_info (*--p == ')');
+ check_aux_info (*--p == ')');
}
for (other = def_dec_p->hash_entry->ddip; other; other = other->next_for_func)
{
- if (def_dec_p->line == other->line && def_dec_p->file == other->file)
- {
- if (strcmp (def_dec_p->ansi_decl, other->ansi_decl))
- {
- notice ("%s:%d: declaration of function `%s' takes different forms\n",
+ if (def_dec_p->line == other->line && def_dec_p->file == other->file)
+ {
+ if (strcmp (def_dec_p->ansi_decl, other->ansi_decl))
+ {
+ notice ("%s:%d: declaration of function `%s' takes different forms\n",
def_dec_p->file->hash_entry->symbol,
def_dec_p->line,
def_dec_p->hash_entry->symbol);
- exit (FATAL_EXIT_CODE);
- }
- free_def_dec (def_dec_p);
- return;
- }
+ exit (FATAL_EXIT_CODE);
+ }
+ free_def_dec (def_dec_p);
+ return;
+ }
}
}
check_aux_info (*++p == '(');
{
- const char *kr_names_start = ++p; /* Point just inside '('. */
+ const char *kr_names_start = ++p; /* Point just inside '('. */
- while (*p++ != ')')
- continue;
- p--; /* point to closing right paren */
+ while (*p++ != ')')
+ continue;
+ p--; /* point to closing right paren */
- /* Make a copy of the K&R parameter names list. */
+ /* Make a copy of the K&R parameter names list. */
- def_dec_p->formal_names
+ def_dec_p->formal_names
= dupnstr (kr_names_start, (size_t) (p - kr_names_start));
}
p++;
/* p now points to the first character of the K&R style declarations
- list (if there is one) or to the star-slash combination that ends
- the comment in which such lists get embedded. */
+ list (if there is one) or to the star-slash combination that ends
+ the comment in which such lists get embedded. */
/* Make a copy of the K&R formal decls list and set the def_dec record
- to point to it. */
+ to point to it. */
if (*p == '*') /* Are there no K&R declarations? */
- {
- check_aux_info (*++p == '/');
- def_dec_p->formal_decls = "";
- }
+ {
+ check_aux_info (*++p == '/');
+ def_dec_p->formal_decls = "";
+ }
else
- {
- const char *kr_decls_start = p;
+ {
+ const char *kr_decls_start = p;
- while (p[0] != '*' || p[1] != '/')
- p++;
- p--;
+ while (p[0] != '*' || p[1] != '/')
+ p++;
+ p--;
- check_aux_info (*p == ' ');
+ check_aux_info (*p == ' ');
- def_dec_p->formal_decls
+ def_dec_p->formal_decls
= dupnstr (kr_decls_start, (size_t) (p - kr_decls_start));
- }
+ }
/* Handle a special case. If we have a function definition marked as
- being in "old" style, and if its formal names list is empty, then
- it may actually have the string "void" in its real formals list
- in the original source code. Just to make sure, we will get setup
- to convert such things anyway.
+ being in "old" style, and if its formal names list is empty, then
+ it may actually have the string "void" in its real formals list
+ in the original source code. Just to make sure, we will get setup
+ to convert such things anyway.
- This kludge only needs to be here because of an insurmountable
- problem with generating .X files. */
+ This kludge only needs to be here because of an insurmountable
+ problem with generating .X files. */
if (!def_dec_p->prototyped && !*def_dec_p->formal_names)
- def_dec_p->prototyped = 1;
+ def_dec_p->prototyped = 1;
}
/* Since we are unprotoizing, if this item is already in old (K&R) style,
const def_dec_info *next = curr->next_in_file;
while (next && (line < curr->line))
- {
- prev = curr;
- curr = next;
- next = next->next_in_file;
- }
+ {
+ prev = curr;
+ curr = next;
+ next = next->next_in_file;
+ }
if (line >= curr->line)
- {
- def_dec_p->next_in_file = curr;
- if (prev)
- ((NONCONST def_dec_info *) prev)->next_in_file = def_dec_p;
- else
- def_dec_p->file->defs_decs = def_dec_p;
- }
+ {
+ def_dec_p->next_in_file = curr;
+ if (prev)
+ ((NONCONST def_dec_info *) prev)->next_in_file = def_dec_p;
+ else
+ def_dec_p->file->defs_decs = def_dec_p;
+ }
else /* assert (next == NULL); */
- {
- ((NONCONST def_dec_info *) curr)->next_in_file = def_dec_p;
- /* assert (next == NULL); */
- def_dec_p->next_in_file = next;
- }
+ {
+ ((NONCONST def_dec_info *) curr)->next_in_file = def_dec_p;
+ /* assert (next == NULL); */
+ def_dec_p->next_in_file = next;
+ }
}
}
\f
for (;;)
{
while (ISSPACE ((const unsigned char)*params_list))
- params_list++;
+ params_list++;
if (!*params_list)
- break;
+ break;
param = params_list;
while (*params_list && !ISSPACE ((const unsigned char)*params_list))
- params_list++;
+ params_list++;
if (param[0] != '-')
- temp_params[param_count++]
+ temp_params[param_count++]
= dupnstr (param, (size_t) (params_list - param));
else
- {
- switch (param[1])
- {
- case 'g':
- case 'O':
- case 'S':
- case 'c':
- break; /* Don't copy these. */
- case 'o':
- while (ISSPACE ((const unsigned char)*params_list))
- params_list++;
- while (*params_list
- && !ISSPACE ((const unsigned char)*params_list))
- params_list++;
- break;
- default:
- temp_params[param_count++]
- = dupnstr (param, (size_t) (params_list - param));
- }
- }
+ {
+ switch (param[1])
+ {
+ case 'g':
+ case 'O':
+ case 'S':
+ case 'c':
+ break; /* Don't copy these. */
+ case 'o':
+ while (ISSPACE ((const unsigned char)*params_list))
+ params_list++;
+ while (*params_list
+ && !ISSPACE ((const unsigned char)*params_list))
+ params_list++;
+ break;
+ default:
+ temp_params[param_count++]
+ = dupnstr (param, (size_t) (params_list - param));
+ }
+ }
if (!*params_list)
- break;
+ break;
}
temp_params[param_count++] = "-aux-info";
temp_params[param_count++] = "-S";
temp_params[param_count++] = "-o";
-
+
if ((stat (HOST_BIT_BUCKET, &st) == 0)
&& (!S_ISDIR (st.st_mode))
&& (access (HOST_BIT_BUCKET, W_OK) == 0))
/* Add .X to source file name to get aux-info file name. */
compile_params[aux_info_file_name_index] =
concat (compile_params[input_file_name_index], aux_info_suffix, NULL);
-
+
if (!quiet_flag)
notice ("%s: compiling `%s'\n",
pname, compile_params[input_file_name_index]);
struct stat stat_buf;
/* Get some status information about this aux_info file. */
-
+
if (stat (aux_info_filename, &stat_buf) == -1)
{
int errno_val = errno;
- notice ("%s: can't get status of aux info file `%s': %s\n",
+ notice ("%s: can't get status of aux info file `%s': %s\n",
pname, shortpath (NULL, aux_info_filename),
xstrerror (errno_val));
- errors++;
- return;
+ errors++;
+ return;
}
-
+
/* Check on whether or not this aux_info file is zero length. If it is,
then just ignore it and return. */
-
+
if ((aux_info_size = stat_buf.st_size) == 0)
return;
-
+
/* Get the date/time of last modification for this aux_info file and
remember it. We will have to check that any source files that it
contains information about are at least this old or older. */
-
+
aux_info_mtime = stat_buf.st_mtime;
if (!is_syscalls)
int fd_flags;
/* Open the aux_info file. */
-
+
fd_flags = O_RDONLY;
#ifdef O_BINARY
/* Use binary mode to avoid having to deal with different EOL characters. */
if ((aux_info_file = open (aux_info_filename, fd_flags, 0444 )) == -1)
{
int errno_val = errno;
- notice ("%s: can't open aux info file `%s' for reading: %s\n",
+ notice ("%s: can't open aux info file `%s' for reading: %s\n",
pname, shortpath (NULL, aux_info_filename),
xstrerror (errno_val));
- return;
+ return;
}
-
+
/* Allocate space to hold the aux_info file in memory. */
-
+
aux_info_base = xmalloc (aux_info_size + 1);
aux_info_limit = aux_info_base + aux_info_size;
*aux_info_limit = '\0';
-
+
/* Read the aux_info file into memory. */
-
+
if (safe_read (aux_info_file, aux_info_base, aux_info_size) !=
(int) aux_info_size)
{
int errno_val = errno;
- notice ("%s: error reading aux info file `%s': %s\n",
+ notice ("%s: error reading aux info file `%s': %s\n",
pname, shortpath (NULL, aux_info_filename),
xstrerror (errno_val));
- free (aux_info_base);
- close (aux_info_file);
- return;
+ free (aux_info_base);
+ close (aux_info_file);
+ return;
}
-
+
/* Close the aux info file. */
-
+
if (close (aux_info_file))
{
int errno_val = errno;
- notice ("%s: error closing aux info file `%s': %s\n",
+ notice ("%s: error closing aux info file `%s': %s\n",
pname, shortpath (NULL, aux_info_filename),
xstrerror (errno_val));
- free (aux_info_base);
- close (aux_info_file);
- return;
+ free (aux_info_base);
+ close (aux_info_file);
+ return;
}
}
while (*p != ':'
#ifdef HAVE_DOS_BASED_FILE_SYSTEM
- || (*p == ':' && *p && *(p+1) && IS_DIR_SEPARATOR (*(p+1)))
+ || (*p == ':' && *p && *(p+1) && IS_DIR_SEPARATOR (*(p+1)))
#endif
- )
+ )
p++;
p++;
while (*p == ' ')
{
char *slash;
- slash = strrchr (dir_end ? dir_end : aux_info_relocated_name,
- DIR_SEPARATOR_2);
+ slash = strrchr (dir_end ? dir_end : aux_info_relocated_name,
+ DIR_SEPARATOR_2);
if (slash)
dir_end = slash;
}
if (!is_syscalls)
{
- current_aux_info_lineno = 2;
-
- for (aux_info_p = aux_info_second_line; *aux_info_p; )
- {
- if (referenced_file_is_newer (aux_info_p, aux_info_mtime))
- {
- free (aux_info_base);
+ current_aux_info_lineno = 2;
+
+ for (aux_info_p = aux_info_second_line; *aux_info_p; )
+ {
+ if (referenced_file_is_newer (aux_info_p, aux_info_mtime))
+ {
+ free (aux_info_base);
free (aux_info_relocated_name);
- if (keep_it && unlink (aux_info_filename) == -1)
- {
+ if (keep_it && unlink (aux_info_filename) == -1)
+ {
int errno_val = errno;
- notice ("%s: can't delete file `%s': %s\n",
+ notice ("%s: can't delete file `%s': %s\n",
pname, shortpath (NULL, aux_info_filename),
xstrerror (errno_val));
- return;
- }
+ return;
+ }
must_create = 1;
- goto start_over;
- }
-
- /* Skip over the rest of this line to start of next line. */
-
- while (*aux_info_p != '\n')
- aux_info_p++;
- aux_info_p++;
- current_aux_info_lineno++;
- }
+ goto start_over;
+ }
+
+ /* Skip over the rest of this line to start of next line. */
+
+ while (*aux_info_p != '\n')
+ aux_info_p++;
+ aux_info_p++;
+ current_aux_info_lineno++;
+ }
}
/* Now do the real pass on the aux_info lines. Save their information in
the in-core data base. */
-
+
current_aux_info_lineno = 2;
-
+
for (aux_info_p = aux_info_second_line; *aux_info_p;)
{
- char *unexpanded_line = unexpand_if_needed (aux_info_p);
-
- if (unexpanded_line)
- {
- save_def_or_dec (unexpanded_line, is_syscalls);
- free (unexpanded_line);
- }
- else
- save_def_or_dec (aux_info_p, is_syscalls);
-
- /* Skip over the rest of this line and get to start of next line. */
-
- while (*aux_info_p != '\n')
- aux_info_p++;
- aux_info_p++;
- current_aux_info_lineno++;
+ char *unexpanded_line = unexpand_if_needed (aux_info_p);
+
+ if (unexpanded_line)
+ {
+ save_def_or_dec (unexpanded_line, is_syscalls);
+ free (unexpanded_line);
+ }
+ else
+ save_def_or_dec (aux_info_p, is_syscalls);
+
+ /* Skip over the rest of this line and get to start of next line. */
+
+ while (*aux_info_p != '\n')
+ aux_info_p++;
+ aux_info_p++;
+ current_aux_info_lineno++;
}
}
{
const char *filename = hp->symbol;
int last_char_index = strlen (filename) - 1;
- char *const new_filename = (char *) alloca (strlen (filename)
- + strlen (cplus_suffix) + 1);
+ char *const new_filename = (char *) alloca (strlen (filename)
+ + strlen (cplus_suffix) + 1);
/* Note that we don't care here if the given file was converted or not. It
is possible that the given file was *not* converted, simply because there
{
file_info *file_p = hp->fip;
def_dec_info *prev = NULL;
- def_dec_info *current = (def_dec_info *)file_p->defs_decs;
+ def_dec_info *current = (def_dec_info *) file_p->defs_decs;
if (!current)
return; /* no list to reverse */
prev = current;
- if (! (current = (def_dec_info *)current->next_in_file))
+ if (! (current = (def_dec_info *) current->next_in_file))
return; /* can't reverse a single list element */
prev->next_in_file = NULL;
while (current)
{
- def_dec_info *next = (def_dec_info *)current->next_in_file;
+ def_dec_info *next = (def_dec_info *) current->next_in_file;
current->next_in_file = prev;
prev = current;
code being converted contains its own definition of a function which
could have been supplied by libc.a. In such cases, we should avoid
issuing the normal warning, and defer to the definition given in the
- user's own code. */
+ user's own code. */
for (dd_p = head; dd_p; dd_p = dd_p->next_for_func)
if (dd_p->is_func_def && !dd_p->is_static)
{
- if (!extern_def_p) /* Previous definition? */
- extern_def_p = dd_p; /* Remember the first definition found. */
- else
- {
- /* Ignore definition just found if it came from SYSCALLS.c.X. */
-
- if (is_syscalls_file (dd_p->file))
- continue;
-
- /* Quietly replace the definition previously found with the one
- just found if the previous one was from SYSCALLS.c.X. */
-
- if (is_syscalls_file (extern_def_p->file))
- {
- extern_def_p = dd_p;
- continue;
- }
-
- /* If we get here, then there is a conflict between two function
- declarations for the same function, both of which came from the
- user's own code. */
-
- if (!conflict_noted) /* first time we noticed? */
- {
- conflict_noted = 1;
- notice ("%s: conflicting extern definitions of '%s'\n",
+ if (!extern_def_p) /* Previous definition? */
+ extern_def_p = dd_p; /* Remember the first definition found. */
+ else
+ {
+ /* Ignore definition just found if it came from SYSCALLS.c.X. */
+
+ if (is_syscalls_file (dd_p->file))
+ continue;
+
+ /* Quietly replace the definition previously found with the one
+ just found if the previous one was from SYSCALLS.c.X. */
+
+ if (is_syscalls_file (extern_def_p->file))
+ {
+ extern_def_p = dd_p;
+ continue;
+ }
+
+ /* If we get here, then there is a conflict between two function
+ declarations for the same function, both of which came from the
+ user's own code. */
+
+ if (!conflict_noted) /* first time we noticed? */
+ {
+ conflict_noted = 1;
+ notice ("%s: conflicting extern definitions of '%s'\n",
pname, head->hash_entry->symbol);
- if (!quiet_flag)
- {
- notice ("%s: declarations of '%s' will not be converted\n",
+ if (!quiet_flag)
+ {
+ notice ("%s: declarations of '%s' will not be converted\n",
pname, head->hash_entry->symbol);
- notice ("%s: conflict list for '%s' follows:\n",
+ notice ("%s: conflict list for '%s' follows:\n",
pname, head->hash_entry->symbol);
- fprintf (stderr, "%s: %s(%d): %s\n",
+ fprintf (stderr, "%s: %s(%d): %s\n",
pname,
shortpath (NULL, extern_def_p->file->hash_entry->symbol),
extern_def_p->line, extern_def_p->ansi_decl);
- }
- }
- if (!quiet_flag)
- fprintf (stderr, "%s: %s(%d): %s\n",
+ }
+ }
+ if (!quiet_flag)
+ fprintf (stderr, "%s: %s(%d): %s\n",
pname,
shortpath (NULL, dd_p->file->hash_entry->symbol),
dd_p->line, dd_p->ansi_decl);
- }
+ }
}
/* We want to err on the side of caution, so if we found multiple conflicting
if (!extern_def_p)
{
/* We have no definitions for this function so do the next best thing.
- Search for an extern declaration already in prototype form. */
+ Search for an extern declaration already in prototype form. */
for (dd_p = head; dd_p; dd_p = dd_p->next_for_func)
- if (!dd_p->is_func_def && !dd_p->is_static && dd_p->prototyped)
- {
- extern_def_p = dd_p; /* save a pointer to the definition */
- if (!quiet_flag)
- notice ("%s: warning: using formals list from %s(%d) for function `%s'\n",
+ if (!dd_p->is_func_def && !dd_p->is_static && dd_p->prototyped)
+ {
+ extern_def_p = dd_p; /* save a pointer to the definition */
+ if (!quiet_flag)
+ notice ("%s: warning: using formals list from %s(%d) for function `%s'\n",
pname,
shortpath (NULL, dd_p->file->hash_entry->symbol),
dd_p->line, dd_p->hash_entry->symbol);
- break;
- }
+ break;
+ }
/* Gripe about unprototyped function declarations that we found no
- corresponding definition (or other source of prototype information)
- for.
+ corresponding definition (or other source of prototype information)
+ for.
- Gripe even if the unprototyped declaration we are worried about
- exists in a file in one of the "system" include directories. We
- can gripe about these because we should have at least found a
- corresponding (pseudo) definition in the SYSCALLS.c.X file. If we
+ Gripe even if the unprototyped declaration we are worried about
+ exists in a file in one of the "system" include directories. We
+ can gripe about these because we should have at least found a
+ corresponding (pseudo) definition in the SYSCALLS.c.X file. If we
didn't, then that means that the SYSCALLS.c.X file is missing some
- needed prototypes for this particular system. That is worth telling
- the user about! */
+ needed prototypes for this particular system. That is worth telling
+ the user about! */
if (!extern_def_p)
- {
- const char *file = user->file->hash_entry->symbol;
+ {
+ const char *file = user->file->hash_entry->symbol;
- if (!quiet_flag)
- if (in_system_include_dir (file))
- {
+ if (!quiet_flag)
+ if (in_system_include_dir (file))
+ {
/* Why copy this string into `needed' at all?
Why not just use user->ansi_decl without copying? */
char *needed = (char *) alloca (strlen (user->ansi_decl) + 1);
- char *p;
+ char *p;
- strcpy (needed, user->ansi_decl);
- p = (NONCONST char *) substr (needed, user->hash_entry->symbol)
- + strlen (user->hash_entry->symbol) + 2;
+ strcpy (needed, user->ansi_decl);
+ p = (NONCONST char *) substr (needed, user->hash_entry->symbol)
+ + strlen (user->hash_entry->symbol) + 2;
/* Avoid having ??? in the string. */
*p++ = '?';
*p++ = '?';
*p++ = '?';
- strcpy (p, ");");
+ strcpy (p, ");");
- notice ("%s: %d: `%s' used but missing from SYSCALLS\n",
+ notice ("%s: %d: `%s' used but missing from SYSCALLS\n",
shortpath (NULL, file), user->line,
needed+7); /* Don't print "extern " */
- }
+ }
#if 0
- else
- notice ("%s: %d: warning: no extern definition for `%s'\n",
+ else
+ notice ("%s: %d: warning: no extern definition for `%s'\n",
shortpath (NULL, file), user->line,
user->hash_entry->symbol);
#endif
- }
+ }
}
return extern_def_p;
}
for (dd_p = head; dd_p; dd_p = dd_p->next_for_func)
if (dd_p->is_func_def && dd_p->is_static && (dd_p->file == user->file))
{
- static_def_p = dd_p; /* save a pointer to the definition */
- num_static_defs++;
+ static_def_p = dd_p; /* save a pointer to the definition */
+ num_static_defs++;
}
if (num_static_defs == 0)
{
if (!quiet_flag)
- notice ("%s: warning: no static definition for `%s' in file `%s'\n",
+ notice ("%s: warning: no static definition for `%s' in file `%s'\n",
pname, head->hash_entry->symbol,
shortpath (NULL, user->file->hash_entry->symbol));
}
for (dd_p = hp->ddip; dd_p; dd_p = dd_p->next_for_func)
if (!dd_p->is_func_def && !dd_p->is_static && !dd_p->definition)
{
- if (first_extern_reference)
- {
- extern_def_p = find_extern_def (hp->ddip, dd_p);
- first_extern_reference = 0;
- }
- ((NONCONST def_dec_info *) dd_p)->definition = extern_def_p;
+ if (first_extern_reference)
+ {
+ extern_def_p = find_extern_def (hp->ddip, dd_p);
+ first_extern_reference = 0;
+ }
+ ((NONCONST def_dec_info *) dd_p)->definition = extern_def_p;
}
/* Traverse the list of definitions and declarations for this particular
for (dd_p = hp->ddip; dd_p; dd_p = dd_p->next_for_func)
if (!dd_p->is_func_def && dd_p->is_static && !dd_p->definition)
{
- const def_dec_info *dd_p2;
- const def_dec_info *static_def;
-
- /* We have now found a single static declaration for which we need to
- find a matching definition. We want to minimize the work (and the
- number of warnings), so we will find an appropriate (matching)
- static definition for this declaration, and then distribute it
- (as the definition for) any and all other static declarations
- for this function name which occur within the same file, and which
- do not already have definitions.
-
- Note that a trick is used here to prevent subsequent attempts to
- call find_static_definition for a given function-name & file
- if the first such call returns NULL. Essentially, we convert
- these NULL return values to -1, and put the -1 into the definition
- field for each other static declaration from the same file which
- does not already have an associated definition.
- This makes these other static declarations look like they are
- actually defined already when the outer loop here revisits them
- later on. Thus, the outer loop will skip over them. Later, we
- turn the -1's back to NULL's. */
-
- ((NONCONST def_dec_info *) dd_p)->definition =
- (static_def = find_static_definition (dd_p))
- ? static_def
- : (const def_dec_info *) -1;
-
- for (dd_p2 = dd_p->next_for_func; dd_p2; dd_p2 = dd_p2->next_for_func)
- if (!dd_p2->is_func_def && dd_p2->is_static
- && !dd_p2->definition && (dd_p2->file == dd_p->file))
- ((NONCONST def_dec_info *)dd_p2)->definition = dd_p->definition;
+ const def_dec_info *dd_p2;
+ const def_dec_info *static_def;
+
+ /* We have now found a single static declaration for which we need to
+ find a matching definition. We want to minimize the work (and the
+ number of warnings), so we will find an appropriate (matching)
+ static definition for this declaration, and then distribute it
+ (as the definition for) any and all other static declarations
+ for this function name which occur within the same file, and which
+ do not already have definitions.
+
+ Note that a trick is used here to prevent subsequent attempts to
+ call find_static_definition for a given function-name & file
+ if the first such call returns NULL. Essentially, we convert
+ these NULL return values to -1, and put the -1 into the definition
+ field for each other static declaration from the same file which
+ does not already have an associated definition.
+ This makes these other static declarations look like they are
+ actually defined already when the outer loop here revisits them
+ later on. Thus, the outer loop will skip over them. Later, we
+ turn the -1's back to NULL's. */
+
+ ((NONCONST def_dec_info *) dd_p)->definition =
+ (static_def = find_static_definition (dd_p))
+ ? static_def
+ : (const def_dec_info *) -1;
+
+ for (dd_p2 = dd_p->next_for_func; dd_p2; dd_p2 = dd_p2->next_for_func)
+ if (!dd_p2->is_func_def && dd_p2->is_static
+ && !dd_p2->definition && (dd_p2->file == dd_p->file))
+ ((NONCONST def_dec_info *) dd_p2)->definition = dd_p->definition;
}
/* Convert any dummy (-1) definitions we created in the step above back to
if (!quiet_flag)
{
if (clean_p == 0)
- notice ("%s: %d: warning: source too confusing\n",
+ notice ("%s: %d: warning: source too confusing\n",
shortpath (NULL, convert_filename), last_known_line_number);
else
- notice ("%s: %d: warning: source too confusing\n",
+ notice ("%s: %d: warning: source too confusing\n",
shortpath (NULL, convert_filename),
identify_lineno (clean_p));
}
while (n > last_known_line_number)
{
while (*last_known_line_start != '\n')
- check_source (++last_known_line_start < clean_text_limit, 0);
+ check_source (++last_known_line_start < clean_text_limit, 0);
last_known_line_start++;
last_known_line_number++;
}
const char *candidate;
if ((candidate = substr (p, varargs_style_indicator)) == 0)
- return 0;
+ return 0;
else
- if (!is_id_char (candidate[-1]) && !is_id_char (candidate[len]))
- return 1;
- else
- p = candidate + 1;
+ if (!is_id_char (candidate[-1]) && !is_id_char (candidate[len]))
+ return 1;
+ else
+ p = candidate + 1;
}
return 0;
#endif /* !defined (UNPROTOIZE) */
if (other_variable_style_function (definition->ansi_decl))
{
if (!quiet_flag)
- notice ("%s: %d: warning: varargs function declaration not converted\n",
+ notice ("%s: %d: warning: varargs function declaration not converted\n",
shortpath (NULL, def_dec_p->file->hash_entry->symbol),
def_dec_p->line);
return;
do
{
for (;;)
- {
- /* Scan leftwards until we find some character which can be
- part of an identifier. */
+ {
+ /* Scan leftwards until we find some character which can be
+ part of an identifier. */
- while (!is_id_char (*clean_text_p))
- check_source (--clean_text_p > clean_read_ptr, 0);
+ while (!is_id_char (*clean_text_p))
+ check_source (--clean_text_p > clean_read_ptr, 0);
- /* Scan backwards until we find a char that cannot be part of an
- identifier. */
+ /* Scan backwards until we find a char that cannot be part of an
+ identifier. */
- while (is_id_char (*clean_text_p))
- check_source (--clean_text_p > clean_read_ptr, 0);
+ while (is_id_char (*clean_text_p))
+ check_source (--clean_text_p > clean_read_ptr, 0);
- /* Having found an "id break", see if the following id is the one
- that we are looking for. If so, then exit from this loop. */
+ /* Having found an "id break", see if the following id is the one
+ that we are looking for. If so, then exit from this loop. */
- if (!strncmp (clean_text_p+1, function_to_edit, func_name_len))
- {
- char ch = *(clean_text_p + 1 + func_name_len);
+ if (!strncmp (clean_text_p+1, function_to_edit, func_name_len))
+ {
+ char ch = *(clean_text_p + 1 + func_name_len);
+
+ /* Must also check to see that the name in the source text
+ ends where it should (in order to prevent bogus matches
+ on similar but longer identifiers. */
- /* Must also check to see that the name in the source text
- ends where it should (in order to prevent bogus matches
- on similar but longer identifiers. */
+ if (! is_id_char (ch))
+ break; /* exit from loop */
+ }
+ }
- if (! is_id_char (ch))
- break; /* exit from loop */
- }
- }
-
/* We have now found the first perfect match for the function name in
- our backward search. This may or may not be the actual function
- name at the start of the actual function declaration (i.e. we could
- have easily been mislead). We will try to avoid getting fooled too
- often by looking forward for the open paren which should follow the
- identifier we just found. We ignore whitespace while hunting. If
- the next non-whitespace byte we see is *not* an open left paren,
- then we must assume that we have been fooled and we start over
- again accordingly. Note that there is no guarantee, that even if
- we do see the open paren, that we are in the right place.
- Programmers do the strangest things sometimes! */
-
+ our backward search. This may or may not be the actual function
+ name at the start of the actual function declaration (i.e. we could
+ have easily been mislead). We will try to avoid getting fooled too
+ often by looking forward for the open paren which should follow the
+ identifier we just found. We ignore whitespace while hunting. If
+ the next non-whitespace byte we see is *not* an open left paren,
+ then we must assume that we have been fooled and we start over
+ again accordingly. Note that there is no guarantee, that even if
+ we do see the open paren, that we are in the right place.
+ Programmers do the strangest things sometimes! */
+
end_of_fn_name = clean_text_p + strlen (def_dec_p->hash_entry->symbol);
start_formals = forward_to_next_token_char (end_of_fn_name);
}
for (;;)
{
{
- int depth;
-
- end_formals = start_formals + 1;
- depth = 1;
- for (; depth; check_source (++end_formals < clean_text_limit, 0))
- {
- switch (*end_formals)
- {
- case '(':
- depth++;
- break;
- case ')':
- depth--;
- break;
- }
- }
- end_formals--;
+ int depth;
+
+ end_formals = start_formals + 1;
+ depth = 1;
+ for (; depth; check_source (++end_formals < clean_text_limit, 0))
+ {
+ switch (*end_formals)
+ {
+ case '(':
+ depth++;
+ break;
+ case ')':
+ depth--;
+ break;
+ }
+ }
+ end_formals--;
}
/* end_formals now points to the closing right paren of the formals
- list whose left paren is pointed to by start_formals. */
-
+ list whose left paren is pointed to by start_formals. */
+
/* Now, if we are protoizing, we insert the new ANSI-style formals list
- attached to the associated definition of this function. If however
- we are unprotoizing, then we simply delete any formals list which
- may be present. */
-
+ attached to the associated definition of this function. If however
+ we are unprotoizing, then we simply delete any formals list which
+ may be present. */
+
output_up_to (start_formals);
#ifndef UNPROTOIZE
if (this_f_list_chain_item)
- {
- output_string (this_f_list_chain_item->formals_list);
- this_f_list_chain_item = this_f_list_chain_item->chain_next;
- }
+ {
+ output_string (this_f_list_chain_item->formals_list);
+ this_f_list_chain_item = this_f_list_chain_item->chain_next;
+ }
else
- {
- if (!quiet_flag)
- notice ("%s: warning: too many parameter lists in declaration of `%s'\n",
+ {
+ if (!quiet_flag)
+ notice ("%s: warning: too many parameter lists in declaration of `%s'\n",
pname, def_dec_p->hash_entry->symbol);
- check_source (0, end_formals); /* leave the declaration intact */
- }
+ check_source (0, end_formals); /* leave the declaration intact */
+ }
#endif /* !defined (UNPROTOIZE) */
clean_read_ptr = end_formals - 1;
/* Now see if it looks like there may be another formals list associated
- with the function declaration that we are converting (following the
- formals list that we just converted. */
+ with the function declaration that we are converting (following the
+ formals list that we just converted. */
{
- const char *another_r_paren = forward_to_next_token_char (end_formals);
+ const char *another_r_paren = forward_to_next_token_char (end_formals);
- if ((*another_r_paren != ')')
- || (*(start_formals = forward_to_next_token_char (another_r_paren)) != '('))
- {
+ if ((*another_r_paren != ')')
+ || (*(start_formals = forward_to_next_token_char (another_r_paren)) != '('))
+ {
#ifndef UNPROTOIZE
- if (this_f_list_chain_item)
- {
- if (!quiet_flag)
- notice ("\n%s: warning: too few parameter lists in declaration of `%s'\n",
+ if (this_f_list_chain_item)
+ {
+ if (!quiet_flag)
+ notice ("\n%s: warning: too few parameter lists in declaration of `%s'\n",
pname, def_dec_p->hash_entry->symbol);
- check_source (0, start_formals); /* leave the decl intact */
- }
+ check_source (0, start_formals); /* leave the decl intact */
+ }
#endif /* !defined (UNPROTOIZE) */
- break;
-
- }
+ break;
+
+ }
}
/* There does appear to be yet another formals list, so loop around
- again, and convert it also. */
+ again, and convert it also. */
}
}
list that lies to the left of the one it was originally called to work
on. Thus, a whole set gets done in right-to-left order.
- This routine returns non-zero if it thinks that it should not be trying
+ This routine returns nonzero if it thinks that it should not be trying
to convert this particular function definition (because the name of the
function doesn't match the one expected). */
for (; depth; check_source (--start_formals > clean_read_ptr, 0))
{
switch (*start_formals)
- {
- case '(':
- depth--;
- break;
- case ')':
- depth++;
- break;
- }
+ {
+ case '(':
+ depth--;
+ break;
+ case ')':
+ depth++;
+ break;
+ }
}
start_formals++;
next_end = start_formals - 1;
check_source (next_end > clean_read_ptr, 0);
while (ISSPACE ((const unsigned char)*next_end))
- check_source (--next_end > clean_read_ptr, 0);
+ check_source (--next_end > clean_read_ptr, 0);
check_source (*next_end == ')', next_end);
check_source (--next_end > clean_read_ptr, 0);
check_source (*next_end == ')', next_end);
if (edit_formals_lists (next_end, f_list_count, def_dec_p))
- return 1;
+ return 1;
}
/* Check that the function name in the header we are working on is the same
as the one we would expect to find. If not, issue a warning and return
- non-zero. */
+ nonzero. */
if (f_list_count == 0)
{
for (func_name_limit = start_formals-1;
ISSPACE ((const unsigned char)*func_name_limit); )
- check_source (--func_name_limit > clean_read_ptr, 0);
+ check_source (--func_name_limit > clean_read_ptr, 0);
for (func_name_start = func_name_limit++;
- is_id_char (*func_name_start);
- func_name_start--)
- check_source (func_name_start > clean_read_ptr, 0);
+ is_id_char (*func_name_start);
+ func_name_start--)
+ check_source (func_name_start > clean_read_ptr, 0);
func_name_start++;
func_name_len = func_name_limit - func_name_start;
if (func_name_len == 0)
- check_source (0, func_name_start);
+ check_source (0, func_name_start);
if (func_name_len != strlen (expected)
|| strncmp (func_name_start, expected, func_name_len))
- {
- notice ("%s: %d: warning: found `%s' but expected `%s'\n",
+ {
+ notice ("%s: %d: warning: found `%s' but expected `%s'\n",
shortpath (NULL, def_dec_p->file->hash_entry->symbol),
identify_lineno (func_name_start),
dupnstr (func_name_start, func_name_len),
expected);
- return 1;
- }
+ return 1;
+ }
}
output_up_to (start_formals);
/* Look leftward and try to find a right-paren. */
while (*end_formals != ')')
- {
- if (ISSPACE ((const unsigned char)*end_formals))
- while (ISSPACE ((const unsigned char)*end_formals))
- check_source (--end_formals > clean_read_ptr, 0);
- else
- check_source (--end_formals > clean_read_ptr, 0);
- }
+ {
+ if (ISSPACE ((const unsigned char)*end_formals))
+ while (ISSPACE ((const unsigned char)*end_formals))
+ check_source (--end_formals > clean_read_ptr, 0);
+ else
+ check_source (--end_formals > clean_read_ptr, 0);
+ }
ch = *(l_brace_p = forward_to_next_token_char (end_formals));
/* Since it is possible that we found a right paren before the starting
- '{' of the body which IS NOT the one at the end of the real K&R
- formals list (say for instance, we found one embedded inside one of
- the old K&R formal parameter declarations) we have to check to be
- sure that this is in fact the right paren that we were looking for.
+ '{' of the body which IS NOT the one at the end of the real K&R
+ formals list (say for instance, we found one embedded inside one of
+ the old K&R formal parameter declarations) we have to check to be
+ sure that this is in fact the right paren that we were looking for.
- The one we were looking for *must* be followed by either a '{' or
- by an alphabetic character, while others *cannot* validly be followed
- by such characters. */
+ The one we were looking for *must* be followed by either a '{' or
+ by an alphabetic character, while others *cannot* validly be followed
+ by such characters. */
- if ((ch == '{') || ISALPHA ((unsigned char)ch))
- break;
+ if ((ch == '{') || ISALPHA ((unsigned char) ch))
+ break;
/* At this point, we have found a right paren, but we know that it is
- not the one we were looking for, so backup one character and keep
- looking. */
+ not the one we were looking for, so backup one character and keep
+ looking. */
check_source (--end_formals > clean_read_ptr, 0);
}
if (*start_of_block != '{')
{
if (!quiet_flag)
- notice ("\n%s: %d: warning: can't add declaration of `%s' into macro call\n",
- def_dec_p->file->hash_entry->symbol, def_dec_p->line,
- def_dec_p->hash_entry->symbol);
+ notice ("\n%s: %d: warning: can't add declaration of `%s' into macro call\n",
+ def_dec_p->file->hash_entry->symbol, def_dec_p->line,
+ def_dec_p->hash_entry->symbol);
return;
}
we just found. */
output_up_to (ep);
-
+
/* Now we go ahead and insert the new declaration at this point.
If the definition of the given function is in the same file that we
are currently editing, and if its full ANSI declaration normally
would start with the keyword `extern', suppress the `extern'. */
-
+
{
const char *decl = def_dec_p->definition->ansi_decl;
-
+
if ((*decl == 'e') && (def_dec_p->file == def_dec_p->definition->file))
- decl += 7;
+ decl += 7;
output_string (decl);
}
for (;; --scan_p)
{
if (scan_p < clean_text_base)
- break;
+ break;
check_source (scan_p > clean_read_ptr, 0);
if (*scan_p == ';')
- break;
+ break;
}
/* scan_p now points either to a semicolon, or to just before the start
/* Now write out full prototypes for all of the things that had been
implicitly declared in this file (but only those for which we were
actually able to find unique matching definitions). Avoid duplicates
- by marking things that we write out as we go. */
+ by marking things that we write out as we go. */
{
int some_decls_added = 0;
-
+
for (dd_p = file_p->defs_decs; dd_p; dd_p = dd_p->next_in_file)
if (dd_p->is_implicit && dd_p->definition && !dd_p->definition->written)
- {
- const char *decl = dd_p->definition->ansi_decl;
-
- /* If the function for which we are inserting a declaration is
- actually defined later in the same file, then suppress the
- leading `extern' keyword (if there is one). */
-
- if (*decl == 'e' && (dd_p->file == dd_p->definition->file))
- decl += 7;
-
- output_string ("\n");
- output_string (decl);
- some_decls_added = 1;
- ((NONCONST def_dec_info *) dd_p->definition)->written = 1;
- }
+ {
+ const char *decl = dd_p->definition->ansi_decl;
+
+ /* If the function for which we are inserting a declaration is
+ actually defined later in the same file, then suppress the
+ leading `extern' keyword (if there is one). */
+
+ if (*decl == 'e' && (dd_p->file == dd_p->definition->file))
+ decl += 7;
+
+ output_string ("\n");
+ output_string (decl);
+ some_decls_added = 1;
+ ((NONCONST def_dec_info *) dd_p->definition)->written = 1;
+ }
if (some_decls_added)
output_string ("\n\n");
}
function with a variable number of arguments, and if the way it does
that is different from that way we would like it (i.e. varargs vs.
stdarg) then issue a warning and leave the header unconverted. */
-
+
if (other_variable_style_function (def_dec_p->ansi_decl))
{
if (!quiet_flag)
- notice ("%s: %d: warning: definition of %s not converted\n",
+ notice ("%s: %d: warning: definition of %s not converted\n",
shortpath (NULL, def_dec_p->file->hash_entry->symbol),
- identify_lineno (end_formals),
+ identify_lineno (end_formals),
other_var_style);
output_up_to (end_formals);
return;
limit_p = decl_p + strlen (decl_p);
for (;decl_p < limit_p; decl_p = semicolon_p + 2)
{
- for (semicolon_p = decl_p; *semicolon_p != ';'; semicolon_p++)
- continue;
- output_string ("\n");
- output_string (indent_string);
- output_bytes (decl_p, (size_t) ((semicolon_p + 1) - decl_p));
+ for (semicolon_p = decl_p; *semicolon_p != ';'; semicolon_p++)
+ continue;
+ output_string ("\n");
+ output_string (indent_string);
+ output_bytes (decl_p, (size_t) ((semicolon_p + 1) - decl_p));
}
/* If there are no newlines between the end of the formals list and the
for (scan_p = end_formals+1; *scan_p != '{'; )
{
- if (*scan_p == '\n')
- {
- had_newlines = 1;
- break;
- }
- check_source (++scan_p < clean_text_limit, 0);
+ if (*scan_p == '\n')
+ {
+ had_newlines = 1;
+ break;
+ }
+ check_source (++scan_p < clean_text_limit, 0);
}
if (!had_newlines)
output_string ("\n");
scan_orig = end_formals_orig + 1;
for (; scan < start_body; scan++, scan_orig++)
{
- if (*scan == *scan_orig)
- {
- have_newlines |= (*scan_orig == '\n');
- /* Leave identical whitespace alone. */
- if (!ISSPACE ((const unsigned char)*scan_orig))
- *((NONCONST char *)scan_orig) = ' '; /* identical - so whiteout */
- }
- else
- have_flotsam = 1;
+ if (*scan == *scan_orig)
+ {
+ have_newlines |= (*scan_orig == '\n');
+ /* Leave identical whitespace alone. */
+ if (!ISSPACE ((const unsigned char)*scan_orig))
+ *((NONCONST char *) scan_orig) = ' '; /* identical - so whiteout */
+ }
+ else
+ have_flotsam = 1;
}
if (have_flotsam)
output_bytes (end_formals_orig + 1,
(size_t) (start_body_orig - end_formals_orig) - 1);
else
if (have_newlines)
- output_string ("\n");
+ output_string ("\n");
else
- output_string (" ");
+ output_string (" ");
clean_read_ptr = start_body - 1;
}
#endif /* !defined (UNPROTOIZE) */
for (scan_p = new_clean_text_base; scan_p < new_clean_text_limit; scan_p++)
{
switch (*scan_p)
- {
- case '/': /* Handle comments. */
- if (scan_p[1] != '*')
- goto regular;
- non_whitespace_since_newline = 1;
- scan_p[0] = ' ';
- scan_p[1] = ' ';
- scan_p += 2;
- while (scan_p[1] != '/' || scan_p[0] != '*')
- {
- if (!ISSPACE ((const unsigned char)*scan_p))
- *scan_p = ' ';
- if (++scan_p >= new_clean_text_limit)
- abort ();
- }
- *scan_p++ = ' ';
- *scan_p = ' ';
- break;
-
- case '#': /* Handle pp directives. */
- if (non_whitespace_since_newline)
- goto regular;
- *scan_p = ' ';
- while (scan_p[1] != '\n' || scan_p[0] == '\\')
- {
- if (!ISSPACE ((const unsigned char)*scan_p))
- *scan_p = ' ';
- if (++scan_p >= new_clean_text_limit)
- abort ();
- }
- *scan_p++ = ' ';
- break;
-
- case '\'': /* Handle character literals. */
- non_whitespace_since_newline = 1;
- while (scan_p[1] != '\'' || scan_p[0] == '\\')
- {
- if (scan_p[0] == '\\'
- && !ISSPACE ((const unsigned char)scan_p[1]))
- scan_p[1] = ' ';
- if (!ISSPACE ((const unsigned char)*scan_p))
- *scan_p = ' ';
- if (++scan_p >= new_clean_text_limit)
- abort ();
- }
- *scan_p++ = ' ';
- break;
-
- case '"': /* Handle string literals. */
- non_whitespace_since_newline = 1;
- while (scan_p[1] != '"' || scan_p[0] == '\\')
- {
- if (scan_p[0] == '\\'
- && !ISSPACE ((const unsigned char)scan_p[1]))
- scan_p[1] = ' ';
- if (!ISSPACE ((const unsigned char)*scan_p))
- *scan_p = ' ';
- if (++scan_p >= new_clean_text_limit)
- abort ();
- }
- if (!ISSPACE ((const unsigned char)*scan_p))
- *scan_p = ' ';
- scan_p++;
- break;
-
- case '\\': /* Handle line continuations. */
- if (scan_p[1] != '\n')
- goto regular;
- *scan_p = ' ';
- break;
-
- case '\n':
- non_whitespace_since_newline = 0; /* Reset. */
- break;
-
- case ' ':
- case '\v':
- case '\t':
- case '\r':
- case '\f':
- case '\b':
- break; /* Whitespace characters. */
-
- default:
+ {
+ case '/': /* Handle comments. */
+ if (scan_p[1] != '*')
+ goto regular;
+ non_whitespace_since_newline = 1;
+ scan_p[0] = ' ';
+ scan_p[1] = ' ';
+ scan_p += 2;
+ while (scan_p[1] != '/' || scan_p[0] != '*')
+ {
+ if (!ISSPACE ((const unsigned char)*scan_p))
+ *scan_p = ' ';
+ if (++scan_p >= new_clean_text_limit)
+ abort ();
+ }
+ *scan_p++ = ' ';
+ *scan_p = ' ';
+ break;
+
+ case '#': /* Handle pp directives. */
+ if (non_whitespace_since_newline)
+ goto regular;
+ *scan_p = ' ';
+ while (scan_p[1] != '\n' || scan_p[0] == '\\')
+ {
+ if (!ISSPACE ((const unsigned char)*scan_p))
+ *scan_p = ' ';
+ if (++scan_p >= new_clean_text_limit)
+ abort ();
+ }
+ *scan_p++ = ' ';
+ break;
+
+ case '\'': /* Handle character literals. */
+ non_whitespace_since_newline = 1;
+ while (scan_p[1] != '\'' || scan_p[0] == '\\')
+ {
+ if (scan_p[0] == '\\'
+ && !ISSPACE ((const unsigned char) scan_p[1]))
+ scan_p[1] = ' ';
+ if (!ISSPACE ((const unsigned char)*scan_p))
+ *scan_p = ' ';
+ if (++scan_p >= new_clean_text_limit)
+ abort ();
+ }
+ *scan_p++ = ' ';
+ break;
+
+ case '"': /* Handle string literals. */
+ non_whitespace_since_newline = 1;
+ while (scan_p[1] != '"' || scan_p[0] == '\\')
+ {
+ if (scan_p[0] == '\\'
+ && !ISSPACE ((const unsigned char) scan_p[1]))
+ scan_p[1] = ' ';
+ if (!ISSPACE ((const unsigned char)*scan_p))
+ *scan_p = ' ';
+ if (++scan_p >= new_clean_text_limit)
+ abort ();
+ }
+ if (!ISSPACE ((const unsigned char)*scan_p))
+ *scan_p = ' ';
+ scan_p++;
+ break;
+
+ case '\\': /* Handle line continuations. */
+ if (scan_p[1] != '\n')
+ goto regular;
+ *scan_p = ' ';
+ break;
+
+ case '\n':
+ non_whitespace_since_newline = 0; /* Reset. */
+ break;
+
+ case ' ':
+ case '\v':
+ case '\t':
+ case '\r':
+ case '\f':
+ case '\b':
+ break; /* Whitespace characters. */
+
+ default:
regular:
- non_whitespace_since_newline = 1;
- break;
- }
+ non_whitespace_since_newline = 1;
+ break;
+ }
}
}
for (paren_depth = 1, q = p-1; paren_depth; check_source (--q >= clean_text_base, 0))
{
switch (*q)
- {
- case ')':
- paren_depth++;
- break;
- case '(':
- paren_depth--;
- break;
- }
+ {
+ case ')':
+ paren_depth++;
+ break;
+ case '(':
+ paren_depth--;
+ break;
+ }
}
return ++q;
}
for (scan_p = clean_text_base; scan_p < limit; scan_p++)
{
if (*scan_p == ')')
- {
- static const char *last_r_paren;
- const char *ahead_p;
+ {
+ static const char *last_r_paren;
+ const char *ahead_p;
- last_r_paren = scan_p;
+ last_r_paren = scan_p;
- for (ahead_p = scan_p + 1; ISSPACE ((const unsigned char)*ahead_p); )
- check_source (++ahead_p < limit, limit);
+ for (ahead_p = scan_p + 1; ISSPACE ((const unsigned char)*ahead_p); )
+ check_source (++ahead_p < limit, limit);
- scan_p = ahead_p - 1;
+ scan_p = ahead_p - 1;
- if (ISALPHA ((const unsigned char)*ahead_p) || *ahead_p == '{')
- {
- const char *last_l_paren;
- const int lineno = identify_lineno (ahead_p);
+ if (ISALPHA ((const unsigned char)*ahead_p) || *ahead_p == '{')
+ {
+ const char *last_l_paren;
+ const int lineno = identify_lineno (ahead_p);
- if (setjmp (source_confusion_recovery))
- continue;
+ if (setjmp (source_confusion_recovery))
+ continue;
- /* We know we have a function definition header. Now skip
- leftwards over all of its associated formals lists. */
+ /* We know we have a function definition header. Now skip
+ leftwards over all of its associated formals lists. */
- do
- {
- last_l_paren = careful_find_l_paren (last_r_paren);
- for (last_r_paren = last_l_paren-1;
+ do
+ {
+ last_l_paren = careful_find_l_paren (last_r_paren);
+ for (last_r_paren = last_l_paren-1;
ISSPACE ((const unsigned char)*last_r_paren); )
- check_source (--last_r_paren >= backup_limit, backup_limit);
- }
- while (*last_r_paren == ')');
-
- if (is_id_char (*last_r_paren))
- {
- const char *id_limit = last_r_paren + 1;
- const char *id_start;
- size_t id_length;
- const def_dec_info *dd_p;
-
- for (id_start = id_limit-1; is_id_char (*id_start); )
- check_source (--id_start >= backup_limit, backup_limit);
- id_start++;
- backup_limit = id_start;
- if ((id_length = (size_t) (id_limit - id_start)) == 0)
- goto not_missed;
+ check_source (--last_r_paren >= backup_limit, backup_limit);
+ }
+ while (*last_r_paren == ')');
+
+ if (is_id_char (*last_r_paren))
+ {
+ const char *id_limit = last_r_paren + 1;
+ const char *id_start;
+ size_t id_length;
+ const def_dec_info *dd_p;
+
+ for (id_start = id_limit-1; is_id_char (*id_start); )
+ check_source (--id_start >= backup_limit, backup_limit);
+ id_start++;
+ backup_limit = id_start;
+ if ((id_length = (size_t) (id_limit - id_start)) == 0)
+ goto not_missed;
{
char *func_name = (char *) alloca (id_length + 1);
pname);
}
not_missed: ;
- }
- }
- }
+ }
+ }
+ }
}
}
Note that the trick of making a copy of the original sans comments &
preprocessing directives make the editing a whole lot easier. */
-
+
static void
edit_file (hp)
const hash_table_entry *hp;
{
if (!quiet_flag
#ifdef UNPROTOIZE
- /* Don't even mention "system" include files unless we are
- protoizing. If we are protoizing, we mention these as a
- gentle way of prodding the user to convert his "system"
- include files to prototype format. */
- && !in_system_include_dir (convert_filename)
+ /* Don't even mention "system" include files unless we are
+ protoizing. If we are protoizing, we mention these as a
+ gentle way of prodding the user to convert his "system"
+ include files to prototype format. */
+ && !in_system_include_dir (convert_filename)
#endif /* defined (UNPROTOIZE) */
- )
- notice ("%s: `%s' not converted\n",
+ )
+ notice ("%s: `%s' not converted\n",
pname, shortpath (NULL, convert_filename));
return;
}
if ((input_file = open (convert_filename, fd_flags, 0444)) == -1)
{
int errno_val = errno;
- notice ("%s: can't open file `%s' for reading: %s\n",
+ notice ("%s: can't open file `%s' for reading: %s\n",
pname, shortpath (NULL, convert_filename),
xstrerror (errno_val));
- return;
+ return;
}
/* Read the entire original source text file into the original text buffer
(int) orig_size)
{
int errno_val = errno;
- close (input_file);
- notice ("\n%s: error reading input file `%s': %s\n",
+ close (input_file);
+ notice ("\n%s: error reading input file `%s': %s\n",
pname, shortpath (NULL, convert_filename),
xstrerror (errno_val));
- return;
+ return;
}
close (input_file);
char *const clean_filename = (char *) alloca (strlen (convert_filename) + 6 + 1);
/* Open (and create) the clean file. */
-
+
strcpy (clean_filename, convert_filename);
strcat (clean_filename, ".clean");
if ((clean_file = creat (clean_filename, 0666)) == -1)
{
int errno_val = errno;
- notice ("%s: can't create/open clean file `%s': %s\n",
+ notice ("%s: can't create/open clean file `%s': %s\n",
pname, shortpath (NULL, clean_filename),
xstrerror (errno_val));
- return;
+ return;
}
-
+
/* Write the clean file. */
-
+
safe_write (clean_file, new_clean_text_base, clean_size, clean_filename);
-
+
close (clean_file);
}
#endif /* 0 */
def_dec_p = file_p->defs_decs;
for (; def_dec_p; def_dec_p = def_dec_p->next_in_file)
{
- const char *clean_text_p = seek_to_line (def_dec_p->line);
-
- /* clean_text_p now points to the first character of the line which
- contains the `terminator' for the declaration or definition that
- we are about to process. */
-
+ const char *clean_text_p = seek_to_line (def_dec_p->line);
+
+ /* clean_text_p now points to the first character of the line which
+ contains the `terminator' for the declaration or definition that
+ we are about to process. */
+
#ifndef UNPROTOIZE
-
- if (global_flag && def_dec_p->is_func_def && first_definition_in_file)
- {
- add_global_decls (def_dec_p->file, clean_text_p);
- first_definition_in_file = 0;
- }
- /* Don't edit this item if it is already in prototype format or if it
- is a function declaration and we have found no corresponding
- definition. */
+ if (global_flag && def_dec_p->is_func_def && first_definition_in_file)
+ {
+ add_global_decls (def_dec_p->file, clean_text_p);
+ first_definition_in_file = 0;
+ }
- if (def_dec_p->prototyped
- || (!def_dec_p->is_func_def && !def_dec_p->definition))
- continue;
+ /* Don't edit this item if it is already in prototype format or if it
+ is a function declaration and we have found no corresponding
+ definition. */
+
+ if (def_dec_p->prototyped
+ || (!def_dec_p->is_func_def && !def_dec_p->definition))
+ continue;
#endif /* !defined (UNPROTOIZE) */
- if (def_dec_p->is_func_def)
- edit_fn_definition (def_dec_p, clean_text_p);
- else
+ if (def_dec_p->is_func_def)
+ edit_fn_definition (def_dec_p, clean_text_p);
+ else
#ifndef UNPROTOIZE
- if (def_dec_p->is_implicit)
- add_local_decl (def_dec_p, clean_text_p);
- else
+ if (def_dec_p->is_implicit)
+ add_local_decl (def_dec_p, clean_text_p);
+ else
#endif /* !defined (UNPROTOIZE) */
- edit_fn_declaration (def_dec_p, clean_text_p);
+ edit_fn_declaration (def_dec_p, clean_text_p);
}
}
{
char *new_filename
= (char *) xmalloc (strlen (convert_filename) + strlen (save_suffix) + 2);
-
+
strcpy (new_filename, convert_filename);
#ifdef __MSDOS__
/* MSDOS filenames are restricted to 8.3 format, so we save `foo.c'
- as `foo.<save_suffix>'. */
+ as `foo.<save_suffix>'. */
new_filename[(strlen (convert_filename) - 1] = '\0';
#endif
strcat (new_filename, save_suffix);
shortpath (NULL, new_filename));
}
else if (rename (convert_filename, new_filename) == -1)
- {
+ {
int errno_val = errno;
notice ("%s: can't link file `%s' to `%s': %s\n",
pname,
shortpath (NULL, new_filename),
xstrerror (errno_val));
return;
- }
+ }
}
if (unlink (convert_filename) == -1)
int errno_val = errno;
/* The file may have already been renamed. */
if (errno_val != ENOENT)
- {
+ {
notice ("%s: can't delete file `%s': %s\n",
pname, shortpath (NULL, convert_filename),
xstrerror (errno_val));
int output_file;
/* Open (and create) the output file. */
-
+
if ((output_file = creat (convert_filename, 0666)) == -1)
{
int errno_val = errno;
- notice ("%s: can't create/open output file `%s': %s\n",
+ notice ("%s: can't create/open output file `%s': %s\n",
pname, shortpath (NULL, convert_filename),
xstrerror (errno_val));
- return;
+ return;
}
#ifdef O_BINARY
/* Use binary mode to avoid changing the existing EOL character. */
setmode (output_file, O_BINARY);
#endif
-
+
/* Write the output file. */
-
+
{
unsigned int out_size = (repl_write_ptr + 1) - repl_text_base;
-
+
safe_write (output_file, repl_text_base, out_size, convert_filename);
}
-
+
close (output_file);
}
if (nondefault_syscalls_dir)
{
syscalls_absolute_filename
- = (char *) xmalloc (strlen (nondefault_syscalls_dir) + 1
- + sizeof (syscalls_filename));
+ = (char *) xmalloc (strlen (nondefault_syscalls_dir) + 1
+ + sizeof (syscalls_filename));
strcpy (syscalls_absolute_filename, nondefault_syscalls_dir);
}
else
{
- GET_ENV_PATH_LIST (default_syscalls_dir, "GCC_EXEC_PREFIX");
+ GET_ENVIRONMENT (default_syscalls_dir, "GCC_EXEC_PREFIX");
if (!default_syscalls_dir)
{
default_syscalls_dir = standard_exec_prefix;
}
syscalls_absolute_filename
- = (char *) xmalloc (strlen (default_syscalls_dir) + 0
+ = (char *) xmalloc (strlen (default_syscalls_dir) + 0
+ strlen (target_machine) + 1
+ strlen (target_version) + 1
- + sizeof (syscalls_filename));
+ + sizeof (syscalls_filename));
strcpy (syscalls_absolute_filename, default_syscalls_dir);
strcat (syscalls_absolute_filename, target_machine);
strcat (syscalls_absolute_filename, "/");
*(syscalls_absolute_filename + syscalls_len) = '\0';
}
strcat (syscalls_absolute_filename, syscalls_filename);
-
+
/* Call process_aux_info_file in such a way that it does not try to
delete the SYSCALLS aux_info file. */
#endif /* !defined (UNPROTOIZE) */
}
\f
-static struct option longopts[] =
+static const struct option longopts[] =
{
{"version", 0, 0, 'V'},
{"file_name", 0, 0, 'p'},
signal (SIGCHLD, SIG_DFL);
#endif
-/* LC_CTYPE determines the character set used by the terminal so it has be set
- to output messages correctly. */
-
-#ifdef HAVE_LC_MESSAGES
- setlocale (LC_CTYPE, "");
- setlocale (LC_MESSAGES, "");
-#else
- setlocale (LC_ALL, "");
-#endif
-
- (void) bindtextdomain (PACKAGE, localedir);
- (void) textdomain (PACKAGE);
+ gcc_init_libintl ();
cwd_buffer = getpwd ();
if (!cwd_buffer)
case 'x':
exclude_list = string_list_cons (optarg, exclude_list);
break;
-
+
case 'v':
case 'V':
version_flag = 1;
usage ();
}
}
-
+
/* Set up compile_params based on -p and -c options. */
munge_compile_params (params);
{
const char *cp;
- for (cp = varargs_style_indicator;
- ISALNUM ((const unsigned char)*cp) || *cp == '_'; cp++)
+ for (cp = varargs_style_indicator; ISIDNUM (*cp); cp++)
continue;
if (*cp != 0)
varargs_style_indicator = savestring (varargs_style_indicator,
else
{
if (version_flag)
- fprintf (stderr, "%s: %s\n", pname, version_string);
+ fprintf (stderr, "%s: %s\n", pname, version_string);
do_processing ();
}
OSDN Git Service
