projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove casts from xmalloc()
[oweals/busybox.git]
/
libbb
/
concat_path_file.c
diff --git
a/libbb/concat_path_file.c
b/libbb/concat_path_file.c
index 61efa9c3e16ac7ab13fdbe3f8ec0125c727425e1..9aae601a4cca7ad100a561e78e383c93c0b1f079 100644
(file)
--- a/
libbb/concat_path_file.c
+++ b/
libbb/concat_path_file.c
@@
-1,23
+1,27
@@
+/* vi: set sw=4 ts=4: */
/*
/*
- *
busybox library eXtendet funcion
+ *
Utility routines.
*
*
- *
concatenate path and file name to new allocation buffer,
- *
not addition '/' if path name already have '/'
+ *
Copyright (C) many different people.
+ *
If you wrote this, please acknowledge your work.
*
*
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ */
+
+/* concatenate path and file name to new allocation buffer,
+ * not adding '/' if path name already has '/'
*/
*/
-#include <string.h>
#include "libbb.h"
#include "libbb.h"
-
extern
char *concat_path_file(const char *path, const char *filename)
+char *concat_path_file(const char *path, const char *filename)
{
{
- char *outbuf;
char *lc;
char *lc;
-
+
+ if (!path)
+ path = "";
lc = last_char_is(path, '/');
lc = last_char_is(path, '/');
-
if (filename[0]
== '/')
+
while (*filename
== '/')
filename++;
filename++;
- outbuf = xmalloc(strlen(path)+strlen(filename)+1+(lc==NULL));
- sprintf(outbuf, (lc==NULL ? "%s/%s" : "%s%s"), path, filename);
- return outbuf;
+ return xasprintf("%s%s%s", path, (lc==NULL ? "/" : ""), filename);
}
}