# fixproto TARGET-DIR SOURCE-DIR-ALL SOURCE-DIR-STD
#
# COPYRIGHT
-# Copyright (C) 1993 Free Software Foundation, Inc.
+# Copyright (C) 1993, 1994, 1997, 1998 Free Software Foundation, Inc.
# This file is part of GNU CC.
#
# GNU CC is free software; you can redistribute it and/or modify
#
# You should have received a copy of the GNU General Public License
# along with GNU CC; see the file COPYING. If not, write to
-# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# the Free Software Foundation, 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
#
# DESCRIPTION
# Adjunct script for GNU CC to populate a directory with ANSI,
# files are copied. An earlier version just included the original
# by "reference", using GNU cpp's #include_next mechanism.
# This is currently not done, partly because #include_next is
-# fragile (susceptible to version incompatibilties, and depends
+# fragile (susceptible to version incompatibilities, and depends
# and GCC-specific features), and partly for performance reasons.
#
# AUTHORS
# Ron Guilmette (rfg@netcom.com) (original idea and code)
# Per Bothner (bothner@cygnus.com) (major re-write)
-progname=$0
-progname=`basename $progname`
+dirname=`echo "$0" | sed 's,^[^/]*$,.,;s,//*[^/]*$,,'`
+progname=`echo "$0" | sed 's,.*/,,'`
original_dir=`pwd`
-CPP=${CPP-./cpp}
+FIX_HEADER=${FIX_HEADER-$original_dir/fix-header}
+DEFINES="-D__STDC__=0 -D__cplusplus ${FIXPROTO_DEFINES}"
+
+if mkdir -p . 2> /dev/null; then
+ # Great, mkdir accepts -p
+ mkinstalldirs="mkdir -p"
+else
+ # We expect mkinstalldirs to be passed in the environment.
+ # If it is not, assume it is in the directory that contains this script.
+ mkinstalldirs=${mkinstalldirs-"/bin/sh $dirname/mkinstalldirs"}
+ if $mkinstalldirs . 2> /dev/null; then
+ :
+ else
+ # But, in case of failure, fallback to plain mkdir, and hope it works
+ mkinstalldirs=mkdir
+ fi
+fi
if [ `echo $1 | wc -w` = 0 ] ; then
echo $progname\: usage\: $progname target-dir \[ source-dir \.\.\. \]
exit 1
fi
-std_files="ctype.h dirent.h errno.h curses.h fcntl.h grp.h locale.h math.h pwd.h setjmp.h signal.h stdio.h stdlib.h string.h sys/stat.h sys/times.h sys/resource.h sys/utsname.h sys/wait.h tar.h termios.h time.h unistd.h"
+std_files="ctype.h dirent.h errno.h curses.h fcntl.h grp.h locale.h math.h pwd.h setjmp.h signal.h stdio.h stdlib.h string.h sys/socket.h sys/stat.h sys/times.h sys/resource.h sys/utsname.h sys/wait.h tar.h termios.h time.h unistd.h utime.h"
rel_target_dir=$1
# All files in $src_dir_all (normally same as $rel_target_dir) are
# "standard" ANSI/POSIX files listed in $std_files are processed.
src_dir_std=$3
-if [ `expr $rel_target_dir : '\(.\)'` != '/' ] ; then
- abs_target_dir=$original_dir/$rel_target_dir
-else
- abs_target_dir=$rel_target_dir
-fi
+case $rel_target_dir in
+ /* | [A-Za-z]:[\\/]*)
+ abs_target_dir=$rel_target_dir
+ ;;
+ *)
+ abs_target_dir=$original_dir/$rel_target_dir
+ ;;
+esac
# Determine whether this system has symbolic links.
if ln -s X $rel_target_dir/ShouldNotExist 2>/dev/null; then
if [ \! -d $abs_target_dir ] ; then
echo $progname\: creating directory $rel_target_dir
- mkdir $abs_target_dir
+ $mkinstalldirs $abs_target_dir
fi
echo $progname\: populating \`$rel_target_dir\'
if [ `echo $* | wc -w` != 0 ] ; then
for rel_source_dir in $src_dir_all $src_dir_std; do
- if [ `expr $rel_source_dir : '\(.\)'` != '/' ] ; then
- abs_source_dir=$original_dir/$rel_source_dir
- else
- abs_source_dir=$rel_source_dir
- fi
+ case $rel_source_dir in
+ /* | [A-Za-z]:[\\/]*)
+ abs_source_dir=$rel_source_dir
+ ;;
+ *)
+ abs_source_dir=$original_dir/$rel_source_dir
+ ;;
+ esac
include_path="$include_path -I$abs_source_dir"
done
fi
-required_stdlib_h="abort abs atexit atof atoi atol bsearch calloc exit free getenv labs malloc qsort rand realloc srand strtod strtol strtoul system"
+required_stdlib_h="abort abs atexit atof atoi atol bsearch calloc exit free getenv labs malloc putenv qsort rand realloc srand strtod strtol strtoul system"
# "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
-required_unistd_h="_exit access alarm chdir chown close ctermid cuserid dup dup2 execl execle execlp execv execve execvp fork fpathconf getcwd getegid geteuid getgid getgroups getlogin getpgrp getpid getppid getuid isatty link lseek pathconf pause pipe read rmdir setgid setpgid setsid setuid sleep sysconf tcgetpgrp tcsetpgrp ttyname unlink write"
+required_unistd_h="_exit access alarm chdir chown close ctermid cuserid dup dup2 execl execle execlp execv execve execvp fork fpathconf getcwd getegid geteuid getgid getlogin getopt getpgrp getpid getppid getuid isatty link lseek pathconf pause pipe read rmdir setgid setpgid setsid setuid sleep sysconf tcgetpgrp tcsetpgrp ttyname unlink write"
done_dirs=""
+subdirs_made=""
echo "" >fixproto.list
for code in ALL STD ; do
# for C++, so skip those.
subdirs="$subdirs "`cd $rel_source_dir/$d; find . -type d -print | \
sed -e '/^\.$/d' -e "s|^\./|${d}/|" -e 's|^\./||' \
- -e '/CC$/d' -e '/\+\+/d'`
+ -e '/CC$/d' -e '/[+][+]/d'`
links=
links=`cd $rel_source_dir; find $d/. -type l -print | \
sed -e "s|$d/./|$d/|" -e 's|^\./||'`
;;
esac
- if [ `expr $rel_source_dir : '\(.\)'` != '/' ] ; then
- abs_source_dir=$original_dir/$rel_source_dir
- else
- abs_source_dir=$rel_source_dir
- fi
+ case $rel_source_dir in
+ /* | [A-Za-z]:[\\/]*)
+ abs_source_dir=$rel_source_dir
+ ;;
+ *)
+ abs_source_dir=$original_dir/$rel_source_dir
+ ;;
+ esac
if [ \! -d $abs_source_dir ] ; then
echo $progname\: warning\: no such directory\: \`$rel_source_dir\'
abs_target_subdir=${abs_target_dir}/${rel_source_subdir}
if [ \! -d $abs_target_subdir ] ; then
- mkdir $abs_target_subdir
+ if $mkinstalldirs $abs_target_subdir ; then
+ subdirs_made="$abs_target_subdir $subdirs_made"
+ fi
fi
# Append "/"; remove initial "./". Hence "." -> "" and "sys" -> "sys/".
rel_source_prefix=`echo $rel_source_subdir | sed -e 's|$|/|' -e 's|^./||'`
new_files_to_check=""
for file in $files_to_check ; do
xxfile=`echo $file | sed -e 's|/\([^/\.][^/\.]*\)/\.\./|/|'`
+ # Create the dir where this file will go when fixed.
+ xxdir=`echo ./$file | sed -e 's|/[^/]*$||'`
+ if [ \! -d $abs_target_subdir/$xxdir ] ; then
+ if $mkinstalldirs $abs_target_subdir/$xxdir ; then
+ subdirs_made="$abs_target_subdir/$xxdir $subdirs_made"
+ fi
+ fi
# Just in case we have edited out a symbolic link
if [ -f $src_dir_std/$file -a -f $src_dir_std/$xxfile ] ; then
file=$xxfile
&& grep "$rel_source_file" fixproto.list >/dev/null
then true
else
- # echo doing $rel_source_file from $abs_source_dir
- required_list=
- extra_check_list=
- case $rel_source_file in
- ctype.h)
- required_list="isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper isxdigit tolower toupper" ;;
- dirent.h)
- required_list="closedir opendir readdir rewinddir" ;;
- errno.h)
- extra_check_list="errno" ;;
- curses.h)
- required_list="box delwin endwin getcurx getcury initscr mvcur mvwprintw mvwscanw newwin overlay overwrite scroll subwin touchwin waddstr wclear wclrtobot wclrtoeol waddch wdelch wdeleteln werase wgetch wgetstr winsch winsertln wmove wprintw wrefresh wscanw wstandend wstandout" ;;
- fcntl.h)
- required_list="creat fcntl open" ;;
- grp.h)
- #Maybe also "getgrent fgetgrent setgrent endgrent" */
- required_list="getgrgid getgrnam" ;;
- limit.h)
- required_list= /* Lots of macros */ ;;
- locale.h)
- required_list="localeconv setlocale" ;;
- math.h)
- required_list="acos asin atan atan2 ceil cos cosh exp fabs floor fmod frexp ldexp log10 log modf pow sin sinh sqrt tan tanh"
- extra_check_list="HUGE_VAL" ;;
- pwd.h)
- required_list="getpwnam getpwuid" ;;
- setjmp.h)
- # Left out siglongjmp sigsetjmp - these depend on sigjmp_buf.
- required_list="longjmp setjmp" ;;
- signal.h)
- # 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.
- required_list="kill raise" ;;
- stdio.h)
- required_list="clearerr fclose feof ferror fflush fgetc fgetpos fgets fopen fprintf fputc fputs fread freopen fscanf fseek fsetpos ftell fwrite getc getchar gets perror printf putc putchar puts remove rename rewind scanf setbuf setvbuf sprintf sscanf vprintf vsprintf vfprintf tmpfile tmpnam ungetc"
- if grep '[^_a-zA-Z0-9]_flsbuf' <$abs_source_file >/dev/null; then
- required_list="$required_list _flsbuf _filbuf"
- fi
- # Should perhaps also handle NULL, EOF, ... ?
- ;;
- stdlib.h)
- required_list="$required_stdlib_h" ;;
- string.h)
- required_list="memchr memcmp memcpy memmove memset strcat strchr strcmp strcoll strcpy strcspn strerror strlen strncat strncmp" ;;
-# Should perhaps also add NULL and size_t
- sys/stat.h)
- required_list="chmod fstat mkdir mkfifo stat umask"
- extra_check_list="S_ISDIR S_ISBLK S_ISCHR S_ISFIFO S_ISREG S_ISLNK S_IFDIR S_IFBLK S_IFCHR S_IFIFO S_IFREG S_IFLNK" ;;
- sys/times.h)
- required_list="times" ;;
-# "sys/types.h" add types (not in old g++-include)
- sys/utsname.h)
- required_list="uname" ;;
- sys/wait.h)
- required_list="wait waitpid"
- extra_check_list="WEXITSTATUS WIFEXITED WIFSIGNALED WIFSTOPPED WSTOPSIG WTERMSIG WNOHANG WNOTRACED" ;;
- tar.h)
- required_list= ;;
- termios.h)
- required_list="cfgetispeed cfgetospeed cfsetispeed cfsetospeed tcdrain tcflow tcflush tcgetattr tcsendbreak tcsetattr" ;;
- time.h)
- required_list="asctime clock ctime difftime gmtime localtime mktime strftime time tzset" ;;
- unistd.h)
- required_list="$required_unistd_h" ;;
- esac
- rm -f fixtmp.c fixtmp.i
- echo "#include <${rel_source_file}>" >fixtmp.c
- for macro in ${required_list} ${extra_check_list}
- do
- echo "#ifdef ${macro}" >>fixtmp.c
- echo "__DEFINED_MACRO_${macro};" >>fixtmp.c
- echo "#endif" >>fixtmp.c
- done
- if ${CPP} -D__STDC__ -D__cplusplus -D_POSIX_SOURCE $include_path fixtmp.c >fixtmp.i 2>/dev/null
- then
- $original_dir/fix-header $rel_source_file $abs_source_file $abs_target_file "$required_list" <fixtmp.i
- else
- echo "${progname}: cpp could not parse ${abs_source_file} (ignored)"
- fi
+ $FIX_HEADER $rel_source_file $abs_source_file $abs_target_file ${DEFINES} $include_path
+ if test $? != 0 ; then exit 1 ; fi
echo "${rel_source_file}" >>fixproto.list
fi
done
- rm -f fixtmp.c fixtmp.i
done
- # check for broken assert.h that needs stdio.h
- if test -f $abs_source_dir/assert.h -a \! -f $abs_target_dir/assert.h \
- && grep 'stderr' $abs_source_dir/assert.h >/dev/null
- then
- if grep 'include.*stdio.h' $abs_source_dir/assert.h >/dev/null
- then true
- else
- echo 'Fixing broken assert.h (needs stdio.h)'
- cat $abs_source_dir/assert.h >$abs_target_dir/assert.h
- echo '#include <stdio.h>' >>$abs_target_dir/assert.h
- fi
- fi
done_dirs="$done_dir $rel_source_dir"
done
rel_source_ident=`echo $rel_source_file | tr ./ __`
required_list=`eval echo '${required_'${rel_source_ident}'-}'`
cat >tmp.h <<EOF
-#ifndef ${rel_source_ident}
-#define ${rel_source_ident}
-#endif
+#ifndef __${rel_source_ident}
+#define __${rel_source_ident}
EOF
- $original_dir/fix-header $rel_source_file tmp.h $abs_target_dir/$rel_source_file "$required_list" </dev/null
- rm tmp.h
+ if test $rel_source_file = stdlib.h
+ then
+ # Make sure it contains a definition of size_t.
+ cat >>tmp.h <<EOF
+
+#define __need_size_t
+#include <stddef.h>
+EOF
+ fi
+ cat >>tmp.h <<EOF
+
+#endif /* __${rel_source_ident} */
+EOF
+ ${FIX_HEADER} $rel_source_file tmp.h $abs_target_dir/$rel_source_file ${DEFINES} $include_path
+ if test $? != 0 ; then exit 1 ; fi
+ if test -f $abs_target_dir/$rel_source_file
+ then
+ rm tmp.h
+ else
+ mv tmp.h $abs_target_dir/$rel_source_file
+ fi
fi
done
+
+# Remove any directories that we made that are still empty.
+rmdir $subdirs_made 2>/dev/null
+
exit 0
OSDN Git Service
