head	1.29;
access;
symbols
	gcc-2_8_1-990325:1.29
	gcc-2_8_1-990319:1.29
	gcc-2_8_1-990302:1.29
	gcc_2_8_1-990302:1.29
	gcc_2_8_1-990222:1.29
	gcc-2_8_1-990109:1.29
	gcc-2_8_1-981210:1.29
	gcc-2_8_1-981208:1.29
	gcc-2_8_1-980929:1.29
	gcc_2_8_1-980929:1.29
	gcc-2_8_1-980928:1.29
	gcc-2_8_1-980813:1.29
	gcc-2_8_1-980811:1.29
	gcc-2_8_1-980718:1.29
	gcc-2_8_1-980705:1.29
	gcc-2_8_1-980627:1.29
	gcc-2_8_1-980609:1.29
	gcc-2_8_1-980608:1.29
	gcc-2_8_1-980529:1.29
	gcc-2_8_1-980525:1.29
	gcc-2_8_1-980513:1.29
	gcc-2_8_1-980502:1.29
	gcc-2_8_1-980402:1.29
	gcc-2_8_1-980426:1.29
	gcc-2_8_1-980419:1.29
	gcc-2_8_1-980413:1.29
	gcc-2_8_1-980412:1.29
	gcc-2_8_1-980407:1.29
	gcc-2_8_1-980401:1.29
	gcc_2_8_1-980315:1.29
	gcc-2_8_1-RELEASE:1.29;
locks; strict;
comment	@# @;


1.29
date	97.09.21.17.30.15;	author eggert;	state Exp;
branches;
next	1.28;

1.28
date	96.11.12.19.37.01;	author kenner;	state Exp;
branches;
next	1.27;

1.27
date	96.07.19.19.24.59;	author brendan;	state Exp;
branches;
next	1.26;

1.26
date	96.06.06.21.31.55;	author eggert;	state Exp;
branches;
next	1.25;

1.25
date	95.06.15.21.04.18;	author kenner;	state Exp;
branches;
next	1.24;

1.24
date	95.05.16.12.30.11;	author kenner;	state Exp;
branches;
next	1.23;

1.23
date	95.04.05.21.16.26;	author bothner;	state Exp;
branches;
next	1.22;

1.22
date	94.09.01.00.43.07;	author bothner;	state Exp;
branches;
next	1.21;

1.21
date	94.08.19.23.49.28;	author bothner;	state Exp;
branches;
next	1.20;

1.20
date	94.06.18.21.51.42;	author merrill;	state Exp;
branches;
next	1.19;

1.19
date	94.05.18.23.08.30;	author merrill;	state Exp;
branches;
next	1.18;

1.18
date	94.04.01.22.36.00;	author merrill;	state Exp;
branches;
next	1.17;

1.17
date	94.02.09.00.30.01;	author kenner;	state Exp;
branches;
next	1.16;

1.16
date	94.02.09.00.21.44;	author kenner;	state Exp;
branches;
next	1.15;

1.15
date	94.02.05.12.05.24;	author kenner;	state Exp;
branches;
next	1.14;

1.14
date	93.12.22.19.31.24;	author wilson;	state Exp;
branches;
next	1.13;

1.13
date	93.11.27.11.11.23;	author rms;	state Exp;
branches;
next	1.12;

1.12
date	93.11.21.10.11.51;	author rms;	state Exp;
branches;
next	1.11;

1.11
date	93.11.11.11.01.01;	author rms;	state Exp;
branches;
next	1.10;

1.10
date	93.11.06.01.34.55;	author rms;	state Exp;
branches;
next	1.9;

1.9
date	93.11.05.07.51.14;	author rms;	state Exp;
branches;
next	1.8;

1.8
date	93.11.03.08.14.02;	author bothner;	state Exp;
branches;
next	1.7;

1.7
date	93.11.02.03.21.17;	author rms;	state Exp;
branches;
next	1.6;

1.6
date	93.10.26.06.52.18;	author rms;	state Exp;
branches;
next	1.5;

