mdw@git.distorted.org.uk Git - termux-packages/blob - packages/apt/apt-get.patch

   1 diff -u -r ../upstream.git/cmdline/apt-get.cc ./cmdline/apt-get.cc
   2 --- ../upstream.git/cmdline/apt-get.cc  2014-03-14 09:05:18.000000000 +0100
   3 +++ ./cmdline/apt-get.cc        2014-04-15 21:01:01.072700439 +0200
   4 @@ -79,8 +79,11 @@
   5  #include <sys/ioctl.h>
   6  #include <sys/stat.h>
   7  #include <sys/statfs.h>
   8 -#include <sys/statvfs.h>
   9 +#ifndef __ANDROID__
  10 +# include <sys/statvfs.h>
  11 +#endif
  12  #include <sys/wait.h>
  13 +#include <termios.h>
  14  #include <unistd.h>
  15  #include <algorithm>
  16  #include <fstream>
  17 @@ -854,14 +857,14 @@
  18     unsigned long long DebBytes = Fetcher.TotalNeeded();
  19
  20     // Check for enough free space
  21 -   struct statvfs Buf;
  22 +   struct statfs Buf;
  23     string OutputDir = ".";
  24 -   if (statvfs(OutputDir.c_str(),&Buf) != 0) {
  25 +   if (statfs(OutputDir.c_str(),&Buf) != 0) {
  26        if (errno == EOVERFLOW)
  27 -        return _error->WarningE("statvfs",_("Couldn't determine free space in %s"),
  28 +        return _error->WarningE("statfs",_("Couldn't determine free space in %s"),
  29                                 OutputDir.c_str());
  30        else
  31 -        return _error->Errno("statvfs",_("Couldn't determine free space in %s"),
  32 +        return _error->Errno("statfs",_("Couldn't determine free space in %s"),
  33                                 OutputDir.c_str());
  34     } else if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize)
  35       {