diff options
| author | Matt Kraai <kraai@debian.org> | 2001-08-24 20:35:45 +0000 |
|---|---|---|
| committer | Matt Kraai <kraai@debian.org> | 2001-08-24 20:35:45 +0000 |
| commit | 80f6d55836963f4e85c297f2901161d0ff69b4cb (patch) | |
| tree | d75333cf5a2360ef3f9fc16bf3099ac2461b45f3 | |
| parent | ac20ce1924a0eb563acfda6533a80701cd611bfa (diff) | |
| download | busybox-w32-80f6d55836963f4e85c297f2901161d0ff69b4cb.tar.gz busybox-w32-80f6d55836963f4e85c297f2901161d0ff69b4cb.tar.bz2 busybox-w32-80f6d55836963f4e85c297f2901161d0ff69b4cb.zip | |
Eliminate improper consts and allow standard version to override.
| -rw-r--r-- | include/libbb.h | 2 | ||||
| -rw-r--r-- | libbb/dirname.c | 8 | ||||
| -rw-r--r-- | libbb/libbb.h | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/include/libbb.h b/include/libbb.h index a7e38325b..30f0bb9a7 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
| @@ -259,7 +259,7 @@ extern FILE *gz_open(FILE *compressed_file, int *pid); | |||
| 259 | extern struct hostent *xgethostbyname(const char *name); | 259 | extern struct hostent *xgethostbyname(const char *name); |
| 260 | extern int create_icmp_socket(void); | 260 | extern int create_icmp_socket(void); |
| 261 | 261 | ||
| 262 | char *dirname (const char *path); | 262 | char *dirname (char *path); |
| 263 | 263 | ||
| 264 | int make_directory (char *path, long mode, int flags); | 264 | int make_directory (char *path, long mode, int flags); |
| 265 | 265 | ||
diff --git a/libbb/dirname.c b/libbb/dirname.c index 87db1f24f..df9a49daa 100644 --- a/libbb/dirname.c +++ b/libbb/dirname.c | |||
| @@ -22,12 +22,14 @@ | |||
| 22 | #include <string.h> | 22 | #include <string.h> |
| 23 | #include "libbb.h" | 23 | #include "libbb.h" |
| 24 | 24 | ||
| 25 | #if defined __UCLIBC__ || __GNU_LIBRARY___ < 5 | ||
| 26 | |||
| 25 | /* Return a string containing the path name of the parent | 27 | /* Return a string containing the path name of the parent |
| 26 | * directory of PATH. */ | 28 | * directory of PATH. */ |
| 27 | 29 | ||
| 28 | char *dirname(const char *path) | 30 | char *dirname(char *path) |
| 29 | { | 31 | { |
| 30 | const char *s; | 32 | char *s; |
| 31 | 33 | ||
| 32 | /* Go to the end of the string. */ | 34 | /* Go to the end of the string. */ |
| 33 | s = path + strlen(path) - 1; | 35 | s = path + strlen(path) - 1; |
| @@ -49,3 +51,5 @@ char *dirname(const char *path) | |||
| 49 | s[1] = '\0'; | 51 | s[1] = '\0'; |
| 50 | return path; | 52 | return path; |
| 51 | } | 53 | } |
| 54 | |||
| 55 | #endif | ||
diff --git a/libbb/libbb.h b/libbb/libbb.h index a7e38325b..30f0bb9a7 100644 --- a/libbb/libbb.h +++ b/libbb/libbb.h | |||
| @@ -259,7 +259,7 @@ extern FILE *gz_open(FILE *compressed_file, int *pid); | |||
| 259 | extern struct hostent *xgethostbyname(const char *name); | 259 | extern struct hostent *xgethostbyname(const char *name); |
| 260 | extern int create_icmp_socket(void); | 260 | extern int create_icmp_socket(void); |
| 261 | 261 | ||
| 262 | char *dirname (const char *path); | 262 | char *dirname (char *path); |
| 263 | 263 | ||
| 264 | int make_directory (char *path, long mode, int flags); | 264 | int make_directory (char *path, long mode, int flags); |
| 265 | 265 | ||