1.5
date	93.10.22.21.50.08;	author rms;	state Exp;
branches;
next	1.4;

1.4
date	93.10.12.22.58.40;	author bothner;	state Exp;
branches;
next	1.3;

1.3
date	93.08.10.01.59.37;	author bothner;	state Exp;
branches;
next	1.2;

1.2
date	93.07.27.22.45.09;	author bothner;	state Exp;
branches;
next	1.1;

1.1
date	93.07.26.00.00.23;	author bothner;	state Exp;
branches;
next	;


desc
@Script to add prototypes and otherwise clean up system include files.
@


1.29
log
@(subdirs_made):  New var, to keep track of which
subdirectories we've made (in reverse order).  At the end,
attempt to rmdir them all, so that we don't create any empty
directories.
@
text
@#!/bin/sh
#
# SYNOPSIS
#	fixproto TARGET-DIR SOURCE-DIR-ALL SOURCE-DIR-STD
#
# COPYRIGHT
#	Copyright (C) 1993, 1994 Free Software Foundation, Inc.
#	This file is part of GNU CC.
#
#	GNU CC is free software; you can redistribute it and/or modify
#	it under the terms of the GNU General Public License as published by
#	the Free Software Foundation; either version 2, or (at your option)
#	any later version.
#
#	GNU CC is distributed in the hope that it will be useful,
#	but WITHOUT ANY WARRANTY; without even the implied warranty of
#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
#	GNU General Public License for more details.
#
#	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, 59 Temple Place - Suite 330,
#	Boston, MA 02111-1307, USA.
#
# DESCRIPTION
#	Adjunct script for GNU CC to populate a directory with ANSI,
#	Posix.1, and C++ compatible header files.
#
#	Each file found under SOURCE-DIR-ALL is analyzed and "fixed."
#       Only standard ANSI/POSIX files found under SOURCE-DIR-STD
#       are analyzed and "fixed."
#	The SOURCE-DIRs are searched in order; a file found
#	under multiple SOURCE-DIRs is only handled for the first one.
#
# STRATEGY
#       Each include file is fed through cpp, and the scan-decls program
#	parses it, and emits any found function declarations.
#	The fix-header program analyzes the scan-decls output,
#	together with the original include file, and writes a "fixed"
#	include file, if needed.
#
#	The comment at the beginning of fix-header.c lists specifically
#	what kind of changes are made.
#
# NOTE
#	Some file space will be wasted, because the original header
#	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 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`
original_dir=`pwd`
FIX_HEADER=${FIX_HEADER-$original_dir/fix-header}
DEFINES="-D__STDC__=0 -D__cplusplus ${FIXPROTO_DEFINES}"

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/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
# processed.
src_dir_all=$2
# In $src_dir_std (normally same as /usr/include), only the
# "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

# Determine whether this system has symbolic links.
if ln -s X $rel_target_dir/ShouldNotExist 2>/dev/null; then
  rm -f $rel_target_dir/ShouldNotExist
  LINKS=true
elif ln -s X /tmp/ShouldNotExist 2>/dev/null; then
  rm -f /tmp/ShouldNotExist
  LINKS=true
else
  LINKS=false
fi

if [ \! -d $abs_target_dir ] ; then
  echo $progname\: creating directory $rel_target_dir
  mkdir $abs_target_dir
fi

