libc: update the includes to be closer to standards

Fix some clashes FIXME a couple of problem cases

diff --git a/Library/include/arpa/inet.h b/Library/include/arpa/inet.h
index b30cca7..f0d6480 100644 (file)
--- a/Library/include/arpa/inet.h
+++ b/Library/include/arpa/inet.h
@@ -34,9 +34,9 @@ extern int inet_pton(int __af, const char *__src, void *__dst);
 
 #if 0
 /* These are obsolete to the point we don't bother */
-extern struct in_addr inet_makeaddr(in_addr_t net, ip_addr_t host);
-extern in_addr_t inet_lnaof(struct in_addr in);
-extern in_addr_t inet_netof(struct in_addr in);
+extern struct in_addr inet_makeaddr(in_addr_t __net, ip_addr_t __host);
+extern in_addr_t inet_lnaof(struct in_addr __in);
+extern in_addr_t inet_netof(struct in_addr __in);
 #endif
 
 #endif

diff --git a/Library/include/assert.h b/Library/include/assert.h
index 95d4b12..c8d9472 100644 (file)
--- a/Library/include/assert.h
+++ b/Library/include/assert.h
@@ -15,14 +15,14 @@
 
 #else /* NDEBUG */
 
-extern void __assert __P((char *, char *, int));
+extern void __assert(const char *__expr, const char *__file, const int __line);
 
 #define assert(expr)   \
   ((void) ((expr) || (__assert (__STRING(expr),  __FILE__, __LINE__), 0)))
 
 #endif /* NDEBUG */
 
-extern void __errput __P((char *));
+extern void __errput(const char *__txt);
 
 #endif /* __ASSERT_H */
 

diff --git a/Library/include/ctype.h b/Library/include/ctype.h
index beae6d7..ad876f9 100644 (file)
--- a/Library/include/ctype.h
+++ b/Library/include/ctype.h
@@ -5,28 +5,24 @@
 
 #include <stdint.h>
 
-extern int toupper(int c);
-extern int tolower(int c);
+extern int toupper(int __c);
+extern int tolower(int __c);
 
-extern int isalnum(int c);
-extern int isalpha(int c);
-extern int isascii(int c);
-extern int isblank(int c);
-extern int iscntrl(int c);
-extern int isdigit(int c);
-extern int isgraph(int c);
-extern int islower(int c);
-extern int isprint(int c);
-extern int ispunct(int c);
-extern int isspace(int c);
-extern int isupper(int c);
-extern int isxdigit(int c);
+extern int isalnum(int __c);
+extern int isalpha(int __c);
+extern int isascii(int __c);
+extern int isblank(int __c);
+extern int iscntrl(int __c);
+extern int isdigit(int __c);
+extern int isgraph(int __c);
+extern int islower(int __c);
+extern int isprint(int __c);
+extern int ispunct(int __c);
+extern int isspace(int __c);
+extern int isupper(int __c);
+extern int isxdigit(int __c);
 
-#define isascii(c) (!((uint8_t)c & 0x80))
+#define isascii(c) (!((uint8_t)(c) & 0x80))
 #define toascii(c) ((c) & 0x7f)
 
-#define isdecimal isdigit
-#define _tolower tolower
-#define _toupper toupper
-
 #endif /* __CTYPE_H */

diff --git a/Library/include/curses.h b/Library/include/curses.h
index 4313462..8569fb6 100644 (file)
--- a/Library/include/curses.h
+++ b/Library/include/curses.h
@@ -2,16 +2,10 @@
 
 #ifndef CURSES_H
 
-#define _BIG_MACHINE_
-
 #include <termios.h>
 #include <stdarg.h>
 #include <stdio.h>
 
-#ifndef _PROTOTYPE
-#define _PROTOTYPE(x,y)        x y
-#endif
-
 typedef int bool;
 
 #define TRUE 1
@@ -139,90 +133,88 @@ extern unsigned int ACS_BOARD;
 extern unsigned int ACS_LANTERN;
 extern unsigned int ACS_BLOCK;
 
