Bug ugly formatting update

98 files changed, 10786 insertions, 10566 deletions

diff --git a/Makefile b/Makefile
index dd22dd58b..88fbc0c19 100644
--- a/Makefile
+++ b/Makefile
@@ -20,16 +20,21 @@
 # other sundry sources.  Files within this library are copyright by their
 # respective copyright holders.
 
-DIRS = error getent malloc misc regex stdio \
+#MALLOC = malloc
+MALLOC = malloc-simple
+
+DIRS = error getent $(MALLOC) misc regex stdio \
 	    string termios time sysdeps shm #rpc
 all: libc.a
 
-libc.a: headers subdirs
+libc.a: halfclean headers subdirs
 	@echo
 	@echo Finally finished compiling...
 	@echo
-	$(CROSS)ranlib $@
+	$(CROSS)ranlib libc.a
 
+halfclean:
+	@rm -f libc.a
 
 headers: dummy
 	@if [ ! -L "include/asm" ]; then ln -s /usr/include/asm include/asm ; fi
diff --git a/include/fcntl.h b/include/fcntl.h
index b9f727216..deea51182 100644
--- a/include/fcntl.h
+++ b/include/fcntl.h
@@ -1,20 +1,128 @@
-#ifndef __FCNTL_H
-#define __FCNTL_H
+/* Copyright (C) 1991, 92, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+/*
+ *	POSIX Standard: 6.5 File Control Operations	<fcntl.h>
+ */
+
+#ifndef	_FCNTL_H
+#define	_FCNTL_H	1
 
 #include <features.h>
-#include <sys/types.h>
-#include <linux/fcntl.h>
 
-#ifndef FNDELAY
-#define FNDELAY	O_NDELAY
+/* This must be early so <bits/fcntl.h> can define types winningly.  */
+__BEGIN_DECLS
+
+/* Get the definitions of O_*, F_*, FD_*: all the
+   numbers and flag bits for `open', `fcntl', et al.  */
+#include <bits/fcntl.h>
+
+/* For XPG all symbols from <sys/stat.h> should also be available.  */
+#ifdef __USE_XOPEN
+# include <sys/stat.h>
 #endif
 
-__BEGIN_DECLS
+#ifdef	__USE_MISC
+# ifndef R_OK			/* Verbatim from <unistd.h>.  Ugh.  */
+/* Values for the second argument to access.
+   These may be OR'd together.  */
+#  define R_OK	4		/* Test for read permission.  */
+#  define W_OK	2		/* Test for write permission.  */
+#  define X_OK	1		/* Test for execute permission.  */
+#  define F_OK	0		/* Test for existence.  */
+# endif
+#endif /* Use misc.  */
 
-extern int creat __P ((__const char * __filename, mode_t __mode));
-extern int fcntl __P ((int __fildes,int __cmd, ...));
-extern int open __P ((__const char * __filename, int __flags, ...));
+/* XPG wants the following symbols.  */
+#ifdef __USE_XOPEN		/* <stdio.h> has the same definitions.  */
+# define SEEK_SET	0	/* Seek from beginning of file.  */
+# define SEEK_CUR	1	/* Seek from current position.  */
+# define SEEK_END	2	/* Seek from end of file.  */
+#endif	/* XPG */
 
-__END_DECLS
+/* Do the file control operation described by CMD on FD.
+   The remaining arguments are interpreted depending on CMD.  */
+extern int fcntl __P ((int __fd, int __cmd, ...));
+
+/* Open FILE and return a new file descriptor for it, or -1 on error.
+   OFLAG determines the type of access used.  If O_CREAT is on OFLAG,
+   the third argument is taken as a `mode_t', the mode of the created file.  */
+#ifndef __USE_FILE_OFFSET64
+extern int open __P ((__const char *__file, int __oflag, ...));
+#else
+# ifdef __REDIRECT
+extern int __REDIRECT (open, __P ((__const char *__file, int __oflag, ...)),
+		       open64);
+# else
+#  define open open64
+# endif
+#endif
+#ifdef __USE_LARGEFILE64
+extern int open64 __P ((__const char *__file, int __oflag, ...));
+#endif
 
+/* Create and open FILE, with mode MODE.
+   This takes an `int' MODE argument because that is
+   what `mode_t' will be widened to.  */
+#ifndef __USE_FILE_OFFSET64
+extern int creat __P ((__const char *__file, __mode_t __mode));
+#else
+# ifdef __REDIRECT
+extern int __REDIRECT (creat, __P ((__const char *__file, __mode_t __mode)),
+		       creat64);
+# else
+#  define creat creat64
+# endif
+#endif
+#ifdef __USE_LARGEFILE64
+extern int creat64 __P ((__const char *__file, __mode_t __mode));
 #endif
+
+#if !defined F_LOCK && (defined __USE_MISC || (defined __USE_XOPEN_EXTENDED \
+					       && !defined __USE_POSIX))
+/* NOTE: These declarations also appear in <unistd.h>; be sure to keep both
+   files consistent.  Some systems have them there and some here, and some
+   software depends on the macros being defined without including both.  */
+
+/* `lockf' is a simpler interface to the locking facilities of `fcntl'.
+   LEN is always relative to the current file position.
+   The CMD argument is one of the following.  */
+
+# define F_ULOCK 0	/* Unlock a previously locked region.  */
+# define F_LOCK  1	/* Lock a region for exclusive use.  */
+# define F_TLOCK 2	/* Test and lock a region for exclusive use.  */
+# define F_TEST  3	/* Test a region for other processes locks.  */
+
+# ifndef __USE_FILE_OFFSET64
+extern int lockf __P ((int __fd, int __cmd, __off_t __len));
+# else
+# ifdef __REDIRECT
+extern int __REDIRECT (lockf, __P ((int __fd, int __cmd, __off64_t __len)),
+		       lockf64);
+# else
+#  define lockf lockf64
+# endif
+# endif
+# ifdef __USE_LARGEFILE64
+extern int lockf64 __P ((int __fd, int __cmd, __off64_t __len));
+# endif
+#endif
+
+__END_DECLS
+
+#endif /* fcntl.h  */
diff --git a/include/stdlib.h b/include/stdlib.h
index b1ae61d06..08af451f0 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -58,21 +58,20 @@ extern void srand __P ((unsigned int seed));
 
 
 /* Memory management functions */