echo $progname\: populating \`$rel_target_dir\'

include_path=""

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
    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 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 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

  subdirs="."

  case $code in
    ALL)
      rel_source_dir=$src_dir_all

      dirs="."
      levels=2
      while $LINKS && test -n "$dirs" -a $levels -gt 0
      do
        levels=`expr $levels - 1`
	newdirs=
	for d in $dirs ; do
	  # Find all directories under $d, relative to $d, excluding $d itself.
	  # Assume directory names ending in CC or containing ++ are
	  # 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'`
	  links=
	  links=`cd $rel_source_dir; find $d/. -type l -print | \
		       sed -e "s|$d/./|$d/|" -e 's|^\./||'`
	  for link in $links --dummy-- ; do
	    test -d $rel_source_dir/$link/. && newdirs="$newdirs $link"
	  done
	done
	dirs="$newdirs"
	subdirs="$subdirs $newdirs"
      done
      ;;
    STD)
      rel_source_dir=$src_dir_std
      ;;
  esac

  if [ `expr $rel_source_dir : '\(.\)'` != '/' ] ; then
    abs_source_dir=$original_dir/$rel_source_dir
  else
    abs_source_dir=$rel_source_dir
  fi

  if [ \! -d $abs_source_dir ] ; then
    echo $progname\: warning\: no such directory\: \`$rel_source_dir\'
    continue
  fi

  for rel_source_subdir in $subdirs; do

      abs_target_subdir=${abs_target_dir}/${rel_source_subdir}
      if [ \! -d $abs_target_subdir ] ; then
	if mkdir $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|^./||'`

      case $code in
	ALL)
	  # The 'sed' is in case the *.h matches nothing, which yields "*.h"
	  # which would then get re-globbed in the current directory.  Sigh.
	  rel_source_files=`cd ${abs_source_dir}/${rel_source_subdir}; echo *.h | sed -e 's|[*].h|NONE|'`
	  ;;

	STD)
	  files_to_check="$std_files"
	  rel_source_files=""

	  # Also process files #included by the $std_files.
	  while [ -n "${files_to_check}" ]
	  do
	    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 mkdir $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
	      fi
	      case " $rel_source_files " in
	        *" ${file} "*)
		  # Already seen $file; nothing to do
		  ;;
		*)
		  if test -f $src_dir_std/$file ; then
		    rel_dir=`echo $file | sed -n -e 's|^\(.*/\)[^/]*$|\1|p'`
		    # For #include "foo.h", that might be either "foo.h"
		    # or "${rel_dir}foo.h (or something bogus).
	            new_files_to_check="$new_files_to_check "`sed -n \
			-e 's@@	@@ @@g' \
		        -e 's@@^ *# *include *<\([^>]*\)>.*$@@\1@@p' -e \
		        's@@^ *# *include *\"\([^\"]*\)\".*$@@\1 '$rel_dir'\1@@p'\
			<$src_dir_std/$file`
	            rel_source_files="$rel_source_files $file"
		  fi
		  ;;
	      esac
	    done
	    files_to_check="$new_files_to_check"
	  done
	  rel_source_files="$rel_source_files"
	  ;;
      esac

      for filename in $rel_source_files ; do
	rel_source_file=${rel_source_prefix}${filename}
	abs_source_file=$abs_source_dir/$rel_source_file
	abs_target_file=$abs_target_dir/$rel_source_file

	if test "$filename" = 'NONE' ; then
	  echo "(No *.h files in $abs_source_dir/$rel_source_subdir)"
	# If target file exists, check if was written while processing one
	# of the earlier source directories;  if so ignore it.
	elif test -f $abs_target_file -a -n "$done_dirs" \
	  && grep "$rel_source_file" fixproto.list >/dev/null
	then true
	else
	  $FIX_HEADER $rel_source_file $abs_source_file $abs_target_file ${DEFINES} $include_path
	  echo "${rel_source_file}" >>fixproto.list
	fi
      done
    done
    done_dirs="$done_dir $rel_source_dir"
done

# This might be more cleanly moved into the main loop, by adding
# a <dummy> source directory at the end.  FIXME!
for rel_source_file in unistd.h stdlib.h
do
  if grep "$rel_source_file" fixproto.list >/dev/null
  then true
  else
    echo Adding missing $rel_source_file
    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
EOF
    ${FIX_HEADER} $rel_source_file tmp.h $abs_target_dir/$rel_source_file ${DEFINES} $include_path
    rm tmp.h
  fi
done

# Remove any directories that we made that are still empty.
rmdir $subdirs_made 2>/dev/null

exit 0
@


1.28
log
@(std_files): Add sys/socket.h.
@
text
@d123 1
d178 3
a180 1
        mkdir $abs_target_subdir
d205 3
a207 1
		mkdir $abs_target_subdir/$xxdir