-#ifdef _BIG_MACHINE_
-_PROTOTYPE( char *unctrl, (char _c) );
-_PROTOTYPE( int baudrate, (void));
-_PROTOTYPE( void beep, (void));
-_PROTOTYPE( void cbreak, (void));
-_PROTOTYPE( void clearok, (WINDOW *_win, bool _flag) );
-_PROTOTYPE( void clrscr, (void));
-_PROTOTYPE( void curs_set, (int _visibility) );
-_PROTOTYPE( void delwin, (WINDOW *_win) );
-_PROTOTYPE( void doupdate, (void));
-_PROTOTYPE( void echo, (void));
-_PROTOTYPE( int endwin, (void));
-_PROTOTYPE( int erasechar, (void));
-_PROTOTYPE( void fatal, (char *_s) );
-_PROTOTYPE( int fixterm, (void));
-_PROTOTYPE( void flash, (void));
-_PROTOTYPE( void gettmode, (void));
-_PROTOTYPE( void idlok, (WINDOW *_win, bool _flag) );
-_PROTOTYPE( WINDOW *initscr, (void));
-_PROTOTYPE( void keypad, (WINDOW *_win, bool _flag) );
-_PROTOTYPE( int killchar, (void));
-_PROTOTYPE( void leaveok, (WINDOW *_win, bool _flag) );
-_PROTOTYPE( char *longname, (void));
-_PROTOTYPE( void meta, (WINDOW *_win, bool _flag) );
-_PROTOTYPE( int mvcur, (int _oldy, int _oldx, int _newy, int _newx) );
-_PROTOTYPE( int mvinch, (int _y, int _x) );
-_PROTOTYPE( int mvprintw, (int _y, int _x, const char *_fmt, ...) );
-_PROTOTYPE( int mvscanw, (int _y, int _x, const char *_fmt, ...) );
-_PROTOTYPE( int mvwin, (WINDOW *_win, int _begy, int _begx) );
-_PROTOTYPE( int mvwinch, (WINDOW *_win, int _y, int _x) );
-_PROTOTYPE( int mvwprintw, (WINDOW *_win, int _y, int _x, const char *_fmt, ...) );
-_PROTOTYPE( int mvwscanw, (WINDOW *_win, int _y, int _x, const char *_fmt,
-                                                                        ...) );
-_PROTOTYPE( WINDOW *newwin, (int _num_lines, int _num_cols, int _y, int _x));
-_PROTOTYPE( void nl, (void));
-_PROTOTYPE( void nocbreak, (void));
-_PROTOTYPE( void nodelay, (WINDOW *_win, bool _flag) );
-_PROTOTYPE( void noecho, (void));
-_PROTOTYPE( void nonl, (void));
-_PROTOTYPE( void noraw, (void));
-_PROTOTYPE( int outc, (int _c) );
-_PROTOTYPE( void overlay, (WINDOW *_win1, WINDOW *_win2) );
-_PROTOTYPE( void overwrite, (WINDOW *_win1, WINDOW *_win2) );
-_PROTOTYPE( void poscur, (int _r, int _c) );
-_PROTOTYPE( int printw, (const char *_fmt, ...) );
-_PROTOTYPE( void raw, (void));
-_PROTOTYPE( int resetterm, (void));
-_PROTOTYPE( int saveoldterm, (void));
-_PROTOTYPE( int saveterm, (void));
-_PROTOTYPE( int savetty, (void));
-_PROTOTYPE( int scanw, (const char *_fmt, ...) );
-_PROTOTYPE( void scroll, (WINDOW *_win) );
-_PROTOTYPE( void scrollok, (WINDOW *_win, bool _flag) );
-_PROTOTYPE( int setscrreg, (int _top, int _bottom) );
-_PROTOTYPE( int setterm, (char *_type) );
-_PROTOTYPE( int setupterm, (void));
-_PROTOTYPE( WINDOW *subwin, (WINDOW *_orig, int _nlines, int _ncols, int _y,
-                                       int _x));
-_PROTOTYPE( int tabsize, (int _ts) );
-_PROTOTYPE( void touchwin, (WINDOW *_win) );
-_PROTOTYPE( int waddch, (WINDOW *_win, int _c) );
-_PROTOTYPE( int waddstr, (WINDOW *_win, char *_str) );
-_PROTOTYPE( int wbox, (WINDOW *_win, int _ymin, int _xmin, int _ymax,
-                               int _xmax, unsigned int _v, unsigned int _h) );
-_PROTOTYPE( void wclear, (WINDOW *_win) );
-_PROTOTYPE( int wclrtobot, (WINDOW *_win) );
-_PROTOTYPE( int wclrtoeol, (WINDOW *_win) );
-_PROTOTYPE( int wdelch, (WINDOW *_win) );
-_PROTOTYPE( int wdeleteln, (WINDOW *_win) );
-_PROTOTYPE( void werase, (WINDOW *_win) );
-_PROTOTYPE( int wgetch, (WINDOW *_win) );
-_PROTOTYPE( int wgetstr, (WINDOW *_win, char *_str) );
-_PROTOTYPE( int winch, (WINDOW *_win) );
-_PROTOTYPE( int winsch, (WINDOW *_win, char _c) );
-_PROTOTYPE( int winsertln, (WINDOW *_win) );
-_PROTOTYPE( int wmove, (WINDOW *_win, int _y, int _x) );
-_PROTOTYPE( void wnoutrefresh, (WINDOW *_win) );
-_PROTOTYPE( int wprintw, (WINDOW *_win, const char *_fmt, ...));
-_PROTOTYPE( void wrefresh, (WINDOW *_win) );
-_PROTOTYPE( int wscanw, (WINDOW *_win, const char *_fmt, ...));
-_PROTOTYPE( int wsetscrreg, (WINDOW *_win, int _top, int _bottom) );
-_PROTOTYPE( int wtabsize, (WINDOW *_win, int _ts) );
+extern char *unctrl(char _c);
+extern int baudrate(void);
+extern void beep(void);
+extern void cbreak(void);
+extern void clearok(WINDOW *_win, bool _flag);
+extern void clrscr(void);
+extern void curs_set(int _visibility);
+extern void delwin(WINDOW *_win);
+extern void doupdate(void);
+extern void echo(void);
+extern int endwin(void);
+extern int erasechar(void);
+extern void fatal(char *_s);
+extern int fixterm(void);
+extern void flash(void);
+extern void gettmode(void);
+extern void idlok(WINDOW *_win, bool _flag);
+extern WINDOW *initscr(void);
+extern void keypad(WINDOW *_win, bool _flag);
+extern int killchar(void);
+extern void leaveok(WINDOW *_win, bool _flag);
+extern char *longname(void);
+extern void meta(WINDOW *_win, bool _flag);
+extern int mvcur(int _oldy, int _oldx, int _newy, int _newx);
+extern int mvinch(int _y, int _x);
+extern int mvprintw(int _y, int _x, const char *_fmt, ...);
+extern int mvscanw(int _y, int _x, const char *_fmt, ...);
+extern int mvwin(WINDOW *_win, int _begy, int _begx);
+extern int mvwinch(WINDOW *_win, int _y, int _x);
+extern int mvwprintw(WINDOW *_win, int _y, int _x, const char *_fmt, ...);
+extern int mvwscanw(WINDOW *_win, int _y, int _x, const char *_fmt,
+                                                                        ...);
+extern WINDOW *newwin(int _num_lines, int _num_cols, int _y, int _x);
+extern void nl(void);
+extern void nocbreak(void);
+extern void nodelay(WINDOW *_win, bool _flag);
+extern void noecho(void);
+extern void nonl(void);
+extern void noraw(void);
+extern int outc(int _c);
+extern void overlay(WINDOW *_win1, WINDOW *_win2);
+extern void overwrite(WINDOW *_win1, WINDOW *_win2);
+extern void poscur(int _r, int _c);
+extern int printw(const char *_fmt, ...);
+extern void raw(void);
+extern int resetterm(void);
+extern int saveoldterm(void);
+extern int saveterm(void);
+extern int savetty(void);
+extern int scanw(const char *_fmt, ...);
+extern void scroll(WINDOW *_win);
+extern void scrollok(WINDOW *_win, bool _flag);
+extern int setscrreg(int _top, int _bottom);
+extern int setterm(char *_type);
+extern int setupterm(void);
+extern WINDOW *subwin(WINDOW *_orig, int _nlines, int _ncols, int _y,
+                                       int _x);
+extern int tabsize(int _ts);
+extern void touchwin(WINDOW *_win);
+extern int waddch(WINDOW *_win, int _c);
+extern int waddstr(WINDOW *_win, char *_str);
+extern int wbox(WINDOW *_win, int _ymin, int _xmin, int _ymax,
+                               int _xmax, unsigned int _v, unsigned int _h);
+extern void wclear(WINDOW *_win);
+extern int wclrtobot(WINDOW *_win);
+extern int wclrtoeol(WINDOW *_win);
+extern int wdelch(WINDOW *_win);
+extern int wdeleteln(WINDOW *_win);
+extern void werase(WINDOW *_win);
+extern int wgetch(WINDOW *_win);
+extern int wgetstr(WINDOW *_win, char *_str);
+extern int winch(WINDOW *_win);
+extern int winsch(WINDOW *_win, char _c);
+extern int winsertln(WINDOW *_win);
+extern int wmove(WINDOW *_win, int _y, int _x);
+extern void wnoutrefresh(WINDOW *_win);
+extern int wprintw(WINDOW *_win, const char *_fmt, ...);
+extern void wrefresh(WINDOW *_win);
+extern int wscanw(WINDOW *_win, const char *_fmt, ...);
+extern int wsetscrreg(WINDOW *_win, int _top, int _bottom);
+extern int wtabsize(WINDOW *_win, int _ts);
 
-#endif
 #define CURSES_H
 
 #endif

diff --git a/Library/include/dirent.h b/Library/include/dirent.h
index 695088e..0f6fe5a 100644 (file)
--- a/Library/include/dirent.h
+++ b/Library/include/dirent.h
@@ -4,6 +4,11 @@
 #include <types.h>
 #endif
 
+/* FIXME:
+ openddir_r/closedir_r should be in a Fuzix specific space
+ MAXNAMELEN ought to die and the users be cleaned up
+ */
+
 /* `MAXNAMLEN' is the BSD name for what POSIX calls `NAME_MAX'.  */
 #define MAXNAMLEN      30
 #define NAME_MAX        30
@@ -33,33 +38,33 @@ typedef struct {
 } DIR;                         /* stream data from opendir() */
 
 
-typedef int (*__dir_select_fn_t) __P ((struct dirent *));
+typedef int (*__dir_select_fn_t)(struct dirent *__de);
 
-typedef int (*__dir_compar_fn_t) __P ((struct dirent **, struct dirent **));
+typedef int (*__dir_compar_fn_t)(struct dirent **__d1, struct dirent **__d2);
 
 /* Kernel directory format off disk */
 struct __dirent {
        ino_t           d_ino;
        char            d_name[30];
 };
-extern DIR *opendir __P ((char *__name));
-extern DIR *opendir_r __P ((DIR *__dirp, char *__name));
-extern int closedir __P ((DIR *__dirp));
-extern int closedir_r __P ((DIR *__dirp));
-extern struct dirent *readdir __P ((DIR *__dirp));
-extern void rewinddir __P ((DIR *__dirp));
+extern DIR *opendir(char *__name);
+extern DIR *opendir_r(DIR *__dirp, char *__name);
+extern int closedir(DIR *__dirp);
+extern int closedir_r(DIR *__dirp);
+extern struct dirent *readdir(DIR *__dirp);
+extern void rewinddir(DIR *__dirp);
 
-extern void seekdir __P ((DIR *__dirp, off_t __pos));
-extern off_t telldir __P ((DIR *__dirp));
+extern void seekdir(DIR *__dirp, off_t __pos);
+extern off_t telldir(DIR *__dirp);
 
 /* Scan the directory DIR, calling SELECT on each directory entry.
    Entries for which SELECT returns nonzero are individually malloc'd,
    sorted using qsort with CMP, and collected in a malloc'd array in
    *NAMELIST.  Returns the number of entries selected, or -1 on error.
  */
-extern int scandir __P ((char *__dir,
+extern int scandir(char *__dir,
                         struct dirent ***__namelist,
                         __dir_select_fn_t __select,
-                        __dir_compar_fn_t __compar));
+                        __dir_compar_fn_t __compar);
 
 #endif /* dirent.h  */

diff --git a/Library/include/err.h b/Library/include/err.h
index d77f95e..6b49069 100644 (file)
--- a/Library/include/err.h
+++ b/Library/include/err.h
@@ -4,18 +4,18 @@
 #include <stdarg.h>
 /* BSD err functionality */
 
