diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-07-05 00:12:55 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-07-05 00:12:55 +0000 |
commit | d166f83d74240e49bcc56ece0b709d773c2e8f62 (patch) | |
tree | 0f3d1f75a26b83d935683035f6787580831ae4f5 /coreutils | |
parent | 42b3dea9bfb8ac595c71089ee23012f44dd43eb2 (diff) | |
download | busybox-d166f83d74240e49bcc56ece0b709d773c2e8f62.tar.gz |
md5_sha1_sum: fix mishandling when run as /bin/md5sum (with path)
chown/chgrp: completely match coreutils 6.8 wrt symlink handling
function old new delta
recursive_action 411 422 +11
arith 2033 2042 +9
collect_blk 467 474 +7
dhcprelay_main 1122 1125 +3
fsck_main 1909 1911 +2
singlemount 4555 4547 -8
xmalloc_realpath 14 - -14
get_lcm 123 105 -18
ed_main 3111 3084 -27
chown_main 217 183 -34
------------------------------------------------------------------------------
(add/remove: 0/1 grow/shrink: 5/4 up/down: 32/-101) Total: -69 bytes
text data bss dec hex filename
684132 2744 14000 700876 ab1cc busybox_old
684060 2744 14000 700804 ab184 busybox_unstripped
Diffstat (limited to 'coreutils')
-rw-r--r-- | coreutils/chown.c | 60 | ||||
-rw-r--r-- | coreutils/md5_sha1_sum.c | 2 |
2 files changed, 32 insertions, 30 deletions
diff --git a/coreutils/chown.c b/coreutils/chown.c index 7579e1735..eb8d8c450 100644 --- a/coreutils/chown.c +++ b/coreutils/chown.c @@ -65,6 +65,7 @@ int chown_main(int argc, char **argv); int chown_main(int argc, char **argv) { int retval = EXIT_SUCCESS; + int flags; chown_fptr chown_func; opt_complementary = "-2"; @@ -80,23 +81,21 @@ int chown_main(int argc, char **argv) chown_func = lchown; } + flags = ACTION_DEPTHFIRST; /* match coreutils order */ + if (OPT_RECURSE) + flags |= ACTION_RECURSE; + if (OPT_TRAVERSE_TOP) + flags |= ACTION_FOLLOWLINKS_L0; /* -H/-L: follow links on depth 0 */ + if (OPT_TRAVERSE) + flags |= ACTION_FOLLOWLINKS; /* follow links if -L */ + parse_chown_usergroup_or_die(&ugid, argv[0]); /* Ok, ready to do the deed now */ argv++; do { - char *arg = *argv; - - if (OPT_TRAVERSE_TOP) { - /* resolves symlink (even recursive) */ - arg = xmalloc_realpath(arg); - if (!arg) - continue; - } - - if (!recursive_action(arg, - (OPT_RECURSE ? ACTION_RECURSE : 0) | /* recurse */ - (OPT_TRAVERSE ? ACTION_FOLLOWLINKS : 0),/* follow links if -L */ + if (!recursive_action(*argv, + flags, /* flags */ fileAction, /* file action */ fileAction, /* dir action */ chown_func, /* user data */ @@ -104,9 +103,6 @@ int chown_main(int argc, char **argv) ) { retval = EXIT_FAILURE; } - - if (OPT_TRAVERSE_TOP) - free(arg); } while (*++argv); return retval; @@ -137,8 +133,10 @@ create() { tst() { create test1 create test2 - (cd test1; $t1 $1) - (cd test2; $t2 $1) + echo "[$1]" >>test1.out + echo "[$1]" >>test2.out + (cd test1; $t1 $1) >>test1.out 2>&1 + (cd test2; $t2 $1) >>test2.out 2>&1 (cd test1; ls -lnR) >out1 (cd test2; ls -lnR) >out2 echo "chown $1" >out.diff @@ -152,18 +150,22 @@ tst_for_each() { tst "$1 1:1 linkfile" } echo "If script produced 'out.diff' file, then at least one testcase failed" +>test1.out +>test2.out # These match coreutils 6.8: -tst_for_each "" -tst_for_each "-R" -tst_for_each "-RP" -tst_for_each "-RL" -tst_for_each "-RH" -tst_for_each "-h" -tst_for_each "-hR" -tst_for_each "-hRP" -# Below: with "chown linkdir" coreutils 6.8 will chown linkdir _target_, -# we lchown _the link_. I believe we are "more correct". -#tst_for_each "-hRL" -#tst_for_each "-hRH" +tst_for_each "-v" +tst_for_each "-vR" +tst_for_each "-vRP" +tst_for_each "-vRL" +tst_for_each "-vRH" +tst_for_each "-vh" +tst_for_each "-vhR" +tst_for_each "-vhRP" +tst_for_each "-vhRL" +tst_for_each "-vhRH" +# Fix `name' in coreutils output +sed 's/`/'"'"'/g' -i test2.out +# Compare us with coreutils output +diff -u test1.out test2.out */ diff --git a/coreutils/md5_sha1_sum.c b/coreutils/md5_sha1_sum.c index 4523fa4ec..8bc203486 100644 --- a/coreutils/md5_sha1_sum.c +++ b/coreutils/md5_sha1_sum.c @@ -84,7 +84,7 @@ int md5_sha1_sum_main(int argc, char **argv) uint8_t *hash_value; unsigned flags; hash_algo_t hash_algo = ENABLE_MD5SUM - ? (ENABLE_SHA1SUM ? (**argv=='m' ? HASH_MD5 : HASH_SHA1) : HASH_MD5) + ? (ENABLE_SHA1SUM ? (applet_name[0] == 'm' ? HASH_MD5 : HASH_SHA1) : HASH_MD5) : HASH_SHA1; if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK) |