d278 4
@


1.27
log
@        * fixproto (std_files): Add utime.h.
@
text
@d68 1
a68 1
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 utime.h"
@


1.26
log
@(subdirs): Work around Solaris 2.5
/usr/xpgr/bin/sed problem with \+\+.
@
text
@d68 1
a68 1
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"
@


1.25
log
@Change FSF address.
@
text
@d145 1
a145 1
		     -e '/CC$/d' -e '/\+\+/d'`
@


1.24
log
@Fix typos in comments.
@
text
@d22 2
a23 1
#	the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
@


1.23
log
@Re-write fixproto/fix-header/etc to use cpplib.
@
text
@d49 1
a49 1
#	fragile (susceptible to version incompatibilties, and depends
@


1.22
log
@* fixproto:  Define FIX_HEADER (needed by Aug 19 change).
Use FIX_HEADER instead of $original_dir/fix-header (twice).
@
text
@a58 1
CPP=${CPP-./cpp}
d245 1
a245 82
	  # 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 pclose perror popen 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 strncpy strpbrk strrchr strspn strstr strtok strxfrm" ;;
# Should perhaps also add NULL and size_t
	    sys/stat.h)
	      required_list="chmod fstat mkdir mkfifo stat lstat 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} ${DEFINES} $include_path fixtmp.c >fixtmp.i 2>/dev/null
	  then
	   $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
a248 1
      rm -f fixtmp.c fixtmp.i
d268 1
a268 1
    ${FIX_HEADER} $rel_source_file tmp.h $abs_target_dir/$rel_source_file "$required_list" </dev/null
@


1.21
log
@Use $FIX_HEADER macro instead of calling fix-header directly.
@
text
@d60 1
d324 1
a324 1
	   $original_dir/fix-header $rel_source_file $abs_source_file $abs_target_file "$required_list" <fixtmp.i
@


1.20
log
@Lose assert.h hacking
@
text
@d350 1
a350 1
    $original_dir/fix-header $rel_source_file tmp.h $abs_target_dir/$rel_source_file "$required_list" </dev/null
@


1.19
log
@Use ${FIXPROTO_DEFINES}.
@
text
@a331 24
    # check for broken assert.h that needs stdio.h
    if test -f $abs_source_dir/assert.h -a \! -f $abs_target_dir/assert.h; then
      if 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
      if grep 'exit *(' $abs_source_dir/assert.h >/dev/null || 
	 grep 'abort *(' $abs_source_dir/assert.h >/dev/null ; then
	if grep 'include.*stdlib.h' $abs_source_dir/assert.h >/dev/null ; then
	  true
	else
	  echo 'Fixing broken assert.h (needs stdlib.h)'
	  if test ! -f $abs_target_dir/assert.h ; then
	    cat $abs_source_dir/assert.h >$abs_target_dir/assert.h
	  fi
	  echo '#include <stdlib.h>' >>$abs_target_dir/assert.h
	fi
      fi
    fi
@


1.18
log
@Add missing fns to required list for string.h
@
text
@d60 1
d321 1
a321 1
	  if ${CPP} -D__STDC__ -D__cplusplus -D_POSIX_SOURCE $include_path fixtmp.c >fixtmp.i 2>/dev/null
@


1.17
log
@Add popen and pclose to required list for stdio.h.
Add putenv to required list for stdlib.h.
Add getopt to required list for unistd.h.
@
text
@d290 1
a290 1
	      required_list="memchr memcmp memcpy memmove memset strcat strchr strcmp strcoll strcpy strcspn strerror strlen strncat strncmp" ;;
@


1.16
log
@Append "#include <stdlib.h>" to assert.h if it uses exit or abort.
@
text
@d113 1
a113 1
required_stdlib_h="abort abs atexit atof atoi atol bsearch calloc exit free getenv labs malloc qsort rand realloc srand strtod strtol strtoul system"
d118 1
a118 1
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 getpgrp getpid getppid getuid isatty link lseek pathconf pause pipe read rmdir setgid setpgid setsid setuid sleep sysconf tcgetpgrp tcsetpgrp ttyname unlink write"
d281 1
a281 1
	      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"
@


1.15
log
@Add lstat to required_list for sys/stat.h
@
text
@d7 1
a7 1
#	Copyright (C) 1993 Free Software Foundation, Inc.
d332 21
a352 9
    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
@


1.14
log
@(required_unistd_h): Delete getgroups from list.
@
text
@d293 1
a293 1
	      required_list="chmod fstat mkdir mkfifo stat umask"
@


1.13
log
@(scanning files_to_check): Create subdirs files are in.
@
text
@d116 1
d118 1
a118 1
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"
@


1.12
log
@(stdio.h): Reenable adding protos for v*printf.
@
text
@d196 5
@


1.11
log
@(rel_source_subdir): Prune out redundant /subdir/../ to prevent recursion.
@
text
@d275 1
a275 4
	      # Omitted vfprintf, vprintf, vsprintf because it's hard
	      # to specify the right data type, and because not all systems
	      # have them.
	      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 tmpfile tmpnam ungetc"
@


1.10
log
@(stdio.h): Don't add protos for vprintf, vfprintf, vsprintf.
@
text
@d195 5
@


1.9
log
@Don't scan sub-directories whose names end in CC
or contain ++ - these are probably C++ directories.
@
text
@d270 4
a273 1
	      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 tmpfile tmpnam ungetc vfprintf vprintf vsprintf"
@


1.8
log
@Make more robust in two places.
@
text
@d138 2
d141 2
a142 1
	           sed -e '/^\.$/d' -e "s|^\./|${d}/|" -e 's|^\./||'`
