cb41c2e83
Eric Andersen
1999-11-22
Subject
Bug fixes
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
applets/install.sh +3 -3coreutils/dd.c +5 -0coreutils/mkdir.c +9 -5dd.c +5 -0install.sh +3 -3mkdir.c +9 -5utility.c +1 -7
applets/install.sh+3 -3
| @@ -12,11 +12,11 @@ h=`sort busybox.links | uniq` | |
| for i in $h ; do | |
| mypath=`echo $i | sed -e 's/\(^.*\/\)\(.*\)/\1/g' `; | |
| myapp=`echo $i | sed -e 's/\(^.*\/\)\(.*\)/\2/g' `; | |
| - | mkdir -p $1$mypath |
| echo " $1$mypath$myapp -> /bin/busybox" | |
| - | (cd $1$mypath ; rm -f $1$mypath$myapp ; ln -s /bin/busybox $1$mypath$myapp ) |
| + | mkdir -p $1$mypath |
| + | (cd $1$mypath && rm -f $1$mypath$myapp && ln -s /bin/busybox $1$mypath$myapp ) |
| done | |
| rm -f $1/bin/busybox | |
| install -m 755 busybox $1/bin/busybox | |
| - | |
| + | exit 0 |
coreutils/dd.c+5 -0
| @@ -29,10 +29,15 @@ | |
| #include "internal.h" | |
| + | #include <features.h> |
| #include <stdio.h> | |
| #include <fcntl.h> | |
| #include <errno.h> | |
| + | #if (__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 1) |
| #include <inttypes.h> | |
| + | #else |
| + | typedef unsigned long long int uintmax_t; |
| + | #endif |
| static const char dd_usage[] = | |
| "dd [if=name] [of=name] [bs=n] [count=n]\n\n" | |
coreutils/mkdir.c+9 -5
| @@ -80,17 +80,21 @@ extern int mkdir_main(int argc, char **argv) | |
| while (argc > 0) { | |
| int status; | |
| struct stat statBuf; | |
| - | status=stat(*argv, &statBuf); |
| + | char buf[NAME_MAX]; |
| + | |
| + | strcpy (buf, *argv); |
| + | status=stat(buf, &statBuf); |
| if (status != -1 && status != ENOENT ) { | |
| - | fprintf(stderr, "%s: File exists\n", *argv); |
| + | fprintf(stderr, "%s: File exists\n", buf); |
| exit( FALSE); | |
| } | |
| if (parentFlag == TRUE) { | |
| - | createPath(*argv, mode); |
| + | strcat( buf, "/"); |
| + | createPath(buf, mode); |
| } | |
| else { | |
| - | if (mkdir (*argv, mode) != 0) { |
| - | perror(*argv); |
| + | if (mkdir (buf, mode) != 0) { |
| + | perror(buf); |
| exit( FALSE); | |
| } | |
| } | |
dd.c+5 -0
| @@ -29,10 +29,15 @@ | |
| #include "internal.h" | |
| + | #include <features.h> |
| #include <stdio.h> | |
| #include <fcntl.h> | |
| #include <errno.h> | |
| + | #if (__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 1) |
| #include <inttypes.h> | |
| + | #else |
| + | typedef unsigned long long int uintmax_t; |
| + | #endif |
| static const char dd_usage[] = | |
| "dd [if=name] [of=name] [bs=n] [count=n]\n\n" | |
install.sh+3 -3
| @@ -12,11 +12,11 @@ h=`sort busybox.links | uniq` | |
| for i in $h ; do | |
| mypath=`echo $i | sed -e 's/\(^.*\/\)\(.*\)/\1/g' `; | |
| myapp=`echo $i | sed -e 's/\(^.*\/\)\(.*\)/\2/g' `; | |
| - | mkdir -p $1$mypath |
| echo " $1$mypath$myapp -> /bin/busybox" | |
| - | (cd $1$mypath ; rm -f $1$mypath$myapp ; ln -s /bin/busybox $1$mypath$myapp ) |
| + | mkdir -p $1$mypath |
| + | (cd $1$mypath && rm -f $1$mypath$myapp && ln -s /bin/busybox $1$mypath$myapp ) |
| done | |
| rm -f $1/bin/busybox | |
| install -m 755 busybox $1/bin/busybox | |
| - | |
| + | exit 0 |
mkdir.c+9 -5
| @@ -80,17 +80,21 @@ extern int mkdir_main(int argc, char **argv) | |
| while (argc > 0) { | |
| int status; | |
| struct stat statBuf; | |
| - | status=stat(*argv, &statBuf); |
| + | char buf[NAME_MAX]; |
| + | |
| + | strcpy (buf, *argv); |
| + | status=stat(buf, &statBuf); |
| if (status != -1 && status != ENOENT ) { | |
| - | fprintf(stderr, "%s: File exists\n", *argv); |
| + | fprintf(stderr, "%s: File exists\n", buf); |
| exit( FALSE); | |
| } | |
| if (parentFlag == TRUE) { | |
| - | createPath(*argv, mode); |
| + | strcat( buf, "/"); |
| + | createPath(buf, mode); |
| } | |
| else { | |
| - | if (mkdir (*argv, mode) != 0) { |
| - | perror(*argv); |
| + | if (mkdir (buf, mode) != 0) { |
| + | perror(buf); |
| exit( FALSE); | |
| } | |
| } | |
utility.c+1 -7
| @@ -481,14 +481,8 @@ extern void createPath (const char *name, int mode) | |
| char *cpOld; | |
| char buf[NAME_MAX]; | |
| - | strcpy (buf, name); |
| - | if (buf[strlen(buf)]!='/') { |
| - | buf[strlen(buf)] = '/'; |
| - | buf[strlen(buf)+1] = '\0'; |
| - | } |
| - | |
| + | strcpy( buf, name); |
| cp = strchr (buf, '/'); | |
| - | |
| while (cp) { | |
| cpOld = cp; | |
| cp = strchr (cp + 1, '/'); | |