mirror of
https://github.com/sheumann/hush.git
synced 2024-05-28 06:41:31 +00:00
051b79efc1
Dmake gets confused if you use over-15-character file names, so they needed to be shortened to get it to work. While I was at it, I also switched _ to . in the filenames so they're fully ProDOS compatible. The shell/hush_test directory (not needed to build the code) still uses ProDOS-incompatible file names.
30 lines
695 B
C
30 lines
695 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 source tree.
|
|
*/
|
|
|
|
/* Concatenate path and filename to new allocated buffer.
|
|
* Add '/' only as needed (no duplicate // are produced).
|
|
* If path is NULL, it is assumed to be "/".
|
|
* filename should not be NULL.
|
|
*/
|
|
|
|
#include "libbb.h"
|
|
|
|
char* FAST_FUNC 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);
|
|
}
|