@


1.7
log
@(setjmp.h):  Don't require siglongjmp and sigsetjmp.
They need sigjmp_buf, and are missing on many systems.
@
text
@d197 5
a201 1
	          new_files_to_check="$new_files_to_check `sed -n \
d203 5
a207 4
			-e 's@@^ *# *include *<\([^>]*\)>.*$@@\1@@p' \
			-e 's@@^ *# *include *\"\([^\"]*\)\".*$@@\1@@p' \
			<$src_dir_std/$file`"
	          rel_source_files="$rel_source_files $file"
d268 1
a268 1
	      if grep _flsbuf <$abs_source_file >/dev/null ; then
@


1.6
log
@(signal.h): Add prototypes only for kill and raise.
Not for the POSIX signal functions.
(sys/resource.h): Delete special handling for this file.
@
text
@d252 2
a253 1
	      required_list="longjmp setjmp siglongjmp sigsetjmp" ;;
@


1.5
log
@Use fix-header.
@
text
@a253 1
	      required_list="kill raise sigaction sigaddset sigdelset sigemptyset sigfillset sigismember sigpending sigprocmask sigsuspend" ;;
d255 5
a277 2
	    sys/resource.h)
	      required_list="getrusage getrlimit setrlimit getpriority setpriority" ;;
@


1.4
log
@Re-write.  New logic, assuming implicit extern "C" from cpp.
@
text
@d37 1
a37 1
#	The patch-header program analyzes the scan-decls output,
d41 1
a41 1
#	The comment at the beginning of patch-header.c lists specifically
d300 1
a300 1
	   $original_dir/patch-header $rel_source_file $abs_source_file $abs_target_file "$required_list" <fixtmp.i
d339 1
a339 1
    $original_dir/patch-header $rel_source_file tmp.h $abs_target_dir/$rel_source_file "$required_list" </dev/null
@


1.3
log
@Merge.  See ChangeLog.
@
text
@d4 1
a4 1
#	fixproto TARGET-DIR [ SOURCE-DIR ... ]
d28 3
a30 1
#	Each file found under each SOURCE-DIR is analized and "fixed."
d65 3
d69 6
a74 1
shift
d103 1
a103 1
  for rel_source_dir in $*; do
d122 3
a124 11
if [ `echo $* | wc -w` != 0 ] ; then
  for rel_source_dir in $* ; do
    if [ `expr $rel_source_dir : '\(.\)'` != '/' ] ; then
      abs_source_dir=$original_dir/$rel_source_dir
    else
      abs_source_dir=$rel_source_dir
    fi
    if [ \! -d $abs_source_dir ] ; then
      echo $progname\: warning\: no such directory\: \`$rel_source_dir\'
      continue
    fi
d126 16
a141 13
    dirs="."
    levels=2
    subdirs="."
    while $LINKS && test -n "$dirs" -a $levels -gt 0
    do
      levels=`expr $levels - 1`
      newdirs=
      for d in $dirs ; do
	# Find all directories under $d, relative to $d, excluding $d itself.
        subdirs="$subdirs "`cd $abs_source_dir/$d; find . -type d -print | \
		       sed -e '/^\.$/d' -e "s|^\./|${d}/|" -e 's|^\./||'`
	links=
	links=`cd $abs_source_dir; find $d/. -type l -print | \
