summary refs log tree commit diff
path: root/posix
diff options
context:
space:
mode:
Diffstat (limited to 'posix')
-rw-r--r--posix/fnmatch.c2
-rw-r--r--posix/spawn_faction_addclose.c2
-rw-r--r--posix/spawn_faction_adddup2.c2
-rw-r--r--posix/spawn_faction_addopen.c2
-rw-r--r--posix/spawni.c12
-rw-r--r--posix/wordexp.c8
6 files changed, 15 insertions, 13 deletions
diff --git a/posix/fnmatch.c b/posix/fnmatch.c
index b6f67ae0b3..1db39d9e0d 100644
--- a/posix/fnmatch.c
+++ b/posix/fnmatch.c
@@ -56,6 +56,8 @@
 # include "../locale/elem-hash.h"
 
 # define CONCAT(a,b) __CONCAT(a,b)
+# define mbsinit __mbsinit
+# define mbsrtowcs __mbsrtowcs
 #endif
 
 /* Comment out all this code if we are using the GNU C Library, and are not
diff --git a/posix/spawn_faction_addclose.c b/posix/spawn_faction_addclose.c
index b90abb1f7a..b093f2812a 100644
--- a/posix/spawn_faction_addclose.c
+++ b/posix/spawn_faction_addclose.c
@@ -28,7 +28,7 @@ int
 posix_spawn_file_actions_addclose (posix_spawn_file_actions_t *file_actions,
 				   int fd)
 {
-  int maxfd = sysconf (_SC_OPEN_MAX);
+  int maxfd = __sysconf (_SC_OPEN_MAX);
   struct __spawn_action *rec;
 
   /* Test for the validity of the file descriptor.  */
diff --git a/posix/spawn_faction_adddup2.c b/posix/spawn_faction_adddup2.c
index 7407cca531..f8de8ca7f6 100644
--- a/posix/spawn_faction_adddup2.c
+++ b/posix/spawn_faction_adddup2.c
@@ -28,7 +28,7 @@ int
 posix_spawn_file_actions_adddup2 (posix_spawn_file_actions_t *file_actions,
 				  int fd, int newfd)
 {
-  int maxfd = sysconf (_SC_OPEN_MAX);
+  int maxfd = __sysconf (_SC_OPEN_MAX);
   struct __spawn_action *rec;
 
   /* Test for the validity of the file descriptor.  */
diff --git a/posix/spawn_faction_addopen.c b/posix/spawn_faction_addopen.c
index b177f07294..3e0c62659e 100644
--- a/posix/spawn_faction_addopen.c
+++ b/posix/spawn_faction_addopen.c
@@ -29,7 +29,7 @@ posix_spawn_file_actions_addopen (posix_spawn_file_actions_t *file_actions,
 				  int fd, const char *path, int oflag,
 				  mode_t mode)
 {
-  int maxfd = sysconf (_SC_OPEN_MAX);
+  int maxfd = __sysconf (_SC_OPEN_MAX);
   struct __spawn_action *rec;
 
   /* Test for the validity of the file descriptor.  */
diff --git a/posix/spawni.c b/posix/spawni.c
index 9f10c930f3..1fa97a0eea 100644
--- a/posix/spawni.c
+++ b/posix/spawni.c
@@ -77,7 +77,7 @@ __spawni (pid_t *pid, const char *file,
   short int flags;
 
   /* Generate the new process.  */
-  new_pid = fork ();
+  new_pid = __fork ();
   if (new_pid != 0)
     {
       if (new_pid < 0)
@@ -157,16 +157,16 @@ __spawni (pid_t *pid, const char *file,
 	  switch (action->tag)
 	    {
 	    case spawn_do_close:
-	      if (close (action->action.close_action.fd) != 0)
+	      if (__close (action->action.close_action.fd) != 0)
 		/* Signal the error.  */
 		_exit (SPAWN_ERROR);
 	      break;
 
 	    case spawn_do_open:
 	      {
-		int new_fd = open (action->action.open_action.path,
-				   action->action.open_action.oflag,
-				   action->action.open_action.mode);
+		int new_fd = __open (action->action.open_action.path,
+				     action->action.open_action.oflag,
+				     action->action.open_action.mode);
 
 		if (new_fd == -1)
 		  /* The `open' call failed.  */
@@ -180,7 +180,7 @@ __spawni (pid_t *pid, const char *file,
 		      /* The `dup2' call failed.  */
 		      _exit (SPAWN_ERROR);
 
-		    if (close (new_fd) != 0)
+		    if (__close (new_fd) != 0)
 		      /* The `close' call failed.  */
 		      _exit (SPAWN_ERROR);
 		  }
diff --git a/posix/wordexp.c b/posix/wordexp.c
index fd6ce113b2..739df218fb 100644
--- a/posix/wordexp.c
+++ b/posix/wordexp.c
@@ -1,5 +1,5 @@
 /* POSIX.2 wordexp implementation.
-   Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Tim Waugh <tim@cyberelk.demon.co.uk>.
 
@@ -851,7 +851,7 @@ exec_comm_child (char *comm, int *fildes, int showerr, int noexec)
     }
 
   /* Make sure the subshell doesn't field-split on our behalf. */
-  unsetenv ("IFS");
+  __unsetenv ("IFS");
 
   __close (fildes[0]);
   __execve (_PATH_BSHELL, (char *const *) args, __environ);
@@ -1069,7 +1069,7 @@ exec_comm (char *comm, char **word, size_t *word_length, size_t *max_length,
           fildes[0] = fildes[1] = -1;
 	  exec_comm_child(comm, fildes, 0, 1);
 	}
-      
+
       if (__waitpid (pid, &status, 0) == pid && status != 0)
 	return WRDE_SYNTAX;
     }
@@ -1847,7 +1847,7 @@ envsubst:
 	  if (pattern && !value)
 	    goto no_space;
 
-	  setenv (env, value, 1);
+	  __setenv (env, value, 1);
 	  break;
 
 	default: