/* fix-header.c - Make C header file suitable for C++.
- Copyright (C) 1993, 1994 Free Software Foundation, Inc.
+ Copyright (C) 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
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
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
/* This program massages a system include file (such as stdio.h),
- into a form more conformant with ANSI/POSIX, and more suitable for C++:
+ into a form more conforming with ANSI/POSIX, and more suitable for C++:
* extern "C" { ... } braces are added (inside #ifndef __cplusplus),
if they seem to be needed. These prevent C++ compilers from name
the empty parameter list with the argument lust from sys-protos.h.
* The program can be given a list of (names of) required standard
- functions (such as fclose for stdio.h). If a reqquired function
+ functions (such as fclose for stdio.h). If a required function
is not seen in the input, then a prototype for it will be
written to the output.
b) it would be nice to allow update in place.
Usage:
- fix-header FOO.H INFILE.H OUTFILE.H REQUIRED_FUNCS <SCAN-FILE
+ fix-header FOO.H INFILE.H OUTFILE.H [OPTIONS]
where:
* FOO.H is the relative file name of the include file,
as it would be #include'd by a C file. (E.g. stdio.h)
* INFILE.H is a full pathname for the input file (e.g. /usr/include/stdio.h)
* OUTFILE.H is the full pathname for where to write the output file,
if anything needs to be done. (e.g. ./include/stdio.h)
- * SCAN-FILE is the output of the scan-decls program.
- * REQUIRED_FUNCS is a list of required function (e.g. fclose for stdio.h).
+ * OPTIONS are such as you would pass to cpp.
- Written by Per Bothner <bothner@cygnus.com>, July 1993. */
+ Written by Per Bothner <bothner@cygnus.com>, July 1993. */
#include <stdio.h>
#include <ctype.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#ifndef O_RDONLY
-#define O_RDONLY 0
-#endif
#include "hconfig.h"
#include "obstack.h"
#include "scan.h"
+#include "cpplib.h"
+#include "gansidecl.h"
+
+#ifndef O_RDONLY
+#define O_RDONLY 0
+#endif
+
+extern void cpp_fatal ();
+
+#if !__STDC__ && !defined(const)
+#define const /* nothing */
+#endif
-extern sstring buf;
+sstring buf;
int verbose = 0;
int partial_count = 0;
-#if 0
-/* All uses of this are ifdefed out. This is no longer needed, because
- cccp.c implicitly forces the standard include files to be treated as C.
- Adding an explicit extern "C" is undesireable as it breaks the SunOS 4.x
- sun4c/romvec.h file. */
+int warnings = 0;
+
+/* We no longer need to add extern "C", because cpp implicitly
+ forces the standard include files to be treated as C. */
+/*#define ADD_MISSING_EXTERN_C 1 */
+
+#if ADD_MISSING_EXTERN_C
int missing_extern_C_count = 0;
#endif
-int missing_errno = 0;
#include "xsys-protos.h"
+#ifdef FIXPROTO_IGNORE_LIST
+/* This is a currently unused feature. */
+
+/* List of files and directories to ignore.
+ A directory name (ending in '/') means ignore anything in that
+ directory. (It might be more efficient to do directory pruning
+ earlier in fixproto, but this is simpler and easier to customize.) */
+
+static char *files_to_ignore[] = {
+ "X11/",
+ FIXPROTO_IGNORE_LIST
+ 0
+};
+#endif
+
char *inf_buffer;
char *inf_limit;
char *inf_ptr;
enum special_file
{
no_special,
- errno_special,
- sys_stat_special
+ errno_h,
+ stdio_h,
+ stdlib_h,
+ sys_stat_h
+};
+
+/* A NAMELIST is a sequence of names, separated by '\0', and terminated
+ by an empty name (i.e. by "\0\0"). */
+
+typedef const char *namelist;
+
+/* The following macros provide the bits for symbol_flags. */
+typedef int symbol_flags;
+
+/* Used to mark names defined in the ANSI/ISO C standard. */
+#define ANSI_SYMBOL 1
+
+/* Used to mark names defined in the Posix.1 or Posix.2 standard. */
+#define POSIX1_SYMBOL 2
+#define POSIX2_SYMBOL 4
+
+/* Used to mark names defined in X/Open Portability Guide. */
+#define XOPEN_SYMBOL 8
+/* Used to mark names defined in X/Open UNIX Extensions. */
+#define XOPEN_EXTENDED_SYMBOL 16
+
+/* Used to indicate names that are not functions */
+#define MACRO_SYMBOL 512
+
+struct symbol_list {
+ symbol_flags flags;
+ namelist names;
+};
+
+#define SYMBOL_TABLE_SIZE 10
+struct symbol_list symbol_table[SYMBOL_TABLE_SIZE];
+int cur_symbol_table_size;
+
+void
+add_symbols (flags, names)
+ symbol_flags flags;
+ namelist names;
+{
+ symbol_table[cur_symbol_table_size].flags = flags;
+ symbol_table[cur_symbol_table_size].names = names;
+ cur_symbol_table_size++;
+ if (cur_symbol_table_size >= SYMBOL_TABLE_SIZE)
+ fatal ("too many calls to add_symbols");
+ symbol_table[cur_symbol_table_size].names = NULL; /* Termination. */
+}
+
+struct std_include_entry {
+ const char *name;
+ symbol_flags flags;
+ namelist names;
+};
+
+const char NONE[] = ""; /* The empty namelist. */
+
+/* Special name to indicate a continuation line in std_include_table. */
+const char CONTINUED[] = "";
+
+struct std_include_entry *include_entry;
+
+struct std_include_entry std_include_table [] = {
+ { "ctype.h", ANSI_SYMBOL,
+ "isalnum\0isalpha\0iscntrl\0isdigit\0isgraph\0islower\0\
+isprint\0ispunct\0isspace\0isupper\0isxdigit\0tolower\0toupper\0" },
+
+ { "dirent.h", POSIX1_SYMBOL, "closedir\0opendir\0readdir\0rewinddir\0"},
+
+ { "errno.h", ANSI_SYMBOL|MACRO_SYMBOL, "errno\0" },
+
+ /* ANSI_SYMBOL is wrong, but ... */
+ { "curses.h", ANSI_SYMBOL, "box\0delwin\0endwin\0getcurx\0getcury\0initscr\0\
+mvcur\0mvwprintw\0mvwscanw\0newwin\0overlay\0overwrite\0\
+scroll\0subwin\0touchwin\0waddstr\0wclear\0wclrtobot\0wclrtoeol\0\
+waddch\0wdelch\0wdeleteln\0werase\0wgetch\0wgetstr\0winsch\0winsertln\0\
+wmove\0wprintw\0wrefresh\0wscanw\0wstandend\0wstandout\0" },
+
+ { "fcntl.h", POSIX1_SYMBOL, "creat\0fcntl\0open\0" },
+
+ /* Maybe also "getgrent fgetgrent setgrent endgrent" */
+ { "grp.h", POSIX1_SYMBOL, "getgrgid\0getgrnam\0" },
+
+/*{ "limit.h", ... provided by gcc }, */
+
+ { "locale.h", ANSI_SYMBOL, "localeconv\0setlocale\0" },
+
+ { "math.h", ANSI_SYMBOL,
+ "acos\0asin\0atan\0atan2\0ceil\0cos\0cosh\0exp\0\
+fabs\0floor\0fmod\0frexp\0ldexp\0log10\0log\0modf\0pow\0sin\0sinh\0sqrt\0\
+tan\0tanh\0" },
+
+ { CONTINUED, ANSI_SYMBOL|MACRO_SYMBOL, "HUGE_VAL\0" },
+
+ { "pwd.h", POSIX1_SYMBOL, "getpwnam\0getpwuid\0" },
+
+ /* Left out siglongjmp sigsetjmp - these depend on sigjmp_buf. */
+ { "setjmp.h", ANSI_SYMBOL, "longjmp\0setjmp\0" },
+
+ /* Left out signal() - its prototype is too complex for us!
+ Also left out "sigaction sigaddset sigdelset sigemptyset
+ sigfillset sigismember sigpending sigprocmask sigsuspend"
+ because these need sigset_t or struct sigaction.
+ Most systems that provide them will also declare them. */
+ { "signal.h", ANSI_SYMBOL, "kill\0raise\0" },
+
+ { "stdio.h", ANSI_SYMBOL,
+ "clearerr\0fclose\0feof\0ferror\0fflush\0fgetc\0fgetpos\0\
+fgets\0fopen\0fprintf\0fputc\0fputs\0fread\0freopen\0fscanf\0fseek\0\
+fsetpos\0ftell\0fwrite\0getc\0getchar\0gets\00perror\0popen\0\
+printf\0putc\0putchar\0puts\0remove\0rename\0rewind\0scanf\0setbuf\0\
+setvbuf\0sprintf\0sscanf\0vprintf\0vsprintf\0vfprintf\0tmpfile\0\
+tmpnam\0ungetc\0" },
+ { CONTINUED, POSIX1_SYMBOL, "fdopen\0fileno\0" },
+ { CONTINUED, POSIX2_SYMBOL, "pclose\0popen\0" }, /* I think ... */
+/* Should perhaps also handle NULL, EOF, ... ? */
+
+ /* "div ldiv", - ignored because these depend on div_t, ldiv_t
+ ignore these: "mblen mbstowcs mbstowc wcstombs wctomb"
+ Left out getgroups, because SunOS4 has incompatible BSD and SVR4 versions.
+ Should perhaps also add NULL */
+ { "stdlib.h", ANSI_SYMBOL,
+ "abort\0abs\0atexit\0atof\0atoi\0atol\0bsearch\0calloc\0\
+exit\0free\0getenv\0labs\0malloc\0putenv\0qsort\0rand\0realloc\0\
+srand\0strtod\0strtol\0strtoul\0system\0" },
+ { CONTINUED, ANSI_SYMBOL|MACRO_SYMBOL, "EXIT_FAILURE\0EXIT_SUCCESS\0" },
+
+ { "string.h", ANSI_SYMBOL, "memchr\0memcmp\0memcpy\0memmove\0memset\0\
+strcat\0strchr\0strcmp\0strcoll\0strcpy\0strcspn\0strerror\0\
+strlen\0strncat\0strncmp\0strncpy\0strpbrk\0strrchr\0strspn\0strstr\0\
+strtok\0strxfrm\0" },
+/* Should perhaps also add NULL and size_t */
+
+ { "strings.h", XOPEN_EXTENDED_SYMBOL,
+ "bcmp\0bcopy\0bzero\0ffs\0index\0rindex\0strcasecmp\0strncasecmp\0" },
+
+ { "strops.h", XOPEN_EXTENDED_SYMBOL, "ioctl\0" },
+
+ /* Actually, XPG4 does not seem to have <sys/ioctl.h>, but defines
+ ioctl in <strops.h>. However, many systems have it is sys/ioctl.h,
+ and many systems do have <sys/ioctl.h> but not <strops.h>. */
+ { "sys/ioctl.h", XOPEN_EXTENDED_SYMBOL, "ioctl\0" },
+
+ { "sys/socket.h", XOPEN_EXTENDED_SYMBOL, "socket\0" },
+
+ { "sys/stat.h", POSIX1_SYMBOL,
+ "chmod\0fstat\0mkdir\0mkfifo\0stat\0lstat\0umask\0" },
+ { CONTINUED, POSIX1_SYMBOL|MACRO_SYMBOL,
+ "S_ISDIR\0S_ISBLK\0S_ISCHR\0S_ISFIFO\0S_ISREG\0S_ISLNK\0S_IFDIR\0\
+S_IFBLK\0S_IFCHR\0S_IFIFO\0S_IFREG\0S_IFLNK\0" },
+ { CONTINUED, XOPEN_EXTENDED_SYMBOL, "fchmod\0" },
+
+#if 0
+/* How do we handle fd_set? */
+ { "sys/time.h", XOPEN_EXTENDED_SYMBOL, "select\0" },
+ { "sys/select.h", XOPEN_EXTENDED_SYMBOL /* fake */, "select\0" },
+#endif
+
+ { "sys/times.h", POSIX1_SYMBOL, "times\0" },
+ /* "sys/types.h" add types (not in old g++-include) */
+
+ { "sys/utsname.h", POSIX1_SYMBOL, "uname\0" },
+
+ { "sys/wait.h", POSIX1_SYMBOL, "wait\0waitpid\0" },
+ { CONTINUED, POSIX1_SYMBOL|MACRO_SYMBOL,
+ "WEXITSTATUS\0WIFEXITED\0WIFSIGNALED\0WIFSTOPPED\0WSTOPSIG\0\
+WTERMSIG\0WNOHANG\0WNOTRACED\0" },
+
+ { "tar.h", POSIX1_SYMBOL, NONE },
+
+ { "termios.h", POSIX1_SYMBOL,
+ "cfgetispeed\0cfgetospeed\0cfsetispeed\0cfsetospeed\0tcdrain\0tcflow\0tcflush\0tcgetattr\0tcsendbreak\0tcsetattr\0" },
+
+ { "time.h", ANSI_SYMBOL,
+ "asctime\0clock\0ctime\0difftime\0gmtime\0localtime\0mktime\0strftime\0time\0tzset\0" },
+
+ { "unistd.h", POSIX1_SYMBOL,
+ "_exit\0access\0alarm\0chdir\0chown\0close\0ctermid\0cuserid\0\
+dup\0dup2\0execl\0execle\0execlp\0execv\0execve\0execvp\0fork\0fpathconf\0\
+getcwd\0getegid\0geteuid\0getgid\0getlogin\0getpgrp\0getpid\0\
+getppid\0getuid\0isatty\0link\0lseek\0pathconf\0pause\0pipe\0read\0rmdir\0\
+setgid\0setpgid\0setsid\0setuid\0sleep\0sysconf\0tcgetpgrp\0tcsetpgrp\0\
+ttyname\0unlink\0write\0" },
+ { CONTINUED, POSIX2_SYMBOL, "getopt\0" },
+ { CONTINUED, XOPEN_EXTENDED_SYMBOL,
+ "lockf\0gethostid\0gethostname\0readlink\0" },
+
+ { "utime.h", POSIX1_SYMBOL, "utime\0" },
+
+ { NULL, 0, NONE }
};
enum special_file special_file_handling = no_special;
+/* They are set if the corresponding macro has been seen. */
/* The following are only used when handling sys/stat.h */
-/* They are set if the corresponding macro has been seen. */
int seen_S_IFBLK = 0, seen_S_ISBLK = 0;
int seen_S_IFCHR = 0, seen_S_ISCHR = 0;
int seen_S_IFDIR = 0, seen_S_ISDIR = 0;
int seen_S_IFIFO = 0, seen_S_ISFIFO = 0;
int seen_S_IFLNK = 0, seen_S_ISLNK = 0;
int seen_S_IFREG = 0, seen_S_ISREG = 0;
+/* The following are only used when handling errno.h */
+int seen_errno = 0;
+/* The following are only used when handling stdlib.h */
+int seen_EXIT_FAILURE = 0, seen_EXIT_SUCCESS = 0;
\f
-/* Wrapper around free, to avoid prototype clashes. */
+/* Wrapper around free, to avoid prototype clashes. */
void
xfree (ptr)
struct obstack scan_file_obstack;
/* NOTE: If you edit this, also edit gen-protos.c !! */
+
struct fn_decl *
-lookup_std_proto (name)
- char *name;
+lookup_std_proto (name, name_length)
+ const char *name;
+ int name_length;
{
- int i = hash (name) % HASH_SIZE;
+ int i = hashf (name, name_length, HASH_SIZE);
int i0 = i;
for (;;)
{
if (hash_tab[i] == 0)
return NULL;
fn = &std_protos[hash_tab[i]];
- if (strcmp (fn->fname, name) == 0)
+ if (strlen (fn->fname) == name_length
+ && strncmp (fn->fname, name, name_length) == 0)
return fn;
i = (i+1) % HASH_SIZE;
if (i == i0)
int lbrac_line, rbrac_line;
-char **required_functions;
-int required_unseen_count;
+int required_unseen_count = 0;
+int required_other = 0;
void
write_lbrac ()
{
-#if 0
+#if ADD_MISSING_EXTERN_C
if (missing_extern_C_count + required_unseen_count > 0)
fprintf (outf, "#ifdef __cplusplus\nextern \"C\" {\n#endif\n");
#endif
struct partial_proto *partial_proto_list = NULL;
-struct partial_proto required_dummy_proto;
+struct partial_proto required_dummy_proto, seen_dummy_proto;
#define REQUIRED(FN) ((FN)->partial == &required_dummy_proto)
#define SET_REQUIRED(FN) ((FN)->partial = &required_dummy_proto)
-#define CLEAR_REQUIRED(FN) ((FN)->partial = 0)
+#define SET_SEEN(FN) ((FN)->partial = &seen_dummy_proto)
+#define SEEN(FN) ((FN)->partial == &seen_dummy_proto)
void
recognized_macro (fname)
char *fname;
{
- /* The original include file defines fname as a macro. */
- struct fn_decl *fn = lookup_std_proto (fname);
+ /* The original include file defines fname as a macro. */
+ struct fn_decl *fn = lookup_std_proto (fname, strlen (fname));
- /* Since fname is a macro, don't require a prototype for it. */
- if (fn && REQUIRED (fn))
+ /* Since fname is a macro, don't require a prototype for it. */
+ if (fn)
{
- CLEAR_REQUIRED (fn);
- required_unseen_count--;
+ if (REQUIRED (fn))
+ required_unseen_count--;
+ SET_SEEN (fn);
}
switch (special_file_handling)
{
- case errno_special:
- if (strcmp (fname, "errno") == 0) missing_errno = 0;
+ case errno_h:
+ if (strcmp (fname, "errno") == 0 && !seen_errno)
+ seen_errno = 1, required_other--;
+ break;
+ case stdlib_h:
+ if (strcmp (fname, "EXIT_FAILURE") == 0 && !seen_EXIT_FAILURE)
+ seen_EXIT_FAILURE = 1, required_other--;
+ if (strcmp (fname, "EXIT_SUCCESS") == 0 && !seen_EXIT_SUCCESS)
+ seen_EXIT_SUCCESS = 1, required_other--;
break;
- case sys_stat_special:
+ case sys_stat_h:
if (fname[0] == 'S' && fname[1] == '_')
{
if (strcmp (fname, "S_IFBLK") == 0) seen_S_IFBLK++;
}
void
-recognized_extern (name, type)
+recognized_extern (name, name_length, type, type_length)
char *name;
char *type;
+ int name_length, type_length;
{
switch (special_file_handling)
{
- case errno_special:
- if (strcmp (name, "errno") == 0) missing_errno = 0;
+ case errno_h:
+ if (strcmp (name, "errno") == 0 && !seen_errno)
+ seen_errno = 1, required_other--;
break;
}
}
KIND is 'I' for an inline function;
'F' if a normal function declaration preceded by 'extern "C"'
(or nested inside 'extern "C"' braces); or
- 'f' for other function declarations. */
+ 'f' for other function declarations. */
void
-recognized_function (fname, kind, rtype, args, file_seen, line_seen)
+recognized_function (fname, fname_length,
+ kind, rtype, rtype_length,
+ have_arg_list, file_seen, line_seen)
char *fname;
+ int fname_length;
int kind; /* One of 'f' 'F' or 'I' */
char *rtype;
- char *args;
+ int rtype_length;
+ int have_arg_list;
char *file_seen;
int line_seen;
{
struct partial_proto *partial;
int i;
struct fn_decl *fn;
-#if 0
+#if ADD_MISSING_EXTERN_C
if (kind == 'f')
missing_extern_C_count++;
#endif
- fn = lookup_std_proto (fname);
+ fn = lookup_std_proto (fname, fname_length);
- /* Remove the function from the list of required function. */
- if (fn && REQUIRED (fn))
+ /* Remove the function from the list of required function. */
+ if (fn)
{
- CLEAR_REQUIRED (fn);
- required_unseen_count--;
+ if (REQUIRED (fn))
+ required_unseen_count--;
+ SET_SEEN (fn);
}
- /* If we have a full prototype, we're done. */
- if (args[0] != '\0')
+ /* If we have a full prototype, we're done. */
+ if (have_arg_list)
return;
if (kind == 'I') /* don't edit inline function */
return;
/* If the partial prototype was included from some other file,
- we don't need to patch it up (in this run). */
+ we don't need to patch it up (in this run). */
i = strlen (file_seen);
if (i < inc_filename_length
|| strcmp (inc_filename, file_seen + (i - inc_filename_length)) != 0)
return;
/* We only have a partial function declaration,
- so remember that we have to add a complete prototype. */
+ so remember that we have to add a complete prototype. */
partial_count++;
- partial = (struct partial_proto*)
+ partial = (struct partial_proto *)
obstack_alloc (&scan_file_obstack, sizeof (struct partial_proto));
- partial->fname = obstack_alloc (&scan_file_obstack, strlen (fname) + 1);
- strcpy (partial->fname, fname);
- partial->rtype = obstack_alloc (&scan_file_obstack, strlen (rtype) + 1);
- strcpy (partial->rtype, rtype);
+ partial->fname = obstack_alloc (&scan_file_obstack, fname_length + 1);
+ bcopy (fname, partial->fname, fname_length);
+ partial->fname[fname_length] = 0;
+ partial->rtype = obstack_alloc (&scan_file_obstack, rtype_length + 1);
+ sprintf (partial->rtype, "%.*s", rtype_length, rtype);
partial->line_seen = line_seen;
partial->fn = fn;
fn->partial = partial;
if (verbose)
{
fprintf (stderr, "(%s: %s non-prototype function declaration.)\n",
- inc_filename, fname);
+ inc_filename, partial->fname);
}
}
+/* For any name in NAMES that is defined as a macro,
+ call recognized_macro on it. */
+
void
-read_scan_file (scan_file)
- FILE *scan_file;
+check_macro_names (pfile, names)
+ cpp_reader *pfile;
+ namelist names;
{
+ while (*names)
+ {
+ if (cpp_lookup (pfile, names, -1, -1))
+ recognized_macro (names);
+ names += strlen (names) + 1;
+ }
+}
+
+void
+read_scan_file (in_fname, argc, argv)
+ char *in_fname;
+ int argc;
+ char **argv;
+{
+ cpp_reader scan_in;
+ cpp_options scan_options;
+ struct fn_decl *fn;
+ int i;
+ register struct symbol_list *cur_symbols;
+
obstack_init (&scan_file_obstack);
- scan_decls (scan_file);
+ cpp_reader_init (&scan_in);
+ scan_in.data = &scan_options;
+ cpp_options_init (&scan_options);
+ i = cpp_handle_options (&scan_in, argc, argv);
+ if (i < argc && ! CPP_FATAL_ERRORS (&scan_in))
+ cpp_fatal (&scan_in, "Invalid option `%s'", argv[i]);
+ if (CPP_FATAL_ERRORS (&scan_in))
+ exit (FATAL_EXIT_CODE);
+
+ if (! cpp_start_read (&scan_in, in_fname))
+ exit (FATAL_EXIT_CODE);
+ CPP_OPTIONS (&scan_in)->no_line_commands = 1;
+
+ scan_decls (&scan_in, argc, argv);
+ for (cur_symbols = &symbol_table[0]; cur_symbols->names; cur_symbols++)
+ check_macro_names (&scan_in, cur_symbols->names);
+
+ if (verbose && (scan_in.errors + warnings) > 0)
+ fprintf (stderr, "(%s: %d errors and %d warnings from cpp)\n",
+ inc_filename, scan_in.errors, warnings);
+ if (scan_in.errors)
+ exit (0);
+
+ /* Traditionally, getc and putc are defined in terms of _filbuf and _flsbuf.
+ If so, those functions are also required. */
+ if (special_file_handling == stdio_h
+ && (fn = lookup_std_proto ("_filbuf", 7)) != NULL)
+ {
+ static char getchar_call[] = "getchar();";
+ cpp_buffer *buf =
+ cpp_push_buffer (&scan_in, getchar_call, sizeof(getchar_call) - 1);
+ int old_written = CPP_WRITTEN (&scan_in);
+ int seen_filbuf = 0;
- if (required_unseen_count + partial_count + missing_errno
-#if 0
+ /* Scan the macro expansion of "getchar();". */
+ for (;;)
+ {
+ enum cpp_token token = cpp_get_token (&scan_in);
+ int length = CPP_WRITTEN (&scan_in) - old_written;
+ CPP_SET_WRITTEN (&scan_in, old_written);
+ if (token == CPP_EOF) /* Should not happen ... */
+ break;
+ if (token == CPP_POP && CPP_BUFFER (&scan_in) == buf)
+ {
+ cpp_pop_buffer (&scan_in);
+ break;
+ }
+ if (token == CPP_NAME && length == 7
+ && strcmp ("_filbuf", scan_in.token_buffer + old_written) == 0)
+ seen_filbuf++;
+ }
+ if (seen_filbuf)
+ {
+ int need_filbuf = !SEEN (fn) && !REQUIRED (fn);
+ struct fn_decl *flsbuf_fn = lookup_std_proto ("_flsbuf", 7);
+ int need_flsbuf
+ = flsbuf_fn && !SEEN (flsbuf_fn) && !REQUIRED (flsbuf_fn);
+
+ /* Append "_filbuf" and/or "_flsbuf" to the required functions. */
+ if (need_filbuf + need_flsbuf)
+ {
+ char *new_list;
+ if (need_filbuf)
+ SET_REQUIRED (fn);
+ if (need_flsbuf)
+ SET_REQUIRED (flsbuf_fn);
+ if (need_flsbuf + need_filbuf == 2)
+ new_list = "_filbuf\0_flsbuf\0";
+ else if (need_flsbuf)
+ new_list = "_flsbuf\0";
+ else /* if (need_flsbuf) */
+ new_list = "_filbuf\0";
+ add_symbols (ANSI_SYMBOL, new_list);
+ required_unseen_count += need_filbuf + need_flsbuf;
+ }
+ }
+ }
+
+ if (required_unseen_count + partial_count + required_other
+#if ADD_MISSING_EXTERN_C
+ missing_extern_C_count
#endif
== 0)
if (partial_count)
fprintf (stderr, "%s: %d non-prototype function declarations.\n",
inc_filename, partial_count);
-#if 0
+#if ADD_MISSING_EXTERN_C
if (missing_extern_C_count)
fprintf (stderr,
"%s: %d declarations not protected by extern \"C\".\n",
write_rbrac ()
{
struct fn_decl *fn;
- char **rptr;
+ const char *cptr;
+ register struct symbol_list *cur_symbols;
if (required_unseen_count)
- fprintf (outf, "#ifdef __cplusplus\n");
+ {
+#ifdef NO_IMPLICIT_EXTERN_C
+ fprintf (outf, "#ifdef __cplusplus\nextern \"C\" {\n#endif\n");
+#endif
+ }
- /* Now we print out prototypes for those functions that we haven't seen. */
- for (rptr = required_functions; *rptr; rptr++)
+ /* Now we print out prototypes for those functions that we haven't seen. */
+ for (cur_symbols = &symbol_table[0]; cur_symbols->names; cur_symbols++)
{
- int macro_protect = 0;
+ int if_was_emitted = 0;
+ int name_len;
+ cptr = cur_symbols->names;
+ for ( ; (name_len = strlen (cptr)) != 0; cptr+= name_len + 1)
+ {
+ int macro_protect = 0;
- fn = lookup_std_proto (*rptr);
- if (fn == NULL || !REQUIRED (fn))
- continue;
+ if (cur_symbols->flags & MACRO_SYMBOL)
+ continue;
+
+ fn = lookup_std_proto (cptr, name_len);
+ if (fn == NULL || !REQUIRED (fn))
+ continue;
+
+ if (!if_was_emitted)
+ {
+/* what about curses. ??? or _flsbuf/_filbuf ??? */
+ if (cur_symbols->flags & ANSI_SYMBOL)
+ fprintf (outf,
+ "#if defined(__USE_FIXED_PROTOTYPES__) || defined(__cplusplus) || defined (__STRICT_ANSI__)\n");
+ else if (cur_symbols->flags & (POSIX1_SYMBOL|POSIX2_SYMBOL))
+ fprintf (outf,
+ "#if defined(__USE_FIXED_PROTOTYPES__) || (defined(__cplusplus) \\\n\
+ ? (!defined(__STRICT_ANSI__) || defined(_POSIX_SOURCE)) \\\n\
+ : (defined(__STRICT_ANSI__) && defined(_POSIX_SOURCE)))\n");
+ else if (cur_symbols->flags & XOPEN_SYMBOL)
+ {
+ fprintf (outf,
+ "#if defined(__USE_FIXED_PROTOTYPES__) \\\n\
+ || (defined(__STRICT_ANSI__) && defined(_XOPEN_SOURCE))\n");
+ }
+ else if (cur_symbols->flags & XOPEN_EXTENDED_SYMBOL)
+ {
+ fprintf (outf,
+ "#if defined(__USE_FIXED_PROTOTYPES__) \\\n\
+ || (defined(__STRICT_ANSI__) && defined(_XOPEN_EXTENDED_SOURCE))\n");
+ }
+ else
+ {
+ fatal ("internal error for function %s", fn->fname);
+ }
+ if_was_emitted = 1;
+ }
- /* In the case of memmove, protect in case the application
- defines it as a macro before including the header. */
- if (!strcmp (fn->fname, "memmove")
- || !strcmp (fn->fname, "vprintf")
- || !strcmp (fn->fname, "vfprintf")
- || !strcmp (fn->fname, "vsprintf")
- || !strcmp (fn->fname, "rewinddir"))
- macro_protect = 1;
-
- if (macro_protect)
- fprintf (outf, "#ifndef %s\n", fn->fname);
- fprintf (outf, "extern %s %s (%s);\n",
- fn->rtype, fn->fname, fn->params);
- if (macro_protect)
- fprintf (outf, "#endif\n");
+ /* In the case of memmove, protect in case the application
+ defines it as a macro before including the header. */
+ if (!strcmp (fn->fname, "memmove")
+ || !strcmp (fn->fname, "vprintf")
+ || !strcmp (fn->fname, "vfprintf")
+ || !strcmp (fn->fname, "vsprintf")
+ || !strcmp (fn->fname, "rewinddir"))
+ macro_protect = 1;
+
+ if (macro_protect)
+ fprintf (outf, "#ifndef %s\n", fn->fname);
+ fprintf (outf, "extern %s %s (%s);\n",
+ fn->rtype, fn->fname, fn->params);
+ if (macro_protect)
+ fprintf (outf, "#endif\n");
+ }
+ if (if_was_emitted)
+ fprintf (outf,
+ "#endif /* defined(__USE_FIXED_PROTOTYPES__) || ... */\n");
}
if (required_unseen_count)
- fprintf (outf,
- "#endif /* defined(__cplusplus) */\n");
+ {
+#ifdef NO_IMPLICIT_EXTERN_C
+ fprintf (outf, "#ifdef __cplusplus\n}\n#endif\n");
+#endif
+ }
switch (special_file_handling)
{
- case errno_special:
- if (missing_errno)
+ case errno_h:
+ if (!seen_errno)
fprintf (outf, "extern int errno;\n");
break;
- case sys_stat_special:
+ case stdlib_h:
+ if (!seen_EXIT_FAILURE)
+ fprintf (outf, "#define EXIT_FAILURE 1\n");
+ if (!seen_EXIT_SUCCESS)
+ fprintf (outf, "#define EXIT_SUCCESS 0\n");
+ break;
+ case sys_stat_h:
if (!seen_S_ISBLK && seen_S_IFBLK)
fprintf (outf,
"#define S_ISBLK(mode) (((mode) & S_IFMT) == S_IFBLK)\n");
}
-#if 0
+#if ADD_MISSING_EXTERN_C
if (missing_extern_C_count + required_unseen_count > 0)
fprintf (outf, "#ifdef __cplusplus\n}\n#endif\n");
#endif
*/
-#define INF_GET() (inf_ptr < inf_limit ? *(unsigned char*)inf_ptr++ : EOF)
+#define INF_GET() (inf_ptr < inf_limit ? *(unsigned char *) inf_ptr++ : EOF)
#define INF_UNGET(c) ((c)!=EOF && inf_ptr--)
int
return c;
}
-/* Read into STR from inf_buffer upto DELIM. */
+/* Read into STR from inf_buffer upto DELIM. */
int
inf_read_upto (str, delim)
/* Returns 1 if the file is correctly protected against multiple
inclusion, setting *ifndef_line to the line number of the initial #ifndef
and setting *endif_line to the final #endif.
- Otherwise return 0. */
+ Otherwise return 0. */
int
check_protection (ifndef_line, endif_line)
char *protect_name = NULL; /* Identifier following initial #ifndef */
int define_seen = 0;
- /* Skip initial white space (including comments). */
+ /* Skip initial white space (including comments). */
for (;; lineno++)
{
c = inf_skip_spaces (' ');
if (SSTRING_LENGTH (&buf) == 0 || strcmp (buf.base, "ifndef") != 0)
return 0;
- /* So far so good: We've seen an initial #ifndef. */
+ /* So far so good: We've seen an initial #ifndef. */
*ifndef_line = lineno;
c = inf_scan_ident (&buf, inf_skip_spaces (c));
if (SSTRING_LENGTH (&buf) == 0 || c == EOF)
if (!define_seen)
return 0;
*endif_line = lineno;
- /* Skip final white space (including comments). */
+ /* Skip final white space (including comments). */
for (;;)
{
c = inf_skip_spaces (' ');
struct stat sbuf;
int c;
int i, done;
- char *cptr, *cptr0, **pptr;
+ const char *cptr, **pptr;
int ifndef_line;
int endif_line;
long to_read;
long int inf_size;
+ register struct symbol_list *cur_symbols;
if (argv[0] && argv[0][0])
{
if (argc < 4)
{
- fprintf (stderr, "%s: Usage: foo.h infile.h outfile.h req_funcs <scan-file-name\n",
+ fprintf (stderr, "%s: Usage: foo.h infile.h outfile.h options\n",
progname);
exit (-1);
}
inc_filename = argv[1];
inc_filename_length = strlen (inc_filename);
- if (strcmp (inc_filename, "sys/stat.h") == 0)
- special_file_handling = sys_stat_special;
- else if (strcmp (inc_filename, "errno.h") == 0)
- special_file_handling = errno_special, missing_errno = 1;
-
- /* Calculate an upper bound of the number of function names in argv[4] */
- for (i = 1, cptr = argv[4]; *cptr; cptr++)
- if (*cptr == ' ') i++;
- /* Find the list of prototypes required for this include file. */
- required_functions = (char**)xmalloc ((i+1) * sizeof (char*));
- for (cptr = argv[4], cptr0 = cptr, pptr = required_functions, done = 0;
- !done; cptr++)
- {
- done = *cptr == '\0';
- if (*cptr == ' ' || done)
+
+#ifdef FIXPROTO_IGNORE_LIST
+ for (i = 0; files_to_ignore[i] != NULL; i++)
+ {
+ char *ignore_name = files_to_ignore[i];
+ int ignore_len = strlen (ignore_name);
+ if (strncmp (inc_filename, ignore_name, ignore_len) == 0)
{
- *cptr = '\0';
- if (cptr > cptr0)
+ if (ignore_name[ignore_len-1] == '/'
+ || inc_filename[ignore_len] == '\0')
{
- struct fn_decl *fn = lookup_std_proto (cptr0);
- *pptr++ = cptr0;
- if (fn == NULL)
- fprintf (stderr, "Internal error: No prototype for %s\n",
- cptr0);
- else
- SET_REQUIRED (fn);
+ if (verbose)
+ fprintf (stderr, "%s: ignoring %s\n", progname, inc_filename);
+ exit (0);
}
- cptr0 = cptr + 1;
+ }
+
+ }
+#endif
+
+ if (strcmp (inc_filename, "sys/stat.h") == 0)
+ special_file_handling = sys_stat_h;
+ else if (strcmp (inc_filename, "errno.h") == 0)
+ special_file_handling = errno_h, required_other++;
+ else if (strcmp (inc_filename, "stdlib.h") == 0)
+ special_file_handling = stdlib_h, required_other+=2;
+ else if (strcmp (inc_filename, "stdio.h") == 0)
+ special_file_handling = stdio_h;
+ include_entry = std_include_table;
+ while (include_entry->name != NULL
+ && (include_entry->name == CONTINUED
+ || strcmp (inc_filename, include_entry->name) != 0))
+ include_entry++;
+
+ if (include_entry->name != NULL)
+ {
+ struct std_include_entry *entry;
+ cur_symbol_table_size = 0;
+ for (entry = include_entry; ;)
+ {
+ add_symbols (entry->flags, entry->names);
+ entry++;
+ if (entry->name != CONTINUED)
+ break;
}
}
- required_unseen_count = pptr - required_functions;
- *pptr = 0;
+ else
+ symbol_table[0].names = NULL;
- read_scan_file (stdin);
+ /* Count and mark the prototypes required for this include file. */
+ for (cur_symbols = &symbol_table[0]; cur_symbols->names; cur_symbols++)
+ {
+ int name_len;
+ if (cur_symbols->flags & MACRO_SYMBOL)
+ continue;
+ cptr = cur_symbols->names;
+ for ( ; (name_len = strlen (cptr)) != 0; cptr+= name_len + 1)
+ {
+ struct fn_decl *fn = lookup_std_proto (cptr, name_len);
+ required_unseen_count++;
+ if (fn == NULL)
+ fprintf (stderr, "Internal error: No prototype for %s\n", cptr);
+ else
+ SET_REQUIRED (fn);
+ }
+ }
+
+ read_scan_file (argv[2], argc - 4, argv + 4);
inf_fd = open (argv[2], O_RDONLY, 0666);
if (inf_fd < 0)
exit (-1);
}
inf_size = sbuf.st_size;
- inf_buffer = (char*) xmalloc (inf_size + 2);
+ inf_buffer = (char *) xmalloc (inf_size + 2);
inf_buffer[inf_size] = '\n';
inf_buffer[inf_size + 1] = '\0';
inf_limit = inf_buffer + inf_size;
close (inf_fd);
- /* If file doesn't end with '\n', add one. */
+ /* If file doesn't end with '\n', add one. */
if (inf_limit > inf_buffer && inf_limit[-1] != '\n')
inf_limit++;
if (check_protection (&ifndef_line, &endif_line))
{
-#if 0
- fprintf (stderr, "#ifndef %s on line %d; #endif on line %d\n",
- protect_name, ifndef_line, endif_line);
-#endif
lbrac_line = ifndef_line+1;
rbrac_line = endif_line;
}
rbrac_line = -1;
}
- /* Reset input file. */
+ /* Reset input file. */
inf_ptr = inf_buffer;
lineno = 1;
c = inf_scan_ident (&buf, c);
INF_UNGET (c);
fputs (buf.base, outf);
- fn = lookup_std_proto (buf.base);
+ fn = lookup_std_proto (buf.base, strlen (buf.base));
/* We only want to edit the declaration matching the one
seen by scan-decls, as there can be multiple
- declarations, selected by #ifdef __STDC__ or whatever. */
+ declarations, selected by #ifdef __STDC__ or whatever. */
if (fn && fn->partial && fn->partial->line_seen == lineno)
{
c = inf_skip_spaces (' ');
return 0;
}
+\f
+/* Stub error functions. These replace cpperror.c,
+ because we want to suppress error messages. */
+
+void
+cpp_file_line_for_message (pfile, filename, line, column)
+ cpp_reader *pfile;
+ char *filename;
+ int line, column;
+{
+ if (!verbose)
+ return;
+ if (column > 0)
+ fprintf (stderr, "%s:%d:%d: ", filename, line, column);
+ else
+ fprintf (stderr, "%s:%d: ", filename, line);
+}
+
+void
+cpp_print_containing_files (pfile)
+ cpp_reader *pfile;
+{
+}
+
+/* IS_ERROR is 2 for fatal error, 1 for error, 0 for warning */
+
+void cpp_message (pfile, is_error, msg, arg1, arg2, arg3)
+ int is_error;
+ cpp_reader *pfile;
+ char *msg;
+ char *arg1, *arg2, *arg3;
+{
+ if (is_error == 1)
+ pfile->errors++;
+ else if (is_error > 1)
+ pfile->errors = CPP_FATAL_LIMIT;
+ if (!verbose)
+ return;
+ if (!is_error)
+ fprintf (stderr, "warning: ");
+ fprintf (stderr, msg, arg1, arg2, arg3);
+ fprintf (stderr, "\n");
+}
+
+void
+fatal (str, arg)
+ char *str, *arg;
+{
+ fprintf (stderr, "%s: %s: ", progname, inc_filename);
+ fprintf (stderr, str, arg);
+ fprintf (stderr, "\n");
+ exit (FATAL_EXIT_CODE);
+}
+
+void
+cpp_fatal (pfile, str, arg)
+ cpp_reader *pfile;
+ char *str, *arg;
+{
+ fatal (str, arg);
+}
+
+void
+cpp_pfatal_with_name (pfile, name)
+ cpp_reader *pfile;
+ char *name;
+{
+ cpp_perror_with_name (pfile, name);
+ exit (FATAL_EXIT_CODE);
+}
OSDN Git Service