d143 3
a145 4
	for link in $links --dummy-- ; do
	  if test -d $abs_source_dir/$link/. ; then
	    newdirs="$newdirs $link"
	  fi
d147 2
d150 18
a167 3
      dirs="$newdirs"
      subdirs="$subdirs $newdirs"
    done
a168 1
    for rel_source_subdir in $subdirs; do
d176 35
a210 3
      # The 'sed' is in case the *.h matches nothing, which yields "*.h"
      # which would then get re-globbed in the current directory.  Sigh.
      rel_source_files=`cd ${abs_source_dir}/${rel_source_subdir}; echo *.h | sed -e 's|[*].h|NONE|'`
a223 1
#	  echo $abs_target_file exists, $abs_source_file is ignored
d300 1
a300 5
	    cat $abs_source_file >fixtmp.c
#	    echo Doing: "$original_dir/scan-decls <fixtmp.i | $original_dir/patch-header $rel_source_file fixtmp.c $abs_target_file \"$required_list\""

	    $original_dir/scan-decls <fixtmp.i | \
	     $original_dir/patch-header $rel_source_file fixtmp.c $abs_target_file "$required_list"
d322 1
a322 2
  done
fi
@


1.2
log
@Pass '-' to tr as the 1-character range '---'.
@
text
@a56 1
CC=gcc
d58 1
a58 1
#CPP="${CC} -E"
d72 11
a89 38
required_ctype_h="isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper isxdigit tolower toupper"
required_dirent_h="closedir opendir readdir rewinddir"
extra_check_errno_h="errno"
required_curses_h="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"
required_fcntl_h="creat fcntl open"
# required_float_h=...
required_grp_h="getgrgid getgrnam"
# Maybe also "getgrent fgetgrent setgrent endgrent" */
# required_limit_h= /* Lots of macros */
required_locale_h="localeconv setlocale"
required_math_h="acos asin atan atan2 ceil cos cosh exp fabs floor fmod frexp ldexp log10 log modf pow sin sinh sqrt tan tanh"
extra_check_math_h="HUGE_VAL"

required_pwd_h="getpwnam getpwuid"
required_setjmp_h="longjmp setjmp siglongjmp sigsetjmp"
required_signal_h="kill raise sigaction sigaddset sigdelset sigemptyset sigfillset sigismember signal sigpending sigprocmask sigsuspend"
# *stdarg_h *stddef.h  - supplied by gcc
required_stdio_h="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 tmpfile tmpnam ungetc vfprintf vprintf vsprintf"
# Should perhaps also handle NULL, EOF, ... ?
required_stdlib_h="abort abs atexit atof atoi atol bsearch calloc exit free getenv labs malloc 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"
# Should perhaps also add NULL
required_string_h="memchr memcmp memcpy memmove memset strcat strchr strcmp strcoll strcpy strcspn strerror strlen strncat strncmp"
# Should perhaps also add NULL and size_t
required_sys_stat_h="chmod fstat mkdir mkfifo stat umask"
extra_check_sys_stat_h="S_ISDIR S_ISBLK S_ISCHR S_ISFIFO S_ISREG S_ISLNK S_IFDIR S_IFBLK S_IFCHR S_IFIFO S_IFREG S_IFLNK"
required_sys_times_h="times"
# "sys_types.h" add types (not in old g++-include)
required_sys_resource_h="getrusage getrlimit setrlimit getpriority setpriority"
required_sys_utsname_h="uname"
required_sys_wait_h="wait waitpid"
extra_check_sys_wait_h="WEXITSTATUS WIFEXITED WIFSIGNALED WIFSTOPPED WSTOPSIG WTERMSIG WNOHANG WNOTRACED"
# required_tar.h= 
required_termios_h="cfgetispeed cfgetospeed cfsetispeed cfsetospeed tcdrain tcflow tcflush tcgetattr tcsendbreak tcsetattr"
required_time_h="asctime clock ctime difftime gmtime localtime mktime strftime time tzset"
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"