-extern void err(int eval, const char *fmt, ...);
-extern void errc(int eval, int code, const char *fmt, ...);
-extern void errx(int eval, const char *fmt, ...);
-extern void warn(const char *fmt, ...);
-extern void warnc(int code, const char *fmt, ...);
-extern void warnx(const char *fmt, ...);
+extern void err(int __eval, const char *__fmt, ...);
+extern void errc(int __eval, int __code, const char *__fmt, ...);
+extern void errx(int __eval, const char *__fmt, ...);
+extern void warn(const char *__fmt, ...);
+extern void warnc(int __code, const char *__fmt, ...);
+extern void warnx(const char *__fmt, ...);
 
-extern void verr(int eval, const char *fmt, va_list args);
-extern void verrc(int eval, int code, const char *fmt, va_list args);
-extern void verrx(int eval, const char *fmt, va_list args);
-extern void vwarn(const char *fmt, va_list args);
-extern void vwarnc(int code, const char *fmt, va_list args);
-extern void vwarnx(const char *fmt, va_list args);
+extern void verr(int __eval, const char *__fmt, va_list __args);
+extern void verrc(int __eval, int __code, const char *__fmt, va_list __args);
+extern void verrx(int __eval, const char *__fmt, va_list __args);
+extern void vwarn(const char *__fmt, va_list __args);
+extern void vwarnc(int __code, const char *__fmt, va_list __args);
+extern void vwarnx(const char *__fmt, va_list __args);
 
 #endif

diff --git a/Library/include/errno.h b/Library/include/errno.h
index cb7f145..a63f75d 100644 (file)
--- a/Library/include/errno.h
+++ b/Library/include/errno.h
@@ -62,7 +62,5 @@ extern int sys_nerr;
 extern char *sys_errlist[];
 extern int errno;
 
-extern char *strerror __P((int _errno));
-
 #endif
 

diff --git a/Library/include/fcntl.h b/Library/include/fcntl.h
index 182715e..c9bf47c 100644 (file)
--- a/Library/include/fcntl.h
+++ b/Library/include/fcntl.h
@@ -39,9 +39,8 @@
 typedef struct flock {
    short l_type;
    short l_whence;
-   long l_start;
-   long l_len;
-   short l_sysid;
+   off_t l_start;
+   off_t l_len;
    pid_t l_pid;
 } flock_t;
 

diff --git a/Library/include/features.h b/Library/include/features.h
index c6f86c6..337d4ed 100644 (file)
--- a/Library/include/features.h
+++ b/Library/include/features.h
@@ -7,30 +7,6 @@
 #endif
 #endif
 
-#ifdef __STDC__
-
-#ifndef VOID
-#define VOID   void
-#endif
-#ifndef __P
-#define __P(a) a
-#endif
-#define __const const
-
-#else  /* K&R */
-
-#ifndef VOID
-#define VOID
-#endif
-#ifndef __P
-#define __P(a) ()
-#endif
-#define __const
-#define volatile
-#define void   char
-
-#endif /* __STDC__ */
-
 #include <sys/cdefs.h>
 
 #endif

diff --git a/Library/include/getopt.h b/Library/include/getopt.h
index fcfa690..a516f6c 100644 (file)
--- a/Library/include/getopt.h
+++ b/Library/include/getopt.h
@@ -8,6 +8,6 @@ extern char *optarg;
 extern int opterr;
 extern int optind;
 
-extern int getopt __P((int argc, char **argv, char *shortopts));
+extern int getopt(int __argc, char **__argv, char *__shortopts));
 
 #endif /* __GETOPT_H */

diff --git a/Library/include/grp.h b/Library/include/grp.h
index 4b9ca27..cea0c31 100644 (file)
--- a/Library/include/grp.h
+++ b/Library/include/grp.h
@@ -16,18 +16,18 @@ struct group {
        char    **gr_mem;       /* Member list. */
 };
 
-extern void setgrent __P((void));
-extern void endgrent __P((void));
-extern struct group *getgrent __P((void));
+extern void setgrent(void);
+extern void endgrent(void);
+extern struct group *getgrent(void);
 
-extern struct group *getgrgid __P((const gid_t gid));
-extern struct group *getgrnam __P((const char * name));
+extern struct group *getgrgid(const gid_t __gid);
+extern struct group *getgrnam(const char *__name);
 
-extern struct group * fgetgrent __P((FILE * file));
+extern struct group *fgetgrent(FILE *__file);
 
-extern int initgroups __P((const char * user, gid_t gid));
+extern int initgroups(const char *__user, gid_t __gid);
 
-extern struct group * __getgrent __P((int grp_fd));
+extern struct group * __getgrent(int __grp_fd);
 
 extern char *_path_group;
 

diff --git a/Library/include/libintl.h b/Library/include/libintl.h
index 1a00715..790fb86 100644 (file)
--- a/Library/include/libintl.h
+++ b/Library/include/libintl.h
@@ -2,18 +2,18 @@
 #define _LIBINTL_H
 
 #define _(s)   (s)
-#define N_(s)
+#define N_(s)  (s)
 
-extern char *bindtextdomain(const char *domainname, const char *dirname);
+extern char *bindtextdomain(const char *__domainname, const char *__dirname);
 
-extern char *gettext(const char *msgid);
-extern char *dgettext(const char *domainname, const char *msgid);
-extern char *dcgettext(const char *domainnanem, const char *msgid, int category);
+extern char *gettext(const char *__msgid);
+extern char *dgettext(const char *__domainname, const char *__msgid);
+extern char *dcgettext(const char *domainnanem, const char *__msgid, int __category);
 
-extern char *ngettext(const char *msgid, const char *msgid_plural, unsigned long n);
-extern char *dngettext(const char *domainname, const char *msgid, const char *msgid_plural, unsigned long n);
-extern char *dcngettext(const char *domainname, const char *msgid, const char *msgid_plural, unsigned long n, int category);
+extern char *ngettext(const char *__msgid, const char *__msgid_plural, unsigned long __n);
+extern char *dngettext(const char *__domainname, const char *__msgid, const char *__msgid_plural, unsigned long __n);
+extern char *dcngettext(const char *__domainname, const char *__msgid, const char *__msgid_plural, unsigned long __n, int __category);
 
-extern char *textdomain(const char *domainname);
+extern char *textdomain(const char *__domainname);
 
 #endif

diff --git a/Library/include/malloc.h b/Library/include/malloc.h
index 0323417..ed2238f 100644 (file)
--- a/Library/include/malloc.h
+++ b/Library/include/malloc.h
@@ -4,10 +4,9 @@
 #include <types.h>
 #endif
 
-extern void free __P((void *));
-extern void *malloc __P((size_t));
-extern void *realloc __P((void *, size_t));
-extern void *calloc __P((size_t, size_t));
-extern void *alloca __P((size_t));
+extern void free(void *__ptr);
+extern void *malloc(size_t __size);
+extern void *realloc(void *__ptr, size_t __size);
+extern void *calloc(size_t __nmemb, size_t __size);
 
 #endif

diff --git a/Library/include/pwd.h b/Library/include/pwd.h
index 2f66226..3e5fc22 100644 (file)
--- a/Library/include/pwd.h
+++ b/Library/include/pwd.h
@@ -16,22 +16,20 @@ struct passwd {
        char    *pw_shell;      /* Shell program */
 };
 
-extern void setpwent __P((void));
-extern void endpwent __P((void));
-extern struct passwd *getpwent __P((void));
+extern void setpwent(void);
+extern void endpwent(void);
+extern struct passwd *getpwent(void);
 
-extern int putpwent __P((const struct passwd * __p, FILE * __f));
-extern int getpw __P((uid_t uid, char *buf));
+extern int putpwent(const struct passwd *__p, FILE *__f);
+extern int getpw(uid_t uid, char *buf);
 
-extern struct passwd *fgetpwent __P((FILE * file));
+extern struct passwd *fgetpwent(FILE *__file);
 
-extern struct passwd *getpwuid __P((uid_t __uid));
-extern struct passwd *getpwnam __P((const char *));
+extern struct passwd *getpwuid(uid_t __uid);
+extern struct passwd *getpwnam(const char *__name);
 
-extern struct passwd * __getpwent __P((int passwd_fd));
+extern struct passwd * __getpwent(int __passwd_fd);
 
 extern char *_path_passwd;
 
-#define getlogin()     getpwnam(getuid())
-
 #endif /* pwd.h  */

diff --git a/Library/include/regexp.h b/Library/include/regexp.h
index 9882e3d..7b29699 100644 (file)
--- a/Library/include/regexp.h
+++ b/Library/include/regexp.h
@@ -19,9 +19,9 @@ typedef struct regexp {
        char    program[1];     /* Unwarranted chumminess with compiler. */
 } regexp;
 