-extern __ptr_t alloca __P ((size_t __size));
 extern __ptr_t calloc __P ((size_t, size_t));
 extern __ptr_t malloc __P ((size_t));
 extern __ptr_t realloc __P ((__ptr_t, size_t));
 extern void free __P ((__ptr_t));
 
 #ifdef DEBUG_MALLOC
-extern __ptr_t malloc_dbg __P ((size_t, char* func, char* file, int line));
 extern __ptr_t calloc_dbg __P ((size_t, size_t, char* func, char* file, int line));
-extern void free_dbg __P ((__ptr_t, char* func, char* file, int line));
+extern __ptr_t malloc_dbg __P ((size_t, char* func, char* file, int line));
 extern __ptr_t realloc_dbg __P ((__ptr_t, size_t, char* func, char* file, int line));
-#define malloc(x) malloc_dbg((x),__FUNCTION__,__FILE__,__LINE__)
+extern void free_dbg __P ((__ptr_t, char* func, char* file, int line));
 #define calloc(x,y) calloc_dbg((x),(y),__FUNCTION__,__FILE__,__LINE__)
-#define free(x) free_dbg((x),__FUNCTION__,__FILE__,__LINE__)
+#define malloc(x) malloc_dbg((x),__FUNCTION__,__FILE__,__LINE__)
 #define realloc(x) realloc((x),__FUNCTION__,__FILE__,__LINE__)
+#define free(x) free_dbg((x),__FUNCTION__,__FILE__,__LINE__)
 #endif
 
 
diff --git a/include/unistd.h b/include/unistd.h
index d8a25dfa1..a070b03df 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -25,7 +25,7 @@ extern size_t write __P ((int __fd, __const char * __buf, size_t __n));
 extern off_t lseek __P ((int __fd, off_t __n, int __whence));
 extern int pipe __P ((int __pipedes[2]));
 extern unsigned int alarm __P ((unsigned int __seconds));
-extern int sleep __P ((unsigned int __seconds));
+extern unsigned int sleep __P ((unsigned int __seconds));
 extern void usleep __P ((unsigned long __microseconds));
 extern int pause __P ((void));
 extern char*    crypt __P((__const char *__key, __const char *__salt));
@@ -163,7 +163,6 @@ extern void _exit __P ((int __status)) __attribute__ ((__noreturn__));
 /* Clone the calling process, creating an exact copy.
  *    Return -1 for errors, 0 to the new process,
  *       and the process ID of the new process to the old process.  */
-extern __pid_t __fork __P ((void));
 extern __pid_t fork __P ((void));
 
 /* Clone the calling process, but without copying the whole address space.
diff --git a/libc/inet/.indent.pro b/libc/inet/.indent.pro
new file mode 100644
index 000000000..492ecf1c7
--- /dev/null
+++ b/libc/inet/.indent.pro
@@ -0,0 +1,33 @@
+--blank-lines-after-declarations
+--blank-lines-after-procedures
+--break-before-boolean-operator
+--no-blank-lines-after-commas
+--braces-on-if-line
+--braces-on-struct-decl-line
+--comment-indentation25
+--declaration-comment-column25
+--no-comment-delimiters-on-blank-lines
+--cuddle-else
+--continuation-indentation4
+--case-indentation0
+--else-endif-column33
+--space-after-cast
+--line-comments-indentation0
+--declaration-indentation1
+--dont-format-first-column-comments
+--dont-format-comments
+--honour-newlines
+--indent-level4
+/* changed from 0 to 4 */
+--parameter-indentation4
+--line-length78 /* changed from 75 */
+--continue-at-parentheses
+--no-space-after-function-call-names
+--dont-break-procedure-type
+--dont-star-comments
+--leave-optional-blank-lines
+--dont-space-special-semicolon
+--tab-size4
+/* additions by Mark */
+--case-brace-indentation0
+--leave-preprocessor-space
diff --git a/libc/inet/Makefile b/libc/inet/Makefile
index 519501180..07d84d6eb 100644
--- a/libc/inet/Makefile
+++ b/libc/inet/Makefile
@@ -33,11 +33,13 @@ MOBJ2=encodeh.o decodeh.o encoded.o decoded.o lengthd.o encodeq.o \
 	formquery.o dnslookup.o resolveaddress.o resolvemailbox.o \
 	opennameservers.o closenameservers.o resolvename.o gethostbyname.o\
 	gethostbyaddr.o
+OBJS=$(MOBJ) $(MOBJ2)
+all: $(OBJS) $(LIBC)
 
-all: $(MOBJ) $(MOBJ2) $(LIBC)
+$(LIBC): ar-target
 
-$(LIBC): $(MOBJ) $(MOBJ2)
-	$(AR) $(ARFLAGS) $(LIBC) $(MOBJ) $(MOBJ2)
+ar-target: $(OBJS)
+	$(AR) $(ARFLAGS) $(LIBC) $(OBJS)
 
 $