emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

A patch from Vladimir to simplify concat_path_file() and

Browse Source 
make it less likely to break.
This commit is contained in:
Eric Andersen 2001-05-07 23:01:32 +00:00
parent c33ebc9741
commit 4ad13e5d95
1 changed files with 7 additions and 11 deletions

16
libbb/concat_path_file.c

@ -11,16 +11,12 @@
extern char *concat_path_file(const char *path, const char *filename) extern char *concat_path_file(const char *path, const char *filename)
{ {
char *outbuf; char *outbuf;
int l; const char *lc;
int flg_slash = 1;
l = strlen(path); lc = last_char_is((char*)path, '/');
if (l>0 && path[l-1] == '/') if (filename[0] == '/')
flg_slash--; filename++;
l += strlen(filename); outbuf = xmalloc(strlen(path)+strlen(filename)+1+(lc==NULL));
if (l>0 && filename[0] == '/') sprintf(outbuf, (lc==NULL ? "%s/%s" : "%s%s"), path, filename);
flg_slash--;
outbuf = xmalloc(l+1+flg_slash);
sprintf(outbuf, (flg_slash ? "%s/%s" : "%s%s"), path, filename);
return outbuf; return outbuf;
} }