/*
* DO NOT EDIT THIS FILE (fixincl.x)
*
- * It has been autogen-ed Wednesday March 31, 1999 at 01:11:59 AM MST
- * From the definitions /puke/law//egcs/egcs/gcc/fixinc/inclhack.def
- * and the template file /puke/law//egcs/egcs/gcc/fixinc/fixincl.tpl
+ * It has been autogen-ed Wednesday March 31, 1999 at 12:03:54 PM PST
+ * From the definitions inclhack.def
+ * and the template file fixincl.tpl
*
* Install modified versions of certain ANSI-incompatible system header
* files which are fixed to work correctly with ANSI C and placed in a
* directory that GNU C will search.
*
- * This script contains 105 fixup scripts.
+ * This script contains 103 fixup scripts.
*
* See README-fixinc for more information.
*
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 10 - Bad_Malloc_Decl fix
- */
-tSCC zBad_Malloc_DeclName[] =
- "Bad_Malloc_Decl";
-/*
- * File name selection pattern
- */
-tSCC zBad_Malloc_DeclList[] =
- "|" "rpc/types.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzBad_Malloc_DeclMachs (const char**)NULL
-
-/*
- * content bypass pattern
- */
-tSCC zBad_Malloc_DeclBypass0[] =
- "\"C\"";
-
-#define BAD_MALLOC_DECL_TEST_CT 1
-tTestDesc aBad_Malloc_DeclTests[] = {
- { TT_NEGREP, zBad_Malloc_DeclBypass0, (regex_t*)NULL }, };
-
-/*
- * Fix Command Arguments for Bad_Malloc_Decl
- */
-const char* apzBad_Malloc_DeclPatch[] = { "sed",
- "-e" "1i\\\n"
- "#ifdef __cplusplus\\\n"
- "extern \"C\" {\\\n"
- "#endif\\\n"
- "\n",
- "-e" "$a\\\n"
- "#ifdef __cplusplus\\\n"
- "}\\\n"
- "#endif\n",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 11 - Bad_Struct_Term fix
+ * Description 10 - Bad_Struct_Term fix
*/
tSCC zBad_Struct_TermName[] =
"Bad_Struct_Term";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 12 - Badquote fix
+ * Description 11 - Badquote fix
*/
tSCC zBadquoteName[] =
"Badquote";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 13 - Bad_Lval fix
+ * Description 12 - Bad_Lval fix
*/
tSCC zBad_LvalName[] =
"Bad_Lval";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 14 - Broken_Assert_Stdio fix
+ * Description 13 - Broken_Assert_Stdio fix
*/
tSCC zBroken_Assert_StdioName[] =
"Broken_Assert_Stdio";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 15 - Broken_Assert_Stdlib fix
+ * Description 14 - Broken_Assert_Stdlib fix
*/
tSCC zBroken_Assert_StdlibName[] =
"Broken_Assert_Stdlib";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 16 - Bsd43_Io_Macros fix
+ * Description 15 - Bsd43_Io_Macros fix
*/
tSCC zBsd43_Io_MacrosName[] =
"Bsd43_Io_Macros";
"-e" "/#[ \t]*define[ \t]*[ \t]BSD43__IO/s/'\\([cgx]\\)'/\\1/g",
(char*)NULL };
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description 16 - Dec_Intern_Asm fix
+ */
+tSCC zDec_Intern_AsmName[] =
+ "Dec_Intern_Asm";
+/*
+ * File name selection pattern
+ */
+tSCC zDec_Intern_AsmList[] =
+ "|" "c_asm.h" "|";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzDec_Intern_AsmMachs (const char**)NULL
+#define DEC_INTERN_ASM_TEST_CT 0
+#define aDec_Intern_AsmTests (tTestDesc*)NULL
+
+/*
+ * Fix Command Arguments for Dec_Intern_Asm
+ */
+const char* apzDec_Intern_AsmPatch[] = { "sed",
+ "-e" "/^[ \t]*float[ \t]*fasm/i\n"
+ "#ifdef __DECC\n",
+ "-e" "/^[ \t]*#[ \t]*pragma[ \t]*intrinsic([ \t]*dasm/a\n"
+ "#endif\n",
+ (char*)NULL };
+
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Description 17 - No_Double_Slash fix
* content selection pattern
*/
tSCC zNo_Double_SlashSelect0[] =
- "//[^*]";
+ "//[^\"*]";
/*
* content test pattern. A shell will deal with it later.
*/
tSCC zNo_Double_SlashTest0[] =
- "-z \"`echo ${file}|egrep '++$|\\.hh$|\\.H$'`\"";
+ "-z \"`echo ${file}|egrep 'cxx/|++$|\\.hh$|\\.H$'`\"";
#define NO_DOUBLE_SLASH_TEST_CT 2
tTestDesc aNo_Double_SlashTests[] = {
* Fix Command Arguments for No_Double_Slash
*/
const char* apzNo_Double_SlashPatch[] = { "sed",
- "-e" "/\\/\\/[^*]/s|//.*$||g",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 18 - Irix_Bogus_Cxx_Cmnt fix
- */
-tSCC zIrix_Bogus_Cxx_CmntName[] =
- "Irix_Bogus_Cxx_Cmnt";
-/*
- * File name selection pattern
- */
-tSCC zIrix_Bogus_Cxx_CmntList[] =
- "|" "elf_abi.h"
- "|" "elf.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzIrix_Bogus_Cxx_CmntMachs (const char**)NULL
-#define IRIX_BOGUS_CXX_CMNT_TEST_CT 0
-#define aIrix_Bogus_Cxx_CmntTests (tTestDesc*)NULL
-
-/*
- * Fix Command Arguments for Irix_Bogus_Cxx_Cmnt
- */
-const char* apzIrix_Bogus_Cxx_CmntPatch[] = { "sed",
- "-e" "s@\"/\\*\"\\*/@\"//\"@",
+ "-e" "/\\/\\/[^\"*]/s|//.*$||g",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 19 - Ecd_Cursor fix
+ * Description 18 - Ecd_Cursor fix
*/
tSCC zEcd_CursorName[] =
"Ecd_Cursor";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 20 - Else_Label fix
+ * Description 19 - Else_Label fix
*/
tSCC zElse_LabelName[] =
"Else_Label";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 21 - Endif_Label fix
+ * Description 20 - Endif_Label fix
*/
tSCC zEndif_LabelName[] =
"Endif_Label";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 22 - Hp_Inline fix
+ * Description 21 - Hp_Inline fix
*/
tSCC zHp_InlineName[] =
"Hp_Inline";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 23 - Hp_Sysfile fix
+ * Description 22 - Hp_Sysfile fix
*/
tSCC zHp_SysfileName[] =
"Hp_Sysfile";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 24 - Hpux_Cxx_Unready fix
+ * Description 23 - Cxx_Unready fix
*/
-tSCC zHpux_Cxx_UnreadyName[] =
- "Hpux_Cxx_Unready";
+tSCC zCxx_UnreadyName[] =
+ "Cxx_Unready";
/*
* File name selection pattern
*/
-tSCC zHpux_Cxx_UnreadyList[] =
- "|" "sys/mman.h" "|";
+tSCC zCxx_UnreadyList[] =
+ "|" "sys/mman.h"
+ "|" "rpc/types.h" "|";
/*
* Machine/OS name selection pattern
*/
-#define apzHpux_Cxx_UnreadyMachs (const char**)NULL
+#define apzCxx_UnreadyMachs (const char**)NULL
/*
* content bypass pattern
*/
-tSCC zHpux_Cxx_UnreadyBypass0[] =
+tSCC zCxx_UnreadyBypass0[] =
"\"C\"|__BEGIN_DECLS";
-#define HPUX_CXX_UNREADY_TEST_CT 1
-tTestDesc aHpux_Cxx_UnreadyTests[] = {
- { TT_NEGREP, zHpux_Cxx_UnreadyBypass0, (regex_t*)NULL }, };
+#define CXX_UNREADY_TEST_CT 1
+tTestDesc aCxx_UnreadyTests[] = {
+ { TT_NEGREP, zCxx_UnreadyBypass0, (regex_t*)NULL }, };
/*
- * Fix Command Arguments for Hpux_Cxx_Unready
+ * Fix Command Arguments for Cxx_Unready
*/
-const char* apzHpux_Cxx_UnreadyPatch[] = { "sed",
+const char* apzCxx_UnreadyPatch[] = { "sed",
"-e" "1i\\\n"
"#ifdef __cplusplus\\\n"
"extern \"C\" {\\\n"
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 25 - Hpux_Maxint fix
+ * Description 24 - Hpux_Maxint fix
*/
tSCC zHpux_MaxintName[] =
"Hpux_Maxint";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 26 - Hpux_Systime fix
+ * Description 25 - Hpux_Systime fix
*/
tSCC zHpux_SystimeName[] =
"Hpux_Systime";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 27 - Interactv_Add1 fix
+ * Description 26 - Interactv_Add1 fix
*/
tSCC zInteractv_Add1Name[] =
"Interactv_Add1";
* content test pattern. A shell will deal with it later.
*/
tSCC zInteractv_Add1Test0[] =
- "-d /etc/conf/kconfig.d";
+ " -d /etc/conf/kconfig.d";
tSCC zInteractv_Add1Test1[] =
- "-n \"`grep _POSIX_VERSION /usr/include/sys/unistd.h`\"";
+ " -n \"`grep _POSIX_VERSION /usr/include/sys/unistd.h`\"";
#define INTERACTV_ADD1_TEST_CT 2
tTestDesc aInteractv_Add1Tests[] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 28 - Interactv_Add2 fix
+ * Description 27 - Interactv_Add2 fix
*/
tSCC zInteractv_Add2Name[] =
"Interactv_Add2";
* content test pattern. A shell will deal with it later.
*/
tSCC zInteractv_Add2Test0[] =
- "-d /etc/conf/kconfig.d";
+ " -d /etc/conf/kconfig.d";
tSCC zInteractv_Add2Test1[] =
- "-n \"`grep _POSIX_VERSION /usr/include/sys/unistd.h`\"";
+ " -n \"`grep _POSIX_VERSION /usr/include/sys/unistd.h`\"";
#define INTERACTV_ADD2_TEST_CT 2
tTestDesc aInteractv_Add2Tests[] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 29 - Interactv_Add3 fix
+ * Description 28 - Interactv_Add3 fix
*/
tSCC zInteractv_Add3Name[] =
"Interactv_Add3";
* content test pattern. A shell will deal with it later.
*/
tSCC zInteractv_Add3Test0[] =
- "-d /etc/conf/kconfig.d";
+ " -d /etc/conf/kconfig.d";
tSCC zInteractv_Add3Test1[] =
- "-n \"`grep _POSIX_VERSION /usr/include/sys/unistd.h`\"";
+ " -n \"`grep _POSIX_VERSION /usr/include/sys/unistd.h`\"";
#define INTERACTV_ADD3_TEST_CT 2
tTestDesc aInteractv_Add3Tests[] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 30 - Io_Def_Quotes fix
+ * Description 29 - Io_Def_Quotes fix
*/
tSCC zIo_Def_QuotesName[] =
"Io_Def_Quotes";
* content selection pattern
*/
tSCC zIo_Def_QuotesSelect0[] =
- "[ \t]_IO[A-Z]*[ \t]*\\([A-Za-z]";
+ "[ \t](_|DES)IO[A-Z]*[ \t]*\\( *[^,']";
#define IO_DEF_QUOTES_TEST_CT 1
tTestDesc aIo_Def_QuotesTests[] = {
* Fix Command Arguments for Io_Def_Quotes
*/
const char* apzIo_Def_QuotesPatch[] = { "sed",
- "-e" "s/\\([ \t]_IO[A-Z]*[ \t]*(\\)\\([A-Za-z]\\),/\\1'\\2',/",
+ "-e" "s/\\([ \t](_|DES)IO[A-Z]*[ \t]*(\\)\\([^,']\\),/\\1'\\2',/",
"-e" "/#[ \t]*define[ \t]*[ \t]_IO/s/'\\([cgxtf]\\)'/\\1/g",
"-e" "/#[ \t]*define[ \t]*[ \t]DESIOC/s/'\\([cdgx]\\)'/\\1/g",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 31 - Ioctl_Fix_Ctrl fix
+ * Description 30 - Ioctl_Fix_Ctrl fix
*/
tSCC zIoctl_Fix_CtrlName[] =
"Ioctl_Fix_Ctrl";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 32 - Ip_Missing_Semi fix
+ * Description 31 - Ip_Missing_Semi fix
*/
tSCC zIp_Missing_SemiName[] =
"Ip_Missing_Semi";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 33 - Irix_Multiline_Cmnt fix
+ * Description 32 - Irix_Multiline_Cmnt fix
*/
tSCC zIrix_Multiline_CmntName[] =
"Irix_Multiline_Cmnt";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 34 - Irix_Sockaddr fix
+ * Description 33 - Irix_Sockaddr fix
*/
tSCC zIrix_SockaddrName[] =
"Irix_Sockaddr";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 35 - Irix_Struct__File fix
+ * Description 34 - Irix_Struct__File fix
*/
tSCC zIrix_Struct__FileName[] =
"Irix_Struct__File";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 36 - Isc_Fmod fix
+ * Description 35 - Isc_Fmod fix
*/
tSCC zIsc_FmodName[] =
"Isc_Fmod";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 37 - Motorola_Nested fix
+ * Description 36 - Motorola_Nested fix
*/
tSCC zMotorola_NestedName[] =
"Motorola_Nested";
/*
* Machine/OS name selection pattern
*/
-#define apzMotorola_NestedMachs (const char**)NULL
+tSCC* apzMotorola_NestedMachs[] = {
+ "m68k-motorola-sysv*",
+ (const char*)NULL };
#define MOTOROLA_NESTED_TEST_CT 0
#define aMotorola_NestedTests (tTestDesc*)NULL
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 38 - Isc_Sys_Limits fix
+ * Description 37 - Isc_Sys_Limits fix
*/
tSCC zIsc_Sys_LimitsName[] =
"Isc_Sys_Limits";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 39 - Kandr_Concat fix
+ * Description 38 - Kandr_Concat fix
*/
tSCC zKandr_ConcatName[] =
"Kandr_Concat";
* Fix Command Arguments for Kandr_Concat
*/
const char* apzKandr_ConcatPatch[] = { "sed",
- "-e" "s|/\\*\\*/| ## |g",
+ "-e" "s|/\\*\\*/|##|g",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 40 - Limits_Ifndefs fix
+ * Description 39 - Limits_Ifndefs fix
*/
tSCC zLimits_IfndefsName[] =
"Limits_Ifndefs";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 41 - Lynx_Void_Int fix
+ * Description 40 - Lynx_Void_Int fix
*/
tSCC zLynx_Void_IntName[] =
"Lynx_Void_Int";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 42 - Lynxos_Fcntl_Proto fix
+ * Description 41 - Lynxos_Fcntl_Proto fix
*/
tSCC zLynxos_Fcntl_ProtoName[] =
"Lynxos_Fcntl_Proto";
* Machine/OS name selection pattern
*/
#define apzLynxos_Fcntl_ProtoMachs (const char**)NULL
-#define LYNXOS_FCNTL_PROTO_TEST_CT 0
-#define aLynxos_Fcntl_ProtoTests (tTestDesc*)NULL
+
+/*
+ * content selection pattern
+ */
+tSCC zLynxos_Fcntl_ProtoSelect0[] =
+ "fcntl.*\\(int, int, int\\)";
+
+#define LYNXOS_FCNTL_PROTO_TEST_CT 1
+tTestDesc aLynxos_Fcntl_ProtoTests[] = {
+ { TT_EGREP, zLynxos_Fcntl_ProtoSelect0, (regex_t*)NULL } };
/*
* Fix Command Arguments for Lynxos_Fcntl_Proto
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 43 - M88k_Bad_Hypot_Opt fix
+ * Description 42 - M88k_Bad_Hypot_Opt fix
*/
tSCC zM88k_Bad_Hypot_OptName[] =
"M88k_Bad_Hypot_Opt";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 44 - M88k_Bad_S_If fix
+ * Description 43 - M88k_Bad_S_If fix
*/
tSCC zM88k_Bad_S_IfName[] =
"M88k_Bad_S_If";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 45 - M88k_Multi_Incl fix
+ * Description 44 - M88k_Multi_Incl fix
*/
tSCC zM88k_Multi_InclName[] =
"M88k_Multi_Incl";
const char* apzM88k_Multi_InclPatch[] = { "sh", "-c",
"echo Fixing $file, to protect against multiple inclusion. >&2\n"
" cpp_wrapper=`echo $file | sed -e 's,\\.,_,g' -e 's,/,_,g'`\n"
- " sed -e \"1i\\\n"
- "#ifndef __GCC_GOT_${cpp_wrapper}_\\\n"
- "#define __GCC_GOT_${cpp_wrapper}_\\\n"
- "\" \\\n"
- "\t-e \"$a\\\n"
- "#endif /* ! __GCC_GOT_${cpp_wrapper}_ */\n"
- "\"",
+ " echo \"#ifndef __GCC_GOT_${cpp_wrapper}_\"\n"
+ " echo \"#define __GCC_GOT_${cpp_wrapper}_\"\n"
+ " cat\n"
+ " echo \"#endif /* ! __GCC_GOT_${cpp_wrapper}_ */\"",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 46 - Machine_Name fix
+ * Description 45 - Machine_Name fix
*/
tSCC zMachine_NameName[] =
"Machine_Name";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 47 - Math_Exception fix
+ * Description 46 - Math_Exception fix
*/
tSCC zMath_ExceptionName[] =
"Math_Exception";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 48 - Math_Gcc_Ifndefs fix
+ * Description 47 - Math_Gcc_Ifndefs fix
*/
tSCC zMath_Gcc_IfndefsName[] =
"Math_Gcc_Ifndefs";
* Fix Command Arguments for Math_Gcc_Ifndefs
*/
const char* apzMath_Gcc_IfndefsPatch[] = { "sh", "-c",
- " dbl_max_def=\"`egrep 'define[ \t]+DBL_MAX[ \t]+.*' ${SRCDIR}/float.h 2>/dev/null`\"\n"
+ "\tdbl_max_def=`egrep 'define[ \t]+DBL_MAX[ \t]+.*' float.h 2>/dev/null`\n"
"\n"
"\tif ( test -n \"${dbl_max_def}\" \\\n"
"\t\t-a -n \"`egrep '#define[ \t]*HUGE_VAL[ \t]+DBL_MAX' $file`\" \\\n"
"\t\t-a -z \"`egrep '#define[ \t]+DBL_MAX[ \t]+' $file`\"\n"
"\t ) > /dev/null 2>&1\n"
- "\tthen sed -e '/define[ \t]HUGE_VAL[ \t]/i\\\n"
- "#ifndef HUGE_VAL\n"
- "' \\\n"
- "\t-e '/define[ \t]HUGE_VAL[ \t]/a\\\n"
- "#endif\n"
- "'\\\n"
- "\t-e \"/define[ \t]HUGE_VAL[ \t]DBL_MAX/s/DBL_MAX/$dbl_max_def/\"\n"
- "\telse sed -e '/define[ \t]HUGE_VAL[ \t]/i\\\n"
+ "\tthen sed -e '/define[ \t]HUGE_VAL[ \t]DBL_MAX/s/DBL_MAX/$dbl_max_def/'\n"
+ "\telse cat ; fi |\n"
+ "\tsed -e'/define[ \t]HUGE_VAL[ \t]/i\\\n"
"#ifndef HUGE_VAL\n"
- "' \\\n"
- "\t-e '/define[ \t]HUGE_VAL[ \t]/a\\\n"
+ "' -e'/define[ \t]HUGE_VAL[ \t]/a\\\n"
"#endif\n"
- "'\n"
- "\tfi",
+ "'",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 49 - Motorola_Stupid_Opt fix
- */
-tSCC zMotorola_Stupid_OptName[] =
- "Motorola_Stupid_Opt";
-/*
- * File name selection pattern
- */
-tSCC zMotorola_Stupid_OptList[] =
- "|" "math.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-tSCC* apzMotorola_Stupid_OptMachs[] = {
- "m88k-motorola-sysv3*",
- (const char*)NULL };
-
-/*
- * content selection pattern
- */
-tSCC zMotorola_Stupid_OptSelect0[] =
- "^extern double hypot();$";
-
-#define MOTOROLA_STUPID_OPT_TEST_CT 1
-tTestDesc aMotorola_Stupid_OptTests[] = {
- { TT_EGREP, zMotorola_Stupid_OptSelect0, (regex_t*)NULL } };
-
-/*
- * Fix Command Arguments for Motorola_Stupid_Opt
- */
-const char* apzMotorola_Stupid_OptPatch[] = { "sed",
- "-e" "/^extern double hypot();$/a\\\n"
- "\\/* Workaround a stupid Motorola optimization if one\\\n"
- " of x or y is 0.0 and the other is negative! *\\/\\\n"
- "#ifdef __STDC__\\\n"
- "static __inline__ double fake_hypot (double x, double y)\\\n"
- "#else\\\n"
- "static __inline__ double fake_hypot (x, y)\\\n"
- "\tdouble x, y;\\\n"
- "#endif\\\n"
- "{\\\n"
- "\treturn fabs (hypot (x, y));\\\n"
- "}\\\n"
- "#define hypot\tfake_hypot\n",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 50 - Nested_Comment fix
+ * Description 48 - Nested_Comment fix
*/
tSCC zNested_CommentName[] =
"Nested_Comment";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 51 - News_Os_Recursion fix
+ * Description 49 - News_Os_Recursion fix
*/
tSCC zNews_Os_RecursionName[] =
"News_Os_Recursion";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 52 - Next_Math_Prefix fix
+ * Description 50 - Next_Math_Prefix fix
*/
tSCC zNext_Math_PrefixName[] =
"Next_Math_Prefix";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 53 - Next_Template fix
+ * Description 51 - Next_Template fix
*/
tSCC zNext_TemplateName[] =
"Next_Template";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 54 - Next_Volitile fix
+ * Description 52 - Next_Volitile fix
*/
tSCC zNext_VolitileName[] =
"Next_Volitile";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 55 - Next_Wait_Union fix
+ * Description 53 - Next_Wait_Union fix
*/
tSCC zNext_Wait_UnionName[] =
"Next_Wait_Union";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 56 - Nodeent_Syntax fix
+ * Description 54 - Nodeent_Syntax fix
*/
tSCC zNodeent_SyntaxName[] =
"Nodeent_Syntax";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 57 - Osf_Namespace_A fix
+ * Description 55 - Osf_Namespace_A fix
*/
tSCC zOsf_Namespace_AName[] =
"Osf_Namespace_A";
* content test pattern. A shell will deal with it later.
*/
tSCC zOsf_Namespace_ATest0[] =
- "-r reg_types.h-a -r sys/lc_core.h-a -n \"`grep '} regex_t;' reg_types.h`\"-a -z \"`grep __regex_t regex.h`\"";
-
-#define OSF_NAMESPACE_A_TEST_CT 1
+ " -r reg_types.h";
+tSCC zOsf_Namespace_ATest1[] =
+ " -r sys/lc_core.h";
+tSCC zOsf_Namespace_ATest2[] =
+ " -n \"`grep '} regex_t;' reg_types.h`\"";
+tSCC zOsf_Namespace_ATest3[] =
+ " -z \"`grep __regex_t regex.h`\"";
+
+#define OSF_NAMESPACE_A_TEST_CT 4
tTestDesc aOsf_Namespace_ATests[] = {
- { TT_TEST, zOsf_Namespace_ATest0, 0 /* unused */ }, };
+ { TT_TEST, zOsf_Namespace_ATest0, 0 /* unused */ },
+ { TT_TEST, zOsf_Namespace_ATest1, 0 /* unused */ },
+ { TT_TEST, zOsf_Namespace_ATest2, 0 /* unused */ },
+ { TT_TEST, zOsf_Namespace_ATest3, 0 /* unused */ }, };
/*
* Fix Command Arguments for Osf_Namespace_A
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 58 - Osf_Namespace_B fix
+ * Description 56 - Osf_Namespace_B fix
*/
tSCC zOsf_Namespace_BName[] =
"Osf_Namespace_B";
* content test pattern. A shell will deal with it later.
*/
tSCC zOsf_Namespace_BTest0[] =
- "-r reg_types.h-a -r sys/lc_core.h-a -n \"`grep '} regex_t;' reg_types.h`\"-a -z \"`grep __regex_t regex.h`\"";
-
-#define OSF_NAMESPACE_B_TEST_CT 1
+ " -r reg_types.h";
+tSCC zOsf_Namespace_BTest1[] =
+ " -r sys/lc_core.h";
+tSCC zOsf_Namespace_BTest2[] =
+ " -n \"`grep '} regex_t;' reg_types.h`\"";
+tSCC zOsf_Namespace_BTest3[] =
+ " -z \"`grep __regex_t regex.h`\"";
+
+#define OSF_NAMESPACE_B_TEST_CT 4
tTestDesc aOsf_Namespace_BTests[] = {
- { TT_TEST, zOsf_Namespace_BTest0, 0 /* unused */ }, };
+ { TT_TEST, zOsf_Namespace_BTest0, 0 /* unused */ },
+ { TT_TEST, zOsf_Namespace_BTest1, 0 /* unused */ },
+ { TT_TEST, zOsf_Namespace_BTest2, 0 /* unused */ },
+ { TT_TEST, zOsf_Namespace_BTest3, 0 /* unused */ }, };
/*
* Fix Command Arguments for Osf_Namespace_B
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 59 - Pthread_Page_Size fix
+ * Description 57 - Pthread_Page_Size fix
*/
tSCC zPthread_Page_SizeName[] =
"Pthread_Page_Size";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 60 - Rs6000_Double fix
+ * Description 58 - Rs6000_Double fix
*/
tSCC zRs6000_DoubleName[] =
"Rs6000_Double";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 61 - Rs6000_Fchmod fix
+ * Description 59 - Rs6000_Fchmod fix
*/
tSCC zRs6000_FchmodName[] =
"Rs6000_Fchmod";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 62 - Rs6000_Param fix
+ * Description 60 - Rs6000_Param fix
*/
tSCC zRs6000_ParamName[] =
"Rs6000_Param";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 63 - Sony_Include fix
+ * Description 61 - Sony_Include fix
*/
tSCC zSony_IncludeName[] =
"Sony_Include";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 64 - Statsswtch fix
+ * Description 62 - Statsswtch fix
*/
tSCC zStatsswtchName[] =
"Statsswtch";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 65 - Stdio_Va_List fix
+ * Description 63 - Stdio_Va_List fix
*/
tSCC zStdio_Va_ListName[] =
"Stdio_Va_List";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 66 - Sun_Bogus_Ifdef fix
+ * Description 64 - Sun_Bogus_Ifdef fix
*/
tSCC zSun_Bogus_IfdefName[] =
"Sun_Bogus_Ifdef";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 67 - Sun_Bogus_Ifdef_Sun4c fix
+ * Description 65 - Sun_Bogus_Ifdef_Sun4c fix
*/
tSCC zSun_Bogus_Ifdef_Sun4cName[] =
"Sun_Bogus_Ifdef_Sun4c";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 68 - Sun_Catmacro fix
+ * Description 66 - Sun_Catmacro fix
*/
tSCC zSun_CatmacroName[] =
"Sun_Catmacro";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 69 - Sun_Malloc fix
+ * Description 67 - Sun_Malloc fix
*/
tSCC zSun_MallocName[] =
"Sun_Malloc";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 70 - Sun_Memcpy fix
+ * Description 68 - Sun_Memcpy fix
*/
tSCC zSun_MemcpyName[] =
"Sun_Memcpy";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 71 - Sun_Rusers_Semi fix
+ * Description 69 - Sun_Rusers_Semi fix
*/
tSCC zSun_Rusers_SemiName[] =
"Sun_Rusers_Semi";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 72 - Sun_Signal fix
+ * Description 70 - Sun_Signal fix
*/
tSCC zSun_SignalName[] =
"Sun_Signal";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 73 - Sun_Auth_Proto fix
+ * Description 71 - Sun_Auth_Proto fix
*/
tSCC zSun_Auth_ProtoName[] =
"Sun_Auth_Proto";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 74 - Sunos_Large_Macro fix
- */
-tSCC zSunos_Large_MacroName[] =
- "Sunos_Large_Macro";
-/*
- * File name selection pattern
- */
-tSCC zSunos_Large_MacroList[] =
- "|" "sundev/ipi_error.h" "|";
-/*
- * Machine/OS name selection pattern
- */
-#define apzSunos_Large_MacroMachs (const char**)NULL
-#define SUNOS_LARGE_MACRO_TEST_CT 0
-#define aSunos_Large_MacroTests (tTestDesc*)NULL
-
-/*
- * Fix Command Arguments for Sunos_Large_Macro
- */
-const char* apzSunos_Large_MacroPatch[] = { "sh", "-c",
- "echo \"Removing incorrect fix to SunOS <sundev/ipi_error.h>\" >&2\n"
- "rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\n"
- "cat > /dev/null",
- (char*)NULL };
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- * Description 75 - Sunos_Matherr_Decl fix
+ * Description 72 - Sunos_Matherr_Decl fix
*/
tSCC zSunos_Matherr_DeclName[] =
"Sunos_Matherr_Decl";
* Machine/OS name selection pattern
*/
#define apzSunos_Matherr_DeclMachs (const char**)NULL
-
-/*
- * content test pattern. A shell will deal with it later.
- */
-tSCC zSunos_Matherr_DeclTest0[] =
- "\"`fgrep 'struct exception' $file | line`\" != 'struct exception {'";
-
-#define SUNOS_MATHERR_DECL_TEST_CT 1
-tTestDesc aSunos_Matherr_DeclTests[] = {
- { TT_TEST, zSunos_Matherr_DeclTest0, 0 /* unused */ }, };
+#define SUNOS_MATHERR_DECL_TEST_CT 0
+#define aSunos_Matherr_DeclTests (tTestDesc*)NULL
/*
* Fix Command Arguments for Sunos_Matherr_Decl
*/
const char* apzSunos_Matherr_DeclPatch[] = { "sed",
+ "-e" "/^struct exception/,$b",
"-e" "/matherr/i\\\n"
"struct exception;\n",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 76 - Sunos_Strlen fix
+ * Description 73 - Sunos_Strlen fix
*/
tSCC zSunos_StrlenName[] =
"Sunos_Strlen";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 77 - Systypes fix
+ * Description 74 - Systypes fix
*/
tSCC zSystypesName[] =
"Systypes";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 78 - Systypes_For_Aix fix
+ * Description 75 - Systypes_For_Aix fix
*/
tSCC zSystypes_For_AixName[] =
"Systypes_For_Aix";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 79 - Sysv68_String fix
+ * Description 76 - Sysv68_String fix
*/
tSCC zSysv68_StringName[] =
"Sysv68_String";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 80 - Sysz_Stdlib_For_Sun fix
+ * Description 77 - Sysz_Stdlib_For_Sun fix
*/
tSCC zSysz_Stdlib_For_SunName[] =
"Sysz_Stdlib_For_Sun";
* Machine/OS name selection pattern
*/
tSCC* apzSysz_Stdlib_For_SunMachs[] = {
- "*-sun-*",
- "m88k-*-sysv3*",
+ "*-sun*",
+ "m88k-*sysv3*",
(const char*)NULL };
#define SYSZ_STDLIB_FOR_SUN_TEST_CT 0
#define aSysz_Stdlib_For_SunTests (tTestDesc*)NULL
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 81 - Sysz_Stdtypes_For_Sun fix
+ * Description 78 - Sysz_Stdtypes_For_Sun fix
*/
tSCC zSysz_Stdtypes_For_SunName[] =
"Sysz_Stdtypes_For_Sun";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 82 - Tinfo_Cplusplus fix
+ * Description 79 - Tinfo_Cplusplus fix
*/
tSCC zTinfo_CplusplusName[] =
"Tinfo_Cplusplus";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 83 - Ultrix_Ansi_Compat fix
+ * Description 80 - Ultrix_Ansi_Compat fix
*/
tSCC zUltrix_Ansi_CompatName[] =
"Ultrix_Ansi_Compat";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 84 - Ultrix_Fix_Fixproto fix
+ * Description 81 - Ultrix_Fix_Fixproto fix
*/
tSCC zUltrix_Fix_FixprotoName[] =
"Ultrix_Fix_Fixproto";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 85 - Ultrix_Atof_Param fix
+ * Description 82 - Ultrix_Atof_Param fix
*/
tSCC zUltrix_Atof_ParamName[] =
"Ultrix_Atof_Param";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 86 - Ultrix_Const fix
+ * Description 83 - Ultrix_Const fix
*/
tSCC zUltrix_ConstName[] =
"Ultrix_Const";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 87 - Ultrix_Ifdef fix
+ * Description 84 - Ultrix_Ifdef fix
*/
tSCC zUltrix_IfdefName[] =
"Ultrix_Ifdef";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 88 - Ultrix_Nested_Cmnt fix
+ * Description 85 - Ultrix_Nested_Cmnt fix
*/
tSCC zUltrix_Nested_CmntName[] =
"Ultrix_Nested_Cmnt";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 89 - Ultrix_Static fix
+ * Description 86 - Ultrix_Static fix
*/
tSCC zUltrix_StaticName[] =
"Ultrix_Static";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 90 - Undefine_Null fix
+ * Description 87 - Undefine_Null fix
*/
tSCC zUndefine_NullName[] =
"Undefine_Null";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 91 - Va_I960_Macro fix
+ * Description 88 - Va_I960_Macro fix
*/
tSCC zVa_I960_MacroName[] =
"Va_I960_Macro";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 92 - Void_Null fix
+ * Description 89 - Void_Null fix
*/
tSCC zVoid_NullName[] =
"Void_Null";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 93 - Vxworks_Gcc_Problem fix
+ * Description 90 - Vxworks_Gcc_Problem fix
*/
tSCC zVxworks_Gcc_ProblemName[] =
"Vxworks_Gcc_Problem";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 94 - Vxworks_Needs_Vxtypes fix
+ * Description 91 - Vxworks_Needs_Vxtypes fix
*/
tSCC zVxworks_Needs_VxtypesName[] =
"Vxworks_Needs_Vxtypes";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 95 - Vxworks_Needs_Vxworks fix
+ * Description 92 - Vxworks_Needs_Vxworks fix
*/
tSCC zVxworks_Needs_VxworksName[] =
"Vxworks_Needs_Vxworks";
* content test pattern. A shell will deal with it later.
*/
tSCC zVxworks_Needs_VxworksTest0[] =
- "-r types/vxTypesOld.h";
+ " -r types/vxTypesOld.h";
tSCC zVxworks_Needs_VxworksTest1[] =
- "-n \"`fgrep '#include' $file`\"";
+ " -n \"`egrep '#include' $file`\"";
tSCC zVxworks_Needs_VxworksTest2[] =
- "-n \"`fgrep ULONG $file`\"";
+ " -n \"`egrep ULONG $file`\"";
#define VXWORKS_NEEDS_VXWORKS_TEST_CT 4
tTestDesc aVxworks_Needs_VxworksTests[] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 96 - Vxworks_Time fix
+ * Description 93 - Vxworks_Time fix
*/
tSCC zVxworks_TimeName[] =
"Vxworks_Time";
* content test pattern. A shell will deal with it later.
*/
tSCC zVxworks_TimeTest0[] =
- "-r vxWorks.h";
+ " -r vxWorks.h";
#define VXWORKS_TIME_TEST_CT 2
tTestDesc aVxworks_TimeTests[] = {
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 97 - X11_Class fix
+ * Description 94 - X11_Class fix
*/
tSCC zX11_ClassName[] =
"X11_Class";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 98 - X11_Class_Usage fix
+ * Description 95 - X11_Class_Usage fix
*/
tSCC zX11_Class_UsageName[] =
"X11_Class_Usage";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 99 - X11_New fix
+ * Description 96 - X11_New fix
*/
tSCC zX11_NewName[] =
"X11_New";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 100 - X11_Sprintf fix
+ * Description 97 - X11_Sprintf fix
*/
tSCC zX11_SprintfName[] =
"X11_Sprintf";
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 101 - Zzz_Ki_Iface fix
+ * Description 98 - Zzz_Ki_Iface fix
*/
tSCC zZzz_Ki_IfaceName[] =
"Zzz_Ki_Iface";
* Fix Command Arguments for Zzz_Ki_Iface
*/
const char* apzZzz_Ki_IfacePatch[] = { "sh", "-c",
- "echo \"Removing incorrect fix to HP-UX <$file>\" >&2\n"
+ "echo \"Removing incorrect fix to <$file>\" >&2\n"
"rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\n"
"cat > /dev/null",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 102 - Zzz_Ki fix
+ * Description 99 - Zzz_Ki fix
*/
tSCC zZzz_KiName[] =
"Zzz_Ki";
* Fix Command Arguments for Zzz_Ki
*/
const char* apzZzz_KiPatch[] = { "sh", "-c",
- "echo \"Removing incorrect fix to HP-UX <$file>\" >&2\n"
+ "echo \"Removing incorrect fix to <$file>\" >&2\n"
"rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\n"
"cat > /dev/null",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 103 - Zzz_Ki_Calls fix
+ * Description 100 - Zzz_Ki_Calls fix
*/
tSCC zZzz_Ki_CallsName[] =
"Zzz_Ki_Calls";
* Fix Command Arguments for Zzz_Ki_Calls
*/
const char* apzZzz_Ki_CallsPatch[] = { "sh", "-c",
- "echo \"Removing incorrect fix to HP-UX <$file>\" >&2\n"
+ "echo \"Removing incorrect fix to <$file>\" >&2\n"
"rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\n"
"cat > /dev/null",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 104 - Zzz_Ki_Defs fix
+ * Description 101 - Zzz_Ki_Defs fix
*/
tSCC zZzz_Ki_DefsName[] =
"Zzz_Ki_Defs";
* Fix Command Arguments for Zzz_Ki_Defs
*/
const char* apzZzz_Ki_DefsPatch[] = { "sh", "-c",
- "echo \"Removing incorrect fix to HP-UX <$file>\" >&2\n"
+ "echo \"Removing incorrect fix to <$file>\" >&2\n"
"rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\n"
"cat > /dev/null",
(char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * *
*
- * Description 105 - Zzz_Time fix
+ * Description 102 - Zzz_Bad_Fixes fix
+ */
+tSCC zZzz_Bad_FixesName[] =
+ "Zzz_Bad_Fixes";
+/*
+ * File name selection pattern
+ */
+tSCC zZzz_Bad_FixesList[] =
+ "|" "sundev/ipi_error.h" "|";
+/*
+ * Machine/OS name selection pattern
+ */
+#define apzZzz_Bad_FixesMachs (const char**)NULL
+#define ZZZ_BAD_FIXES_TEST_CT 0
+#define aZzz_Bad_FixesTests (tTestDesc*)NULL
+
+/*
+ * Fix Command Arguments for Zzz_Bad_Fixes
+ */
+const char* apzZzz_Bad_FixesPatch[] = { "sh", "-c",
+ "echo \"Removing incorrect fix to <$file>\" >&2\n"
+ "rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\n"
+ "cat > /dev/null",
+ (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * Description 103 - Zzz_Time fix
*/
tSCC zZzz_TimeName[] =
"Zzz_Time";
* Fix Command Arguments for Zzz_Time
*/
const char* apzZzz_TimePatch[] = { "sh", "-c",
- "echo \"Removing incorrect fix to HP-UX <$file>\" >&2\n"
+ "echo \"Removing incorrect fix to <$file>\" >&2\n"
"rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\n"
"cat > /dev/null",
(char*)NULL };
*
* List of all fixes
*/
-#define REGEX_COUNT 76
-#define FIX_COUNT 105
-tFixDesc fixDescList[ 105 ] = {
+#define REGEX_COUNT 75
+#define FIX_COUNT 103
+tFixDesc fixDescList[ 103 ] = {
{ zAix_SyswaitName, zAix_SyswaitList,
apzAix_SyswaitMachs, (regex_t*)NULL,
AIX_SYSWAIT_TEST_CT, FD_MACH_ONLY,
AVOID_BOOL_TEST_CT, FD_MACH_ONLY,
aAvoid_BoolTests, apzAvoid_BoolPatch },
- { zBad_Malloc_DeclName, zBad_Malloc_DeclList,
- apzBad_Malloc_DeclMachs, (regex_t*)NULL,
- BAD_MALLOC_DECL_TEST_CT, FD_MACH_ONLY,
- aBad_Malloc_DeclTests, apzBad_Malloc_DeclPatch },
-
{ zBad_Struct_TermName, zBad_Struct_TermList,
apzBad_Struct_TermMachs, (regex_t*)NULL,
BAD_STRUCT_TERM_TEST_CT, FD_MACH_ONLY,
BSD43_IO_MACROS_TEST_CT, FD_MACH_ONLY,
aBsd43_Io_MacrosTests, apzBsd43_Io_MacrosPatch },
+ { zDec_Intern_AsmName, zDec_Intern_AsmList,
+ apzDec_Intern_AsmMachs, (regex_t*)NULL,
+ DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY,
+ aDec_Intern_AsmTests, apzDec_Intern_AsmPatch },
+
{ zNo_Double_SlashName, zNo_Double_SlashList,
apzNo_Double_SlashMachs, (regex_t*)NULL,
NO_DOUBLE_SLASH_TEST_CT, FD_MACH_ONLY,
aNo_Double_SlashTests, apzNo_Double_SlashPatch },
- { zIrix_Bogus_Cxx_CmntName, zIrix_Bogus_Cxx_CmntList,
- apzIrix_Bogus_Cxx_CmntMachs, (regex_t*)NULL,
- IRIX_BOGUS_CXX_CMNT_TEST_CT, FD_MACH_ONLY,
- aIrix_Bogus_Cxx_CmntTests, apzIrix_Bogus_Cxx_CmntPatch },
-
{ zEcd_CursorName, zEcd_CursorList,
apzEcd_CursorMachs, (regex_t*)NULL,
ECD_CURSOR_TEST_CT, FD_MACH_ONLY,
HP_SYSFILE_TEST_CT, FD_MACH_ONLY,
aHp_SysfileTests, apzHp_SysfilePatch },
- { zHpux_Cxx_UnreadyName, zHpux_Cxx_UnreadyList,
- apzHpux_Cxx_UnreadyMachs, (regex_t*)NULL,
- HPUX_CXX_UNREADY_TEST_CT, FD_MACH_ONLY,
- aHpux_Cxx_UnreadyTests, apzHpux_Cxx_UnreadyPatch },
+ { zCxx_UnreadyName, zCxx_UnreadyList,
+ apzCxx_UnreadyMachs, (regex_t*)NULL,
+ CXX_UNREADY_TEST_CT, FD_MACH_ONLY,
+ aCxx_UnreadyTests, apzCxx_UnreadyPatch },
{ zHpux_MaxintName, zHpux_MaxintList,
apzHpux_MaxintMachs, (regex_t*)NULL,
MATH_GCC_IFNDEFS_TEST_CT, FD_MACH_ONLY,
aMath_Gcc_IfndefsTests, apzMath_Gcc_IfndefsPatch },
- { zMotorola_Stupid_OptName, zMotorola_Stupid_OptList,
- apzMotorola_Stupid_OptMachs, (regex_t*)NULL,
- MOTOROLA_STUPID_OPT_TEST_CT, FD_MACH_ONLY,
- aMotorola_Stupid_OptTests, apzMotorola_Stupid_OptPatch },
-
{ zNested_CommentName, zNested_CommentList,
apzNested_CommentMachs, (regex_t*)NULL,
NESTED_COMMENT_TEST_CT, FD_MACH_ONLY,
SUN_AUTH_PROTO_TEST_CT, FD_MACH_ONLY,
aSun_Auth_ProtoTests, apzSun_Auth_ProtoPatch },
- { zSunos_Large_MacroName, zSunos_Large_MacroList,
- apzSunos_Large_MacroMachs, (regex_t*)NULL,
- SUNOS_LARGE_MACRO_TEST_CT, FD_MACH_ONLY,
- aSunos_Large_MacroTests, apzSunos_Large_MacroPatch },
-
{ zSunos_Matherr_DeclName, zSunos_Matherr_DeclList,
apzSunos_Matherr_DeclMachs, (regex_t*)NULL,
SUNOS_MATHERR_DECL_TEST_CT, FD_MACH_ONLY,
ZZZ_KI_DEFS_TEST_CT, FD_MACH_ONLY,
aZzz_Ki_DefsTests, apzZzz_Ki_DefsPatch },
+ { zZzz_Bad_FixesName, zZzz_Bad_FixesList,
+ apzZzz_Bad_FixesMachs, (regex_t*)NULL,
+ ZZZ_BAD_FIXES_TEST_CT, FD_MACH_ONLY,
+ aZzz_Bad_FixesTests, apzZzz_Bad_FixesPatch },
+
{ zZzz_TimeName, zZzz_TimeList,
apzZzz_TimeMachs, (regex_t*)NULL,
ZZZ_TIME_TEST_CT, FD_MACH_ONLY,
#
# DO NOT EDIT THIS FILE (inclhack.sh)
#
-# It has been autogen-ed Wednesday March 31, 1999 at 01:11:59 AM MST
-# From the definitions /puke/law//egcs/egcs/gcc/fixinc/inclhack.def
-# and the template file /puke/law//egcs/egcs/gcc/fixinc/inclhack.tpl
+# It has been autogen-ed Wednesday March 31, 1999 at 12:02:52 PM PST
+# From the definitions inclhack.def
+# and the template file inclhack.tpl
#
# Install modified versions of certain ANSI-incompatible system header
# files which are fixed to work correctly with ANSI C and placed in a
# directory that GNU C will search.
#
-# This script contains 105 fixup scripts.
+# This script contains 103 fixup scripts.
#
# See README-fixinc for more information.
#
esac
echo Fixing headers into ${LIB} for ${target_canonical} target
-
+
# Determine whether this system has symbolic links.
if ln -s X $LIB/ShouldNotExist 2>/dev/null; then
rm -f $LIB/ShouldNotExist
else
LINKS=false
fi
-
+
# # # # # # # # # # # # # # # # # # # # #
#
# Search each input directory for broken header files.
cd ${ORIGDIR}
cd ${INPUT} || continue
+INPUT=`${PWDCMD}`
#
# # # # # # # # # # # # # # # # # # # # #
echo Finding directories and links to directories
# Find all directories and all symlinks that point to directories.
-# Put the list in $files.
+# Put the list in $all_dirs.
# Each time we find a symlink, add it to newdirs
# so that we do another find within the dir the link points to.
-# Note that $files may have duplicates in it;
+# Note that $all_dirs may have duplicates in it;
# later parts of this file are supposed to ignore them.
dirs="."
levels=2
+all_dirs=""
+search_dirs=""
+
while [ -n "$dirs" ] && [ $levels -gt 0 ]
do
- levels=`expr $levels - 1`
- newdirs=
- for d in $dirs
- do
+ levels=`expr $levels - 1`
+ newdirs=
+ for d in $dirs
+ do
echo " Searching $INPUT/$d"
-
+
# Find all directories under $d, relative to $d, excluding $d itself.
# (The /. is needed after $d in case $d is a symlink.)
- files="$files `find $d/. -type d -print | \
+ all_dirs="$all_dirs `find $d/. -type d -print | \
sed -e '/\/\.$/d' -e 's@/./@/@g'`"
# Find all links to directories.
# Using `-exec test -d' in find fails on some systems,
theselinks=`find $d/. -type l -print | sed -e 's@/./@/@g'`
for d1 in $theselinks --dummy--
do
- # If the link points to a directory,
- # add that dir to $newdirs
- if [ -d $d1 ]
- then
- files="$files $d1"
+ # If the link points to a directory,
+ # add that dir to $newdirs
+ if [ -d $d1 ]
+ then
+ all_dirs="$all_dirs $d1"
if [ "`ls -ld $d1 | sed -n 's/.*-> //p'`" != "." ]
then
- newdirs="$newdirs $d1"
- fi
+ newdirs="$newdirs $d1"
+ search_dirs="$search_dirs $d1"
fi
+ fi
done
- done
-
- dirs="$newdirs"
+ done
+
+ dirs="$newdirs"
done
-
+
# # # # # # # # # # # # # # # # # # # # #
#
dirs=
echo "All directories (including links to directories):"
-echo $files
-
-for file in $files; do
+echo $all_dirs
+
+for file in $all_dirs; do
rm -rf $LIB/$file
if [ ! -d $LIB/$file ]
then mkdir $LIB/$file
fi
done
mkdir $LIB/root
-
+
# # # # # # # # # # # # # # # # # # # # #
#
# treetops gets an alternating list
# of old directories to copy
# and the new directories to copy to.
-treetops="${INPUT} ${LIB}"
-
+treetops=". ${LIB}"
+
if $LINKS; then
echo 'Making symbolic directory links'
- for file in $files; do
- dest=`ls -ld $file | sed -n 's/.*-> //p'`
- if [ "$dest" ]; then
- cwd=`${PWDCMD}`
- # In case $dest is relative, get to $file's dir first.
- cd ${INPUT}
- cd `echo ./$file | sed -n 's&[^/]*$&&p'`
- # Check that the target directory exists.
- # Redirections changed to avoid bug in sh on Ultrix.
- (cd $dest) > /dev/null 2>&1
- if [ $? = 0 ]; then
- cd $dest
- # X gets the dir that the link actually leads to.
- x=`${PWDCMD}`
- # Canonicalize ${INPUT} now to minimize the time an
- # automounter has to change the result of ${PWDCMD}.
- cinput=`cd ${INPUT}; ${PWDCMD}`
- # If a link points to ., make a similar link to .
- if [ $x = ${cinput} ]; then
- echo $file '->' . ': Making link'
- rm -fr ${LIB}/$file > /dev/null 2>&1
- ln -s . ${LIB}/$file > /dev/null 2>&1
- # If link leads back into ${INPUT},
- # make a similar link here.
- elif expr $x : "${cinput}/.*" > /dev/null; then
- # Y gets the actual target dir name, relative to ${INPUT}.
- y=`echo $x | sed -n "s&${cinput}/&&p"`
- # DOTS is the relative path from ${LIB}/$file's dir back to ${LIB}.
- dots=`echo "$file" |
- sed -e 's@^./@@' -e 's@/./@/@g' -e 's@[^/][^/]*@..@g' -e 's@..$@@'`
- echo $file '->' $dots$y ': Making link'
- rm -fr ${LIB}/$file > /dev/null 2>&1
- ln -s $dots$y ${LIB}/$file > /dev/null 2>&1
- else
- # If the link is to a dir $target outside ${INPUT},
- # repoint the link at ${INPUT}/root$target
- # and process $target into ${INPUT}/root$target
- # treat this directory as if it actually contained the files.
- echo $file '->' root$x ': Making link'
- if [ -d $LIB/root$x ]
- then true
+ cwd=`${PWDCMD}`
+
+ for sym_link in $search_dirs; do
+ cd ${INPUT}
+ dest=`ls -ld ${sym_link} | sed -n 's/.*-> //p'`
+
+ # In case $dest is relative, get to ${sym_link}'s dir first.
+ #
+ cd ./`echo ${sym_link} | sed 's;/[^/]*$;;'`
+
+ # Check that the target directory exists.
+ # Redirections changed to avoid bug in sh on Ultrix.
+ #
+ (cd $dest) > /dev/null 2>&1
+ if [ $? = 0 ]; then
+ cd $dest
+
+ # full_dest_dir gets the dir that the link actually leads to.
+ #
+ full_dest_dir=`${PWDCMD}`
+
+ # Canonicalize ${INPUT} now to minimize the time an
+ # automounter has to change the result of ${PWDCMD}.
+ #
+ cinput=`cd ${INPUT}; ${PWDCMD}`
+
+ # If a link points to ., make a similar link to .
+ #
+ if [ ${full_dest_dir} = ${cinput} ]; then
+ echo ${sym_link} '->' . ': Making self link'
+ rm -fr ${LIB}/${sym_link} > /dev/null 2>&1
+ ln -s . ${LIB}/${sym_link} > /dev/null 2>&1
+
+ # If link leads back into ${INPUT},
+ # make a similar link here.
+ #
+ elif expr ${full_dest_dir} : "${cinput}/.*" > /dev/null; then
+ # Y gets the actual target dir name, relative to ${INPUT}.
+ y=`echo ${full_dest_dir} | sed -n "s&${cinput}/&&p"`
+ # DOTS is the relative path from ${LIB}/${sym_link} back to ${LIB}.
+ dots=`echo "${sym_link}" |
+ sed -e 's@^./@@' -e 's@/./@/@g' -e 's@[^/][^/]*@..@g' -e 's@..$@@'`
+ echo ${sym_link} '->' $dots$y ': Making local link'
+ rm -fr ${LIB}/${sym_link} > /dev/null 2>&1
+ ln -s $dots$y ${LIB}/${sym_link} > /dev/null 2>&1
+
else
- dirname=root$x/
- dirmade=.
- cd $LIB
- while [ x$dirname != x ]; do
- component=`echo $dirname | sed -e 's|/.*$||'`
- mkdir $component >/dev/null 2>&1
- cd $component
- dirmade=$dirmade/$component
- dirname=`echo $dirname | sed -e 's|[^/]*/||'`
- done
- fi
- # Duplicate directory structure created in ${LIB}/$file in new
- # root area.
- for file2 in $files; do
- case $file2 in
- $file/*)
- dupdir=${LIB}/root$x/`echo $file2 | sed -n "s|^${file}/||p"`
- echo "Duplicating ${file}'s ${dupdir}"
- if [ -d ${dupdir} ]
+ # If the link is to a dir $target outside ${INPUT},
+ # repoint the link at ${INPUT}/root$target
+ # and process $target into ${INPUT}/root$target
+ # treat this directory as if it actually contained the files.
+ #
+ echo ${sym_link} '->' root${full_dest_dir} ': Making rooted link'
+ if [ -d $LIB/root${full_dest_dir} ]
then true
else
- mkdir ${dupdir}
- fi
- ;;
- *)
- ;;
- esac
+ dirname=root${full_dest_dir}/
+ dirmade=.
+ cd $LIB
+ while [ x$dirname != x ]; do
+ component=`echo $dirname | sed -e 's|/.*$||'`
+ mkdir $component >/dev/null 2>&1
+ cd $component
+ dirmade=$dirmade/$component
+ dirname=`echo $dirname | sed -e 's|[^/]*/||'`
done
- # Get the path from ${LIB} to $file, accounting for symlinks.
- parent=`echo "$file" | sed -e 's@/[^/]*$@@'`
- libabs=`cd ${LIB}; ${PWDCMD}`
- file2=`cd ${LIB}; cd $parent; ${PWDCMD} | sed -e "s@^${libabs}@@"`
- # DOTS is the relative path from ${LIB}/$file's dir back to ${LIB}.
- dots=`echo "$file2" | sed -e 's@/[^/]*@../@g'`
- rm -fr ${LIB}/$file > /dev/null 2>&1
- ln -s ${dots}root$x ${LIB}/$file > /dev/null 2>&1
- treetops="$treetops $x ${LIB}/root$x"
- fi
+ fi
+
+ # Duplicate directory structure created in ${LIB}/${sym_link} in new
+ # root area.
+ #
+ for file2 in $all_dirs; do
+ case $file2 in
+ ${sym_link}/*)
+ dupdir=${LIB}/root${full_dest_dir}/`echo $file2 |
+ sed -n "s|^${sym_link}/||p"`
+ echo "Duplicating ${sym_link}'s ${dupdir}"
+ if [ -d ${dupdir} ]
+ then true
+ else
+ mkdir ${dupdir}
+ fi
+ ;;
+ *)
+ ;;
+ esac
+ done
+
+ # Get the path from ${LIB} to ${sym_link}, accounting for symlinks.
+ #
+ parent=`echo "${sym_link}" | sed -e 's@/[^/]*$@@'`
+ libabs=`cd ${LIB}; ${PWDCMD}`
+ file2=`cd ${LIB}; cd $parent; ${PWDCMD} | sed -e "s@^${libabs}@@"`
+
+ # DOTS is the relative path from ${LIB}/${sym_link} back to ${LIB}.
+ #
+ dots=`echo "$file2" | sed -e 's@/[^/]*@../@g'`
+ rm -fr ${LIB}/${sym_link} > /dev/null 2>&1
+ ln -s ${dots}root${full_dest_dir} ${LIB}/${sym_link} > /dev/null 2>&1
+ treetops="$treetops ${sym_link} ${LIB}/root${full_dest_dir}"
fi
- cd $cwd
fi
done
fi
-
+
# # # # # # # # # # # # # # # # # # # # #
#
required=
#
SRCDIR=`cd ${INPUT} ; cd $1 ; ${PWDCMD}`
export SRCDIR
+
+ FIND_BASE=$1
+ export FIND_BASE
shift
DESTDIR=`cd $1;${PWDCMD}`
touch ${DESTDIR}/DONE
echo Fixing directory ${SRCDIR} into ${DESTDIR}
- # Check .h files which are symlinks as well as those which are files.
- # A link to a header file will not be processed by anything but this.
+ # Check files which are symlinks as well as those which are files.
#
- cd ${SRCDIR}
-
- if $LINKS; then
- files=`find . -name '*.h' \( -type f -o -type l \) -print`
+ cd ${INPUT}
+ files=`if $LINKS; then
+ find ${FIND_BASE}/. \( -type f -o -type l \) -print
else
- files=`find . -name '*.h' -type f -print`
- fi
+ find ${FIND_BASE}/. -type f -print
+ fi | \
+ sed -e's;/\./;/;g' -e's;//*;/;g' `
+
echo Checking header files
for file in $files; do
- if ( test ! -r $file -o \
- -n "`fgrep 'This file is part of the GNU C Library' $file`" )
+ if ( test ! -r ${file} -o \
+ -n "`fgrep 'This file is part of the GNU C Library' ${file}`" )
then continue ; fi
fixlist=""
+ DESTFILE=${DESTDIR}/`echo ${file} | sed "s;${FIND_BASE}/;;" `
#
# Fix 1: Aix_Syswait
#
- case "$file" in ./sys/wait.h )
- if ( test -n "`egrep 'bos325,' $file`"
+ case "${file}" in ./sys/wait.h )
+ if ( test -n "`egrep 'bos325,' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
aix_syswait"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '/^extern pid_t wait3();$/i\
struct rusage;
' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
# Fix 2: Aix_Volatile
#
- case "$file" in ./sys/signal.h )
- if ( test -n "`egrep 'typedef volatile int sig_atomic_t' $file`"
+ case "${file}" in ./sys/signal.h )
+ if ( test -n "`egrep 'typedef volatile int sig_atomic_t' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
aix_volatile"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/typedef volatile int sig_atomic_t/typedef int sig_atomic_t/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
# Fix 3: Alpha_Getopt
#
- case "$file" in ./stdio.h | \
+ case "${file}" in ./stdio.h | \
./stdlib.h )
- if ( test -n "`egrep 'getopt\\(int, char \\*\\[' $file`"
+ if ( test -n "`egrep 'getopt\\(int, char \\*\\[' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
alpha_getopt"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/getopt(int, char \*\[\],[ ]*char \*)/getopt(int, char *const[], const char *)/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
# Fix 4: Alpha_Parens
#
- case "$file" in ./sym.h )
- if ( test -n "`egrep '#ifndef\\(__mips64\\)' $file`"
+ case "${file}" in ./sym.h )
+ if ( test -n "`egrep '#ifndef\\(__mips64\\)' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
alpha_parens"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/#ifndef(__mips64)/#ifndef __mips64/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
# Fix 5: Alpha_Sbrk
#
- case "$file" in ./unistd.h )
- if ( test -n "`egrep 'char[ ]*\\*[ ]*sbrk[ ]*\\(' $file`"
+ case "${file}" in ./unistd.h )
+ if ( test -n "`egrep 'char[ ]*\\*[ ]*sbrk[ ]*\\(' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
alpha_sbrk"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/char\([ ]*\*[ ]*sbrk[ ]*(\)/void\1/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
# Fix 6: Arm_Norcroft_Hint
#
- case "$file" in ./X11/Intrinsic.h )
+ case "${file}" in ./X11/Intrinsic.h )
fixlist="${fixlist}
arm_norcroft_hint"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/___type p_type/p_type/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
esac
#
# Fix 7: Arm_Wchar
#
- case "$file" in ./stdlib.h )
- if ( test -n "`egrep '#[ ]*define[ ]*__wchar_t' $file`"
+ case "${file}" in ./stdlib.h )
+ if ( test -n "`egrep '#[ ]*define[ ]*__wchar_t' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
arm_wchar"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/\(#[ ]*ifndef[ ]*\)__wchar_t/\1_GCC_WCHAR_T/' \
-e 's/\(#[ ]*define[ ]*\)__wchar_t/\1_GCC_WCHAR_T/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
# Fix 8: Aux_Asm
#
- case "$file" in ./sys/param.h )
- if ( test -n "`egrep '#ifndef NOINLINE' $file`"
+ case "${file}" in ./sys/param.h )
+ if ( test -n "`egrep '#ifndef NOINLINE' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
aux_asm"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's|#ifndef NOINLINE|#if !defined(NOINLINE) \&\& !defined(__GNUC__)|' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
# Fix 9: Avoid_Bool
#
- case "$file" in ./curses.h | \
+ case "${file}" in ./curses.h | \
./curses_colr/curses.h | \
./term.h | \
./tinfo.h )
fixlist="${fixlist}
avoid_bool"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '/^#[ ]*define[ ][ ]*bool[ ][ ]*char[ ]*$/i\
#ifndef __cplusplus
-e '/^typedef[ ][ ]*char[ ][ ]*bool[ ]*;/a\
#endif
' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 10: Bad_Malloc_Decl
- #
- case "$file" in ./rpc/types.h )
- if ( test -z "`egrep '\"C\"' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- bad_malloc_decl"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '1i\
-#ifdef __cplusplus\
-extern "C" {\
-#endif\
-
-' \
- -e '$a\
-#ifdef __cplusplus\
-}\
-#endif
-' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
esac
#
- # Fix 11: Bad_Struct_Term
+ # Fix 10: Bad_Struct_Term
#
- case "$file" in ./curses.h )
- if ( test -n "`egrep '^[ ]*typedef[ ]+struct[ ]+term[ ]*;' $file`"
+ case "${file}" in ./curses.h )
+ if ( test -n "`egrep '^[ ]*typedef[ ]+struct[ ]+term[ ]*;' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
bad_struct_term"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/^[ ]*typedef[ ][ ]*\(struct[ ][ ]*term[ ]*;[ ]*\)$/\1/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 12: Badquote
+ # Fix 11: Badquote
#
- case "$file" in ./sundev/vuid_event.h )
+ case "${file}" in ./sundev/vuid_event.h )
fixlist="${fixlist}
badquote"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/doesn'\''t/does not/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
esac
#
- # Fix 13: Bad_Lval
+ # Fix 12: Bad_Lval
#
- case "$file" in ./libgen.h | \
+ case "${file}" in ./libgen.h | \
./dirent.h | \
./ftw.h | \
./grp.h | \
./stropts.h | \
./time.h | \
./unistd.h )
- if ( test -n "`egrep '^[ ]*#[ ]*pragma[ ]extern_prefix' $file`"
+ if ( test -n "`egrep '^[ ]*#[ ]*pragma[ ]extern_prefix' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
bad_lval"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/^[ ]*#[ ]*define[ ]*\([^(]*\)\(([^)]*)\)[ ]*\(_.\)\1\2[ ]*$/#define \1 \3\1/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 14: Broken_Assert_Stdio
+ # Fix 13: Broken_Assert_Stdio
#
- case "$file" in ./assert.h )
- if ( test -n "`egrep 'stderr' $file`" -a \
- -z "`egrep 'include.*stdio.h' $file`"
+ case "${file}" in ./assert.h )
+ if ( test -n "`egrep 'stderr' ${file}`" -a \
+ -z "`egrep 'include.*stdio.h' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
broken_assert_stdio"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '1i\
#include <stdio.h>
' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 15: Broken_Assert_Stdlib
+ # Fix 14: Broken_Assert_Stdlib
#
- case "$file" in ./assert.h )
- if ( test -n "`egrep 'exit *\\(|abort *\\(' $file`" -a \
- -z "`egrep 'include.*stdlib.h' $file`"
+ case "${file}" in ./assert.h )
+ if ( test -n "`egrep 'exit *\\(|abort *\\(' ${file}`" -a \
+ -z "`egrep 'include.*stdlib.h' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
broken_assert_stdlib"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '1i\
#ifdef __cplusplus\
#include <stdlib.h>\
#endif
' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 16: Bsd43_Io_Macros
+ # Fix 15: Bsd43_Io_Macros
#
- if ( test -n "`egrep 'BSD43__IO' $file`"
+ if ( test -n "`egrep 'BSD43__IO' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
bsd43_io_macros"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '/[ ]BSD43__IO[A-Z]*[ ]*(/s/(\(.\),/('\''\1'\'',/' \
-e '/#[ ]*define[ ]*[ ]BSD43__IO/s/'\''\([cgx]\)'\''/\1/g' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
#
- # Fix 17: No_Double_Slash
+ # Fix 16: Dec_Intern_Asm
#
- if ( test -n "`egrep '//[^*]' $file`" -a \
- '(' -z "`echo ${file}|egrep '++$|\.hh$|\.H$'`" ')'
- ) > /dev/null 2>&1 ; then
+ case "${file}" in ./c_asm.h )
fixlist="${fixlist}
- no_double_slash"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ dec_intern_asm"
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
- sed -e '/\/\/[^*]/s|//.*$||g' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
+ sed -e '/^[ ]*float[ ]*fasm/i
+#ifdef __DECC
+' \
+ -e '/^[ ]*#[ ]*pragma[ ]*intrinsic([ ]*dasm/a
+#endif
+' \
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
+ ;; # case end for file name test
+ esac
#
- # Fix 18: Irix_Bogus_Cxx_Cmnt
+ # Fix 17: No_Double_Slash
#
- case "$file" in ./elf_abi.h | \
- ./elf.h )
+ if ( test -n "`egrep '//[^\"*]' ${file}`" -a \
+ '(' -z "`echo ${file}|egrep 'cxx/|++$|\.hh$|\.H$'`" ')'
+ ) > /dev/null 2>&1 ; then
fixlist="${fixlist}
- irix_bogus_cxx_cmnt"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ no_double_slash"
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
- sed -e 's@"/\*"\*/@"//"@' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- ;; # case end for file name test
- esac
+ sed -e '/\/\/[^"*]/s|//.*$||g' \
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
+ fi # end of selection 'if'
#
- # Fix 19: Ecd_Cursor
+ # Fix 18: Ecd_Cursor
#
- case "$file" in ./sunwindow/win_lock.h | \
+ case "${file}" in ./sunwindow/win_lock.h | \
./sunwindow/win_cursor.h )
fixlist="${fixlist}
ecd_cursor"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/ecd.cursor/ecd_cursor/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
esac
#
- # Fix 20: Else_Label
+ # Fix 19: Else_Label
#
- if ( test -n "`egrep '^[ ]*#[ ]*else[ ]+[!-.0-~]' $file`"
+ if ( test -n "`egrep '^[ ]*#[ ]*else[ ]+[!-.0-~]' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
else_label"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e ':loop
/\\$/N
s/\\+++fixinc_eol+++/\\/g
s%^\([ ]*#[ ]*else\)[ ]*/[^*].*%\1%
s%^\([ ]*#[ ]*else\)[ ]*[^/ ].*%\1%' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
#
- # Fix 21: Endif_Label
+ # Fix 20: Endif_Label
#
- if ( test -n "`egrep '^[ ]*#[ ]*endif[ ]+[!-.0-z{|}~]' $file`"
+ if ( test -n "`egrep '^[ ]*#[ ]*endif[ ]+[!-.0-z{|}~]' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
endif_label"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e ':loop
/\\$/N
s%^\([ ]*#[ ]*endif\)[ ]*/[^*].*%\1%
s%^\([ ]*#[ ]*endif\)[ ]*\*[^/].*%\1%
s%^\([ ]*#[ ]*endif\)[ ]*[^/* ].*%\1%' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
#
- # Fix 22: Hp_Inline
+ # Fix 21: Hp_Inline
#
- case "$file" in ./sys/spinlock.h )
- if ( test -n "`egrep 'include.*\"\\.\\./machine/' $file`"
+ case "${file}" in ./sys/spinlock.h )
+ if ( test -n "`egrep 'include.*\"\\.\\./machine/' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
hp_inline"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's,"../machine/inline.h",<machine/inline.h>,' \
-e 's,"../machine/psl.h",<machine/psl.h>,' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 23: Hp_Sysfile
+ # Fix 22: Hp_Sysfile
#
- case "$file" in ./sys/file.h )
- if ( test -n "`egrep 'HPUX_SOURCE' $file`"
+ case "${file}" in ./sys/file.h )
+ if ( test -n "`egrep 'HPUX_SOURCE' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
hp_sysfile"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/(\.\.\.)/(struct file * ...)/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 24: Hpux_Cxx_Unready
+ # Fix 23: Cxx_Unready
#
- case "$file" in ./sys/mman.h )
- if ( test -z "`egrep '\"C\"|__BEGIN_DECLS' $file`"
+ case "${file}" in ./sys/mman.h | \
+ ./rpc/types.h )
+ if ( test -z "`egrep '\"C\"|__BEGIN_DECLS' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
- hpux_cxx_unready"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ cxx_unready"
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '1i\
#ifdef __cplusplus\
}\
#endif
' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 25: Hpux_Maxint
+ # Fix 24: Hpux_Maxint
#
- case "$file" in ./sys/param.h )
+ case "${file}" in ./sys/param.h )
fixlist="${fixlist}
hpux_maxint"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '/^#[ ]*define[ ]*MAXINT[ ]/i\
#ifndef MAXINT
-e '/^#[ ]*define[ ]*MAXINT[ ]/a\
#endif
' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
esac
#
- # Fix 26: Hpux_Systime
+ # Fix 25: Hpux_Systime
#
- case "$file" in ./sys/time.h )
- if ( test -n "`egrep '^extern struct sigevent;' $file`"
+ case "${file}" in ./sys/time.h )
+ if ( test -n "`egrep '^extern struct sigevent;' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
hpux_systime"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/^extern struct sigevent;/struct sigevent;/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 27: Interactv_Add1
+ # Fix 26: Interactv_Add1
#
- case "$file" in ./stdio.h | \
+ case "${file}" in ./stdio.h | \
./math.h | \
./ctype.h | \
./sys/limits.h | \
./sys/fcntl.h | \
./sys/dirent.h )
- if ( test '(' -d /etc/conf/kconfig.d ')' -a \
- '(' -n "`grep _POSIX_VERSION /usr/include/sys/unistd.h`" ')'
+ if ( test '(' -d /etc/conf/kconfig.d ')' -a \
+ '(' -n "`grep _POSIX_VERSION /usr/include/sys/unistd.h`" ')'
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
interactv_add1"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/!defined(__STDC__) && !defined(_POSIX_SOURCE)/!defined(_POSIX_SOURCE)/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 28: Interactv_Add2
+ # Fix 27: Interactv_Add2
#
- case "$file" in ./math.h )
- if ( test '(' -d /etc/conf/kconfig.d ')' -a \
- '(' -n "`grep _POSIX_VERSION /usr/include/sys/unistd.h`" ')'
+ case "${file}" in ./math.h )
+ if ( test '(' -d /etc/conf/kconfig.d ')' -a \
+ '(' -n "`grep _POSIX_VERSION /usr/include/sys/unistd.h`" ')'
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
interactv_add2"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/fmod(double)/fmod(double, double)/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 29: Interactv_Add3
+ # Fix 28: Interactv_Add3
#
- case "$file" in ./sys/limits.h )
- if ( test '(' -d /etc/conf/kconfig.d ')' -a \
- '(' -n "`grep _POSIX_VERSION /usr/include/sys/unistd.h`" ')'
+ case "${file}" in ./sys/limits.h )
+ if ( test '(' -d /etc/conf/kconfig.d ')' -a \
+ '(' -n "`grep _POSIX_VERSION /usr/include/sys/unistd.h`" ')'
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
interactv_add3"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '/CHILD_MAX/s,/\* Max, Max,' \
-e '/OPEN_MAX/s,/\* Max, Max,' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 30: Io_Def_Quotes
+ # Fix 29: Io_Def_Quotes
#
- if ( test -n "`egrep '[ ]_IO[A-Z]*[ ]*\\([A-Za-z]' $file`"
+ if ( test -n "`egrep '[ ](_|DES)IO[A-Z]*[ ]*\\( *[^,'\\'']' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
io_def_quotes"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
- sed -e 's/\([ ]_IO[A-Z]*[ ]*(\)\([A-Za-z]\),/\1'\''\2'\'',/' \
+ sed -e 's/\([ ](_|DES)IO[A-Z]*[ ]*(\)\([^,'\'']\),/\1'\''\2'\'',/' \
-e '/#[ ]*define[ ]*[ ]_IO/s/'\''\([cgxtf]\)'\''/\1/g' \
-e '/#[ ]*define[ ]*[ ]DESIOC/s/'\''\([cdgx]\)'\''/\1/g' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
#
- # Fix 31: Ioctl_Fix_Ctrl
+ # Fix 30: Ioctl_Fix_Ctrl
#
- if ( test -n "`egrep 'CTRL[ ]' $file`"
+ if ( test -n "`egrep 'CTRL[ ]' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
ioctl_fix_ctrl"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '/[^A-Z0-9_]CTRL[ ]*(/s/\([^'\'']\))/'\''\1'\'')/' \
-e '/[^A-Z0-9]_CTRL[ ]*(/s/\([^'\'']\))/'\''\1'\'')/' \
-e '/#[ ]*define[ ]*[ ]CTRL/s/'\''\([cgx]\)'\''/\1/g' \
-e '/#[ ]*define[ ]*[ ]_CTRL/s/'\''\([cgx]\)'\''/\1/g' \
-e '/#[ ]*define[ ]*[ ]BSD43_CTRL/s/'\''\([cgx]\)'\''/\1/g' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
#
- # Fix 32: Ip_Missing_Semi
+ # Fix 31: Ip_Missing_Semi
#
- case "$file" in ./netinet/ip.h )
+ case "${file}" in ./netinet/ip.h )
fixlist="${fixlist}
ip_missing_semi"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '/^struct/,/^};/s/}$/};/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
esac
#
- # Fix 33: Irix_Multiline_Cmnt
+ # Fix 32: Irix_Multiline_Cmnt
#
- case "$file" in ./sys/types.h )
+ case "${file}" in ./sys/types.h )
fixlist="${fixlist}
irix_multiline_cmnt"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's@type of the result@type of the result */@' \
-e 's@of the sizeof@/* of the sizeof@' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
esac
#
- # Fix 34: Irix_Sockaddr
+ # Fix 33: Irix_Sockaddr
#
- case "$file" in ./rpc/auth.h )
- if ( test -n "`egrep 'authdes_create.*struct sockaddr' $file`"
+ case "${file}" in ./rpc/auth.h )
+ if ( test -n "`egrep 'authdes_create.*struct sockaddr' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
irix_sockaddr"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '/authdes_create.*struct sockaddr/i\
struct sockaddr;
' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 35: Irix_Struct__File
+ # Fix 34: Irix_Struct__File
#
- case "$file" in ./rpc/xdr.h )
+ case "${file}" in ./rpc/xdr.h )
fixlist="${fixlist}
irix_struct__file"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '/xdrstdio_create.*struct __file_s/i\
struct __file_s;
' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
esac
#
- # Fix 36: Isc_Fmod
+ # Fix 35: Isc_Fmod
#
- case "$file" in ./math.h )
- if ( test -n "`egrep 'fmod\\(double\\)' $file`"
+ case "${file}" in ./math.h )
+ if ( test -n "`egrep 'fmod\\(double\\)' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
isc_fmod"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/fmod(double)/fmod(double, double)/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 37: Motorola_Nested
+ # Fix 36: Motorola_Nested
#
- case "$file" in ./limits.h | \
+ case "${file}" in ./limits.h | \
./sys/limits.h )
+ case "$target_canonical" in m68k-motorola-sysv* )
fixlist="${fixlist}
motorola_nested"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's@^\(#undef[ ][ ]*PIPE_BUF[ ]*/\* max # bytes atomic in write to a\)$@\1 */@' \
-e 's@\(/\*#define HUGE_VAL 3.40282346638528860e+38 \)\(/\*error value returned by Math lib\*/\)$@\1*/ \2@' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
+ ;; # case end for machine type test
+ esac
;; # case end for file name test
esac
#
- # Fix 38: Isc_Sys_Limits
+ # Fix 37: Isc_Sys_Limits
#
- case "$file" in ./sys/limits.h )
- if ( test -n "`egrep 'CHILD_MAX' $file`"
+ case "${file}" in ./sys/limits.h )
+ if ( test -n "`egrep 'CHILD_MAX' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
isc_sys_limits"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '/CHILD_MAX/s,/\* Max, Max,' \
-e '/OPEN_MAX/s,/\* Max, Max,' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 39: Kandr_Concat
+ # Fix 38: Kandr_Concat
#
- case "$file" in ./sparc/asm_linkage.h | \
+ case "${file}" in ./sparc/asm_linkage.h | \
./sun3/asm_linkage.h | \
./sun3x/asm_linkage.h | \
./sun4/asm_linkage.h | \
./sys/tty.h | \
./Xm.acorn/XmP.h | \
./bsd43/bsd43_.h )
- if ( test -n "`egrep '/\\*\\*/' $file`"
+ if ( test -n "`egrep '/\\*\\*/' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
kandr_concat"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
- sed -e 's|/\*\*/| ## |g' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ sed -e 's|/\*\*/|##|g' \
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 40: Limits_Ifndefs
+ # Fix 39: Limits_Ifndefs
#
- case "$file" in ./limits.h )
- if ( test -z "`egrep 'ifndef[ ]+FLT_MIN' $file`"
+ case "${file}" in ./limits.h )
+ if ( test -z "`egrep 'ifndef[ ]+FLT_MIN' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
limits_ifndefs"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '/[ ]FLT_MIN[ ]/i\
#ifndef FLT_MIN
#endif
' \
-e '/^\(\/\*#define HUGE_VAL 3\.[0-9e+]* *\)\/\*/s//\1/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 41: Lynx_Void_Int
+ # Fix 40: Lynx_Void_Int
#
- case "$file" in ./curses.h )
- if ( test -n "`egrep '#[ ]*define[ ]+void[ ]+int' $file`"
+ case "${file}" in ./curses.h )
+ if ( test -n "`egrep '#[ ]*define[ ]+void[ ]+int' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
lynx_void_int"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '/#[ ]*define[ ][ ]*void[ ]int/d' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 42: Lynxos_Fcntl_Proto
+ # Fix 41: Lynxos_Fcntl_Proto
#
- case "$file" in ./fcntl.h )
+ case "${file}" in ./fcntl.h )
+ if ( test -n "`egrep 'fcntl.*\\(int, int, int\\)' ${file}`"
+ ) > /dev/null 2>&1 ; then
fixlist="${fixlist}
lynxos_fcntl_proto"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/\(fcntl.*(int, int, \)int)/\1...)/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
+ fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 43: M88k_Bad_Hypot_Opt
+ # Fix 42: M88k_Bad_Hypot_Opt
#
- case "$file" in ./math.h )
+ case "${file}" in ./math.h )
case "$target_canonical" in m88k-motorola-sysv3* )
fixlist="${fixlist}
m88k_bad_hypot_opt"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/extern double floor(), ceil(), fmod(), fabs();/extern double floor(), ceil(), fmod(), fabs _PARAMS((double));/' \
-e '/^extern double hypot();$/a\
}\
#define hypot fake_hypot
' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for machine type test
esac
;; # case end for file name test
#
- # Fix 44: M88k_Bad_S_If
+ # Fix 43: M88k_Bad_S_If
#
- case "$file" in ./sys/stat.h )
+ case "${file}" in ./sys/stat.h )
case "$target_canonical" in m88k-*-sysv3* )
- if ( test -n "`egrep '#define[ ]+S_IS[A-Z]*(m)[ ]' $file`"
+ if ( test -n "`egrep '#define[ ]+S_IS[A-Z]*(m)[ ]' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
m88k_bad_s_if"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/^\(#define[ ]*S_IS[A-Z]*(m)\)[ ]*(m[ ]*&[ ]*\(S_IF[A-Z][A-Z][A-Z][A-Z]*\)[ ]*)/\1 (((m)\&S_IFMT)==\2)/' \
-e 's/^\(#define[ ]*S_IS[A-Z]*(m)\)[ ]*(m[ ]*&[ ]*\(0[0-9]*\)[ ]*)/\1 (((m)\&S_IFMT)==\2)/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for machine type test
esac
#
- # Fix 45: M88k_Multi_Incl
+ # Fix 44: M88k_Multi_Incl
#
- case "$file" in ./time.h )
+ case "${file}" in ./time.h )
case "$target_canonical" in m88k-tektronix-sysv3* )
- if ( test -z "`egrep '#ifndef' $file`"
+ if ( test -z "`egrep '#ifndef' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
m88k_multi_incl"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
( echo Fixing $file, to protect against multiple inclusion. >&2
cpp_wrapper=`echo $file | sed -e 's,\.,_,g' -e 's,/,_,g'`
- sed -e "1i\
-#ifndef __GCC_GOT_${cpp_wrapper}_\
-#define __GCC_GOT_${cpp_wrapper}_\
-" \
- -e "$a\
-#endif /* ! __GCC_GOT_${cpp_wrapper}_ */
-" ) < $infile > ${DESTDIR}/$file.
+ echo "#ifndef __GCC_GOT_${cpp_wrapper}_"
+ echo "#define __GCC_GOT_${cpp_wrapper}_"
+ cat
+ echo "#endif /* ! __GCC_GOT_${cpp_wrapper}_ */" ) < $infile > ${DESTDIR}/FIXINC.tmp
# Shell scripts have the potential of removing the output
# We interpret that to mean the file is not to be altered
#
- if test ! -f ${DESTDIR}/$file.
+ if test ! -f ${DESTDIR}/fixinc.tmp
then continue ; fi
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for machine type test
esac
#
- # Fix 46: Machine_Name
+ # Fix 45: Machine_Name
#
- if ( test -n "`egrep '^#[ ]*(if|elif).*[^a-zA-Z0-9_](_*[MSRrhim]|[Mbimnpstuv])[a-zA-Z0-9_]' $file`"
+ if ( test -n "`egrep '^#[ ]*(if|elif).*[^a-zA-Z0-9_](_*[MSRrhim]|[Mbimnpstuv])[a-zA-Z0-9_]' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
machine_name"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e ':loop
/\\$/N
s/ vax / __vax__ /g
s/ \([a-zA-Z0-9_][a-zA-Z0-9_]*\) /\1/g
}' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
#
- # Fix 47: Math_Exception
+ # Fix 46: Math_Exception
#
- case "$file" in ./math.h )
- if ( test -n "`egrep 'struct exception' $file`"
+ case "${file}" in ./math.h )
+ if ( test -n "`egrep 'struct exception' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
math_exception"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '/struct exception/i\
#ifdef __cplusplus\
#undef exception\
#endif
' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 48: Math_Gcc_Ifndefs
+ # Fix 47: Math_Gcc_Ifndefs
#
- case "$file" in ./math.h )
+ case "${file}" in ./math.h )
fixlist="${fixlist}
math_gcc_ifndefs"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
- ( dbl_max_def="`egrep 'define[ ]+DBL_MAX[ ]+.*' ${SRCDIR}/float.h 2>/dev/null`"
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
+ ( dbl_max_def=`egrep 'define[ ]+DBL_MAX[ ]+.*' float.h 2>/dev/null`
if ( test -n "${dbl_max_def}" \
-a -n "`egrep '#define[ ]*HUGE_VAL[ ]+DBL_MAX' $file`" \
-a -z "`egrep '#define[ ]+DBL_MAX[ ]+' $file`"
) > /dev/null 2>&1
- then sed -e '/define[ ]HUGE_VAL[ ]/i\
+ then sed -e '/define[ ]HUGE_VAL[ ]DBL_MAX/s/DBL_MAX/$dbl_max_def/'
+ else cat ; fi |
+ sed -e'/define[ ]HUGE_VAL[ ]/i\
#ifndef HUGE_VAL
-' \
- -e '/define[ ]HUGE_VAL[ ]/a\
+' -e'/define[ ]HUGE_VAL[ ]/a\
#endif
-'\
- -e "/define[ ]HUGE_VAL[ ]DBL_MAX/s/DBL_MAX/$dbl_max_def/"
- else sed -e '/define[ ]HUGE_VAL[ ]/i\
-#ifndef HUGE_VAL
-' \
- -e '/define[ ]HUGE_VAL[ ]/a\
-#endif
-'
- fi ) < $infile > ${DESTDIR}/$file.
+' ) < $infile > ${DESTDIR}/FIXINC.tmp
# Shell scripts have the potential of removing the output
# We interpret that to mean the file is not to be altered
#
- if test ! -f ${DESTDIR}/$file.
+ if test ! -f ${DESTDIR}/fixinc.tmp
then continue ; fi
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 49: Motorola_Stupid_Opt
- #
- case "$file" in ./math.h )
- case "$target_canonical" in m88k-motorola-sysv3* )
- if ( test -n "`egrep '^extern double hypot();$' $file`"
- ) > /dev/null 2>&1 ; then
- fixlist="${fixlist}
- motorola_stupid_opt"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
-
- sed -e '/^extern double hypot();$/a\
-\/* Workaround a stupid Motorola optimization if one\
- of x or y is 0.0 and the other is negative! *\/\
-#ifdef __STDC__\
-static __inline__ double fake_hypot (double x, double y)\
-#else\
-static __inline__ double fake_hypot (x, y)\
- double x, y;\
-#endif\
-{\
- return fabs (hypot (x, y));\
-}\
-#define hypot fake_hypot
-' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
- ;; # case end for machine type test
- esac
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
esac
#
- # Fix 50: Nested_Comment
+ # Fix 48: Nested_Comment
#
- case "$file" in ./rpc/rpc.h )
+ case "${file}" in ./rpc/rpc.h )
fixlist="${fixlist}
nested_comment"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's@^\(/\*.*rpc/auth_des.h>.*\)/\*@\1*/ /*@' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
esac
#
- # Fix 51: News_Os_Recursion
+ # Fix 49: News_Os_Recursion
#
- case "$file" in ./stdlib.h )
- if ( test -n "`egrep '#include <stdlib.h>' $file`"
+ case "${file}" in ./stdlib.h )
+ if ( test -n "`egrep '#include <stdlib.h>' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
news_os_recursion"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '/^#include <stdlib.h>/i\
#ifdef BOGUS_RECURSION
-e '/^#include <stdlib.h>/a\
#endif
' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 52: Next_Math_Prefix
+ # Fix 50: Next_Math_Prefix
#
- case "$file" in ./ansi/math.h )
- if ( test -n "`egrep '^extern.*double.*__const__.*' $file`"
+ case "${file}" in ./ansi/math.h )
+ if ( test -n "`egrep '^extern.*double.*__const__.*' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
next_math_prefix"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '/^extern.*double.*__const__.*sqrt(/s/__const__//' \
-e '/^extern.*double.*__const__.*fabs(/s/__const__//' \
-e '/^extern.*double.*__const__.*cos(/s/__const__//' \
-e '/^extern.*double.*__const__.*hypot(/s/__const__//' \
-e '/^extern.*double.*__const__.*sin(/s/__const__//' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 53: Next_Template
+ # Fix 51: Next_Template
#
- case "$file" in ./bsd/libc.h )
- if ( test -n "`egrep 'template' $file`"
+ case "${file}" in ./bsd/libc.h )
+ if ( test -n "`egrep 'template' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
next_template"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '/\(.*template\)/s/template//' \
-e '/extern.*volatile.*void.*abort/s/volatile//' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 54: Next_Volitile
+ # Fix 52: Next_Volitile
#
- case "$file" in ./ansi/stdlib.h )
- if ( test -n "`egrep 'volatile' $file`"
+ case "${file}" in ./ansi/stdlib.h )
+ if ( test -n "`egrep 'volatile' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
next_volitile"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '/extern.*volatile.*void.*exit/s/volatile//' \
-e '/extern.*volatile.*void.*abort/s/volatile//' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 55: Next_Wait_Union
+ # Fix 53: Next_Wait_Union
#
- case "$file" in ./sys/wait.h )
- if ( test -n "`egrep 'wait\\(union wait' $file`"
+ case "${file}" in ./sys/wait.h )
+ if ( test -n "`egrep 'wait\\(union wait' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
next_wait_union"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's@wait(union wait@wait(void@' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 56: Nodeent_Syntax
+ # Fix 54: Nodeent_Syntax
#
- case "$file" in ./netdnet/dnetdb.h )
+ case "${file}" in ./netdnet/dnetdb.h )
fixlist="${fixlist}
nodeent_syntax"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/char.*na_addr *$/char *na_addr;/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
esac
#
- # Fix 57: Osf_Namespace_A
+ # Fix 55: Osf_Namespace_A
#
- case "$file" in ./reg_types.h | \
+ case "${file}" in ./reg_types.h | \
./sys/lc_core.h )
- if ( test '(' -r reg_types.h-a -r sys/lc_core.h-a -n "`grep '} regex_t;' reg_types.h`"-a -z "`grep __regex_t regex.h`" ')'
+ if ( test '(' -r reg_types.h ')' -a \
+ '(' -r sys/lc_core.h ')' -a \
+ '(' -n "`grep '} regex_t;' reg_types.h`" ')' -a \
+ '(' -z "`grep __regex_t regex.h`" ')'
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
osf_namespace_a"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/regex_t/__regex_t/g' \
-e 's/regoff_t/__regoff_t/g' \
-e 's/regmatch_t/__regmatch_t/g' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 58: Osf_Namespace_B
+ # Fix 56: Osf_Namespace_B
#
- case "$file" in ./regex.h )
- if ( test '(' -r reg_types.h-a -r sys/lc_core.h-a -n "`grep '} regex_t;' reg_types.h`"-a -z "`grep __regex_t regex.h`" ')'
+ case "${file}" in ./regex.h )
+ if ( test '(' -r reg_types.h ')' -a \
+ '(' -r sys/lc_core.h ')' -a \
+ '(' -n "`grep '} regex_t;' reg_types.h`" ')' -a \
+ '(' -z "`grep __regex_t regex.h`" ')'
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
osf_namespace_b"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '/#include <reg_types.h>/a\
typedef __regex_t regex_t;\
typedef __regoff_t regoff_t;\
typedef __regmatch_t regmatch_t;
' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 59: Pthread_Page_Size
+ # Fix 57: Pthread_Page_Size
#
- case "$file" in ./pthread.h )
- if ( test -n "`egrep '^int __page_size' $file`"
+ case "${file}" in ./pthread.h )
+ if ( test -n "`egrep '^int __page_size' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
pthread_page_size"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/^int __page_size/extern int __page_size/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 60: Rs6000_Double
+ # Fix 58: Rs6000_Double
#
- case "$file" in ./math.h )
- if ( test -n "`egrep '[^a-zA-Z_]class\\(' $file`"
+ case "${file}" in ./math.h )
+ if ( test -n "`egrep '[^a-zA-Z_]class\\(' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
rs6000_double"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '/class[(]/i\
#ifndef __cplusplus
-e '/class[(]/a\
#endif
' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 61: Rs6000_Fchmod
+ # Fix 59: Rs6000_Fchmod
#
- case "$file" in ./sys/stat.h )
- if ( test -n "`egrep 'fchmod\\(char' $file`"
+ case "${file}" in ./sys/stat.h )
+ if ( test -n "`egrep 'fchmod\\(char' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
rs6000_fchmod"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/fchmod(char \*/fchmod(int/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 62: Rs6000_Param
+ # Fix 60: Rs6000_Param
#
- case "$file" in ./stdio.h | \
+ case "${file}" in ./stdio.h | \
./unistd.h )
fixlist="${fixlist}
rs6000_param"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's@rename(const char \*old, const char \*new)@rename(const char *_old, const char *_new)@' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
esac
#
- # Fix 63: Sony_Include
+ # Fix 61: Sony_Include
#
- case "$file" in ./machine/machparam.h )
- if ( test -n "`egrep '\"\\.\\./machine/endian.h\"' $file`"
+ case "${file}" in ./machine/machparam.h )
+ if ( test -n "`egrep '\"\\.\\./machine/endian.h\"' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
sony_include"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's@"../machine/endian.h"@<machine/endian.h>@' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 64: Statsswtch
+ # Fix 62: Statsswtch
#
- case "$file" in ./rpcsvc/rstat.h )
- if ( test -n "`egrep 'boottime$' $file`"
+ case "${file}" in ./rpcsvc/rstat.h )
+ if ( test -n "`egrep 'boottime$' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
statsswtch"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/boottime$/boottime;/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 65: Stdio_Va_List
+ # Fix 63: Stdio_Va_List
#
- case "$file" in ./stdio.h )
+ case "${file}" in ./stdio.h )
fixlist="${fixlist}
stdio_va_list"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
( if ( egrep "__need___va_list" $file ) > /dev/null 2>&1 ; then
:
else
-e 's@GNUC_VA_LIST@GNUC_Va_LIST@' \
-e 's@_NEED___VA_LIST@_NEED___Va_LIST@' \
-e 's@VA_LIST@DUMMY_VA_LIST@' \
- -e 's@_Va_LIST@_VA_LIST@' ) < $infile > ${DESTDIR}/$file.
+ -e 's@_Va_LIST@_VA_LIST@' ) < $infile > ${DESTDIR}/FIXINC.tmp
# Shell scripts have the potential of removing the output
# We interpret that to mean the file is not to be altered
#
- if test ! -f ${DESTDIR}/$file.
+ if test ! -f ${DESTDIR}/fixinc.tmp
then continue ; fi
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
esac
#
- # Fix 66: Sun_Bogus_Ifdef
+ # Fix 64: Sun_Bogus_Ifdef
#
- case "$file" in ./hsfs/hsfs_spec.h | \
+ case "${file}" in ./hsfs/hsfs_spec.h | \
./hsfs/iso_spec.h )
- if ( test -n "`egrep '#ifdef __i386__ || __vax__' $file`"
+ if ( test -n "`egrep '#ifdef __i386__ || __vax__' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
sun_bogus_ifdef"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/\#ifdef __i386__ || __vax__/\#if __i386__ || __vax__/g' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 67: Sun_Bogus_Ifdef_Sun4c
+ # Fix 65: Sun_Bogus_Ifdef_Sun4c
#
- case "$file" in ./hsfs/hsnode.h )
- if ( test -n "`egrep '#ifdef __i386__ || __sun4c__' $file`"
+ case "${file}" in ./hsfs/hsnode.h )
+ if ( test -n "`egrep '#ifdef __i386__ || __sun4c__' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
sun_bogus_ifdef_sun4c"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/\#ifdef __i386__ || __sun4c__/\#if __i386__ || __sun4c__/g' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 68: Sun_Catmacro
+ # Fix 66: Sun_Catmacro
#
- case "$file" in ./pixrect/memvar.h )
- if ( test -n "`egrep '^#define[ ]+CAT(a,b)' $file`"
+ case "${file}" in ./pixrect/memvar.h )
+ if ( test -n "`egrep '^#define[ ]+CAT(a,b)' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
sun_catmacro"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '/^#define[ ]CAT(a,b)/ i\
#ifdef __STDC__ \
-e '/^#define[ ]CAT(a,b)/ a\
#endif
' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 69: Sun_Malloc
+ # Fix 67: Sun_Malloc
#
- case "$file" in ./malloc.h )
+ case "${file}" in ./malloc.h )
fixlist="${fixlist}
sun_malloc"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/typedef[ ]char \* malloc_t/typedef void \* malloc_t/g' \
-e 's/int[ ][ ]*free/void free/g' \
-e 's/char\([ ]*\*[ ]*malloc\)/void\1/g' \
-e 's/char\([ ]*\*[ ]*realloc\)/void\1/g' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
esac
#
- # Fix 70: Sun_Memcpy
+ # Fix 68: Sun_Memcpy
#
- case "$file" in ./memory.h )
- if ( test -n "`egrep '/\\* @\\(#\\)(head/memory.h 50.1 |memory\\.h 1\\.[2-4] 8./../.. SMI; from S5R2 1\\.2 )\\*/' $file`"
+ case "${file}" in ./memory.h )
+ if ( test -n "`egrep '/\\* @\\(#\\)(head/memory.h 50.1 |memory\\.h 1\\.[2-4] 8./../.. SMI; from S5R2 1\\.2 )\\*/' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
sun_memcpy"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '1i\
/* This file was generated by fixincludes */\
#endif /* __memory_h__ */
' \
-e '1,$d' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 71: Sun_Rusers_Semi
+ # Fix 69: Sun_Rusers_Semi
#
- case "$file" in ./rpcsvc/rusers.h )
- if ( test -n "`egrep '_cnt$' $file`"
+ case "${file}" in ./rpcsvc/rusers.h )
+ if ( test -n "`egrep '_cnt$' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
sun_rusers_semi"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '/^struct/,/^};/s/_cnt$/_cnt;/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 72: Sun_Signal
+ # Fix 70: Sun_Signal
#
- case "$file" in ./sys/signal.h | \
+ case "${file}" in ./sys/signal.h | \
./signal.h )
- if ( test -n "`egrep '^void \\(\\*signal\\(\\)\\)\\(\\);' $file`"
+ if ( test -n "`egrep '^void \\(\\*signal\\(\\)\\)\\(\\);' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
sun_signal"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '/^void (\*signal())();$/i\
#ifdef __cplusplus\
-e '/^void (\*signal())();$/a\
#endif
' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 73: Sun_Auth_Proto
+ # Fix 71: Sun_Auth_Proto
#
- case "$file" in ./rpc/auth.h | \
+ case "${file}" in ./rpc/auth.h | \
./rpc/clnt.h | \
./rpc/svc.h | \
./rpc/xdr.h )
case "$target_canonical" in *-sun-* )
- if ( test -n "`egrep '\\(\\*[a-z][a-z_]*\\)\\(\\)' $file`" -a \
- -z "`egrep '\\(\\*[a-z][a-z_]*\\)\\([ ]*[a-zA-Z.].*\\)' $file`"
+ if ( test -n "`egrep '\\(\\*[a-z][a-z_]*\\)\\(\\)' ${file}`" -a \
+ -z "`egrep '\\(\\*[a-z][a-z_]*\\)\\([ ]*[a-zA-Z.].*\\)' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
sun_auth_proto"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/^\(.*(\*[a-z][a-z_]*)(\)\();.*\)/\
#ifdef __cplusplus\
#else\
\1\2\
#endif/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for machine type test
esac
#
- # Fix 74: Sunos_Large_Macro
- #
- case "$file" in ./sundev/ipi_error.h )
- fixlist="${fixlist}
- sunos_large_macro"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
- ( echo "Removing incorrect fix to SunOS <sundev/ipi_error.h>" >&2
-rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
-cat > /dev/null ) < $infile > ${DESTDIR}/$file.
-
- # Shell scripts have the potential of removing the output
- # We interpret that to mean the file is not to be altered
- #
- if test ! -f ${DESTDIR}/$file.
- then continue ; fi
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- ;; # case end for file name test
- esac
-
-
- #
- # Fix 75: Sunos_Matherr_Decl
+ # Fix 72: Sunos_Matherr_Decl
#
- case "$file" in ./math.h )
- if ( test '(' "`fgrep 'struct exception' $file | line`" != 'struct exception {' ')'
- ) > /dev/null 2>&1 ; then
+ case "${file}" in ./math.h )
fixlist="${fixlist}
sunos_matherr_decl"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
- sed -e '/matherr/i\
+ sed -e '/^struct exception/,$b' \
+ -e '/matherr/i\
struct exception;
' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
- fi # end of selection 'if'
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
esac
#
- # Fix 76: Sunos_Strlen
+ # Fix 73: Sunos_Strlen
#
- case "$file" in ./strings.h )
+ case "${file}" in ./strings.h )
fixlist="${fixlist}
sunos_strlen"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/int[ ]*strlen();/__SIZE_TYPE__ strlen();/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
esac
#
- # Fix 77: Systypes
+ # Fix 74: Systypes
#
- case "$file" in ./sys/types.h | \
+ case "${file}" in ./sys/types.h | \
./stdlib.h | \
./sys/stdtypes.h | \
./stddef.h | \
./memory.h | \
./unistd.h )
- if ( test -n "`egrep 'typedef[ ]+[a-z_][ a-z_]*[ ](size|ptrdiff|wchar)_t' $file`"
+ if ( test -n "`egrep 'typedef[ ]+[a-z_][ a-z_]*[ ](size|ptrdiff|wchar)_t' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
systypes"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '/^[ ]*\*[ ]*typedef unsigned int size_t;/N' \
-e 's/^\([ ]*\*[ ]*typedef unsigned int size_t;\n[ ]*\*\/\)/\1\
#endif
' \
-e 's/typedef[ ][ ]*[a-z_][ a-z_]*[ ]wchar_t/typedef __WCHAR_TYPE__ wchar_t/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 78: Systypes_For_Aix
+ # Fix 75: Systypes_For_Aix
#
- case "$file" in ./sys/types.h )
- if ( test -n "`egrep 'typedef[ ][ ]*[A-Za-z_][ A-Za-z_]*[ ]size_t' $file`" -a \
- -z "`egrep '_GCC_SIZE_T' $file`"
+ case "${file}" in ./sys/types.h )
+ if ( test -n "`egrep 'typedef[ ][ ]*[A-Za-z_][ A-Za-z_]*[ ]size_t' ${file}`" -a \
+ -z "`egrep '_GCC_SIZE_T' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
systypes_for_aix"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '/typedef[ ][ ]*[A-Za-z_][ A-Za-z_]*[ ]size_t/i\
#ifndef _GCC_SIZE_T\
-e '/typedef[ ][ ]*[A-Za-z_][ A-Za-z_]*[ ]size_t/a\
#endif
' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 79: Sysv68_String
+ # Fix 76: Sysv68_String
#
- case "$file" in ./string.h )
+ case "${file}" in ./string.h )
fixlist="${fixlist}
sysv68_string"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/extern[ ]*int[ ]*strlen();/extern unsigned int strlen();/' \
-e 's/extern[ ]*int[ ]*ffs[ ]*(long);/extern int ffs(int);/' \
\2/' \
-e '/^extern int$/N' \
-e 's/^extern int\(\n strlen(),\)/extern size_t\1/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
esac
#
- # Fix 80: Sysz_Stdlib_For_Sun
+ # Fix 77: Sysz_Stdlib_For_Sun
#
- case "$file" in ./stdlib.h )
- case "$target_canonical" in *-sun-* | \
- m88k-*-sysv3* )
+ case "${file}" in ./stdlib.h )
+ case "$target_canonical" in *-sun* | \
+ m88k-*sysv3* )
fixlist="${fixlist}
sysz_stdlib_for_sun"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/int abort/void abort/g' \
-e 's/int free/void free/g' \
-e '/typedef[ a-zA-Z_]*[ ]size_t[ ]*;/a\
#endif
' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for machine type test
esac
;; # case end for file name test
#
- # Fix 81: Sysz_Stdtypes_For_Sun
+ # Fix 78: Sysz_Stdtypes_For_Sun
#
- case "$file" in ./sys/stdtypes.h )
+ case "${file}" in ./sys/stdtypes.h )
fixlist="${fixlist}
sysz_stdtypes_for_sun"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '/[ ]size_t.*;/i\
#ifndef _GCC_SIZE_T\
-e '/[ ]wchar_t.*;/a\
#endif
' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
esac
#
- # Fix 82: Tinfo_Cplusplus
+ # Fix 79: Tinfo_Cplusplus
#
- case "$file" in ./tinfo.h )
+ case "${file}" in ./tinfo.h )
fixlist="${fixlist}
tinfo_cplusplus"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/[ ]_cplusplus/ __cplusplus/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
esac
#
- # Fix 83: Ultrix_Ansi_Compat
+ # Fix 80: Ultrix_Ansi_Compat
#
- case "$file" in ./ansi_compat.h )
- if ( test -n "`egrep 'ULTRIX' $file`"
+ case "${file}" in ./ansi_compat.h )
+ if ( test -n "`egrep 'ULTRIX' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
ultrix_ansi_compat"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '1i\
/* This file intentionally left blank. */
' \
-e '1,$d' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 84: Ultrix_Fix_Fixproto
+ # Fix 81: Ultrix_Fix_Fixproto
#
- case "$file" in ./sys/utsname.h )
- if ( test -n "`egrep 'ULTRIX' $file`"
+ case "${file}" in ./sys/utsname.h )
+ if ( test -n "`egrep 'ULTRIX' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
ultrix_fix_fixproto"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '/^[ ]*extern[ ]*int[ ]*uname();$/i\
struct utsname;
' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 85: Ultrix_Atof_Param
+ # Fix 82: Ultrix_Atof_Param
#
- case "$file" in ./math.h )
+ case "${file}" in ./math.h )
fixlist="${fixlist}
ultrix_atof_param"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's@atof(\([ ]*char[ ]*\*[^)]*\))@atof(const \1)@' \
-e 's@inline int abs(int [a-z][a-z]*) {.*}@extern "C" int abs(int);@' \
-e 's@inline double abs(double [a-z][a-z]*) {.*}@@' \
-e 's@inline int sqr(int [a-z][a-z]*) {.*}@@' \
-e 's@inline double sqr(double [a-z][a-z]*) {.*}@@' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
esac
#
- # Fix 86: Ultrix_Const
+ # Fix 83: Ultrix_Const
#
- case "$file" in ./stdio.h )
+ case "${file}" in ./stdio.h )
fixlist="${fixlist}
ultrix_const"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's@perror( char \*__s );@perror( const char *__s );@' \
-e 's@fputs( char \*__s,@fputs( const char *__s,@' \
-e 's@sscanf( char \*__s, char \*__format,@sscanf( const char *__s, const char *__format,@' \
-e 's@popen(char \*, char \*);@popen(const char *, const char *);@' \
-e 's@tempnam(char\*,char\*);@tempnam(const char*,const char*);@' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
esac
#
- # Fix 87: Ultrix_Ifdef
+ # Fix 84: Ultrix_Ifdef
#
- case "$file" in ./sys/file.h )
- if ( test -n "`egrep '#ifdef KERNEL' $file`"
+ case "${file}" in ./sys/file.h )
+ if ( test -n "`egrep '#ifdef KERNEL' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
ultrix_ifdef"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/#ifdef KERNEL/#if defined(KERNEL)/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 88: Ultrix_Nested_Cmnt
+ # Fix 85: Ultrix_Nested_Cmnt
#
- case "$file" in ./rpc/svc.h )
+ case "${file}" in ./rpc/svc.h )
fixlist="${fixlist}
ultrix_nested_cmnt"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's@^\( \* int protocol; \)/\*@\1*/ /*@' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
esac
#
- # Fix 89: Ultrix_Static
+ # Fix 86: Ultrix_Static
#
- case "$file" in ./machine/cpu.h )
- if ( test -n "`egrep '#include \"r[34]_cpu' $file`"
+ case "${file}" in ./machine/cpu.h )
+ if ( test -n "`egrep '#include \"r[34]_cpu' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
ultrix_static"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/^static struct tlb_pid_state/struct tlb_pid_state/' \
-e 's/^#include "r3_cpu\.h"$/#include <machine\/r3_cpu\.h>/' \
-e 's/^#include "r4_cpu\.h"$/#include <machine\/r4_cpu\.h>/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 90: Undefine_Null
+ # Fix 87: Undefine_Null
#
- if ( test -n "`egrep '^#[ ]*define[ ]*[ ]NULL[ ]' $file`" -a \
- -z "`egrep '#[ ]*(ifn|un)def[ ]*[ ]NULL($|[ ])' $file`"
+ if ( test -n "`egrep '^#[ ]*define[ ]*[ ]NULL[ ]' ${file}`" -a \
+ -z "`egrep '#[ ]*(ifn|un)def[ ]*[ ]NULL($|[ ])' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
undefine_null"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '/^#[ ]*define[ ][ ]*NULL[ ]/i\
#undef NULL
' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
#
- # Fix 91: Va_I960_Macro
+ # Fix 88: Va_I960_Macro
#
- case "$file" in ./arch/i960/archI960.h )
- if ( test -n "`egrep '__(vsiz|vali|vpad|alignof__)' $file`"
+ case "${file}" in ./arch/i960/archI960.h )
+ if ( test -n "`egrep '__(vsiz|vali|vpad|alignof__)' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
va_i960_macro"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/__vsiz/__vxvsiz/' \
-e 's/__vali/__vxvali/' \
-e 's/__vpad/__vxvpad/' \
-e 's/__alignof__/__vxalignof__/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 92: Void_Null
+ # Fix 89: Void_Null
#
- case "$file" in ./curses.h | \
+ case "${file}" in ./curses.h | \
./dbm.h | \
./locale.h | \
./stdio.h | \
./sys/dir.h | \
./sys/param.h | \
./sys/types.h )
- if ( test -n "`egrep '#[ ]*define[ ][ ]*NULL[ ].*void' $file`"
+ if ( test -n "`egrep '#[ ]*define[ ][ ]*NULL[ ].*void' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
void_null"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/^#[ ]*define[ ]*NULL[ ]*((void[ ]*\*)0)/#define NULL 0/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 93: Vxworks_Gcc_Problem
+ # Fix 90: Vxworks_Gcc_Problem
#
- case "$file" in ./types/vxTypesBase.h )
- if ( test -n "`egrep '__GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__' $file`"
+ case "${file}" in ./types/vxTypesBase.h )
+ if ( test -n "`egrep '__GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
vxworks_gcc_problem"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/#ifdef __GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__/#if 1/' \
-e '/[ ]size_t/i\
-e '/[ ]wchar_t/a\
#endif
' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 94: Vxworks_Needs_Vxtypes
+ # Fix 91: Vxworks_Needs_Vxtypes
#
- case "$file" in ./time.h )
- if ( test -n "`egrep 'uint_t[ ][ ]*_clocks_per_sec' $file`"
+ case "${file}" in ./time.h )
+ if ( test -n "`egrep 'uint_t[ ][ ]*_clocks_per_sec' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
vxworks_needs_vxtypes"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/uint_t/unsigned int/' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 95: Vxworks_Needs_Vxworks
+ # Fix 92: Vxworks_Needs_Vxworks
#
- case "$file" in ./sys/stat.h )
- if ( test -n "`egrep '#[ ]define[ ][ ]*__INCstath' $file`" -a \
- '(' -r types/vxTypesOld.h ')' -a \
- '(' -n "`fgrep '#include' $file`" ')' -a \
- '(' -n "`fgrep ULONG $file`" ')'
+ case "${file}" in ./sys/stat.h )
+ if ( test -n "`egrep '#[ ]define[ ][ ]*__INCstath' ${file}`" -a \
+ '(' -r types/vxTypesOld.h ')' -a \
+ '(' -n "`egrep '#include' $file`" ')' -a \
+ '(' -n "`egrep ULONG $file`" ')'
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
vxworks_needs_vxworks"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '/#[ ]define[ ][ ]*__INCstath/a\
#include <types/vxTypesOld.h>
' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 96: Vxworks_Time
+ # Fix 93: Vxworks_Time
#
- case "$file" in ./time.h )
- if ( test -n "`egrep 'VOIDFUNCPTR' $file`" -a \
- '(' -r vxWorks.h ')'
+ case "${file}" in ./time.h )
+ if ( test -n "`egrep 'VOIDFUNCPTR' ${file}`" -a \
+ '(' -r vxWorks.h ')'
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
vxworks_time"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '/VOIDFUNCPTR/i\
#ifndef __gcc_VOIDFUNCPTR_defined\
#endif
' \
-e 's/VOIDFUNCPTR/__gcc_VOIDFUNCPTR/g' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 97: X11_Class
+ # Fix 94: X11_Class
#
- case "$file" in ./X11/ShellP.h )
- if ( test -z "`egrep '__cplusplus' $file`"
+ case "${file}" in ./X11/ShellP.h )
+ if ( test -z "`egrep '__cplusplus' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
x11_class"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '/char \*class;/i\
#ifdef __cplusplus\
-e '/char \*class;/a\
#endif
' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 98: X11_Class_Usage
+ # Fix 95: X11_Class_Usage
#
- case "$file" in ./Xm/BaseClassI.h )
- if ( test -z "`egrep '__cplusplus' $file`"
+ case "${file}" in ./Xm/BaseClassI.h )
+ if ( test -z "`egrep '__cplusplus' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
x11_class_usage"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's/ class[)]/ c_class)/g' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 99: X11_New
+ # Fix 96: X11_New
#
- case "$file" in ./Xm/Traversal.h )
- if ( test -z "`egrep '__cplusplus' $file`"
+ case "${file}" in ./Xm/Traversal.h )
+ if ( test -z "`egrep '__cplusplus' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
x11_new"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e '/Widget old, new;/i\
#ifdef __cplusplus\
#endif
' \
-e 's/Widget new,/Widget c_new,/g' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 100: X11_Sprintf
+ # Fix 97: X11_Sprintf
#
- case "$file" in ./X11*/Xmu.h )
+ case "${file}" in ./X11*/Xmu.h )
fixlist="${fixlist}
x11_sprintf"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
sed -e 's,^extern char \* sprintf();$,#ifndef __STDC__\
extern char * sprintf();\
#endif /* !defined __STDC__ */,' \
- < $infile > ${DESTDIR}/$file.
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ < $infile > ${DESTFILE}.
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
esac
#
- # Fix 101: Zzz_Ki_Iface
+ # Fix 98: Zzz_Ki_Iface
#
- case "$file" in ./sys/ki_iface.h )
- if ( test -n "`egrep 'These definitions are for HP Internal developers' $file`"
+ case "${file}" in ./sys/ki_iface.h )
+ if ( test -n "`egrep 'These definitions are for HP Internal developers' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
zzz_ki_iface"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
- ( echo "Removing incorrect fix to HP-UX <$file>" >&2
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
+ ( echo "Removing incorrect fix to <$file>" >&2
rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
-cat > /dev/null ) < $infile > ${DESTDIR}/$file.
+cat > /dev/null ) < $infile > ${DESTDIR}/FIXINC.tmp
# Shell scripts have the potential of removing the output
# We interpret that to mean the file is not to be altered
#
- if test ! -f ${DESTDIR}/$file.
+ if test ! -f ${DESTDIR}/fixinc.tmp
then continue ; fi
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 102: Zzz_Ki
+ # Fix 99: Zzz_Ki
#
- case "$file" in ./sys/ki.h )
- if ( test -n "`egrep '11.00 HP-UX LP64' $file`"
+ case "${file}" in ./sys/ki.h )
+ if ( test -n "`egrep '11.00 HP-UX LP64' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
zzz_ki"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
- ( echo "Removing incorrect fix to HP-UX <$file>" >&2
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
+ ( echo "Removing incorrect fix to <$file>" >&2
rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
-cat > /dev/null ) < $infile > ${DESTDIR}/$file.
+cat > /dev/null ) < $infile > ${DESTDIR}/FIXINC.tmp
# Shell scripts have the potential of removing the output
# We interpret that to mean the file is not to be altered
#
- if test ! -f ${DESTDIR}/$file.
+ if test ! -f ${DESTDIR}/fixinc.tmp
then continue ; fi
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 103: Zzz_Ki_Calls
+ # Fix 100: Zzz_Ki_Calls
#
- case "$file" in ./sys/ki_calls.h )
- if ( test -n "`egrep 'KI_MAX_PROCS is an arbitrary number' $file`"
+ case "${file}" in ./sys/ki_calls.h )
+ if ( test -n "`egrep 'KI_MAX_PROCS is an arbitrary number' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
zzz_ki_calls"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
- ( echo "Removing incorrect fix to HP-UX <$file>" >&2
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
+ ( echo "Removing incorrect fix to <$file>" >&2
rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
-cat > /dev/null ) < $infile > ${DESTDIR}/$file.
+cat > /dev/null ) < $infile > ${DESTDIR}/FIXINC.tmp
# Shell scripts have the potential of removing the output
# We interpret that to mean the file is not to be altered
#
- if test ! -f ${DESTDIR}/$file.
+ if test ! -f ${DESTDIR}/fixinc.tmp
then continue ; fi
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 104: Zzz_Ki_Defs
+ # Fix 101: Zzz_Ki_Defs
#
- case "$file" in ./sys/ki_defs.h )
- if ( test -n "`egrep 'Kernel Instrumentation Definitions' $file`"
+ case "${file}" in ./sys/ki_defs.h )
+ if ( test -n "`egrep 'Kernel Instrumentation Definitions' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
zzz_ki_defs"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
- ( echo "Removing incorrect fix to HP-UX <$file>" >&2
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
+ ( echo "Removing incorrect fix to <$file>" >&2
rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
-cat > /dev/null ) < $infile > ${DESTDIR}/$file.
+cat > /dev/null ) < $infile > ${DESTDIR}/FIXINC.tmp
# Shell scripts have the potential of removing the output
# We interpret that to mean the file is not to be altered
#
- if test ! -f ${DESTDIR}/$file.
+ if test ! -f ${DESTDIR}/fixinc.tmp
then continue ; fi
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
#
- # Fix 105: Zzz_Time
+ # Fix 102: Zzz_Bad_Fixes
+ #
+ case "${file}" in ./sundev/ipi_error.h )
+ fixlist="${fixlist}
+ zzz_bad_fixes"
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
+ ( echo "Removing incorrect fix to <$file>" >&2
+rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
+cat > /dev/null ) < $infile > ${DESTDIR}/FIXINC.tmp
+
+ # Shell scripts have the potential of removing the output
+ # We interpret that to mean the file is not to be altered
+ #
+ if test ! -f ${DESTDIR}/fixinc.tmp
+ then continue ; fi
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
+ ;; # case end for file name test
+ esac
+
+
+ #
+ # Fix 103: Zzz_Time
#
- case "$file" in ./sys/time.h )
- if ( test -n "`egrep 'For CASPEC, look in' $file`"
+ case "${file}" in ./sys/time.h )
+ if ( test -n "`egrep 'For CASPEC, look in' ${file}`"
) > /dev/null 2>&1 ; then
fixlist="${fixlist}
zzz_time"
- if [ ! -r ${DESTDIR}/$file ]
- then infile=$file
- else infile=${DESTDIR}/$file ; fi
- ( echo "Removing incorrect fix to HP-UX <$file>" >&2
+ if [ ! -r ${DESTFILE} ]
+ then infile=${file}
+ else infile=${DESTFILE} ; fi
+ ( echo "Removing incorrect fix to <$file>" >&2
rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
-cat > /dev/null ) < $infile > ${DESTDIR}/$file.
+cat > /dev/null ) < $infile > ${DESTDIR}/FIXINC.tmp
# Shell scripts have the potential of removing the output
# We interpret that to mean the file is not to be altered
#
- if test ! -f ${DESTDIR}/$file.
+ if test ! -f ${DESTDIR}/fixinc.tmp
then continue ; fi
-
- mv -f ${DESTDIR}/$file. ${DESTDIR}/$file
+ rm -f ${DESTFILE}
+ mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
;; # case end for file name test
esac
# THEN ensure the output is gone
# ELSE look for local directory include syntax
#
- if ( test ! -f ${DESTDIR}/$file || \
- cmp $file ${DESTDIR}/$file ) > /dev/null 2>&1
+ if ( test ! -f ${DESTFILE} || \
+ cmp ${file} ${DESTFILE} ) > /dev/null 2>&1
then
- rm -f ${DESTDIR}/$file
+ rm -f ${DESTFILE}
else
- echo "Fixed $file:${fixlist}"
+ echo "Fixed ${file}:${fixlist}"
# Find any include directives that use "file".
#
+ dir=`echo ${file} | sed -e s';/[^/]*$;;'`
+ ddir=`echo ${DESTDIR} | sed 's;/[^/]*$;;'`/$dir
+
for include in `
- egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${DESTDIR}/$file |
- sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`
+ egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${DESTFILE} |
+ sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`
do
- dir=`echo $file | sed -e s'|/[^/]*$||'`
- required="$required ${SRCDIR} $dir/$include ${DESTDIR}/$dir/$include"
+ required="$required ${SRCDIR} $dir/$include ${ddir}/$include"
done
fi
done # for file in $files
echo 'Removing unneeded directories:'
cd $LIB
-files=`find . -type d -print | sort -r`
-for file in $files; do
+all_dirs=`find . -type d -print | sort -r`
+for file in $all_dirs; do
rmdir $LIB/$file > /dev/null 2>&1 | :
done
projects / gcc.git / commitdiff