26 lines
720 B
Diff
26 lines
720 B
Diff
|
diff -u -r ../upstream.git/apt-private/private-output.cc ./apt-private/private-output.cc
|
||
|
|
--- ../upstream.git/apt-private/private-output.cc 2014-06-10 15:24:50.000000000 +0200
|
||
|
|
+++ ./apt-private/private-output.cc 2014-06-15 02:40:10.539223656 +0200
|
||
|
|
@@ -20,7 +20,11 @@
|
||
|
|
#include <string.h>
|
||
|
|
#include <iomanip>
|
||
|
|
#include <iostream>
|
||
|
|
-#include <langinfo.h>
|
||
|
|
+#ifdef __ANDROID__
|
||
|
|
+# include <termios.h>
|
||
|
|
+# else
|
||
|
|
+# include <langinfo.h>
|
||
|
|
+#endif
|
||
|
|
#include <unistd.h>
|
||
|
|
#include <signal.h>
|
||
|
|
#include <sys/ioctl.h>
|
||
|
|
@@ -764,7 +768,7 @@
|
||
|
|
regex_t Pattern;
|
||
|
|
int Res;
|
||
|
|
|
||
|
|
- Res = regcomp(&Pattern, nl_langinfo(YESEXPR),
|
||
|
|
+ Res = regcomp(&Pattern, "^[yY]",
|
||
|
|
REG_EXTENDED|REG_ICASE|REG_NOSUB);
|
||
|
|
|
||
|
|
if (Res != 0) {
|