044a72d0d5
for 'which'. I ageed, so I whipped this up -- which revealed a bug in concat_path_file. It turns out that that a '/' can be appended from either the path _or_ the filename, but only the former was checked. -Erik
27 lines
550 B
C
27 lines
550 B
C
/*
|
|
* busybox library eXtendet funcion
|
|
*
|
|
* concatenate path and file name to new allocation buffer,
|
|
* not addition '/' if path name already have '/'
|
|
*
|
|
*/
|
|
|
|
#include "libbb.h"
|
|
|
|
extern char *concat_path_file(const char *path, const char *filename)
|
|
{
|
|
char *outbuf;
|
|
int l;
|
|
int flg_slash = 1;
|
|
|
|
l = strlen(path);
|
|
if (l>0 && path[l-1] == '/')
|
|
flg_slash--;
|
|
l += strlen(filename);
|
|
if (l>0 && filename[0] == '/')
|
|
flg_slash--;
|
|
outbuf = xmalloc(l+1+flg_slash);
|
|
sprintf(outbuf, (flg_slash ? "%s/%s" : "%s%s"), path, filename);
|
|
return outbuf;
|
|
}
|