about summary refs log tree commit diff
path: root/io
diff options
context:
space:
mode:
Diffstat (limited to 'io')
-rw-r--r--io/fts.c39
-rw-r--r--io/ftw.c26
-rw-r--r--io/ftw64.c4
-rw-r--r--io/getdirname.c6
-rw-r--r--io/getwd.c4
-rw-r--r--io/lockf.c8
6 files changed, 44 insertions, 43 deletions
diff --git a/io/fts.c b/io/fts.c
index 259274dca9..75bba1f4d5 100644
--- a/io/fts.c
+++ b/io/fts.c
@@ -79,8 +79,8 @@ static u_short	 fts_stat __P((FTS *, struct dirent *, FTSENT *, int))
 #define	ISSET(opt)	(sp->fts_options & opt)
 #define	SET(opt)	(sp->fts_options |= opt)
 
-#define	CHDIR(sp, path)	(!ISSET(FTS_NOCHDIR) && chdir(path))
-#define	FCHDIR(sp, fd)	(!ISSET(FTS_NOCHDIR) && fchdir(fd))
+#define	CHDIR(sp, path)	(!ISSET(FTS_NOCHDIR) && __chdir(path))
+#define	FCHDIR(sp, fd)	(!ISSET(FTS_NOCHDIR) && __fchdir(fd))
 
 /* fts_build flags */
 #define	BCHILD		1		/* fts_children */
@@ -108,7 +108,7 @@ fts_open(argv, options, compar)
 	/* Allocate/initialize the stream */
 	if ((sp = malloc((u_int)sizeof(FTS))) == NULL)
 		return (NULL);
-	bzero(sp, sizeof(FTS));
+	__bzero(sp, sizeof(FTS));
 	sp->fts_compar = (int (*) __P((const void *, const void *))) compar;
 	sp->fts_options = options;
 
@@ -186,7 +186,8 @@ fts_open(argv, options, compar)
 	 * and ".." are all fairly nasty problems.  Note, if we can't get the
 	 * descriptor we run anyway, just more slowly.
 	 */
-	if (!ISSET(FTS_NOCHDIR) && (sp->fts_rfd = open(".", O_RDONLY, 0)) < 0)
+	if (!ISSET(FTS_NOCHDIR)
+	    && (sp->fts_rfd = __open(".", O_RDONLY, 0)) < 0)
 		SET(FTS_NOCHDIR);
 
 	return (sp);
@@ -254,8 +255,8 @@ fts_close(sp)
 
 	/* Return to original directory, save errno if necessary. */
 	if (!ISSET(FTS_NOCHDIR)) {
-		saved_errno = fchdir(sp->fts_rfd) ? errno : 0;
-		(void)close(sp->fts_rfd);
+		saved_errno = __fchdir(sp->fts_rfd) ? errno : 0;
+		(void)__close(sp->fts_rfd);
 	}
 
 	/* Free up the stream pointer. */
@@ -313,7 +314,7 @@ fts_read(sp)
 	    (p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE)) {
 		p->fts_info = fts_stat(sp, NULL, p, 1);
 		if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR))
-			if ((p->fts_symfd = open(".", O_RDONLY, 0)) < 0) {
+			if ((p->fts_symfd = __open(".", O_RDONLY, 0)) < 0) {
 				p->fts_errno = errno;
 				p->fts_info = FTS_ERR;
 			} else
@@ -327,7 +328,7 @@ fts_read(sp)
 		if (instr == FTS_SKIP ||
 		    ISSET(FTS_XDEV) && p->fts_dev != sp->fts_dev) {
 			if (p->fts_flags & FTS_SYMFOLLOW)
-				(void)close(p->fts_symfd);
+				(void)__close(p->fts_symfd);
 			if (sp->fts_child) {
 				fts_lfree(sp->fts_child);
 				sp->fts_child = NULL;
@@ -402,7 +403,7 @@ next:	tmp = p;
 			p->fts_info = fts_stat(sp, NULL, p, 1);
 			if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR))
 				if ((p->fts_symfd =
-				    open(".", O_RDONLY, 0)) < 0) {
+				    __open(".", O_RDONLY, 0)) < 0) {
 					p->fts_errno = errno;
 					p->fts_info = FTS_ERR;
 				} else
@@ -446,12 +447,12 @@ name:		t = sp->fts_path + NAPPEND(p->fts_parent);
 	} else if (p->fts_flags & FTS_SYMFOLLOW) {
 		if (FCHDIR(sp, p->fts_symfd)) {
 			saved_errno = errno;
-			(void)close(p->fts_symfd);
+			(void)__close(p->fts_symfd);
 			__set_errno (saved_errno);
 			SET(FTS_STOP);
 			return (NULL);
 		}
-		(void)close(p->fts_symfd);
+		(void)__close(p->fts_symfd);
 	} else if (!(p->fts_flags & FTS_DONTCHDIR)) {
 		if (CHDIR(sp, "..")) {
 			SET(FTS_STOP);
@@ -543,12 +544,12 @@ fts_children(sp, instr)
 	    ISSET(FTS_NOCHDIR))
 		return (sp->fts_child = fts_build(sp, instr));
 
-	if ((fd = open(".", O_RDONLY, 0)) < 0)
+	if ((fd = __open(".", O_RDONLY, 0)) < 0)
 		return (NULL);
 	sp->fts_child = fts_build(sp, instr);
-	if (fchdir(fd))
+	if (__fchdir(fd))
 		return (NULL);
-	(void)close(fd);
+	(void)__close(fd);
 	return (sp->fts_child);
 }
 