-extern regexp *regcomp(char *);
+extern regexp *regcomp(char *__exp);
 extern int regexec(regexp *__prog, char *__string);
 extern void regsub(regexp *__prog, char *__source, char *__dest);
-extern void regerror(const char *);
+extern void regerror(const char *__err);
 
 #endif

diff --git a/Library/include/search.h b/Library/include/search.h
index 93dde2c..6eadb9c 100644 (file)
--- a/Library/include/search.h
+++ b/Library/include/search.h
@@ -7,7 +7,7 @@
 
 #ifndef __COMPAR_FN_T
 #define __COMPAR_FN_T
-typedef int (*__compar_fn_t) __P((__ptr_t, __ptr_t));
+typedef int (*__compar_fn_t)(__ptr_t, __ptr_t);
 #endif
 
 /* for use with hsearch(3) */
@@ -15,9 +15,9 @@ typedef int (*__compar_fn_t) __P((__ptr_t, __ptr_t));
 typedef struct entry { char *key; char *data; } ENTRY;
 typedef enum { FIND, ENTER } ACTION;
 
-extern ENTRY * hsearch __P((ENTRY __item, ACTION __action));
-extern int     hcreate __P((unsigned __nel));
-extern void    hdestroy __P((void));
+extern ENTRY * hsearch(ENTRY __item, ACTION __action);
+extern int     hcreate(unsigned __nel);
+extern void    hdestroy(void);
 
 /* The tsearch routines are very interesting. They make many
  * assumptions about the compiler. It assumpts that the first field
@@ -25,31 +25,30 @@ extern void    hdestroy __P((void));
  * Everything depends on that. It is a very tricky stuff. H.J.
  */
 /* For tsearch */
-typedef enum { preorder, postorder, endorder, leaf } VISIT;
-
-extern void *tsearch __P((void *__key, void **__rootp, __compar_fn_t compar));
 
-extern void *tfind __P((void *__key, void ** __rootp, __compar_fn_t compar));
+typedef enum { preorder, postorder, endorder, leaf } VISIT;
 
-extern void *tdelete __P((void * __key, void ** __rootp, __compar_fn_t compar));
+extern void *tsearch(void *__key, void **__rootp, __compar_fn_t compar);
+extern void *tfind(void *__key, void ** __rootp, __compar_fn_t compar);
+extern void *tdelete(void * __key, void ** __rootp, __compar_fn_t compar);
 
 #ifndef __ACTION_FN_T
 #define __ACTION_FN_T
 /* FYI, the first argument should be a pointer to "key".
  * Please read the man page for details.
  */
-typedef void (*__action_fn_t) __P((void *__nodep, VISIT __value, int __level));
+typedef void (*__action_fn_t)(void *__nodep, VISIT __value, int __level);
 #endif
 
-extern void twalk __P((void * __root, __action_fn_t action));
+extern void twalk(void * __root, __action_fn_t action);
 
 
-extern void * lfind __P((void * __key, void * __base,
+extern void * lfind(void * __key, void * __base,
                         size_t * __nmemb, size_t __size,
-                        __compar_fn_t __compar));
+                        __compar_fn_t __compar);
 
-extern void * lsearch __P((void * __key, void * __base,
+extern void * lsearch(void * __key, void * __base,
                         size_t * __nmemb, size_t __size,
-                        __compar_fn_t __compar));
+                        __compar_fn_t __compar);
 
 #endif /* search.h */

diff --git a/Library/include/setjmp.h b/Library/include/setjmp.h
index e2cfd7f..5eb71b0 100644 (file)
--- a/Library/include/setjmp.h
+++ b/Library/include/setjmp.h
@@ -8,31 +8,31 @@
 
        /* FIXME: need to add alt registers */
        typedef int jmp_buf[7];
-       extern int __setjmp(jmp_buf env);
+       extern int __setjmp(jmp_buf __env);
        #define setjmp(x) __setjmp(x)
 
 #elif defined(__CC65__)
 
        typedef char jmp_buf[5];
-       extern int _setjmp(jmp_buf env);
+       extern int _setjmp(jmp_buf __env);
        #define setjmp(x) _setjmp(x)
 
 #elif defined(__MSP430__)
 
        typedef uint16_t jmp_buf[11];
-       extern int setjmp(jmp_buf env);
+       extern int setjmp(jmp_buf __env);
        __attribute__((__noreturn__)) void longjmp (jmp_buf env, int val);
 
 #elif defined(__m6809__)
 
        typedef uint16_t jmp_buf[4];
-       extern int setjmp(jmp_buf env);
+       extern int setjmp(jmp_buf __env);
        __attribute__((__noreturn__)) void longjmp (jmp_buf env, int val);
 
 #else
        #error jmp_buf definition not set for this architecture
 #endif
 
-extern void longjmp(jmp_buf env, int rv);
+extern void longjmp(jmp_buf __env, int __rv);
 
 #endif

