| 1 | diff -u -r ../procps-ng-3.3.11/sysctl.c ./sysctl.c |
| 2 | --- ../procps-ng-3.3.11/sysctl.c 2015-08-09 01:54:54.306117153 -0400 |
| 3 | +++ ./sysctl.c 2016-01-03 21:27:00.921667943 -0500 |
| 4 | @@ -29,7 +29,9 @@ |
| 5 | #include <dirent.h> |
| 6 | #include <errno.h> |
| 7 | #include <getopt.h> |
| 8 | -#include <glob.h> |
| 9 | +#ifndef __ANDROID__ |
| 10 | +# include <glob.h> |
| 11 | +#endif |
| 12 | #include <libgen.h> |
| 13 | #include <limits.h> |
| 14 | #include <regex.h> |
| 15 | @@ -491,6 +493,9 @@ |
| 16 | */ |
| 17 | static int Preload(const char *restrict const filename) |
| 18 | { |
| 19 | +#ifdef __ANDROID__ |
| 20 | + return -1; |
| 21 | +#else |
| 22 | char oneline[LINELEN]; |
| 23 | char buffer[LINELEN]; |
| 24 | FILE *fp; |
| 25 | @@ -567,6 +572,7 @@ |
| 26 | fclose(fp); |
| 27 | } |
| 28 | return rc; |
| 29 | +#endif |
| 30 | } |
| 31 | |
| 32 | struct pair { |
| 33 | @@ -816,7 +822,7 @@ |
| 34 | program_invocation_short_name); |
| 35 | |
| 36 | for ( ; *argv; argv++) { |
| 37 | - if (WriteMode || index(*argv, '=')) |
| 38 | + if (WriteMode || strchr(*argv, '=')) |
| 39 | ReturnCode += WriteSetting(*argv); |
| 40 | else |
| 41 | ReturnCode += ReadSetting(*argv); |