Merge branch 'master' into utf8-conversion

cde/config/cf/DtInfo.tmpl

@@ -412,7 +412,7 @@ TEMPLATE_OBJS=TemplateDB//**/*.o
 
 #define TemplateObjs $(TEMPLATE_OBJS)
 
-#if defined(i386Architecture) || defined(AMD64Architecture) || defined(AlphaArchitecture) || defined(ARMArchitecture)
+#if defined(i386Architecture) || defined(AMD64Architecture) || defined(AlphaArchitecture) || defined(ARMArchitecture) || defined(AArch64Architecture)
 # define ByteOrderDefines LittleEndianDefines
 #elif defined(HAL32V7Architecture) || defined(SunArchitecture) || defined(AIXArchitecture) || defined(HPArchitecture)
 # define ByteOrderDefines BigEndianDefines

cde/config/cf/Imake.cf

@@ -79,7 +79,7 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
 #   undef amd64
 # endif
 # if defined(__arm__)
-#   define Arm32Architecture
+#   define ARMArchitecture
 #   undef __arm__
 #   if defined(zaurus)
 #     undef zaurus
@@ -474,14 +474,19 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
 #   define AMD64Architecture
 #  endif
 # endif
-# if defined(__arm__)
-# undef __arm__
+# if defined(__arm__) || defined(__arm32__)
 # define ARMArchitecture
+#   undef __arm__
+#   undef __arm32__
 # endif
 # if defined(__sparc__) || defined(sparc)
 # define SparcArchitecture
 # undef sparc
 # endif
+# if defined(__aarch64__)
+#   define AArch64Architecture
+#   undef __aarch64__
+# endif
 #endif /* linux */
 
 #if defined(sequent) || defined(_SEQUENT_)

cde/config/cf/linux.cf

@@ -238,6 +238,16 @@ TIRPCINC =
 # endif
 #endif /* AMD64Architecture */
 
+#ifdef AArch64Architecture
+# ifndef OptimizedCDebugFlags
+#  define OptimizedCDebugFlags -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -g -fno-strict-aliasing
+# endif
+# define LinuxMachineDefines   -D__aarch64__
+# define ServerOSDefines   XFree86ServerOSDefines -DDDXTIME
+# define ServerExtraDefines    -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
+#endif /* AArch64Architecture */
+
+
 #ifdef PpcArchitecture
 # ifndef OptimizedCDebugFlags
 #  define OptimizedCDebugFlags    DefaultGcc2i386Opt

cde/config/imake/imake.c

@@ -824,7 +824,7 @@ get_distrib(FILE *inFile)
 {
   struct stat sb;
 
-  static char* yast = "/sbin/YaST";
+  static char* yast = "/sbin/yast";
   static char* redhat = "/etc/redhat-release";
 
   fprintf (inFile, "%s\n", "#define LinuxUnknown    0");

cde/databases/CDE-RUN.udb

@@ -461,7 +461,7 @@ programs/dtsession/sys.font.iso
 programs/dtprintinfo/dtprintinfo
 { default
 	install_target = /usr/dt/bin/dtprintinfo
-	mode = 04555
+	mode = 0555
 	owner = root
 }
 #

cde/lib/DtHelp/Layout.c

@@ -2379,7 +2379,7 @@ ProcessTable(
 	    /*
 	     * are any alignment characters specified?
 	     */
-	    if (NULL != alignCharacters && '\0' != alignCharacters)
+	    if (NULL != alignCharacters && '\0' != *alignCharacters)
 	      {
 		int len = mblen(alignCharacters, MB_CUR_MAX);
 
@@ -3865,8 +3865,7 @@ ProcessContainer(
 		 * check to see if the character is 'valid'.
 		 * if not, default out of JUSTIFY_CHAR
 		 */
-		if (NULL != layout->info.align_char ||
-					'\0' == layout->info.align_char)
+		if ( (NULL != layout->info.align_char) && ( '\0' != *layout->info.align_char)) 
 		    layout->txt_justify = _DtCvJUSTIFY_LEFT;
 	      }
 	  }

cde/lib/tt/mini_isam/isfname.c

@@ -111,7 +111,7 @@ _removelast(char *path)
 char *
 _lastelement(char *path)
 {
-    register	char	*p;
+    char	*p;
     
     p = path + strlen(path);
 

cde/programs/dtcm/dtcm/group_editor.c

@@ -1685,13 +1685,14 @@ add_to_gaccess_list(
 	char		access, *buf;
 	XmString	xmstr;
 	Calendar	*c;
-	Props_pu	*p = (Props_pu *)ge->cal->properties_pu;
+	Props_pu	*p;
 	Access_data	*new_data = NULL;
 
 	if (!ge)
 		return;
 
 	c = ge->cal;
+	p = (Props_pu *)c->properties_pu;
 
 	while (ge->access_data && cnt <= ge->access_data->count) {
 		new_data = (Access_data *)

cde/programs/dtcm/dtcm/misc.c

@@ -621,8 +621,8 @@ cm_mbstrlen(char *s) {
 */
 extern char *
 cm_mbchar(char *str) {
-     static char *string;
-     static char *string_head;
+     static char *string = NULL;
+     static char *string_head = NULL;
      static char *buf = NULL;
      int num_byte = 0;
  
@@ -639,10 +639,11 @@ cm_mbchar(char *str) {
           free(buf);
           buf = NULL;
      }
-     if ( string == '\0' ) {
+     if ( *string == '\0' ) {
           free(string_head);
           string_head = NULL;
-     } else {
+          string      = NULL;
+     } else if (string != NULL) {
           num_byte = mblen(string, MB_LEN_MAX);
           if(num_byte > 0) {
                buf = (char *)malloc(num_byte+1);

cde/programs/dtcm/dtcm/rfp.c

@@ -214,7 +214,7 @@ rfp_apply_proc(Widget w, XtPointer client_data, XtPointer cbs) {
 	char			*str, buf[128];
 	XmString		xmstr;
         Calendar 		*c;
-	Props_pu		*pu = (Props_pu *)c->properties_pu;
+	Props_pu		*pu;
 	Repeat_scope_menu_op	op = REPEAT_DAYS;
 	char			*repeat_str;
 
@@ -222,6 +222,7 @@ rfp_apply_proc(Widget w, XtPointer client_data, XtPointer cbs) {
 		return;
 
 	c = rfp->cal;
+	pu = (Props_pu *)c->properties_pu;
 
 	str = XmTextGetString(rfp->repeat_popup_text);
 

cde/programs/dtcm/libDtCmP/props.c

@@ -269,7 +269,7 @@ extern char*
 get_char_prop(Props *p, Props_op op) {
 	Props_entry	*step = p_get_props_entry(p, op);
 
-	if (!step || !step->property_value || step->property_value == '\0')
+	if (!step || !step->property_value || *step->property_value == '\0')
 		return get_char_prop_default(op);
 	return (step->property_value);
 }
@@ -315,7 +315,7 @@ extern int
 get_int_prop(Props *p, Props_op op) {
 	Props_entry	*step = p_get_props_entry(p, op);
 
-	if (!step || !step->property_value || step->property_value == '\0')
+	if (!step || !step->property_value || *step->property_value == '\0')
 		return (atoi(get_char_prop_default(op)));
 	return (atoi(step->property_value));
 }

cde/programs/dtdocbook/instant/Imakefile

@@ -7,9 +7,16 @@ TCLLIB = -ltcl
 
 #if defined(LinuxArchitecture)
 TCLINC = -I/usr/include/tcl
+#if DefaultLinuxDistribution == LinuxSuSE
+TCLLIB = -ltcl8.6
+#endif
+
 #elif defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
 TCLINC = -I/usr/local/include/tcl8.6
 TCLLIB = -ltcl86
+#elif defined(NetBSDArchitecture)
+TCLINC = -I/usr/pkg/include/tcl
+TCLLIB = -ltcl86
 #endif
 
 #if defined(TCLInc)

cde/programs/dtksh/ksh93/ship/shipfeature.sh

@@ -435,7 +435,7 @@ $1"
 	?*)	z=$lib
 		e=
 		lib=
-		echo "main(){return(0);}" > $tmp.c
+		echo "int main(){return(0);}" > $tmp.c
 		for x in $z
 		do	case $x in
 			-)	case $lib in
@@ -854,7 +854,7 @@ extern int $v;
 #endif"
 					;;
 				esac
-				echo "main(){char* i = (char*)&$v; return i!=0;}"
+				echo "int main(){char* i = (char*)&$v; return i!=0;}"
 				} > $tmp.c
 				$cc -c $tmp.c <&$nullin >&$nullout &&
 				rm -f $tmp.exe
@@ -1109,7 +1109,7 @@ static struct xxx v;
 struct xxx* f() { return &v; }"
 					;;
 				esac
-				echo "main() { f(); return 0; }"
+				echo "int main() { f(); return 0; }"
 				} > $tmp.c
 				rm -f $tmp.exe
 				if	$cc -o $tmp.exe $tmp.c <&$nullin >&$nullout &&

cde/programs/dtksh/ksh93/ship/shipiffe.sh

@@ -584,7 +584,7 @@ do	case $in in
 	?*)	z=$lib
 		e=
 		lib=
-		echo "main(){return(0);}" > $tmp.c
+		echo "int main(){return(0);}" > $tmp.c
 		for x in $z
 		do	case $x in
 			-)	case $lib in
@@ -947,13 +947,13 @@ $usr
 _BEGIN_EXTERNS_
 extern int $statictest;
 _END_EXTERNS_
-main(){char* i = (char*)&$statictest; return i!=0;}" > $tmp.c
+int main(){char* i = (char*)&$statictest; return i!=0;}" > $tmp.c
 					rm -f $tmp.exe
 					if	$cc -o $tmp.exe $tmp.c <&$nullin >&$nullout && $executable $tmp.exe
 					then	case $static in
 						.)	static=
 							echo '#include <stdio.h>
-main(){printf("hello");return(0);}' > $tmp.c
+int main(){printf("hello");return(0);}' > $tmp.c
 							rm -f $tmp.exe
 							if	$cc -c $tmp.c <&$nullin >&$nullout && $cc -o $tmp.exe $tmp.o <&$nullin >&$nullout 2>$tmp.e && $executable $tmp.exe
 							then	e=`wc -l $tmp.e`
@@ -1038,7 +1038,7 @@ extern int $v;
 _END_EXTERNS_"
 					;;
 				esac
-				echo "main(){char* i = (char*)&$v; return i!=0;}"
+				echo "int main(){char* i = (char*)&$v; return i!=0;}"
 				} > $tmp.c
 				$cc -c $tmp.c <&$nullin >&$nullout &&
 				rm -f $tmp.exe
@@ -1145,7 +1145,7 @@ $inc
 _BEGIN_EXTERNS_
 extern int $v();
 _END_EXTERNS_
-static int ((*i)())=$v;main(){return(i==0);}" > $tmp.c
+static int ((*i)())=$v;int main(){return(i==0);}" > $tmp.c
 				$cc -c $tmp.c <&$nullin >&$nullout &&
 				rm -f $tmp.exe
 				if	$cc $static -o $tmp.exe $tmp.o $lib $deflib <&$nullin >&$nullout && $executable $tmp.exe
@@ -1389,7 +1389,7 @@ static struct xxx v;
 struct xxx* f() { return &v; }"
 					;;
 				esac
-				echo "main() { f(); return 0; }"
+				echo "int main() { f(); return 0; }"
 				} > $tmp.c
 				rm -f $tmp.exe
 				if	$cc -o $tmp.exe $tmp.c $lib $deflib <&$nullin >&$nullout &&

cde/programs/dtksh/ksh93/ship/shipin

@@ -262,7 +262,7 @@ $INSTALLROOT/bin/cc)
 		;;
 	*)	_ship_probe_PATH=$PATH
 		case $CC in
-		"")	echo 'main() { return 0; }' > ${_tmp_}0.c
+		"")	echo 'int main() { return 0; }' > ${_tmp_}0.c
 			cat > $_tmp_.c <<'!'
 #include <stdio.h>
 #include <limits.h>
