mirrors/tar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't include <sys/time.h>, <sys/resource.h>; no longer needed.

Browse Source
This commit is contained in:
Sergey Poznyakoff
2007-04-03 21:52:20 +00:00
parent 8bdbc08a89
commit 18641602c1
1 changed files with 21 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/misc.c
View File

@@ -18,8 +18,6 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#include <system.h> #include <system.h>
#include <sys/time.h>
#include <sys/resource.h>
#include <rmt.h> #include <rmt.h>
#include "common.h" #include "common.h"
#include <quotearg.h> #include <quotearg.h>
@@ -577,42 +575,12 @@ chdir_arg (char const *dir)
return wds++; return wds++;
} }
/* Return maximum number of open files */
int
get_max_open_files ()
{
#if defined _SC_OPEN_MAX
return sysconf (_SC_OPEN_MAX);
#elif defined RLIMIT_NOFILE
struct rlimit rlim;
if (getrlimit(RLIMIT_NOFILE, &rlim) == 0)
return rlim.rlim_max;
return -1;
#elif defined HAVE_GETDTABLESIZE
return getdtablesize ();
#else
return -1;
#endif
}
/* Close all descriptors, except the first three */
void
closeopen ()
{
int i;
for (i = get_max_open_files () - 1; i > 2; i--)
close (i);
}
/* Change to directory I. If I is 0, change to the initial working /* Change to directory I. If I is 0, change to the initial working
directory; otherwise, I must be a value returned by chdir_arg. */ directory; otherwise, I must be a value returned by chdir_arg. */
void void
chdir_do (int i) chdir_do (int i)
{ {
static int previous; static int previous;
static int saved_count;
if (previous != i) if (previous != i)
{ {
@@ -621,17 +589,30 @@ chdir_do (int i)
if (! prev->saved) if (! prev->saved)
{ {
int err = 0;
prev->saved = 1; prev->saved = 1;
saved_count++; if (save_cwd (&prev->saved_cwd) != 0)
/* Make sure we still have at least one descriptor available */ err = errno;
if (saved_count >= get_max_open_files () - 4) else if (0 <= prev->saved_cwd.desc)
{ {
/* Force restore_cwd to use chdir_long */ /* Make sure we still have at least one descriptor available. */
prev->saved_cwd.desc = -1; int fd1 = prev->saved_cwd.desc;
prev->saved_cwd.name = xgetcwd (); int fd2 = dup (fd1);
if (0 <= fd2)
close (fd2);
else if (errno == EMFILE)
{
/* Force restore_cwd to use chdir_long. */
close (fd1);
prev->saved_cwd.desc = -1;
prev->saved_cwd.name = xgetcwd ();
}
else
err = errno;
} }
else if (save_cwd (&prev->saved_cwd) != 0)
FATAL_ERROR ((0, 0, _("Cannot save working directory"))); if (err)
FATAL_ERROR ((0, err, _("Cannot save working directory")));
} }
if (curr->saved) if (curr->saved)