d103 6
d110 1
a110 1
done_files=""
d123 20
a142 7
    rel_source_subdirs=`cd $abs_source_dir; find . -type d -print | sed -e 's%^\./%%' -e 's/\.//'`
    if [ `echo $rel_source_subdirs | wc -w` != 0 ] ; then
      for rel_source_subdir in $rel_source_subdirs; do
        abs_target_subdir=$abs_target_dir/$rel_source_subdir
        if [ \! -d $abs_target_subdir ] ; then
          mkdir $abs_target_subdir
        fi
d144 11
a154 1
    fi
d156 3
a158 1
    rel_source_files=`cd $abs_source_dir; find . '!' -type d -name \*.h -print | sed 's%^\./%%'`
d160 2
a161 2
    if [ `echo $rel_source_files | wc -w` != 0 ] ; then
      for rel_source_file in $rel_source_files; do
d165 2
d169 4
a172 4
	if test -f $abs_target_file -a -n "$done_dirs" \
	  && echo " $done_files " |grep " $rel_source_file " >/dev/null
	then
	  echo $abs_target_file exists, $abs_source_file is ignored
d175 66
a240 5
	  rel_source_ident=`echo $rel_source_file | tr ./--- ___`
	  required_list=`eval echo '${required_'${rel_source_ident}'-}'`
	  extra_check_list=`eval echo '${extra_check_'${rel_source_ident}'-}'`
	  rm -f tmp.c tmp.i
	  echo "#include <${rel_source_file}>" >tmp.c
d243 3
a245 3
	    echo "#ifdef ${macro}" >>tmp.c
	    echo "__DEFINED_MACRO_${macro};" >>tmp.c
	    echo "#endif" >>tmp.c
d247 1
a247 1
	  if ${CPP} -D__STDC__ -D__cplusplus -D_POSIX_SOURCE $include_path tmp.c >tmp.i
d249 2
a250 8
	    case $rel_source_file in
	      stdio.h)
		if grep _flsbuf <$abs_source_file >/dev/null ; then
		  required_list="$required_list _flsbuf _filbuf"
		fi ;;
	    esac
	    cat $abs_source_file >tmp.c
#	    echo Doing: "$original_dir/scan-decls <tmp.i | $original_dir/patch-header $rel_source_file tmp.c $abs_target_file \"$required_list\""
d252 2
a253 2
	    $original_dir/scan-decls <tmp.i | \
	     $original_dir/patch-header $rel_source_file tmp.c $abs_target_file "$required_list"
d255 1
a255 1
	    echo "${progname}: ${CPP} couldn't grok ${abs_source_file}"
d257 1
a257 1
	  done_files="${done_files} ${rel_source_file}"
d260 2
a261 2
      rm -f tmp.c tmp.i
    fi
d278 2
d282 1
a282 1
  if echo " $done_files " | grep " $rel_source_file " >/dev/null
d286 1
a286 1
    rel_source_ident=`echo $rel_source_file | tr ./--- ___`
@


1.1
log
@Initial revision
@
text
@d170 1
a170 1
	  rel_source_ident=`echo $rel_source_file | tr ./- ___`
d224 1
a224 1
    rel_source_ident=`echo $rel_source_file | tr ./- ___`
@