@@ -383,7 +383,7 @@ glue(i, nt)
 #else
 int
 #endif
-main(int argc, char** argv) { return 0; }
+int main(int argc, char** argv) { return 0; }
 #endif
 " > $_tmp_.c
 		if	$CC $CCFLAGS -c $_tmp_.c >/dev/null 2>&1
@@ -400,7 +400,7 @@ main(int argc, char** argv) { return 0; }
 		echo "#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-main() { return socket(0, 0, 0); }" > $_tmp_.c
+int main() { return socket(0, 0, 0); }" > $_tmp_.c
 		for i in "" "-systype bsd43"
 		do	if	$CC $CCFLAGS $i -o $_tmp_.exe $_tmp_.c >/dev/null 2>&1
 			then	case $i in
@@ -1308,13 +1308,13 @@ case $_read_ in
 	eval `(
 	mkdir /tmp/mam$$
 	cd /tmp/mam$$
-	echo 'main(){return 0;}' > main.c
+	echo 'int main(){return 0;}' > main.c
 	if	$CC -c main.c >/dev/null 2>&1
 	then	if	$CC -L. main.o -lc >/dev/null 2>&1
 		then	$CC -L. main.o -lc > libc.a >/dev/null 2>&1 || echo "mam_cc_L=' '"
 		fi
 	fi
-	echo "int f(){return(0);} main(){return(f());}" > pic.c
+	echo "int f(){return(0);} int main(){return(f());}" > pic.c
 	if	$CC -c pic.c >/dev/null 2>e
 	then	e=\`wc -l e\`
 		s=\`wc pic.o\`

cde/programs/dtksh/ksh93/ship/shipop.c

@@ -260,8 +260,7 @@ static struct optab ops[] =
 	"xap",		shipxap,
 };
 
-int
-main __PARAM__((int argc, char** argv), (argc, argv)) __OTORP__(int argc; char** argv;){
+int main __PARAM__((int argc, char** argv), (argc, argv)) __OTORP__(int argc; char** argv;){
 	char*	s;
 	int	i;
 

cde/programs/dtksh/ksh93/ship/shipproto.c

@@ -4929,8 +4929,7 @@ proto __PARAM__((char* file, char* notice, int flags), (file, notice, flags)) __
 	return(flags);
 }
 
-int
-main __PARAM__((int argc, char** argv), (argc, argv)) __OTORP__(int argc; char** argv;){
+int main __PARAM__((int argc, char** argv), (argc, argv)) __OTORP__(int argc; char** argv;){
 	char*		b;
 	char*		file;
 	int		fd;

cde/programs/dtksh/ksh93/src/cmd/ksh93/Mamfile

@@ -41,12 +41,12 @@ make sh/main.c
 make FEATURE/externs implicit
 make features/externs
 done features/externs
-setv mam_libm `(set -; cd /tmp; echo 'main(){return(0);}' > x.${!-$$}.c; ${CC} ${CCFLAGS}    -o x.${!-$$}.x x.${!-$$}.c -lm >/dev/null 2>&1 && echo ' -lm'; rm -f x.${!-$$}.[cox])`
-setv mam_libjobs `(set -; cd /tmp; echo 'main(){return(0);}' > x.${!-$$}.c; ${CC} ${CCFLAGS}    -o x.${!-$$}.x x.${!-$$}.c -ljobs >/dev/null 2>&1 && echo ' -ljobs'; rm -f x.${!-$$}.[cox])`
-setv mam_libi `(set -; cd /tmp; echo 'main(){return(0);}' > x.${!-$$}.c; ${CC} ${CCFLAGS}    -o x.${!-$$}.x x.${!-$$}.c -li >/dev/null 2>&1 && echo ' -li'; rm -f x.${!-$$}.[cox])`
-setv mam_libdl `(set -; cd /tmp; echo 'main(){return(0);}' > x.${!-$$}.c; ${CC} ${CCFLAGS}    -o x.${!-$$}.x x.${!-$$}.c -ldl >/dev/null 2>&1 && echo ' -ldl'; rm -f x.${!-$$}.[cox])`
-setv mam_libdld `(set -; cd /tmp; echo 'main(){return(0);}' > x.${!-$$}.c; ${CC} ${CCFLAGS}    -o x.${!-$$}.x x.${!-$$}.c -ldld >/dev/null 2>&1 && echo ' -ldld'; rm -f x.${!-$$}.[cox])`
-setv mam_libintl `(set -; cd /tmp; echo 'main(){return(0);}' > x.${!-$$}.c; ${CC} ${CCFLAGS}    -o x.${!-$$}.x x.${!-$$}.c -lintl >/dev/null 2>&1 && echo ' -lintl'; rm -f x.${!-$$}.[cox])`
+setv mam_libm `(set -; cd /tmp; echo 'int main(){return(0);}' > x.${!-$$}.c; ${CC} ${CCFLAGS}    -o x.${!-$$}.x x.${!-$$}.c -lm >/dev/null 2>&1 && echo ' -lm'; rm -f x.${!-$$}.[cox])`
+setv mam_libjobs `(set -; cd /tmp; echo 'int main(){return(0);}' > x.${!-$$}.c; ${CC} ${CCFLAGS}    -o x.${!-$$}.x x.${!-$$}.c -ljobs >/dev/null 2>&1 && echo ' -ljobs'; rm -f x.${!-$$}.[cox])`
+setv mam_libi `(set -; cd /tmp; echo 'int main(){return(0);}' > x.${!-$$}.c; ${CC} ${CCFLAGS}    -o x.${!-$$}.x x.${!-$$}.c -li >/dev/null 2>&1 && echo ' -li'; rm -f x.${!-$$}.[cox])`
+setv mam_libdl `(set -; cd /tmp; echo 'int main(){return(0);}' > x.${!-$$}.c; ${CC} ${CCFLAGS}    -o x.${!-$$}.x x.${!-$$}.c -ldl >/dev/null 2>&1 && echo ' -ldl'; rm -f x.${!-$$}.[cox])`
+setv mam_libdld `(set -; cd /tmp; echo 'int main(){return(0);}' > x.${!-$$}.c; ${CC} ${CCFLAGS}    -o x.${!-$$}.x x.${!-$$}.c -ldld >/dev/null 2>&1 && echo ' -ldld'; rm -f x.${!-$$}.[cox])`
+setv mam_libintl `(set -; cd /tmp; echo 'int main(){return(0);}' > x.${!-$$}.c; ${CC} ${CCFLAGS}    -o x.${!-$$}.x x.${!-$$}.c -lintl >/dev/null 2>&1 && echo ' -lintl'; rm -f x.${!-$$}.[cox])`
 setv mam_libast ${mam_cc_L+-last}${mam_cc_L-${INSTALLROOT}/lib/libast.a}
 exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_cc_static} ${mam_libm} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libjobs} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libi} ${mam_cc_dynamic} ${mam_libdl} ${mam_libdld} ${mam_cc_static} ${mam_libintl} ${mam_cc_dynamic} ${mam_libast} : run features/externs
 done FEATURE/externs generated

cde/programs/dtksh/ksh93/src/cmd/ksh93/bltins/test.c

@@ -242,7 +242,7 @@ static char *nxtarg __PARAM__((int mt), (mt)) __OTORP__(int mt;){
 }
 
 
-static e3 __PARAM__((void), ()){
+static int e3 __PARAM__((void), ()){
 	char *arg, *cp;
 	int op;
 	char *binop;
@@ -419,7 +419,7 @@ int test_unop __PARAM__((int op,const char *arg), (op, arg)) __OTORP__(int op;co
 	}
 }
 
-test_binop __PARAM__((int op,const char *left,const char *right), (op, left, right)) __OTORP__(int op;const char *left;const char *right;){
+int test_binop __PARAM__((int op,const char *left,const char *right), (op, left, right)) __OTORP__(int op;const char *left;const char *right;){
 	double lnum,rnum;
 	if(op&TEST_ARITH)
 	{
@@ -484,7 +484,7 @@ static time_t test_time __PARAM__((const char *file1,const char *file2), (file1,
  * return true if inode of two files are the same
  */
 
-test_inode __PARAM__((const char *file1,const char *file2), (file1, file2)) __OTORP__(const char *file1;const char *file2;){
+int test_inode __PARAM__((const char *file1,const char *file2), (file1, file2)) __OTORP__(const char *file1;const char *file2;){
 	struct stat stat1,stat2;
 	if(test_stat(file1,&stat1)>=0  && test_stat(file2,&stat2)>=0)
 		if(stat1.st_dev == stat2.st_dev && stat1.st_ino == stat2.st_ino)
@@ -498,7 +498,7 @@ test_inode __PARAM__((const char *file1,const char *file2), (file1, file2)) __OT
  * The static buffer statb is shared with test_mode.
  */
 
-sh_access __PARAM__((const char *name, int mode), (name, mode)) __OTORP__(const char *name; int mode;){
+int sh_access __PARAM__((const char *name, int mode), (name, mode)) __OTORP__(const char *name; int mode;){
 	if(*name==0)
 		return(-1);
 	if(strmatch(name,(char*)e_devfdNN))

cde/programs/dtksh/ksh93/src/cmd/ksh93/edit/completion.c

@@ -127,7 +127,7 @@ static char *overlay __PARAM__((char *str,const char *newstr), (str, newstr)) __
  * mode is '=' cause files to be listed in select format
  */
 
-ed_expand __PARAM__((char outbuff[],int *cur,int *eol,int mode), (outbuff, cur, eol, mode)) __OTORP__(char outbuff[];int *cur;int *eol;int mode;){
+int ed_expand __PARAM__((char outbuff[],int *cur,int *eol,int mode), (outbuff, cur, eol, mode)) __OTORP__(char outbuff[];int *cur;int *eol;int mode;){
 	int offset = staktell();
 	char *staksav = stakptr(0);
 	struct comnod  *comptr = (struct comnod*)stakalloc(sizeof(struct comnod));
@@ -335,7 +335,7 @@ ed_expand __PARAM__((char outbuff[],int *cur,int *eol,int mode), (outbuff, cur,
  * look for edit macro named _i
  * if found, puts the macro definition into lookahead buffer and returns 1
  */
-ed_macro __PARAM__((int i), (i)) __OTORP__(int i;){
+int ed_macro __PARAM__((int i), (i)) __OTORP__(int i;){
 	char *out;
 	Namval_t *np;
 	genchar buff[LOOKAHEAD+1];
@@ -368,7 +368,7 @@ ed_macro __PARAM__((int i), (i)) __OTORP__(int i;){
 /*
  * Enter the fc command on the current history line
  */
-ed_fulledit __PARAM__((void), ()){
+int ed_fulledit __PARAM__((void), ()){
 	char *cp;
 	if(!sh.hist_ptr)
 		return(-1);

cde/programs/dtksh/ksh93/src/cmd/ksh93/edit/edit.c

@@ -274,7 +274,7 @@ void tty_cooked __PARAM__((int fd), (fd)) __OTORP__(int fd;){
  *
 }*/
 
-tty_raw __PARAM__((int fd, int echo), (fd, echo)) __OTORP__(int fd; int echo;){
+int tty_raw __PARAM__((int fd, int echo), (fd, echo)) __OTORP__(int fd; int echo;){
 #ifdef L_MASK
 	struct ltchars lchars;
 #endif	/* L_MASK */
@@ -431,7 +431,7 @@ tty_alt __PARAM__((int fd), (fd)) __OTORP__(int fd;){
 #	    define IEXTEN	0
 #	endif /* IEXTEN */
 
-tty_alt __PARAM__((int fd), (fd)) __OTORP__(int fd;){
+int tty_alt __PARAM__((int fd), (fd)) __OTORP__(int fd;){
 	switch(editb.e_raw)
 	{
 	    case ECHOMODE:
@@ -933,7 +933,7 @@ void	ed_putchar __PARAM__((int c), (c)) __OTORP__(int c;){
  * copy virtual to physical and return the index for cursor in physical buffer
  */
 
-ed_virt_to_phys __PARAM__((genchar *virt,genchar *phys,int cur,int voff,int poff), (virt, phys, cur, voff, poff)) __OTORP__(genchar *virt;genchar *phys;int cur;int voff;int poff;){
+int ed_virt_to_phys __PARAM__((genchar *virt,genchar *phys,int cur,int voff,int poff), (virt, phys, cur, voff, poff)) __OTORP__(genchar *virt;genchar *phys;int cur;int voff;int poff;){
 	genchar *sp = virt;
 	genchar *dp = phys;
 	int c;
@@ -1107,7 +1107,7 @@ int	ed_genlen __PARAM__((const genchar *str), (str)) __OTORP__(const genchar *st
  * returns 1 if string in not in this format, 0 otherwise.
  */
 
-ed_setwidth __PARAM__((const char *string), (string)) __OTORP__(const char *string;){
+int ed_setwidth __PARAM__((const char *string), (string)) __OTORP__(const char *string;){
 	int indx = 0;
 	int state = 0;
 	int c;

cde/programs/dtksh/ksh93/src/cmd/ksh93/edit/emacs.c

@@ -189,7 +189,7 @@ static void xcommands __PROTO__((int));
 static int cr_ok;
 static	Histloc_t location = { -5, 0 };
 
-ed_emacsread __PARAM__((int fd,char *buff,int scend), (fd, buff, scend)) __OTORP__(int fd;char *buff;int scend;){
+int ed_emacsread __PARAM__((int fd,char *buff,int scend), (fd, buff, scend)) __OTORP__(int fd;char *buff;int scend;){
 	int c;
 	int i;
 	genchar *out;

cde/programs/dtksh/ksh93/src/cmd/ksh93/edit/vi.c

@@ -247,7 +247,7 @@ static int	textmod __PROTO__((int,int));
  *
 -*/
 
-ed_viread __PARAM__((int fd, char *shbuf, int nchar), (fd, shbuf, nchar)) __OTORP__(int fd; char *shbuf; int nchar;){
+int ed_viread __PARAM__((int fd, char *shbuf, int nchar), (fd, shbuf, nchar)) __OTORP__(int fd; char *shbuf; int nchar;){
 	int i;			/* general variable */
 	int term_char;		/* read() termination character */
 	char prompt[PRSIZE+2];		/* prompt */

cde/programs/dtksh/ksh93/src/cmd/ksh93/ksh.mk

@@ -16,23 +16,23 @@ SHELL=/bin/sh
 YACCFLAGS=-d
 mam_libast=$${mam_cc_L+-last}$${mam_cc_L-${PACKAGE_ast_LIB}/libast.a}
 LPR=lpr
-mam_libdl=`(set -; cd /tmp; echo 'main(){return(0);}' > x.$${!-$$$$}.c; \
+mam_libdl=`(set -; cd /tmp; echo 'int main(){return(0);}' > x.$${!-$$$$}.c; \
 	${CC} ${CCFLAGS}    -o x.$${!-$$$$}.x x.$${!-$$$$}.c -ldl \
 	>/dev/null 2>&1 && echo ' -ldl'; rm -f x.$${!-$$$$}.[cox])`
-mam_libjobs=`(set -; cd /tmp; echo 'main(){return(0);}' > x.$${!-$$$$}.c; \
+mam_libjobs=`(set -; cd /tmp; echo 'int main(){return(0);}' > x.$${!-$$$$}.c; \
 	${CC} ${CCFLAGS}    -o x.$${!-$$$$}.x x.$${!-$$$$}.c -ljobs \
 	>/dev/null 2>&1 && echo ' -ljobs'; rm -f x.$${!-$$$$}.[cox])`
 COTEMP=$$$$
-mam_libintl=`(set -; cd /tmp; echo 'main(){return(0);}' > x.$${!-$$$$}.c; \
+mam_libintl=`(set -; cd /tmp; echo 'int main(){return(0);}' > x.$${!-$$$$}.c; \
 	${CC} ${CCFLAGS}    -o x.$${!-$$$$}.x x.$${!-$$$$}.c -lintl \
 	>/dev/null 2>&1 && echo ' -lintl'; rm -f x.$${!-$$$$}.[cox])`
-mam_libi=`(set -; cd /tmp; echo 'main(){return(0);}' > x.$${!-$$$$}.c; \
+mam_libi=`(set -; cd /tmp; echo 'int main(){return(0);}' > x.$${!-$$$$}.c; \
 	${CC} ${CCFLAGS}    -o x.$${!-$$$$}.x x.$${!-$$$$}.c -li \
 	>/dev/null 2>&1 && echo ' -li'; rm -f x.$${!-$$$$}.[cox])`
 PACKAGE_ast=${INSTALLROOT}
 CPP=${CC} -E
 PR=pr
-mam_libm=`(set -; cd /tmp; echo 'main(){return(0);}' > x.$${!-$$$$}.c; \
+mam_libm=`(set -; cd /tmp; echo 'int main(){return(0);}' > x.$${!-$$$$}.c; \
 	${CC} ${CCFLAGS}    -o x.$${!-$$$$}.x x.$${!-$$$$}.c -lm \
 	>/dev/null 2>&1 && echo ' -lm'; rm -f x.$${!-$$$$}.[cox])`
 INSTALLROOT=../../..
@@ -43,7 +43,7 @@ PACKAGE_ast_LIB=${PACKAGE_ast}/lib
 AR=ar
 AS=as
 TAR=tar
-mam_libdld=`(set -; cd /tmp; echo 'main(){return(0);}' > x.$${!-$$$$}.c; \
+mam_libdld=`(set -; cd /tmp; echo 'int main(){return(0);}' > x.$${!-$$$$}.c; \
 	${CC} ${CCFLAGS}    -o x.$${!-$$$$}.x x.$${!-$$$$}.c -ldld \
 	>/dev/null 2>&1 && echo ' -ldld'; rm -f x.$${!-$$$$}.[cox])`
 CPIO=cpio

cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/io.c

@@ -830,7 +830,7 @@ void	sh_iorestore __PARAM__((int last), (last)) __OTORP__(int last;){
  * returns -1 for failure, 0 for success
  * <mode> is the same as for access()
  */
-sh_ioaccess __PARAM__((int fd,int mode), (fd, mode)) __OTORP__(int fd;int mode;){
+int sh_ioaccess __PARAM__((int fd,int mode), (fd, mode)) __OTORP__(int fd;int mode;){
 	int flags;
 	if(mode==X_OK)
 		return(-1);

cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/jobs.c

@@ -1230,7 +1230,7 @@ done:
  * disown job if bgflag == 'd'
  */
 
-job_switch __PARAM__((struct process *pw,int bgflag), (pw, bgflag)) __OTORP__(struct process *pw;int bgflag;){
+int job_switch __PARAM__((struct process *pw,int bgflag), (pw, bgflag)) __OTORP__(struct process *pw;int bgflag;){
 	const char *msg;
 	if(!pw || !(pw=job_byjid((int)pw->p_job)))
 		return(1);

cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/main.c

@@ -140,7 +140,7 @@ static char	beenhere = 0;
     }
 #endif /* _lib_sigvec */
 
-main __PARAM__((int ac, char *av[]), (ac, av)) __OTORP__(int ac; char *av[];){
+int main __PARAM__((int ac, char *av[]), (ac, av)) __OTORP__(int ac; char *av[];){
 	char	*name;
 	int	fdin;
 	Sfio_t  *iop;

cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/shcomp.c

@@ -102,7 +102,7 @@
 static const char id[] = "\n@(#)shcomp (AT&T Bell Laboratories) 12/28/93\0\n";
 static const char header[6] = { CNTL('k'),CNTL('s'),CNTL('h'),0,VERSION,0 };
 
-main __PARAM__((int argc, char *argv[]), (argc, argv)) __OTORP__(int argc; char *argv[];){
+int main __PARAM__((int argc, char *argv[]), (argc, argv)) __OTORP__(int argc; char *argv[];){
 	Sfio_t *in, *out;
 	union anynode *t;
 	char *cp;

cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/suid_exec.c

@@ -129,7 +129,7 @@ static gid_t rgroupid;
 static gid_t egroupid;
 static struct stat statb;
 
-main __PARAM__((int argc,char *argv[]), (argc, argv)) __OTORP__(int argc;char *argv[];){
+int main __PARAM__((int argc,char *argv[]), (argc, argv)) __OTORP__(int argc;char *argv[];){
 	int m,n;
 	char *p;
 	struct stat statx;
@@ -316,7 +316,7 @@ static void error_exit __PARAM__((const char *message), (message)) __OTORP__(con
  * This version of access checks against effective uid and effective gid
  */
 
-eaccess __PARAM__((const char *name, int mode), (name, mode)) __OTORP__(const char *name; int mode;){
+int eaccess __PARAM__((const char *name, int mode), (name, mode)) __OTORP__(const char *name; int mode;){
 	struct stat statb;
 	if (stat(name, &statb) == 0)
 	{
@@ -367,7 +367,7 @@ eaccess __PARAM__((const char *name, int mode), (name, mode)) __OTORP__(const ch
 }
 
 #ifdef _lib_setreuid
-setids __PARAM__((int mode,int owner,int group), (mode, owner, group)) __OTORP__(int mode;int owner;int group;){
+int setids __PARAM__((int mode,int owner,int group), (mode, owner, group)) __OTORP__(int mode;int owner;int group;){
 	if(mode & S_ISGID)
 		setregid(rgroupid,group);
 

cde/programs/dtksh/ksh93/src/cmd/ksh93/sh/xec.c

@@ -209,7 +209,7 @@ static int pipe_exec __PARAM__((int pv[], union anynode *t, int errorflg), (pv,
 }
 #endif /* SHOPT_FASTPIPE */
 
-sh_exec __PARAM__((const union anynode *t, int flags), (t, flags)) __OTORP__(const union anynode *t; int flags;){
+int sh_exec __PARAM__((const union anynode *t, int flags), (t, flags)) __OTORP__(const union anynode *t; int flags;){
 	sh_sigcheck();
 	if(t && !sh.st.execbrk && !sh_isoption(SH_NOEXEC))
 	{
@@ -1220,7 +1220,7 @@ sh_exec __PARAM__((const union anynode *t, int flags), (t, flags)) __OTORP__(con
  * returns 1 if r == trim(s) otherwise 0
  */
 
-static trim_eq __PARAM__((const char *r,const char *s), (r, s)) __OTORP__(const char *r;const char *s;){
+static int trim_eq __PARAM__((const char *r,const char *s), (r, s)) __OTORP__(const char *r;const char *s;){
 	char c;
 	while(c = *s++)
 	{

cde/programs/dtksh/ksh93/src/cmd/pax/format.c

@@ -90,6 +90,11 @@
 #define __VA_START__(p,a)	va_start(p)
 #endif
 #endif
+
+#if defined(__linux__)
+#include <sys/sysmacros.h>
+#endif
+
 #include "pax.h"
 #include "options.h"
 

cde/programs/dtksh/ksh93/src/cmd/pax/misc.c

@@ -90,6 +90,11 @@
 #define __VA_START__(p,a)	va_start(p)
 #endif
 #endif
+
+#if defined(__linux__)
+#include <sys/sysmacros.h>
+#endif
+
 #include "pax.h"
 #include "options.h"
 

cde/programs/dtksh/ksh93/src/cmd/pax/nocom.c

@@ -402,6 +402,7 @@ nocom __PARAM__((Sfio_t* sp, char* file), (sp, file)) __OTORP__(Sfio_t* sp; char
 	/*NOTREACHED*/
 }
 
+int
 main __PARAM__((int argc, char** argv), (argc, argv)) __OTORP__(int argc; char** argv;){
 	int		c;
 	char*		s;

cde/programs/dtksh/ksh93/src/lib/lib0ast/C.probe

@@ -125,7 +125,7 @@ fi
 mkdir suffix
 cd suffix
 for src in $probe_src
-do	echo "main(){return 0;}" > ../test.$src
+do	echo "int main(){return 0;}" > ../test.$src
 	rm -f test*
 	if	$cc -c ../test.$src
 	then	set test.*
@@ -157,7 +157,7 @@ cd ..
 case $src in
 c)	;;
 *)	echo '// (
-main()
+int main()
 {
 	class { public: int i; } j;
 	j.i = 0;
@@ -217,7 +217,7 @@ do	shift
 done
 
 echo '#include <stdio.h>
-main(){printf("hello");return(0);}' > dynamic.$src
+int main(){printf("hello");return(0);}' > dynamic.$src
 if	$cc -c dynamic.$src
 then	eval set x $probe_so
 	while	:
@@ -297,7 +297,7 @@ then	eval set x $probe_so
 	fi
 fi
 
-echo 'main(){return(0);}' > hosted.$src
+echo 'int main(){return(0);}' > hosted.$src
 $cc -o hosted.$exe hosted.$src && ./hosted.$exe && hosted=1
 
 cp /bin/echo cpp

cde/programs/dtksh/ksh93/src/lib/libAST/C.probe

@@ -129,7 +129,7 @@ done
 case $src in
 c)	;;
 *)	echo '#include <iostream.h>
-main()
+int main()
 {
 	cout << "hello world";
 	return 0;
@@ -168,7 +168,7 @@ do	shift
 done
 
 echo '#include <stdio.h>
-main(){printf("hello");return(0);}' > dynamic.$src
+int main(){printf("hello");return(0);}' > dynamic.$src
 if	$cc -c dynamic.$src
 then	eval set x $probe_so
 	while	:
@@ -234,7 +234,7 @@ then	eval set x $probe_so
 	fi
 fi
 
-echo 'main(){return(0);}' > hosted.$src
+echo 'int main(){return(0);}' > hosted.$src
 $cc -o hosted.$exe hosted.$src && ./hosted.$exe && hosted=1
 
 cp /bin/echo cpp

cde/programs/dtksh/ksh93/src/lib/libast/feature/align.c

@@ -116,7 +116,7 @@ struct _s_
 
 extern __MANGLE__ int		printf __PROTO__((const char*, ...));
 
-main()
+int main()
 {
 	int	i;
 	int	j;

cde/programs/dtksh/ksh93/src/lib/libast/feature/botch.c

@@ -106,7 +106,7 @@
 extern __MANGLE__ int		getgroups __PROTO__((int, gid_t*));
 extern __MANGLE__ int		printf __PROTO__((const char*, ...));
 
-main()
+int main()
 {
 #if _lib_getgroups
 	if (sizeof(gid_t) < sizeof(int))

cde/programs/dtksh/ksh93/src/lib/libast/feature/fcntl.c

@@ -116,7 +116,7 @@
 
 extern __MANGLE__ int		printf __PROTO__((const char*, ...));
 
-main()
+int main()
 {
 	int		f_local = 0;
 	int		f_lck = 0;

cde/programs/dtksh/ksh93/src/lib/libast/feature/int.c

@@ -130,7 +130,7 @@ static struct
 
 static int	size[] = { 1, 2, 4, 8 };
 
-main()
+int main()
 {
 	int	t;
 	int	s;

cde/programs/dtksh/ksh93/src/lib/libast/feature/limits.c

@@ -152,7 +152,7 @@ static char*		cmd[] = { "/bin/echo", 0 };
 #define child()		spawnve(cmd[0],cmd,(char**)0)
 #endif
 
-main()
+int main()
 {
 	int	i;
 	int	n;

cde/programs/dtksh/ksh93/src/lib/libast/feature/mode.c

@@ -105,7 +105,7 @@
 
 extern __MANGLE__ int		printf __PROTO__((const char*, ...));
 
-main()
+int main()
 {
 	int	n;
 	int	idperm;

cde/programs/dtksh/ksh93/src/lib/libast/feature/signal.c

@@ -256,7 +256,7 @@ static int		index[64];
 
 extern __MANGLE__ int		printf __PROTO__((const char*, ...));
 
-main()
+int main()
 {
 	int	i;
 	int	j;

cde/programs/dtksh/ksh93/src/lib/libast/feature/unistd.c

@@ -131,7 +131,7 @@ __STDPP__directive pragma pp:nohide printf
 extern __MANGLE__ int		printf __PROTO__((const char*, ...));
 #endif
 
-main()
+int main()
 {
 	int	sep = 0;
 	long	val;

cde/programs/dtksh/ksh93/src/lib/libast/features/align.c

@@ -108,7 +108,7 @@ struct _s_
 
 extern __MANGLE__ int		printf __PROTO__((const char*, ...));
 
-main()
+int main()
 {
 	int	i;
 	int	j;

cde/programs/dtksh/ksh93/src/lib/libast/features/botch.c

@@ -98,7 +98,7 @@
 extern __MANGLE__ int		getgroups __PROTO__((int, gid_t*));
 extern __MANGLE__ int		printf __PROTO__((const char*, ...));
 
-main()
+int main()
 {
 #if _lib_getgroups
 	if (sizeof(gid_t) < sizeof(int))

cde/programs/dtksh/ksh93/src/lib/libast/features/fcntl.c

@@ -107,7 +107,7 @@
 
 extern __MANGLE__ int		printf __PROTO__((const char*, ...));
 
-main()
+int main()
 {
 	int		f_local = 0;
 	int		f_lck = 0;

cde/programs/dtksh/ksh93/src/lib/libast/features/int.c

@@ -122,7 +122,7 @@ static struct
 
 static int	size[] = { 1, 2, 4, 8 };
 
-main()
+int main()
 {
 	int	t;
 	int	s;

cde/programs/dtksh/ksh93/src/lib/libast/features/limits.c

@@ -119,7 +119,7 @@ extern __MANGLE__ int		printf __PROTO__((const char*, ...));
 
 #include "conflib.h"
 
-main()
+int main()
 {
 	int	i;
 	int	n;

cde/programs/dtksh/ksh93/src/lib/libast/features/mode.c

@@ -97,7 +97,7 @@
 
 extern __MANGLE__ int		printf __PROTO__((const char*, ...));
 
-main()
+int main()
 {
 	int	n;
 	int	idperm;

cde/programs/dtksh/ksh93/src/lib/libast/features/signal.c

@@ -278,7 +278,7 @@ static int		index[64];
 
 extern __MANGLE__ int		printf __PROTO__((const char*, ...));
 
-main()
+int main()
 {
 	int	i;
 	int	j;

cde/programs/dtksh/ksh93/src/lib/libast/features/unistd.c

@@ -118,7 +118,7 @@ extern __MANGLE__ int		printf __PROTO__((const char*, ...));
 
 #include "conflib.h"
 
-main()
+int main()
 {
 #include "confuni.h"
 	return(0);

cde/programs/dtksh/ksh93/src/lib/libast/hash/hashwalk.c

@@ -97,7 +97,7 @@
  */
 
 int
-hashwalk __PARAM__((Hash_table_t* tab, int flags, register(*walker)(const char*, char*, __V_*), __V_* handle), (tab, flags, walker, handle)) __OTORP__(Hash_table_t* tab; int flags; register(*walker)(); __V_* handle;){
+hashwalk __PARAM__((Hash_table_t* tab, int flags, int register(*walker)(const char*, char*, __V_*), __V_* handle), (tab, flags, walker, handle)) __OTORP__(Hash_table_t* tab; int flags; int register(*walker)(); __V_* handle;){
 	Hash_bucket_t*	b;
 	int		v;
 	Hash_position_t*	pos;

cde/programs/dtksh/ksh93/src/lib/libast/misc/ftwalk.c

@@ -416,6 +416,7 @@ static int resize __PARAM__((char** home, char** endbuf, char** path, char** bas
 /*
 	The real thing.
 */
+int
 ftwalk __PARAM__((const char *cpath, int (*userf)(Ftw_t*), int flags, int (*comparf)(Ftw_t*, Ftw_t*)), (cpath, userf, flags, comparf)) __OTORP__(const char *cpath; int (*userf)(); int flags; int (*comparf)();){
 	char		*path = (char*)cpath;
 	int	cdrv;		/* chdir value */

cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfclrerr.c

@@ -46,7 +46,7 @@
 #include	"sfhdr.h"
 
 #if __STD_C
-static __sfclrerr(reg Sfio_t* f)
+static int __sfclrerr(reg Sfio_t* f)
 #else
 static __sfclrerr(f)
 reg Sfio_t	*f;
@@ -58,7 +58,7 @@ reg Sfio_t	*f;
 #undef sfclrerr
 
 #if __STD_C
-sfclrerr(reg Sfio_t* f)
+int sfclrerr(reg Sfio_t* f)
 #else
 sfclrerr(f)
 reg Sfio_t	*f;

cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfeof.c

@@ -46,7 +46,7 @@
 #include	"sfhdr.h"
 
 #if __STD_C
-static __sfeof(reg Sfio_t* f)
+static int __sfeof(reg Sfio_t* f)
 #else
 static __sfeof(f)
 reg Sfio_t	*f;
@@ -58,7 +58,7 @@ reg Sfio_t	*f;
 #undef sfeof
 
 #if __STD_C
-sfeof(reg Sfio_t* f)
+int sfeof(reg Sfio_t* f)
 #else
 sfeof(f)
 reg Sfio_t	*f;

cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sferror.c

@@ -46,7 +46,7 @@
 #include	"sfhdr.h"
 
 #if __STD_C
-static __sferror(reg Sfio_t* f)
+static int __sferror(reg Sfio_t* f)
 #else
 static __sferror(f)
 reg Sfio_t	*f;
@@ -58,7 +58,7 @@ reg Sfio_t	*f;
 #undef sferror
 
 #if __STD_C
-sferror(reg Sfio_t* f)
+int sferror(reg Sfio_t* f)
 #else
 sferror(f)
 reg Sfio_t	*f;

cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sffileno.c

@@ -46,7 +46,7 @@
 #include	"sfhdr.h"
 
 #if __STD_C
-static __sffileno(reg Sfio_t* f)
+static int __sffileno(reg Sfio_t* f)
 #else
 static __sffileno(f)
 reg Sfio_t	*f;
@@ -58,7 +58,7 @@ reg Sfio_t	*f;
 #undef sffileno
 
 #if __STD_C
-sffileno(reg Sfio_t* f)
+int sffileno(reg Sfio_t* f)
 #else
 sffileno(f)
 reg Sfio_t	*f;

cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfgetc.c

@@ -46,7 +46,7 @@
 #include	"sfhdr.h"
 
 #if __STD_C
-static __sfgetc(reg Sfio_t* f)
+static int __sfgetc(reg Sfio_t* f)
 #else
 static __sfgetc(f)
 reg Sfio_t	*f;
@@ -58,7 +58,7 @@ reg Sfio_t	*f;
 #undef sfgetc
 
 #if __STD_C
-sfgetc(reg Sfio_t* f)
+int sfgetc(reg Sfio_t* f)
 #else
 sfgetc(f)
 reg Sfio_t	*f;

cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfputc.c

@@ -46,7 +46,7 @@
 #include	"sfhdr.h"
 
 #if __STD_C
-static __sfputc(reg Sfio_t* f, reg int c)
+static int __sfputc(reg Sfio_t* f, reg int c)
 #else
 static __sfputc(f,c)
 reg Sfio_t	*f;
@@ -59,7 +59,7 @@ reg int		c;
 #undef sfputc
 
 #if __STD_C
-sfputc(reg Sfio_t* f, reg int c)
+int sfputc(reg Sfio_t* f, reg int c)
 #else
 sfputc(f,c)
 reg Sfio_t	*f;

cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfputd.c

@@ -46,7 +46,7 @@
 #include	"sfhdr.h"
 
 #if __STD_C
-static __sfputd(reg Sfio_t* f, reg double v)
+static int __sfputd(reg Sfio_t* f, reg double v)
 #else
 static __sfputd(f,v)
 reg Sfio_t	*f;
@@ -59,7 +59,7 @@ reg double	v;
 #undef sfputd
 
 #if __STD_C
-sfputd(reg Sfio_t* f, reg double v)
+int sfputd(reg Sfio_t* f, reg double v)
 #else
 sfputd(f,v)
 reg Sfio_t	*f;

cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfputl.c

@@ -46,7 +46,7 @@
 #include	"sfhdr.h"
 
 #if __STD_C
-static __sfputl(reg Sfio_t* f, reg long v)
+static int __sfputl(reg Sfio_t* f, reg long v)
 #else
 static __sfputl(f,v)
 reg Sfio_t	*f;
@@ -59,7 +59,7 @@ reg long	v;
 #undef sfputl
 
 #if __STD_C
-sfputl(reg Sfio_t* f, reg long v)
+int sfputl(reg Sfio_t* f, reg long v)
 #else
 sfputl(f,v)
 reg Sfio_t	*f;

cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfputu.c

@@ -46,7 +46,7 @@
 #include	"sfhdr.h"
 
 #if __STD_C
-static __sfputu(reg Sfio_t* f, reg ulong v)
+static int __sfputu(reg Sfio_t* f, reg ulong v)
 #else
 static __sfputu(f,v)
 reg Sfio_t	*f;
@@ -59,7 +59,7 @@ reg ulong	v;
 #undef sfputu
 
 #if __STD_C
-sfputu(reg Sfio_t* f, reg ulong v)
+int sfputu(reg Sfio_t* f, reg ulong v)
 #else
 sfputu(f,v)
 reg Sfio_t	*f;

cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfslen.c

@@ -46,7 +46,7 @@
 #include	"sfhdr.h"
 
 #if __STD_C
-static __sfslen(void)
+static int __sfslen(void)
 #else
 static __sfslen()
 #endif
@@ -57,7 +57,7 @@ static __sfslen()
 #undef sfslen
 
 #if __STD_C
-sfslen(void)
+int sfslen(void)
 #else
 sfslen()
 #endif

cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfstacked.c

@@ -46,7 +46,7 @@
 #include	"sfhdr.h"
 
 #if __STD_C
-static __sfstacked(reg Sfio_t* f)
+static int __sfstacked(reg Sfio_t* f)
 #else
 static __sfstacked(f)
 reg Sfio_t	*f;
@@ -58,7 +58,7 @@ reg Sfio_t	*f;
 #undef sfstacked
 
 #if __STD_C
-sfstacked(reg Sfio_t* f)
+int sfstacked(reg Sfio_t* f)
 #else
 sfstacked(f)
 reg Sfio_t	*f;

cde/programs/dtksh/ksh93/src/lib/libast/sfio/_sfulen.c

@@ -46,7 +46,7 @@
 #include	"sfhdr.h"
 
 #if __STD_C
-static __sfulen(reg ulong v)
+static int __sfulen(reg ulong v)
 #else
 static __sfulen(v)
 reg ulong	v;
@@ -58,7 +58,7 @@ reg ulong	v;
 #undef sfulen
 
 #if __STD_C
-sfulen(reg ulong v)
+int sfulen(reg ulong v)
 #else
 sfulen(v)
 reg ulong	v;

cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfclose.c

@@ -51,7 +51,7 @@
 */
 
 #if __STD_C
-sfclose(reg Sfio_t* f)
+int sfclose(reg Sfio_t* f)
 #else
 sfclose(f)
 reg Sfio_t*	f;

cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfclrlock.c

@@ -52,7 +52,7 @@
 **	Written by Kiem-Phong Vo (07/20/90).
 */
 #if __STD_C
-sfclrlock(reg Sfio_t* f)
+int sfclrlock(reg Sfio_t* f)
 #else
 sfclrlock(f)
 reg Sfio_t	*f;

cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfdlen.c

@@ -51,7 +51,7 @@
 */
 
 #if __STD_C
-sfdlen(reg double v)
+int sfdlen(reg double v)
 #else
 sfdlen(v)
 reg double	v;

cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfexcept.c

@@ -49,7 +49,7 @@
 **	Written by Kiem-Phong Vo (8/18/90)
 */
 #if __STD_C
-_sfexcept(reg Sfio_t* f, reg int type, reg int io, reg Sfdisc_t* disc)
+int _sfexcept(reg Sfio_t* f, reg int type, reg int io, reg Sfdisc_t* disc)
 #else
 _sfexcept(f,type,io,disc)
 reg Sfio_t	*f;	/* stream where the exception happened */

cde/programs/dtksh/ksh93/src/lib/libast/sfio/sffilbuf.c

@@ -56,7 +56,7 @@
 */
 
 #if __STD_C
-_sffilbuf(reg Sfio_t* f, reg int n)
+int _sffilbuf(reg Sfio_t* f, reg int n)
 #else
 _sffilbuf(f,n)
 reg Sfio_t	*f;	/* fill the read buffer of this stream */

cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfflsbuf.c

@@ -52,7 +52,7 @@
 */
 
 #if __STD_C
-_sfflsbuf(reg Sfio_t* f, reg int c)
+int _sfflsbuf(reg Sfio_t* f, reg int c)
 #else
 _sfflsbuf(f,c)
 reg Sfio_t	*f;	/* write out the buffered content of this stream */

cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfllen.c

@@ -50,7 +50,7 @@
 **	Written by Kiem-Phong Vo (06/27/90)
 */
 #if __STD_C
-sfllen(reg long v)
+int sfllen(reg long v)
 #else
 sfllen(v)
 reg long	v;

cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfmode.c

@@ -95,7 +95,7 @@ static void _sfcleanup()
 
 /* put into discrete pool */
 #if __STD_C
-_sfsetpool(Sfio_t* f)
+int _sfsetpool(Sfio_t* f)
 #else
 _sfsetpool(f)
 Sfio_t*	f;
@@ -214,7 +214,7 @@ typedef struct _sfp_
 static Sfpopen_t*	_Sfprocess;
 
 #if __STD_C
-_sfpopen(reg Sfio_t* f, int fd, int pid)
+int _sfpopen(reg Sfio_t* f, int fd, int pid)
 #else
 _sfpopen(f, fd, pid)
 reg Sfio_t*	f;
@@ -245,7 +245,7 @@ int		pid;
 }
 
 #if __STD_C
-_sfpclose(reg Sfio_t* f)
+int _sfpclose(reg Sfio_t* f)
 #else
 _sfpclose(f)
 reg Sfio_t*	f;	/* stream to close */
@@ -307,7 +307,7 @@ reg Sfio_t*	f;	/* stream to close */
 }
 
 #if __STD_C
-static _sfpmode(Sfio_t* f, int type)
+static int _sfpmode(Sfio_t* f, int type)
 #else
 static _sfpmode(f,type)
 Sfio_t*	f;
@@ -413,7 +413,7 @@ int	stack;
 }
 
 #if __STD_C
-_sfmode(reg Sfio_t* f, reg int wanted, reg int local)
+int _sfmode(reg Sfio_t* f, reg int wanted, reg int local)
 #else
 _sfmode(f, wanted, local)
 reg Sfio_t*	f;	/* change r/w mode and sync file pointer for this stream */

cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfnotify.c

@@ -51,7 +51,7 @@
 **	Written by Kiem-Phong Vo (01/06/91)
 */
 #if __STD_C
-sfnotify(void (*notify)(Sfio_t*, int, int))
+int sfnotify(void (*notify)(Sfio_t*, int, int))
 #else
 sfnotify(notify)
 void	(*notify)();

cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfnputc.c

@@ -51,7 +51,7 @@
 */
 
 #if __STD_C
-sfnputc(reg Sfio_t* f, reg int c, reg int n)
+int sfnputc(reg Sfio_t* f, reg int c, reg int n)
 #else
 sfnputc(f,c,n)
 reg Sfio_t	*f;	/* file to write */

cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfopen.c

@@ -113,7 +113,7 @@ reg char	*mode;		/* mode of the stream */
 }
 
 #if __STD_C
-_sftype(reg const char *mode, int *oflagsp)
+int _sftype(reg const char *mode, int *oflagsp)
 #else
 _sftype(mode, oflagsp)
 reg char	*mode;

cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfpeek.c

@@ -52,7 +52,7 @@
 */
 
 #if __STD_C
-sfpeek(reg Sfio_t* f, Void_t** bp, reg int size)
+int sfpeek(reg Sfio_t* f, Void_t** bp, reg int size)
 #else
 sfpeek(f,bp,size)
 reg Sfio_t*	f;	/* file to peek */

cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfpkrd.c

@@ -61,7 +61,7 @@
 #define SOCKET_PEEK	002
 
 #if __STD_C
-sfpkrd(int fd, Void_t* argbuf, int n, int rc, long tm, int action)
+int sfpkrd(int fd, Void_t* argbuf, int n, int rc, long tm, int action)
 #else
 sfpkrd(fd, argbuf, n, rc, tm, action)
 int	fd;	/* file descriptor */

cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfpoll.c

@@ -51,7 +51,7 @@
 */
 
 #if __STD_C
-sfpoll(Sfio_t** fa, reg int n, int tm)
+int sfpoll(Sfio_t** fa, reg int n, int tm)
 #else
 sfpoll(fa, n, tm)
 Sfio_t**	fa;	/* array of streams to poll */

cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfpool.c

@@ -106,7 +106,7 @@ reg int	mode;
 
 /* move a stream to head */
 #if __STD_C
-static _sfphead(Sfpool_t* p, Sfio_t* f, int n)
+static int _sfphead(Sfpool_t* p, Sfio_t* f, int n)
 #else
 static _sfphead(p, f, n)
 Sfpool_t*	p;	/* the pool			*/

cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfprintf.c

@@ -51,7 +51,7 @@
 */
 
 #if __STD_C
-sfprintf(Sfio_t *f, const char *form, ...)
+int sfprintf(Sfio_t *f, const char *form, ...)
 #else
 sfprintf(va_alist)
 va_dcl
@@ -76,7 +76,7 @@ va_dcl
 }
 
 #if __STD_C
-sfsprintf(char *s, int n, const char *form, ...)
+int sfsprintf(char *s, int n, const char *form, ...)
 #else
 sfsprintf(va_alist)
 va_dcl

cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfpurge.c

@@ -51,7 +51,7 @@
 */
 
 #if __STD_C
-sfpurge(reg Sfio_t* f)
+int sfpurge(reg Sfio_t* f)
 #else
 sfpurge(f)
 reg Sfio_t	*f;

cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfputd.c

@@ -51,7 +51,7 @@
 */
 
 #if __STD_C
-_sfputd(Sfio_t* f, reg double v)
+int _sfputd(Sfio_t* f, reg double v)
 #else
 _sfputd(f,v)
 Sfio_t		*f;

cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfputl.c

@@ -51,7 +51,7 @@
 */
 
 #if __STD_C
-_sfputl(reg Sfio_t* f, reg long v)
+int _sfputl(reg Sfio_t* f, reg long v)
 #else
 _sfputl(f,v)
 reg Sfio_t	*f;	/* write a portable long to this stream */

cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfputr.c

@@ -53,7 +53,7 @@
 **	Written by Kiem-Phong Vo
 */
 #if __STD_C
-sfputr(reg Sfio_t* f, const char* s, reg int rc)
+int sfputr(reg Sfio_t* f, const char* s, reg int rc)
 #else
 sfputr(f,s,rc)
 reg Sfio_t*	f;	/* write to this stream. r11 on Vax	*/

cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfputu.c

@@ -51,7 +51,7 @@
 */
 
 #if __STD_C
-_sfputu(reg Sfio_t* f, reg ulong v)
+int _sfputu(reg Sfio_t* f, reg ulong v)
 #else
 _sfputu(f,v)
 reg Sfio_t	*f;	/* write a portable ulong to this stream */

cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfrd.c

@@ -77,7 +77,7 @@ static void _sfwrsync()
 }
 
 #if __STD_C
-sfrd(reg Sfio_t* f, reg Void_t* buf, reg int n, reg Sfdisc_t* disc)
+int sfrd(reg Sfio_t* f, reg Void_t* buf, reg int n, reg Sfdisc_t* disc)
 #else
 sfrd(f,buf,n,disc)
 reg Sfio_t	*f;

cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfread.c

@@ -54,7 +54,7 @@
 */
 
 #if __STD_C
-sfread(reg Sfio_t* f, Void_t* buf, reg int n)
+int sfread(reg Sfio_t* f, Void_t* buf, reg int n)
 #else
 sfread(f,buf,n)
 reg Sfio_t*	f;	/* read from this stream. r11 on Vax	*/

cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfscanf.c

@@ -51,7 +51,7 @@
 */
 
 #if __STD_C
-sfscanf(Sfio_t *f, const char *form, ...)
+int sfscanf(Sfio_t *f, const char *form, ...)
 #else
 sfscanf(va_alist)
 va_dcl
@@ -76,7 +76,7 @@ va_dcl
 }
 
 #if __STD_C
-sfsscanf(const char *s, const char *form,...)
+int sfsscanf(const char *s, const char *form,...)
 #else
 sfsscanf(va_alist)
 va_dcl

cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfset.c

@@ -51,7 +51,7 @@
 */
 
 #if __STD_C
-sfset(reg Sfio_t* f, reg int flags, reg int set)
+int sfset(reg Sfio_t* f, reg int flags, reg int set)
 #else
 sfset(f,flags,set)
 reg Sfio_t	*f;

cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfsetfd.c

@@ -51,7 +51,7 @@
 */
 
 #if __STD_C
-static _sfdup(reg int fd, reg int newfd)
+static int _sfdup(reg int fd, reg int newfd)
 #else
 static _sfdup(fd,newfd)
 reg int	fd;
@@ -80,7 +80,7 @@ reg int	newfd;
 }
 
 #if __STD_C
-sfsetfd(reg Sfio_t* f, reg int newfd)
+int sfsetfd(reg Sfio_t* f, reg int newfd)
 #else
 sfsetfd(f,newfd)
 reg Sfio_t	*f;

cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfsync.c

@@ -51,7 +51,7 @@
 **	Written by Kiem-Phong Vo (06/27/90)
 */
 
-static _sfall()
+static int _sfall()
 {
 	reg Sfpool_t	*p, *next;
 	reg Sfio_t*	f;
@@ -102,7 +102,7 @@ static _sfall()
 }
 
 #if __STD_C
-sfsync(reg Sfio_t* f)
+int sfsync(reg Sfio_t* f)
 #else
 sfsync(f)
 reg Sfio_t*	f;	/* stream to be synchronized */

cde/programs/dtksh/ksh93/src/lib/libast/sfio/sftmp.c

@@ -130,7 +130,7 @@ char	*name;
 #endif /*_PACKAGE_ast*/
 
 #if __STD_C
-static _tmpexcept(Sfio_t* f, int type, Sfdisc_t* disc)
+static int _tmpexcept(Sfio_t* f, int type, Sfdisc_t* disc)
 #else
 static _tmpexcept(f,type,disc)
 Sfio_t*		f;

cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfungetc.c

@@ -50,7 +50,7 @@
 **	Written by Kiem-Phong Vo (03/02/91)
 */
 #if __STD_C
-static _uexcept(reg Sfio_t* f, reg int type, reg Sfdisc_t* disc)
+static int _uexcept(reg Sfio_t* f, reg int type, reg Sfdisc_t* disc)
 #else
 static _uexcept(f,type,disc)
 reg Sfio_t	*f;
@@ -70,7 +70,7 @@ reg Sfdisc_t	*disc;
 }
 
 #if __STD_C
-sfungetc(reg Sfio_t* f, reg int c)
+int sfungetc(reg Sfio_t* f, reg int c)
 #else
 sfungetc(f,c)
 reg Sfio_t	*f;	/* push back one byte to this stream */

cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfvprintf.c

@@ -99,7 +99,7 @@
 	}
 
 #if __STD_C
-sfvprintf(Sfio_t* f, const char* form, va_list args)
+int sfvprintf(Sfio_t* f, const char* form, va_list args)
 #else
 sfvprintf(f,form,args)
 Sfio_t*	f;		/* file to print to	*/

cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfvscanf.c

@@ -136,7 +136,7 @@ int*	rs;
 }
 
 #if __STD_C
-sfvscanf(Sfio_t* f, reg const char* form, va_list args)
+int sfvscanf(Sfio_t* f, reg const char* form, va_list args)
 #else
 sfvscanf(f,form,args)
 Sfio_t		*f;		/* file to be scanned */

cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfwr.c

@@ -52,7 +52,7 @@
 
 /* hole preserving writes */
 #if __STD_C
-static sfoutput(Sfio_t* f, reg char* buf, reg int n)
+static int sfoutput(Sfio_t* f, reg char* buf, reg int n)
 #else
 static sfoutput(f,buf,n)
 Sfio_t*		f;
@@ -144,7 +144,7 @@ reg int		n;
 }
 
 #if __STD_C
-sfwr(reg Sfio_t* f, reg const Void_t* buf, reg int n, reg Sfdisc_t* disc)
+int sfwr(reg Sfio_t* f, reg const Void_t* buf, reg int n, reg Sfdisc_t* disc)
 #else
 sfwr(f,buf,n,disc)
 reg Sfio_t*	f;

cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfwrite.c

@@ -54,7 +54,7 @@
 */
 
 #if __STD_C
-sfwrite(reg Sfio_t* f, const Void_t* buf, reg int n)
+int sfwrite(reg Sfio_t* f, const Void_t* buf, reg int n)
 #else
 sfwrite(f,buf,n)
 reg Sfio_t*	f;	/* write to this stream. r11 on Vax	*/

cde/programs/dtksh/ksh93/src/lib/libast/stdio/stdprintf.c

@@ -53,7 +53,7 @@
 */
 
 #if __STD_C
-_stdprintf(const char *form, ...)
+int _stdprintf(const char *form, ...)
 #else
 _stdprintf(va_alist)
 va_dcl

cde/programs/dtksh/ksh93/src/lib/libast/stdio/stdscanf.c

@@ -52,7 +52,7 @@
 */
 
 #if __STD_C
-_stdscanf(const char *form, ...)
+int _stdscanf(const char *form, ...)
 #else
 _stdscanf(va_alist)
 va_dcl