2 files changed, 14 insertions, 2 deletions

diff --git a/include/libbb.h b/include/libbb.h
index ea02a9978..ce90a11c7 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -410,6 +410,7 @@ extern void *xzalloc(size_t size);
 extern void *xrealloc(void *old, size_t size);
 
 extern ssize_t safe_read(int fd, void *buf, size_t count);
+extern void xread(int fd, void *buf, size_t count);
 extern ssize_t full_read(int fd, void *buf, size_t count);
 extern unsigned char xread_char(int fd);
 extern char *reads(int fd, char *buf, size_t count);
@@ -419,6 +420,7 @@ extern void *xmalloc_open_read_close(const char *filename, size_t *sizep);
 
 #define safe_write(fd, buf, count) bb_safe_write(fd, buf, count)
 extern ssize_t safe_write(int fd, const void *buf, size_t count);
+extern void xwrite(int fd, const void *buf, size_t count);
 extern ssize_t full_write(int fd, const void *buf, size_t count);
 
 /* Reads and prints to stdout till eof, then closes FILE. Exits on error: */
@@ -442,6 +444,7 @@ extern FILE *fopen_or_warn_stdin(const char *filename);
 
 /* Convert each alpha char in str to lower-case */
 extern char* str_tolower(char *str);
+extern char* xstrndup(const char *s, int n);
 
 char *utoa(unsigned n);
 #ifdef __MINGW32__
diff --git a/include/mingw.h b/include/mingw.h
index 500308947..1c3728ee4 100644
--- a/include/mingw.h
+++ b/include/mingw.h
@@ -83,8 +83,10 @@ static inline int symlink(const char *oldpath, const char *newpath)
 { errno = ENOSYS; return -1; }
 static inline int fchmod(int fildes, mode_t mode)
 { errno = ENOSYS; return -1; }
+/*
 static inline int fork(void)
 { errno = ENOSYS; return -1; }
+*/
 static inline unsigned int alarm(unsigned int seconds)
 { return 0; }
 static inline int fsync(int fd)
@@ -93,7 +95,7 @@ static inline int getppid(void)
 { return 1; }
 static inline void sync(void)
 {}
-static inline int getuid()
+static inline int getuid(void)
 { return 1; }
 static inline struct passwd *getpwnam(const char *name)
 { return NULL; }
@@ -148,6 +150,13 @@ int setitimer(int type, struct itimerval *in, struct itimerval *out);
 int sigaction(int sig, struct sigaction *in, struct sigaction *out);
 int link(const char *oldpath, const char *newpath);
 time_t tm_to_time_t(const struct tm *tm);
+char *strsep(char **stringp, const char *delim);
+char *strptime(const char *s, const char *format, struct tm *tm);
+void unsetenv(const char *env);
+char *realpath(const char *path, char *resolved_path);
+int fdprintf(int fd, const char *format, ...);
+int setenv(const char *name, const char *value, int replace);
+size_t strlcpy(char *dest, const char *src, size_t size);
 
 /*
  * replacements of existing functions
@@ -251,7 +260,7 @@ char **copy_environ(void);
 void free_environ(char **env);
 char **env_setenv(char **env, const char *name);
 
-const char *get_busybox_exec_path();
+const char *get_busybox_exec_path(void);
 /*
  * A replacement of main() that ensures that argv[0] has a path
  */