mirror of
https://github.com/sheumann/hush.git
synced 2024-08-17 00:29:03 +00:00
things like xasprintf() into xfuncs.c, remove xprint_file_by_name() (it only had one user), clean up lots of #includes... General cleanup pass. What I've been doing for the last couple days. And it conflicts! I've removed httpd.c from this checkin due to somebody else touching that file. It builds for me. I have to catch a bus. (Now you know why I'm looking forward to Mercurial.)
28 lines
609 B
C
28 lines
609 B
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* Utility routines.
|
|
*
|
|
* 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 addition '/' if path name already have '/'
|
|
*/
|
|
|
|
#include "libbb.h"
|
|
|
|
char *concat_path_file(const char *path, const char *filename)
|
|
{
|
|
char *lc;
|
|
|
|
if (!path)
|
|
path = "";
|
|
lc = last_char_is(path, '/');
|
|
while (*filename == '/')
|
|
filename++;
|
|
return xasprintf("%s%s%s", path, (lc==NULL ? "/" : ""), filename);
|
|
}
|