diff --git a/Library/include/signal.h b/Library/include/signal.h
index 891aac3..f55b506 100644 (file)
--- a/Library/include/signal.h
+++ b/Library/include/signal.h
@@ -52,7 +52,7 @@ typedef enum {
 typedef uint32_t sigset_t;     /* at least 16 bits: use 32 in user space */
                                /* for expansion space */
 /* Type of a signal handler.  */
-typedef void (*sighandler_t) __P((int));
+typedef void (*sighandler_t)(int);
 
 #define SIG_DFL ((sighandler_t)0)      /* default signal handling */
 #define SIG_IGN ((sighandler_t)1)      /* ignore signal */
@@ -60,10 +60,10 @@ typedef void (*sighandler_t) __P((int));
 
 extern const char *sys_siglist[];
 
-extern void sighold(int sig);
-extern void sigrelse(int sig);
-extern void sigignore(int sig);
-extern sighandler_t sigset(int sig, sighandler_t disp);
+extern void sighold(int __sig);
+extern void sigrelse(int __sig);
+extern void sigignore(int __sig);
+extern sighandler_t sigset(int __sig, sighandler_t __disp);
 
 typedef int sig_atomic_t;
 

diff --git a/Library/include/stdio.h b/Library/include/stdio.h
index 8acfc7f..5a9ffab 100644 (file)
--- a/Library/include/stdio.h
+++ b/Library/include/stdio.h
@@ -70,11 +70,11 @@ extern FILE stderr[1];
 #define putchar(c)     fputc((c), stdout)
 #define getchar()      fgetc(stdin)
 
-extern char *gets __P((char *));
-extern char *gets_s __P((char *, size_t));
+extern char *gets(char *__s);
+extern char *gets_s(char *__s, size_t __size);
 
-extern int _putchar __P((int));
-extern int _getchar __P((void));
+extern int _putchar(int __c);
+extern int _getchar(void);
 
 #define ferror(fp)     (((fp)->mode&__MODE_ERR) != 0)
 #define feof(fp)       (((fp)->mode&__MODE_EOF) != 0)
@@ -82,77 +82,78 @@ extern int _getchar __P((void));
 #define fileno(fp)     ((fp)->fd)
 
 /* These two call malloc */
-extern int setvbuf __P((FILE*, char*, int, size_t));
+extern int setvbuf(FILE *__stream, char *__buf, int __mode, size_t __size);
 #define setlinebuf(__fp)       setvbuf((__fp), (char*)0, _IOLBF, 0)
 
 /* These don't */
-extern void setbuffer __P((FILE*, char*, size_t));
+extern void setbuffer(FILE *__stream, char *__buf, size_t __size);
 #define setbuf(__fp, __buf)    setbuffer((__fp), (__buf), BUFSIZ)
 
-extern int fgetc __P((FILE*));
-extern int fputc __P((int, FILE*));
-extern int ungetc __P((int, FILE*));
+extern int fgetc(FILE *__stream);
+extern int fputc(int, FILE *__stream);
+extern int ungetc(int, FILE *__stream);
 
-extern int fclose __P((FILE*));
-extern int fflush __P((FILE*));
+extern int fclose(FILE *__stream);
+extern int fflush(FILE *__stream);
+/* FIXME: this symbol needs to be __ */
 #define stdio_pending(fp) ((fp)->bufread > (fp)->bufpos)
-extern char *fgets __P((char*, size_t, FILE*));
-extern FILE *__fopen __P((const char*, int, FILE*, const char*));
+extern char *fgets(char *__s, size_t __size, FILE *__stream);
+extern FILE *__fopen(const char *__path, int __fd, FILE * __stream, const char *__mode);
 
 #define fopen(__file, __mode)        __fopen((__file), -1, (FILE*)0, (__mode))
 #define freopen(__file, __mode, __fp) __fopen((__file), -1, (__fp), (__mode))
 #define fdopen(__file, __mode) __fopen((char*)0, (__file), (FILE*)0, (__mode))
 
-extern FILE *tmpfile __P((void));
+extern FILE *tmpfile(void);
 
-extern int fputs __P((const void *, FILE*));
-extern int puts __P((const void *));
+extern int fputs(const void *__s, FILE *__stream);
+extern int puts(const void *__s);
 
-extern int fread __P((void *, size_t, size_t, FILE *));
-extern int fwrite __P((const void *, size_t, size_t, FILE *));
+extern int fread(void *__ptr, size_t __size, size_t, FILE *__stream);
+extern int fwrite(const void *__ptr, size_t __size, size_t __nmemb, FILE *__stream);
 
-extern int fseek __P((FILE *fp, long offset, int whence));
-extern long ftell __P((FILE *fp));
+extern int fseek(FILE *__stream, long __offset, int __whence);
+extern long ftell(FILE *__stream);
 #define fseeko fseek
 #define ftello  ftell
 
-extern int fgetpos __P((FILE *fp, fpos_t *pos));
-extern int fsetpos __P((FILE *fp, fpos_t *pos));
+extern int fgetpos(FILE *__stream, fpos_t *__pos);
+extern int fsetpos(FILE *__stream, fpos_t *__pos);
 
-extern int printf __P((const char*, ...));
-extern int fprintf __P((FILE*, const char*, ...));
-extern int sprintf __P((char*, const char*, ...));
-extern int snprintf __P((char*, size_t, const char*, ...));
+extern int printf(const char *__fmt, ...);
+extern int fprintf(FILE *__stream, const char *__fmt, ...);
+extern int sprintf(char *__str, const char *__fmt, ...);
+extern int snprintf(char *__str, size_t __size, const char *__fmt, ...);
 
-extern int vprintf __P((const char*, va_list));
-extern int vfprintf __P((FILE*, const char*, va_list));
-extern int _vfnprintf __P((FILE*, size_t, const char*, va_list));
-extern int vsprintf __P((char*, const char*, va_list));
-extern int vsnprintf __P((char*, size_t, const char*, va_list));
+extern int vprintf(const char*, va_list __ap);
+extern int vfprintf(FILE *__stream, const char*, va_list __ap);
+extern int _vfnprintf(FILE *__stream, size_t __size, const char *__fmt, va_list __ap);
+extern int vsprintf(char *__str, const char *__fmt, va_list __ap);
+extern int vsnprintf(char *__str, size_t __size, const char *__fmt, va_list __ap);
 
-extern int scanf __P((const char*, ...));
-extern int fscanf __P((FILE*, const char*, ...));
-extern int sscanf __P((char*, const char*, ...));
+extern int scanf(const char *__fmt, ...);
+extern int fscanf(FILE *__stream, const char *__fmt, ...);
+extern int sscanf(char *__str, const char *__fmt, ...);
 
-extern int vscanf __P((const char*, va_list));
-extern int vfscanf __P((FILE*, const char*, va_list));
-extern int vsscanf __P((char*, const char*, va_list));
+extern int vscanf(const char *__fmt, va_list __ap);
+extern int vfscanf(FILE *__stream, const char *__fmt, va_list __ap);
+extern int vsscanf(char *__str, const char *__fmt, va_list __ap);
 
-extern void perror __P((const char *__s));
+extern void perror(const char *__s);
 
-extern char *tmpnam __P((char *buf));
+extern char *tmpnam(char *__buf);
 
-extern int rename __P((const char *oldname, const char *newname));
-extern void rewind __P((FILE *fp));
-extern FILE *popen __P((const char *, const char *));
-extern int pclose __P((FILE *));
+extern int rename(const char *__oldname, const char *__newname);
+extern void rewind(FILE *__stream);
+extern FILE *popen(const char *__command, const char *__type);
+extern int pclose(FILE *__stream);
 
-extern char *cuserid __P((char *__buf));
+extern char *cuserid(char *__buf);
 #define L_cuserid      9
-extern char *ctermid __P((char *__buf));
+extern char *ctermid(char *__buf);
 #define L_ctermid      9
 
-extern int getw __P((FILE *__f));
-extern int putw __P((int __n, FILE *__f));
+extern int getw(FILE *__f);
+extern int putw(int __n, FILE *__f);
 
 #endif /* __STDIO_H */

diff --git a/Library/include/stdlib.h b/Library/include/stdlib.h
index 8c0a7ac..2f09c04 100644 (file)
--- a/Library/include/stdlib.h
+++ b/Library/include/stdlib.h
@@ -27,72 +27,74 @@ typedef struct {
 #define EXIT_FAILURE 1
 #define EXIT_SUCCESS 0
 
-extern void exit __P((int));
-extern void abort __P((void));
+extern void exit(int __status);
+extern void abort(void);
 
 
-extern int rand __P((void));
-extern void srand __P((uint seed));
+extern int rand(void);
+extern void srand(unsigned int __seed);
 
-extern char *__longtoa __P((unsigned long, char *, int, char, char));
-extern char *ultoa __P((unsigned long value, char *strP, int radix));
-extern char *ltoa __P((long value, char *strP, int radix));
+/* FIXME: the *toa formats are not standard so belong in a fuzix namespace */
+/* FIXME: untangle all our excessive ultoa etc variants */
+extern char *ultoa(unsigned long __value, char *__strP, int __radix);
+extern char *ltoa(long __value, char *__strP, int __radix);
 
-extern int atoi __P((const char *str));
-extern long atol __P((const char *str));
-extern double atof __P((const char *str));
+extern int atoi(const char *__nptr);
+extern long atol(const char *__nptr);
+extern double atof(const char *__nptr);
 
-extern char *_itoa __P((int value));
-extern char *_uitoa __P((unsigned int value));
-extern char *_ltoa __P((long value));
-extern char *_ultoa __P((unsigned long value));
+extern char *_itoa(int __value);
+extern char *_uitoa(unsigned int __value);
+extern char *_ltoa(long __value);
+extern char *_ultoa(unsigned long __value);
 
-extern char *__ultostr __P((unsigned long value, int radix));
-extern char *__ltostr __P((long value, int radix));
+extern char *__ultostr(unsigned long value, int __radix);
+extern char *__ltostr(long __value, int __radix);
 
-extern long strtol __P ((const char * nptr, char ** endptr, int base));
-extern unsigned long strtoul __P ((const char * nptr,
-                                  char ** endptr, int base));
+extern long strtol(const char *__nptr, char **__endptr, int __base);
+extern unsigned long strtoul(const char *__nptr,
+                                  char **__endptr, int __base);
 
-extern int mkstemp(char *template);
-extern int mkstemps(char *template, int suffix);
+extern int mkstemp(char *__template);
+extern int mkstemps(char *__template, int __suffix);
 
 #ifndef __HAS_NO_DOUBLES__
-extern double strtod __P ((const char * nptr, char ** endptr));
+extern double strtod(const char *__nptr, char **__endptr);
 #endif
 
 extern char **environ;
-extern char *getenv __P((char *));
-extern int putenv __P((char *));
-extern int setenv __P((char *, char *, int));
-extern void unsetenv __P((char *));
+extern char *getenv(char *__name);
+extern int putenv(char *__name);
+extern int setenv(char *__name, char *__value, int __overwrite);
+extern void unsetenv(char *__name);
 
-typedef void (*atexit_t) __P((void));
-extern int atexit __P((atexit_t));
+/* FIXME: atexit_t doesn't appear to be a standard type so should __atexit_t ?? */
+typedef void (*atexit_t)(void);
+extern int atexit(atexit_t __function);
 
-extern char *crypt __P((char *__key, char *__salt));
+extern char *crypt(char *__key, char *__salt);
 
-typedef int (*cmp_func_t) __P((const void *, const void *));
+typedef int (*cmp_func_t)(const void *__a, const void *__b);
 
 extern int _bsearch;
-extern void *bsearch __P((void *key, void *base, size_t num, size_t size, cmp_func_t cmp));
-extern void *lfind __P((void *key, void *base, size_t *num, size_t size, cmp_func_t cmp));
-extern void *lsearch __P((void *key, void *base, size_t *num, size_t size, cmp_func_t cmp));
+extern void *bsearch(void *__key, void *__base, size_t __num, size_t __size, cmp_func_t __cmp);
+extern void *lfind(void *__key, void *__base, size_t *__num, size_t __size, cmp_func_t __cmp);
+extern void *lsearch(void *__key, void *__base, size_t *__num, size_t __size, cmp_func_t __cmp);
 extern void *_qbuf;
-extern void qsort __P((void *base, size_t num, size_t size, cmp_func_t cmp));
+extern void qsort(void *__base, size_t __num, size_t __size, cmp_func_t __cmp);
 
 #define mb_len(a,b)    strnlen(a,b)
 
 extern int opterr;
 extern int optind;
 extern char *optarg;
-extern int getopt __P((int argc, char *argv[], char *optstring));
+extern int getopt(int __argc, char *__argv[], char *__optstring);
 
-extern char *getpass(char *prompt);
+extern char *getpass(char *__prompt);
 
 extern int _argc;
 extern char **_argv;
 
-extern int getloadavg __P((unsigned int loadavg[], int nelem));
+extern int getloadavg(unsigned int __loadavg[], int __nelem);
 
 #endif /* __STDLIB_H */

diff --git a/Library/include/string.h b/Library/include/string.h
index a933a5c..27ecf38 100644 (file)
--- a/Library/include/string.h
+++ b/Library/include/string.h
@@ -6,61 +6,64 @@
 #include <stddef.h>
 
 /* Basic string functions */
-extern size_t strlen __P ((const char* __str));
+extern size_t strlen(const char *__s);
 
-extern char * strcat __P ((char*, const char*));
-extern char * strcpy __P ((char*, const char*));
-extern int strcmp __P ((const char*, const char*));
+extern char *strcat(char *__dest, const char *__src);
+extern char *strcpy(char *__dest, const char *__src);
+extern int strcmp(const char *__s1, const char *__s2);
 
-extern char * strncat __P ((char*, const char*, size_t));
-extern char * strncpy __P ((char*, const char*, size_t));
-extern int strncmp __P((const char*, const char*, size_t));
+extern char *strncat(char *__dest, const char *__src, size_t __n);
+extern char *strncpy(char *__dest, const char *__src, size_t __n);
+extern int strncmp(const char *__s1, const char *__s2, size_t __n);
 
-extern int stricmp __P((const char*, const char*));
-extern int strnicmp __P((const char*, const char*, size_t));
+extern int stricmp(const char *__s1, const char *__s2);
+extern int strnicmp(const char *__s1, const char *__s2, size_t __n);
 
-extern int strcasecmp __P((const char*, const char*));
-extern int strncasecmp __P((const char*, const char*, size_t));
+extern int strcasecmp(const char *__s1, const char *__s2);
+extern int strncasecmp(const char *__s1, const char *__s2, size_t __n);
 
-extern char * strchr __P ((const char*, int));
-extern char * strrchr __P ((const char*, int));
-extern char * strdup __P ((const char*));
+extern char *strchr(const char *__s, int __c);
+extern char *strrchr(const char *__s , int __c);
+extern char *strdup(const char *__s);
+/* FIXME: missing but in POSIX */
+extern char *strndup(const char *__s, int __n);
 
 /* Basic mem functions */
-extern void * memcpy __P ((void*, const void*, size_t));
-extern void * memccpy __P ((void*, const void*, int, size_t));
-extern void * memchr __P ((const void*, int, size_t));
-extern void * memset __P ((void*, int, size_t));
-extern int memcmp __P ((const void*, const void*, size_t));
+extern void *memcpy(void *__dest, const void *__src, size_t __n);
+extern void *memccpy(void *__dest, const void *__src, int __c, size_t __n);
+extern void *memchr(const void *__src, int __c, size_t __n);
+extern void *memset(void *__s, int __c, size_t __n);
+extern int memcmp(const void *__s1, const void *__s2, size_t __n);
 
-extern void * memmove __P ((void*, const void*, size_t));
+extern void *memmove(void *__dest, const void *__src, size_t __n);
 
 /* BSDisms */
-extern char *index __P ((const char *, int));
-extern char *rindex __P ((const char *, int));
-extern void bcopy __P ((const void*, void*, size_t));
-extern void bzero __P ((void*, size_t));
+extern char *index(const char *__s, int __c);
+extern char *rindex(const char *__s, int __c);
+extern void bcopy(const void *__src, void *__dst, size_t __n);
+extern void bzero(void *__dst, size_t __n);
 
 /* Other common BSD functions */
-extern char *strpbrk __P ((const char *, const char *));
-extern char *strsep __P ((char **, const char *));
-extern char *strstr __P ((const char *, const char *));
-extern char *strtok __P ((char *, const char *));
-extern size_t strcspn __P ((const char *, const char *));
-extern size_t strspn __P ((const char *, const char *));
+extern char *strpbrk(const char *__s, const char *__accept);
+extern char *strsep(char **__stringp, const char *__delim);
+extern char *strstr(const char *__haystack, const char *__needle);
+extern char *strtok(char *__str, const char *__delim);
+extern size_t strcspn(const char *__s, const char *__reject);
+extern size_t strspn(const char *__s, const char *__accept);
 
-extern size_t strlcpy __P((char *, const char *, size_t));
-extern size_t strlcat __P((char *, const char *, size_t));
+extern size_t strlcpy(char *__dest, const char *__src, size_t __maxlen);
+extern size_t strlcat(char *__dest, const char *__src, size_t __maxlen);
 
-extern char *strcasestr __P((const char *, const char *));
+/* FIXME: GNUism */
+extern char *strcasestr(const char *__needle, const char *__haystack);
 
 /* Later ISOisms */
-extern size_t strnlen __P((const char *, size_t));
-extern size_t strxfrm __P((char *, const char *, size_t));
-extern int strcoll __P((const char *s1, const char *s2));
+extern size_t strnlen(const char *__s, size_t __maxlen);
+extern size_t strxfrm(char *__dest, const char *__src, size_t __n);
+extern int strcoll(const char *__s1, const char *__s2);
 
-extern const char *strsignal __P((int s));
-extern char *strerror __P((int __errno));
+extern const char *strsignal(int __sig);
+extern char *strerror(int __errno);
 
 #if defined(__SDCC_z80) || defined(__SDCC_z180) || defined(__SDCC_r2k) || defined(__SDCC_r3ka)
 #define memcpy(dst, src, n) __builtin_memcpy(dst, src, n)

diff --git a/Library/include/sys/cdefs.h b/Library/include/sys/cdefs.h
index 7a2b186..0a77b6b 100644 (file)
--- a/Library/include/sys/cdefs.h
+++ b/Library/include/sys/cdefs.h
@@ -13,7 +13,6 @@
 #endif /* __STDC__ */
 
 /* This is not a typedef so `const __ptr_t' does the right thing */
-/* For K&R 'void' defined as 'char' */
 #define __ptr_t void *
 
 #endif

diff --git a/Library/include/sys/errno.h b/Library/include/sys/errno.h
index 08b226c..679ce12 100644 (file)
--- a/Library/include/sys/errno.h
+++ b/Library/include/sys/errno.h
@@ -1,58 +1 @@
-#ifndef __ERRNO_H
-#define __ERRNO_H
-
-#include <features.h>
-
-/*
- * Error codes
- */
-#define EPERM           1               /* Not owner */
-#define ENOENT          2               /* No such file or directory */
-#define ESRCH           3               /* No such process */
-#define EINTR           4               /* Interrupted System Call */
-#define EIO             5               /* I/O Error */
-#define ENXIO           6               /* No such device or address */
-#define E2BIG           7               /* Arg list too long */
-#define ENOEXEC         8               /* Exec format error */
-#define EBADF           9               /* Bad file number */
-#define ECHILD          10              /* No children */
-#define EAGAIN          11              /* No more processes */
-#define ENOMEM          12              /* Not enough core */
-#define EACCES          13              /* Permission denied */
-#define EFAULT          14              /* Bad address */
-#define ENOTBLK         15              /* Block device required */
-#define EBUSY           16              /* Mount device busy */
-#define EEXIST          17              /* File exists */
-#define EXDEV           18              /* Cross-device link */
-#define ENODEV          19              /* No such device */
-#define ENOTDIR         20              /* Not a directory */
-#define EISDIR          21              /* Is a directory */
-#define EINVAL          22              /* Invalid argument */
-#define ENFILE          23              /* File table overflow */
-#define EMFILE          24              /* Too many open files */
-#define ENOTTY          25              /* Not a typewriter */
-#define ETXTBSY         26              /* Text file busy */
-#define EFBIG           27              /* File too large */
-#define ENOSPC          28              /* No space left on device */
-#define ESPIPE          29              /* Illegal seek */
-#define EROFS           30              /* Read-only file system */
-#define EMLINK          31              /* Too many links */
-#define EPIPE           32              /* Broken pipe */
-
-/* math software */
-#define EDOM            33              /* Argument too large */
-#define ERANGE          34              /* Result too large */
-#define EWOULDBLOCK    35              /* Operation would block */
-#define ENOTEMPTY      36              /* Directory is not empty */
-#define ENAMETOOLONG    63              /* File name too long */
-
-extern int     errno;
-
-__BEGIN_DECLS
-
-extern void    perror(__const char* __s);
-extern char*   strerror(int __errno);
-
-__END_DECLS
-
-#endif
+#include <errno.h>
\ No newline at end of file

diff --git a/Library/include/sys/file.h b/Library/include/sys/file.h
index d018b12..836b960 100644 (file)
--- a/Library/include/sys/file.h
+++ b/Library/include/sys/file.h
@@ -17,6 +17,6 @@
 #define LOCK_UN                2
 #define LOCK_NB                O_NDELAY
 
-extern int flock(int fd, int operation);
+extern int flock(int __fd, int __operation);
 
 #endif

diff --git a/Library/include/sys/mount.h b/Library/include/sys/mount.h
index 2b70279..fedae96 100644 (file)
--- a/Library/include/sys/mount.h
+++ b/Library/include/sys/mount.h
@@ -1,7 +1,6 @@
 #ifndef _SYS_MOUNT_H
 #define _SYS_MOUNT_H
 
-/* Not yet implemented */
 #define MS_RDONLY      0x01
 
 #endif

diff --git a/Library/include/sys/stat.h b/Library/include/sys/stat.h
index f9c6ae4..5b9521c 100644 (file)
--- a/Library/include/sys/stat.h
+++ b/Library/include/sys/stat.h
@@ -58,6 +58,6 @@ struct stat {
 
 /* Weird location but for historical reasons */
 
-extern int mkfifo(const char *pathname, mode_t mode);
+extern int mkfifo(const char *__pathname, mode_t __mode);
 
 #endif

diff --git a/Library/include/sys/time.h b/Library/include/sys/time.h
index 12a12ca..828b0a2 100644 (file)
--- a/Library/include/sys/time.h
+++ b/Library/include/sys/time.h
@@ -11,12 +11,12 @@ struct timeval {
   suseconds_t tv_usec;
 };
 
-extern int utimes(const char *filename, const struct timeval times[2]);
+extern int utimes(const char *__filename, const struct timeval __times[2]);
 
 #ifdef _BSD_SOURCE
 
-extern int gettimeofday(struct timeval *tv, struct timezone *tz);
-extern int settimeofday(struct timeval *tv, const struct timezone *tz);
+extern int gettimeofday(struct timeval *__tv, struct timezone *__tz);
+extern int settimeofday(struct timeval *__tv, const struct timezone *__tz);
 
 /* These are courtesy of Linux. Complete with the usual bugs. The only
    change here is to use L for the long types. */

diff --git a/Library/include/sys/times.h b/Library/include/sys/times.h
index 4897c87..fe2768b 100644 (file)
--- a/Library/include/sys/times.h
+++ b/Library/include/sys/times.h
@@ -10,6 +10,6 @@ struct tms {
        clock_t tms_etime;      /* Elapsed real time */
 };
 
-extern int times(struct tms *tms);
+extern int times(struct tms *__tms);
 
 #endif
\ No newline at end of file

diff --git a/Library/include/sys/utsname.h b/Library/include/sys/utsname.h
index 183788f..0ea6c28 100644 (file)
--- a/Library/include/sys/utsname.h
+++ b/Library/include/sys/utsname.h
@@ -12,6 +12,6 @@ struct utsname {
        char machine[8];
 };
 
-extern int uname __P((struct utsname * __utsbuf));
+extern int uname(struct utsname * __utsbuf);
 
 #endif

diff --git a/Library/include/sys/wait.h b/Library/include/sys/wait.h
index 8bd34fb..14ada15 100644 (file)
--- a/Library/include/sys/wait.h
+++ b/Library/include/sys/wait.h
@@ -38,7 +38,7 @@
 #define WAIT_ANY       (-1)    /* Any process.  */
 #define WAIT_MYPGRP    0       /* Any process in my process group.  */
 
-extern pid_t waitpid __P((pid_t pid, int *__stat_loc, int options));
+extern pid_t waitpid(pid_t __pid, int *__stat_loc, int __options);
 
 /* Wait for a child to die.  When one does, put its status in *STAT_LOC
    and return its process ID.  For errors, return (pid_t) -1.

diff --git a/Library/include/termcap.h b/Library/include/termcap.h
index 691915b..369c073 100644 (file)
--- a/Library/include/termcap.h
+++ b/Library/include/termcap.h
@@ -9,12 +9,12 @@ extern char *UP;
 extern char *BC;
 extern int ospeed;
 
-extern int tgetent(char *, const char *);
-extern int tgetflag(char *);
-extern int tgetnum(char *);
-extern char *tgetstr(char *, char **);
+extern int tgetent(char *__bp, const char *__name);
+extern int tgetflag(char *__id);
+extern int tgetnum(char *__id);
+extern char *tgetstr(char *__id, char **__area);
 
-extern int tputs __P((const char *, int, int (*outc)(int)));
-extern char *tgoto __P((const char *, int, int));
+extern int tputs(const char *__str, int __affcnt, int (*__putc)(int)));
+extern char *tgoto(const char *__cap, int __col, int __row);
 
 #endif /* _TERMCAP_H */

diff --git a/Library/include/termios.h b/Library/include/termios.h
index f5ca02e..c26ab89 100644 (file)
--- a/Library/include/termios.h
+++ b/Library/include/termios.h
@@ -142,20 +142,20 @@ struct termios {
 #define TIOCOSTOP      8
 #define TIOCOSTART     9
 
-extern speed_t cfgetispeed __P ((const struct termios *__termios_p));
-extern speed_t cfgetospeed __P ((const struct termios *__termios_p));
-extern int cfsetispeed __P ((struct termios *__termios_p, speed_t __speed));
-extern int cfsetospeed __P ((struct termios *__termios_p, speed_t __speed));
-
-extern void cfmakeraw  __P ((struct termios *__t));
-
-extern int tcsetattr __P ((int __fd, int __opt, const struct termios *__termios_p));
-extern int tcgetattr __P ((int __fildes, struct termios *__termios_p));
-extern int tcdrain __P ((int __fildes));
-extern int tcflow __P ((int __fildes, int __action));
-extern int tcflush __P ((int __fildes, int __queue_selector));
-extern int tcsendbreak __P ((int __fildes, int __duration));
-extern int tcgetpgrp __P ((int __fildes));
-extern int tcsetpgrp __P ((int __fildes, int __pgrp_id));
+extern speed_t cfgetispeed(const struct termios *__termios_p);
+extern speed_t cfgetospeed(const struct termios *__termios_p);
+extern int cfsetispeed(struct termios *__termios_p, speed_t __speed);
+extern int cfsetospeed(struct termios *__termios_p, speed_t __speed);
+
+extern void cfmakeraw (struct termios *__t);
+
+extern int tcsetattr(int __fd, int __opt, const struct termios *__termios_p);
+extern int tcgetattr(int __fildes, struct termios *__termios_p);
+extern int tcdrain(int __fildes);
+extern int tcflow(int __fildes, int __action);
+extern int tcflush(int __fildes, int __queue_selector);
+extern int tcsendbreak(int __fildes, int __duration);
+extern int tcgetpgrp(int __fildes);
+extern int tcsetpgrp(int __fildes, int __pgrp_id);
 
 #endif

diff --git a/Library/include/time.h b/Library/include/time.h
index 8a3d273..02ac272 100644 (file)
--- a/Library/include/time.h
+++ b/Library/include/time.h
@@ -35,22 +35,22 @@ extern char *tzname[2];
 extern int daylight;
 extern long timezone;
 
-extern clock_t clock __P ((void));
-extern time_t mktime __P ((struct tm * __tp));
-extern double difftime __P ((time_t *__time2, time_t *__time1));
+extern clock_t clock(void);
+extern time_t mktime(struct tm * __tp);
+extern double difftime(time_t *__time2, time_t *__time1);
 
 
-extern void __tm_conv __P((struct tm *tmbuf, time_t *t, int offset));
-extern char *asctime __P ((struct tm * __tp));
-extern char *asctime_r __P((struct tm *, char * __buf));
-extern char *ctime __P ((time_t * __tp));
-extern char *ctime_r __P ((time_t * __tp, char * __buf));
-extern void tzset __P ((void));
+extern void __tm_conv(struct tm *tmbuf, time_t *t, int offset);
+extern char *asctime(struct tm * __tp);
+extern char *asctime_r(struct tm *, char * __buf);
+extern char *ctime(time_t * __tp);
+extern char *ctime_r(time_t * __tp, char * __buf);
+extern void tzset(void);
 
-extern struct tm *gmtime __P ((time_t *__tp));
-extern struct tm *localtime __P ((time_t * __tp));
-extern struct tm *gmtime_r(time_t *tvec, struct tm *result);
-extern struct tm *localtime_r(time_t *tvec, struct tm *result);
+extern struct tm *gmtime(time_t *__tp);
+extern struct tm *localtime(time_t * __tp);
+extern struct tm *gmtime_r(time_t *__tvec, struct tm *__result);
+extern struct tm *localtime_r(time_t *__tvec, struct tm *__result);
 
 typedef int clockid_t;
 
@@ -59,14 +59,14 @@ typedef int clockid_t;
 #define CLOCK_REALTIME 0
 #define CLOCK_MONOTONIC 1
 
-extern int clock_getres(clockid_t clk_id,  struct timespec *res);
-extern int clock_gettime(clockid_t clk_id,  struct timespec *tp);
-extern int clock_nanosleep(clockid_t clk_id, int flags,
-       const struct timespec *request, struct timespec *remain);
-extern int clock_settime(clockid_t clk_id,  const struct timespec *tp);
+extern int clock_getres(clockid_t __clk_id,  struct timespec *__res);
+extern int clock_gettime(clockid_t __clk_id,  struct timespec *__tp);
+extern int clock_nanosleep(clockid_t __clk_id, int __flags,
+       const struct timespec *__request, struct timespec *__remain);
+extern int clock_settime(clockid_t __clk_id,  const struct timespec *__tp);
 
 #define TIMER_ABSTIME  1
 
-extern int nanosleep(const struct timespec *request, struct timespec *remain);
+extern int nanosleep(const struct timespec *__request, struct timespec *__remain);
 
 #endif

diff --git a/Library/include/unistd.h b/Library/include/unistd.h
index 4105775..707e218 100644 (file)
--- a/Library/include/unistd.h
+++ b/Library/include/unistd.h
@@ -15,43 +15,42 @@
 #define STDOUT_FILENO  1
 #define STDERR_FILENO  2
 
-extern long tell __P((int));
-extern off_t lseek __P((int, off_t, int));
+extern off_t lseek(int __fd, off_t __offset, int __whence);
 
-extern int isatty __P((int));
+extern int isatty(int __fd);
 
-extern int lstat __P((const char *, struct stat *));
-extern int readlink __P((const char *, char *, int));
+extern int lstat(const char *__pathname, struct stat *__buf);
+extern int readlink(const char *__pathname, char *__buf, int __bufsiz);
 
-extern unsigned int sleep __P((unsigned int seconds));
-extern int usleep __P((useconds_t usecs));
+extern unsigned int sleep(unsigned int __seconds);
+extern int usleep(useconds_t __usecs);
 
 extern char **environ;
 
-extern const char * _findPath __P((const char *pathname));
-extern int execl __P((const char *pathname, const char *arg0, ...));
-extern int execle __P((const char *pathname, const char *arg0, ...));
-extern int execlp __P((const char *pathname, const char *arg0, ...));
-extern int execlpe __P((const char *pathname, const char *arg0, ...));
-extern int execv __P((const char *pathname, char *const argv[]));
-extern int execve __P((const char *pathname, char * const argv[], char * const envp[]));
-extern int execvp __P((const char *pathname, char *const argv[]));
-extern int execvpe __P((const char *pathname, char *const argv[], char * const envp[]));
-
-extern char *ttyname __P((int __fd));
-extern int ttyname_r __P((int __fd, char *__buf, size_t __size));
-extern char *getlogin __P((void));
-extern int getlogin_r __P((char * __buf, size_t __size));
-extern int system __P((const char *));
-extern int pause __P((void));
-extern pid_t fork __P((void));
-extern char *getcwd __P((char *, int));
-extern void swab __P((const void * __from, void * __to, ssize_t __count));
-
-extern long sysconf __P((int name));
-extern long fpathconf __P((int fd, int name));
-extern long pathconf __P((const char *path, int name));
-extern long _pathconf __P((int name));
+extern const char * _findPath(const char *__pathname);
+extern int execl(const char *__pathname, const char *__arg0, ...);
+extern int execle(const char *__pathname, const char *__arg0, ...);
+extern int execlp(const char *__pathname, const char *__arg0, ...);
+extern int execlpe(const char *__pathname, const char *__arg0, ...);
+extern int execv(const char *__pathname, char *const __argv[]);
+extern int execve(const char *__pathname, char * const __argv[], char * const __envp[]);
+extern int execvp(const char *__pathname, char *const __argv[]);
+extern int execvpe(const char *__pathname, char *const __argv[], char * const __envp[]);
+
+extern char *ttyname(int __fd);
+extern int ttyname_r(int __fd, char *__buf, size_t __size);
+extern char *getlogin(void);
+extern int getlogin_r(char * __buf, size_t __size);
+extern int system(const char *);
+extern int pause(void);
+extern pid_t fork(void);
+extern char *getcwd(char *, int);
+extern void swab(const void * __from, void * __to, ssize_t __count);
+
+extern long sysconf(int __name);
+extern long fpathconf(int __fd, int __name);
+extern long pathconf(const char *__path, int __name);
+extern long _pathconf(int __name);
 
 #define _SC_ARG_MAX            1
 #define _SC_CHILD_MAX          2
@@ -102,11 +101,11 @@ extern long _pathconf __P((int name));
 #define _POSIX_TIMERS
 #define _POSIX_MONTONIC_CLOCK
 
-extern int gethostname(char *name, size_t len);
-extern int sethostname(const char *name, size_t len);
+extern int gethostname(char *__name, size_t __len);
+extern int sethostname(const char *__name, size_t __len);
 
 #ifndef __STDLIB_H
-extern void exit __P((int));
+extern void exit(int __status);
 #endif
 
 #ifndef R_OK

diff --git a/Library/include/utime.h b/Library/include/utime.h
index 772134c..2111698 100644 (file)
--- a/Library/include/utime.h
+++ b/Library/include/utime.h
@@ -9,6 +9,6 @@ struct utimbuf {
     time_t modtime; /* modification time */
 };
 
-extern int utime __P ((const char *__filename, const struct utimbuf *__utimebuf));
+extern int utime(const char *__filename, const struct utimbuf *__utimebuf);
 
 #endif

diff --git a/Library/include/utmp.h b/Library/include/utmp.h
index 6eefc37..d7f435f 100644 (file)
--- a/Library/include/utmp.h
+++ b/Library/include/utmp.h
@@ -32,14 +32,14 @@ struct utmp {
        long    ut_addr;                /* IP addr of remote host */
 };
 
-extern void            setutent __P((void));
-extern void            utmpname __P((const char *));
-extern struct utmp *   getutent __P((void));
-extern struct utmp *   getutid __P((const struct utmp *));
-extern struct utmp *   getutline __P((const struct utmp *));
-extern struct utmp *   pututline __P((const struct utmp *));
-extern void            endutent __P((void));
+extern void            setutent(void);
+extern void            utmpname(const char *__file);
+extern struct utmp *   getutent(void);
+extern struct utmp *   getutid(const struct utmp *__ut);
+extern struct utmp *   getutline(const struct utmp *__ut);
+extern struct utmp *   pututline(const struct utmp *__ut);
+extern void            endutent(void);
 
-struct utmp *          __getutent __P((int));
+struct utmp *          __getutent(int);
 
 #endif /* __UTMP_H */

diff --git a/Library/include/utsname.h b/Library/include/utsname.h
index 020d103..abaf5a8 100644 (file)
--- a/Library/include/utsname.h
+++ b/Library/include/utsname.h
@@ -13,6 +13,6 @@ struct utsname {
        char domainname[14];
 };
 
-extern int uname __P ((struct utsname * __utsbuf));
+extern int uname(struct utsname * __utsbuf);
 
 #endif