projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fail silently on failure to read tar header, its unfortunate that many tar implementa...
[oweals/busybox.git]
/
libbb
/
concat_path_file.c
diff --git
a/libbb/concat_path_file.c
b/libbb/concat_path_file.c
index 61efa9c3e16ac7ab13fdbe3f8ec0125c727425e1..c699a84f7e57376321eb5374560d3d64401271cd 100644
(file)
--- a/
libbb/concat_path_file.c
+++ b/
libbb/concat_path_file.c
@@
-13,11
+13,14
@@
extern char *concat_path_file(const char *path, const char *filename)
{
char *outbuf;
char *lc;
{
char *outbuf;
char *lc;
-
+
+ if (!path)
+ path="";
lc = last_char_is(path, '/');
if (filename[0] == '/')
filename++;
outbuf = xmalloc(strlen(path)+strlen(filename)+1+(lc==NULL));
lc = last_char_is(path, '/');
if (filename[0] == '/')
filename++;
outbuf = xmalloc(strlen(path)+strlen(filename)+1+(lc==NULL));
- sprintf(outbuf, (lc==NULL ? "%s/%s" : "%s%s"), path, filename);
+ sprintf(outbuf, "%s%s%s", path, (lc==NULL)? "/" : "", filename);
+
return outbuf;
}
return outbuf;
}