@@ -597,7 +598,7 @@ fts_build(sp, type)
 	else
 		oflag = DTF_HIDEW|DTF_NODUP|DTF_REWIND;
 #else
-# define __opendir2(path, flag) opendir(path)
+# define __opendir2(path, flag) __opendir(path)
 #endif
        if ((dirp = __opendir2 (cur->fts_accpath, oflag)) == NULL) {
 		if (type == BREAD) {
@@ -673,7 +674,7 @@ fts_build(sp, type)
 
 	/* Read the directory, attaching each entry to the `link' pointer. */
 	adjaddr = NULL;
-	for (head = tail = NULL, nitems = 0; dp = readdir(dirp);) {
+	for (head = tail = NULL, nitems = 0; dp = __readdir(dirp);) {
 		int namlen;
 
 		if (!ISSET(FTS_SEEDOT) && ISDOT(dp->d_name))
@@ -693,7 +694,7 @@ mem1:				saved_errno = errno;
 				if (p)
 					free(p);
 				fts_lfree(head);
-				(void)closedir(dirp);
+				(void)__closedir(dirp);
 				__set_errno (saved_errno);
 				cur->fts_info = FTS_ERR;
 				SET(FTS_STOP);
@@ -749,7 +750,7 @@ mem1:				saved_errno = errno;
 		}
 		++nitems;
 	}
-	(void)closedir(dirp);
+	(void)__closedir(dirp);
 
 	/*
 	 * If had to realloc the path, adjust the addresses for the rest
@@ -843,7 +844,7 @@ fts_stat(sp, dp, p, follow)
 		}
 	} else if (lstat(p->fts_accpath, sbp)) {
 		p->fts_errno = errno;
-err:		bzero(sbp, sizeof(struct stat));
+err:		__bzero(sbp, sizeof(struct stat));
 		return (FTS_NS);
 	}
 
diff --git a/io/ftw.c b/io/ftw.c
index b8c82fa969..db687e3dbd 100644
--- a/io/ftw.c
+++ b/io/ftw.c
@@ -1,5 +1,5 @@
 /* File tree walker functions.
-   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -38,7 +38,7 @@
 # define INO_T ino_t
 # define STAT stat
 # define DIRENT dirent
-# define READDIR readdir
+# define READDIR __readdir
 # define LXSTAT __lxstat
 # define XSTAT __xstat
 # define FTW_FUNC_T __ftw_func_t
@@ -205,7 +205,7 @@ open_dir_stream (struct ftw_data *data, struct dir_data *dirp)
 	    }
 	  else
 	    {
-	      closedir (st);
+	      __closedir (st);
 	      data->dirstreams[data->actdir]->stream = NULL;
 	      data->dirstreams[data->actdir] = NULL;
 	    }
@@ -217,7 +217,7 @@ open_dir_stream (struct ftw_data *data, struct dir_data *dirp)
     {
       assert (data->dirstreams[data->actdir] == NULL);
 
-      dirp->stream = opendir (data->dirbuf);
+      dirp->stream = __opendir (data->dirbuf);
       if (dirp->stream == NULL)
 	result = -1;
       else
@@ -309,7 +309,7 @@ process_entry (struct ftw_data *data, struct dir_data *dir, const char *name,
 		    {
 		      if (data->ftw.base == 1)
 			{
-			  if (chdir ("/") < 0)
+			  if (__chdir ("/") < 0)
 			    result = -1;
 			}
 		      else
@@ -317,7 +317,7 @@ process_entry (struct ftw_data *data, struct dir_data *dir, const char *name,
 			  /* Please note that we overwrite a slash.  */
 			  data->dirbuf[data->ftw.base - 1] = '\0';
 
-			  if (chdir (data->dirbuf) < 0)
+			  if (__chdir (data->dirbuf) < 0)
 			    result = -1;
 
 			  data->dirbuf[data->ftw.base - 1] = '/';
@@ -372,7 +372,7 @@ ftw_dir (struct ftw_data *data, struct STAT *st)
 	{
 	  if (errno == ENOSYS)
 	    {
-	      if (chdir (data->dirbuf) < 0)
+	      if (__chdir (data->dirbuf) < 0)
 		result = -1;
 	    }
 	  else
@@ -382,7 +382,7 @@ ftw_dir (struct ftw_data *data, struct STAT *st)
       if (result != 0)
 	{
 	  int save_err = errno;
-	  closedir (dir.stream);
+	  __closedir (dir.stream);
 	  __set_errno (save_err);
 
 	  if (data->actdir-- == 0)
@@ -414,7 +414,7 @@ ftw_dir (struct ftw_data *data, struct STAT *st)
 
       assert (dir.content == NULL);
 
-      closedir (dir.stream);
+      __closedir (dir.stream);
       __set_errno (save_err);
 
       if (data->actdir-- == 0)
@@ -524,7 +524,7 @@ ftw_startup (const char *dir, int is_nftw, void *func, int descriptors,
   if ((flags & FTW_CHDIR) && data.ftw.base > 0)
     {
       /* GNU extension ahead.  */
-      cwd =  getcwd (NULL, 0);
+      cwd =  __getcwd (NULL, 0);
       if (cwd == NULL)
 	result = -1;
       else
@@ -534,12 +534,12 @@ ftw_startup (const char *dir, int is_nftw, void *func, int descriptors,
 	     terminate it for now and change the directory.  */
 	  if (data.ftw.base == 1)
 	    /* I.e., the file is in the root directory.  */
-	    result = chdir ("/");
+	    result = __chdir ("/");
 	  else
 	    {
 	      char ch = data.dirbuf[data.ftw.base - 1];
 	      data.dirbuf[data.ftw.base - 1] = '\0';
-	      result = chdir (data.dirbuf);
+	      result = __chdir (data.dirbuf);
 	      data.dirbuf[data.ftw.base - 1] = ch;
 	    }
 	}
@@ -592,7 +592,7 @@ ftw_startup (const char *dir, int is_nftw, void *func, int descriptors,
   if (cwd != NULL)
     {
       int save_err = errno;
-      chdir (cwd);
+      __chdir (cwd);
       free (cwd);
       __set_errno (save_err);
     }
diff --git a/io/ftw64.c b/io/ftw64.c
index 6dbd03e831..6a3c93f88b 100644
--- a/io/ftw64.c
+++ b/io/ftw64.c
@@ -1,5 +1,5 @@
 /* File tree walker functions.  LFS version.
-   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -23,7 +23,7 @@
 #define INO_T ino64_t
 #define STAT stat64
 #define DIRENT dirent64
-#define READDIR readdir64
+#define READDIR __readdir64
 #define LXSTAT __lxstat64
 #define XSTAT __xstat64
 #define FTW_FUNC_T __ftw64_func_t
diff --git a/io/getdirname.c b/io/getdirname.c
index cc6dd9545c..f6c9bfff21 100644
--- a/io/getdirname.c
+++ b/io/getdirname.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1997, 1998 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
@@ -38,7 +38,7 @@ get_current_dir_name (void)
       pwdstat.st_dev == dotstat.st_dev &&
       pwdstat.st_ino == dotstat.st_ino)
     /* The PWD value is correct.  Use it.  */
-    return strdup (pwd);
+    return __strdup (pwd);
 
-  return getcwd ((char *) NULL, 0);
+  return __getcwd ((char *) NULL, 0);
 }
diff --git a/io/getwd.c b/io/getwd.c
index ae1724545e..7ec56eebbf 100644
--- a/io/getwd.c
+++ b/io/getwd.c
@@ -1,5 +1,5 @@
 /* Obsolete function to get current working directory.
-   Copyright (C) 1991, 1992, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1992, 1996, 1997, 1998 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
@@ -38,7 +38,7 @@ getwd (buf)
       return NULL;
     }
 
-  if (getcwd (tmpbuf, PATH_MAX) == NULL)
+  if (__getcwd (tmpbuf, PATH_MAX) == NULL)
     {
       /* We use 1024 here since it should really be enough and because
 	 this is a safe value.  */
diff --git a/io/lockf.c b/io/lockf.c
index 7bf90c9b59..6d5049027f 100644
--- a/io/lockf.c
+++ b/io/lockf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1996, 1997, 1998 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
@@ -36,9 +36,9 @@ lockf (int fd, int cmd, off_t len)
     case F_TEST:
       /* Test the lock: return 0 if FD is unlocked or locked by this process;
 	 return -1, set errno to EACCES, if another process holds the lock.  */
-      if (fcntl (fd, F_GETLK, &fl) < 0)
+      if (__fcntl (fd, F_GETLK, &fl) < 0)
 	return -1;
-      if (fl.l_type == F_UNLCK || fl.l_pid == getpid ())
+      if (fl.l_type == F_UNLCK || fl.l_pid == __getpid ())
 	return 0;
       __set_errno (EACCES);
       return -1;
@@ -67,5 +67,5 @@ lockf (int fd, int cmd, off_t len)
 
   fl.l_len = len;
 
-  return fcntl (fd, cmd, &fl);
+  return __fcntl (fd, cmd, &fl);
 }
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-24 11:07:04 +0000