diff options
author | kraai <kraai@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2001-06-21 19:41:37 +0000 |
---|---|---|
committer | kraai <kraai@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2001-06-21 19:41:37 +0000 |
commit | 5f0f7d3428d4c8cc51fef8fcb4e7bf0ac616dab2 (patch) | |
tree | 3cdbaddffecc92649215fdc71a43b4e8e86b7ea3 /coreutils/dirname.c | |
parent | ce5c25da381038fa6d2640a2f4aa77771ca2ee43 (diff) | |
download | busybox-w32-5f0f7d3428d4c8cc51fef8fcb4e7bf0ac616dab2.tar.gz busybox-w32-5f0f7d3428d4c8cc51fef8fcb4e7bf0ac616dab2.tar.bz2 busybox-w32-5f0f7d3428d4c8cc51fef8fcb4e7bf0ac616dab2.zip |
Rewrote mkdir (and touched lots of things in the process).
git-svn-id: svn://busybox.net/trunk/busybox@2873 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'coreutils/dirname.c')
-rw-r--r-- | coreutils/dirname.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/coreutils/dirname.c b/coreutils/dirname.c index 935a8313c..b534e6950 100644 --- a/coreutils/dirname.c +++ b/coreutils/dirname.c | |||
@@ -30,21 +30,11 @@ | |||
30 | 30 | ||
31 | extern int dirname_main(int argc, char **argv) | 31 | extern int dirname_main(int argc, char **argv) |
32 | { | 32 | { |
33 | char* s; | ||
34 | |||
35 | if ((argc < 2) || (**(argv + 1) == '-')) | 33 | if ((argc < 2) || (**(argv + 1) == '-')) |
36 | show_usage(); | 34 | show_usage(); |
37 | argv++; | 35 | argv++; |
38 | 36 | ||
39 | s=*argv+strlen(*argv)-1; | 37 | puts (dirname (argv[0])); |
40 | while (s > *argv && *s == '/') { | 38 | |
41 | *s-- = '\0'; | ||
42 | } | ||
43 | s = strrchr(*argv, '/'); | ||
44 | if (s != NULL && s == *argv) | ||
45 | s[1] = '\0'; | ||
46 | else if (s != NULL) | ||
47 | *s = '\0'; | ||
48 | puts(s ? *argv : "."); | ||
49 | return EXIT_SUCCESS; | 39 | return EXIT_SUCCESS; |
50 | } | 40 | } |