CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-04-19 10:15:48 +02:00
Code Issues Projects Releases Wiki Activity

(DIRECTORY_SEPARATOR, FILESYSTEM_PREFIX_LEN, ISSLASH): Remove; now in dirname.h.

Browse Source 
(path_concat): Use base_len to compute
base length, not strlen; this means we cannot rely on memcpy
to null-terminate.
This commit is contained in:
Jim Meyering
2001-05-12 15:45:43 +00:00
parent 1450c855b6
commit f6e82b7dea
1 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/path-concat.c
View File

@@ -55,18 +55,7 @@ char *malloc ();
char *strdup ();
#endif
#ifndef DIRECTORY_SEPARATOR
# define DIRECTORY_SEPARATOR '/'
#endif
#ifndef FILESYSTEM_PREFIX_LEN
# define FILESYSTEM_PREFIX_LEN(Filename) 0
#endif
#ifndef ISSLASH
# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
#endif
#include "dirname.h"
#include "xalloc.h"
#include "path-concat.h"
@@ -88,8 +77,8 @@ path_concat (const char *dir, const char *base, char **base_in_result)
{
char *p;
char *p_concat;
size_t base_len;
size_t dir_len;
size_t baselen;
size_t dirlen;
if (!dir)
{
@@ -100,16 +89,16 @@ path_concat (const char *dir, const char *base, char **base_in_result)
}
/* DIR is not empty. */
base_len = strlen (base);
dir_len = strlen (dir);
baselen = base_len (base);
dirlen = strlen (dir);
p_concat = malloc (dir_len + base_len + 2);
p_concat = malloc (dirlen + baselen + 2);
if (!p_concat)
return 0;
p = mempcpy (p_concat, dir, dir_len);
p = mempcpy (p_concat, dir, dirlen);
if (dir_len > FILESYSTEM_PREFIX_LEN (dir))
if (FILESYSTEM_PREFIX_LEN (dir) < dirlen)
{
if (ISSLASH (*(p - 1)) && ISSLASH (*base))
--p;
@@ -120,7 +109,8 @@ path_concat (const char *dir, const char *base, char **base_in_result)
if (base_in_result)
*base_in_result = p;
memcpy (p, base, base_len + 1);
memcpy (p, base, baselen);
p[baselen] = '\0';
return p_concat;
}