| 1 | diff -u -r ../radare2-1.5.0/libr/core/cconfig.c ./libr/core/cconfig.c |
| 2 | --- ../radare2-1.5.0/libr/core/cconfig.c 2017-05-30 17:39:22.000000000 +0000 |
| 3 | +++ ./libr/core/cconfig.c 2017-06-14 22:12:21.397368964 +0000 |
| 4 | @@ -2145,9 +2145,7 @@ |
| 5 | #endif |
| 6 | SETCB ("dir.source", "", &cb_dirsrc, "Path to find source files"); |
| 7 | SETPREF ("dir.types", "/usr/include", "Default path to look for cparse type files"); |
| 8 | -#if __ANDROID__ |
| 9 | - SETPREF ("dir.projects", "/data/data/org.radare.radare2installer/radare2/projects", "Default path for projects"); |
| 10 | -#elif __WINDOWS__ |
| 11 | +#if __WINDOWS__ |
| 12 | SETPREF ("dir.projects", "~\\"R2_HOMEDIR"\\projects", "Default path for projects"); |
| 13 | #else |
| 14 | SETPREF ("dir.projects", "~/"R2_HOMEDIR"/projects", "Default path for projects"); |
| 15 | @@ -2283,6 +2281,9 @@ |
| 16 | #if __WINDOWS__ |
| 17 | r_config_set (cfg, "http.browser", "start"); |
| 18 | #else |
| 19 | +#ifdef __ANDROID__ |
| 20 | + r_config_set (cfg, "http.browser", "xdg-open"); |
| 21 | +#else |
| 22 | if (r_file_exists ("/usr/bin/openURL")) { // iOS ericautils |
| 23 | r_config_set (cfg, "http.browser", "/usr/bin/openURL"); |
| 24 | } else if (r_file_exists ("/system/bin/toolbox")) { |
| 25 | @@ -2295,14 +2296,13 @@ |
| 26 | } else { |
| 27 | r_config_set (cfg, "http.browser", "firefox"); |
| 28 | } |
| 29 | +#endif |
| 30 | r_config_desc (cfg, "http.browser", "Command to open HTTP URLs"); |
| 31 | #endif |
| 32 | SETI ("http.maxsize", 0, "Maximum file size for upload"); |
| 33 | SETPREF ("http.bind", "localhost", "Server address"); |
| 34 | SETPREF ("http.homeroot", "~/.config/radare2/www", "http home root directory"); |
| 35 | -#if __ANDROID__ |
| 36 | - SETPREF ("http.root", "/data/data/org.radare.radare2installer/www", "http root directory"); |
| 37 | -#elif __WINDOWS__ |
| 38 | +#if __WINDOWS__ |
| 39 | SETPREF ("http.root", "www", "http root directory"); |
| 40 | #else |
| 41 | SETPREF ("http.root", R2_WWWROOT, "http root directory"); |