wok diff busybox/stuff/busybox-1.27-ash.u @ rev 20121
Remove 3 largest in /usr/share/pixmaps on fs,iso.
author | Xander Ziiryanoff <psychomaniak@xakep.ru> |
---|---|
date | Sun Oct 15 01:02:51 2017 +0200 (2017-10-15) |
parents | 08bb2369e4d6 |
children |
line diff
1.1 --- a/busybox/stuff/busybox-1.27-ash.u Sat Jul 22 18:55:04 2017 +0200 1.2 +++ b/busybox/stuff/busybox-1.27-ash.u Sun Oct 15 01:02:51 2017 +0200 1.3 @@ -1,22 +1,17 @@ 1.4 Some SliTaz scripts (cook) need that... 1.5 --- busybox-1.27/shell/ash.c 1.6 +++ busybox-1.27/shell/ash.c 1.7 -@@ -12632,7 +12632,8 @@ 1.8 +@@ -12632,7 +12632,13 @@ 1.9 if (strchr(name, '/')) 1.10 return name; 1.11 1.12 -- while ((fullname = path_advance(&path, name)) != NULL) { 1.13 -+ fullname = name; /* search in . first */ 1.14 -+ do { 1.15 ++ /* IIRC standards do not say whether . is to be searched. Bash do it. */ 1.16 ++ if (ENABLE_ASH_BASH_COMPAT) { 1.17 ++ fullname = name; 1.18 ++ goto try_cur_dir; 1.19 ++ } 1.20 + while ((fullname = path_advance(&path, name)) != NULL) { 1.21 ++ try_cur_dir: 1.22 if ((stat(fullname, &statb) == 0) && S_ISREG(statb.st_mode)) { 1.23 /* 1.24 * Don't bother freeing here, since it will 1.25 -@@ -12642,7 +12643,7 @@ 1.26 - } 1.27 - if (fullname != name) 1.28 - stunalloc(fullname); 1.29 -- } 1.30 -+ } while ((fullname = path_advance(&path, name)) != NULL); 1.31 - 1.32 - /* not found in the PATH */ 1.33 - ash_msg_and_raise_error("%s: not found", name);