Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Move common dirent implementation from sysdeps/unix to sysdeps/posix.
  • Loading branch information
Roland McGrath committed Aug 7, 2012
1 parent 22895b4 commit a281dec
Show file tree
Hide file tree
Showing 16 changed files with 32 additions and 7 deletions.
25 changes: 25 additions & 0 deletions ChangeLog
@@ -1,5 +1,30 @@
2012-08-07 Roland McGrath <roland@hack.frob.com>

* sysdeps/unix/closedir.c: Renamed to ...
* sysdeps/posix/closedir.c: ... here.
* sysdeps/unix/dirfd.c: Renamed to ...
* sysdeps/posix/dirfd.c: ... here.
* sysdeps/unix/dirstream.h: Renamed to ...
* sysdeps/posix/dirstream.h: ... here.
* sysdeps/unix/fdopendir.c: Renamed to ...
* sysdeps/posix/fdopendir.c: ... here.
* sysdeps/unix/opendir.c: Renamed to ...
* sysdeps/posix/opendir.c: ... here.
* sysdeps/unix/readdir.c: Renamed to ...
* sysdeps/posix/readdir.c: ... here.
* sysdeps/unix/readdir_r.c: Renamed to ...
* sysdeps/posix/readdir_r.c: ... here.
* sysdeps/unix/rewinddir.c: Renamed to ...
* sysdeps/posix/rewinddir.c: ... here.
* sysdeps/unix/seekdir.c: Renamed to ...
* sysdeps/posix/seekdir.c: ... here.
* sysdeps/unix/telldir.c: Renamed to ...
* sysdeps/posix/telldir.c: ... here.
* sysdeps/unix/sysv/linux/opendir.c: Update #include.
* sysdeps/unix/sysv/linux/readdir64.c: Likewise.
* sysdeps/unix/sysv/linux/i386/readdir64.c: Likewise.
* sysdeps/unix/sysv/linux/wordsize-64/readdir.c: Likewise.

* sysdeps/unix/bsd/bsd4.4/bits/fcntl.h: Renamed to ...
* bits/fcntl.h: ... here.

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions sysdeps/unix/sysv/linux/i386/readdir64.c
@@ -1,4 +1,4 @@
/* Copyright (C) 2000, 2004 Free Software Foundation, Inc.
/* Copyright (C) 2000-2012 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
Expand All @@ -19,7 +19,7 @@
#define __GETDENTS __getdents64
#define DIRENT_TYPE struct dirent64

#include <sysdeps/unix/readdir.c>
#include <sysdeps/posix/readdir.c>

#include <shlib-compat.h>

Expand All @@ -37,7 +37,7 @@ versioned_symbol (libc, __readdir64, readdir64, GLIBC_2_2);
#define __GETDENTS __old_getdents64
#define DIRENT_TYPE struct __old_dirent64

#include <sysdeps/unix/readdir.c>
#include <sysdeps/posix/readdir.c>

compat_symbol (libc, __old_readdir64, readdir64, GLIBC_2_1);
#endif
2 changes: 1 addition & 1 deletion sysdeps/unix/sysv/linux/opendir.c
Expand Up @@ -17,4 +17,4 @@

#define O_DIRECTORY_WORKS 1

#include <sysdeps/unix/opendir.c>
#include <sysdeps/posix/opendir.c>
2 changes: 1 addition & 1 deletion sysdeps/unix/sysv/linux/readdir64.c
Expand Up @@ -2,6 +2,6 @@
#define __GETDENTS __getdents64
#define DIRENT_TYPE struct dirent64

#include <sysdeps/unix/readdir.c>
#include <sysdeps/posix/readdir.c>

weak_alias (__readdir64, readdir64)
2 changes: 1 addition & 1 deletion sysdeps/unix/sysv/linux/wordsize-64/readdir.c
@@ -1,6 +1,6 @@
#define readdir64 __no_readdir64_decl
#define __readdir64 __no___readdir64_decl
#include <sysdeps/unix/readdir.c>
#include <sysdeps/posix/readdir.c>
#undef __readdir64
strong_alias (__readdir, __readdir64)
#undef readdir64
Expand Down
2 changes: 1 addition & 1 deletion sysdeps/unix/sysv/linux/wordsize-64/readdir_r.c
@@ -1,5 +1,5 @@
#define readdir64_r __no_readdir64_r_decl
#define GETDENTS_64BIT_ALIGNED 1
#include <sysdeps/unix/readdir_r.c>
#include <sysdeps/posix/readdir_r.c>
#undef readdir64_r
weak_alias (__readdir_r, readdir64_r)

0 comments on commit a281dec

Please sign in to comment.