diff options
author | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2001-08-02 05:02:46 +0000 |
---|---|---|
committer | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2001-08-02 05:02:46 +0000 |
commit | f4eebef50a14b8f804aed9a13f6437c6550b348e (patch) | |
tree | bf2c45a12020be4e0a37547abb50c40c0074e8ec /libbb/concat_path_file.c | |
parent | dcfdcb7f829849a4b6d14b162cfab8e7c381fd2f (diff) | |
download | busybox-w32-f4eebef50a14b8f804aed9a13f6437c6550b348e.tar.gz busybox-w32-f4eebef50a14b8f804aed9a13f6437c6550b348e.tar.bz2 busybox-w32-f4eebef50a14b8f804aed9a13f6437c6550b348e.zip |
Latest patch from vodz. Adds a check for divide by zero in the posix
math suport, cleaner math syntax error checking, moves redundant signal
string tables (from kill and ash) into libbb and provides a few
cleanups elsewhere.
git-svn-id: svn://busybox.net/trunk/busybox@3181 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'libbb/concat_path_file.c')
-rw-r--r-- | libbb/concat_path_file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libbb/concat_path_file.c b/libbb/concat_path_file.c index c699a84f7..86dd2fbbf 100644 --- a/libbb/concat_path_file.c +++ b/libbb/concat_path_file.c | |||
@@ -17,7 +17,7 @@ extern char *concat_path_file(const char *path, const char *filename) | |||
17 | if (!path) | 17 | if (!path) |
18 | path=""; | 18 | path=""; |
19 | lc = last_char_is(path, '/'); | 19 | lc = last_char_is(path, '/'); |
20 | if (filename[0] == '/') | 20 | while (*filename == '/') |
21 | filename++; | 21 | filename++; |
22 | outbuf = xmalloc(strlen(path)+strlen(filename)+1+(lc==NULL)); | 22 | outbuf = xmalloc(strlen(path)+strlen(filename)+1+(lc==NULL)); |
23 | sprintf(outbuf, "%s%s%s", path, (lc==NULL)? "/" : "", filename); | 23 | sprintf(outbuf, "%s%s%s", path, (lc==NULL)? "/" : "", filename); |