LineageOS/android_external_bash
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported from ../bash-2.05.tar.gz.

Browse Source
This commit is contained in:
Jari Aalto
2001-04-06 19:14:31 +00:00
parent bb70624e96
commit 28ef6c316f
251 changed files with 22319 additions and 12413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/sh/makepath.c
View File

@@ -68,7 +68,7 @@ sh_makepath (path, dir, flags)
int flags;
{
int dirlen, pathlen;
char *ret, *xpath;
char *ret, *xpath, *r, *s;
if (path == 0 || *path == '\0')
{
@@ -102,14 +102,15 @@ sh_makepath (path, dir, flags)
dirlen -= 2;
}
ret = xmalloc (2 + dirlen + pathlen);
strcpy (ret, xpath);
if (xpath[pathlen - 1] != '/')
{
ret[pathlen++] = '/';
ret[pathlen] = '\0';
}
strcpy (ret + pathlen, dir);
r = ret = xmalloc (2 + dirlen + pathlen);
s = xpath;
while (*s)
*r++ = *s++;
if (s[-1] != '/')
*r++ = '/';
s = dir;
while (*r++ = *s++)
;
if (xpath != path)
free (xpath);
return (ret);