d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migrate from using MAXPATHLEN to MAX_PATH. Use strlcpy to copy the

Browse Source 
strings.
This commit is contained in:
Warner Losh 2001-05-16 19:10:40 +00:00
parent aecd12aed8
commit 34f9c106b9
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/cp/cp.c
View File

@ -69,6 +69,7 @@ static const char rcsid[] =
#include <err.h>
#include <errno.h>
#include <fts.h>
#include <limits.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
@ -177,9 +178,8 @@ main(argc, argv)
/* Save the target base in "to". */
target = argv[--argc];
if (strlen(target) > MAXPATHLEN)
if (strlcpy(to.p_path, target, sizeof(to.p_path)) >= sizeof(to.p_path))
errx(1, "%s: name too long", target);
(void)strcpy(to.p_path, target);
to.p_end = to.p_path + strlen(to.p_path);
if (to.p_path == to.p_end) {
*to.p_end++ = '.';
@ -318,7 +318,7 @@ copy(argv, type, fts_options)
if (*p != '/' && target_mid[-1] != '/')
*target_mid++ = '/';
*target_mid = 0;
if (target_mid - to.p_path + nlen > MAXPATHLEN) {
if (target_mid - to.p_path + nlen >= PATH_MAX) {
warnx("%s%s: name too long (not copied)",
to.p_path, p);
badcp = rval = 1;

2
bin/cp/extern.h
View File

@ -37,7 +37,7 @@
typedef struct {
char *p_end; /* pointer to NULL at end of path */
char *target_end; /* pointer to end of target base */
char p_path[MAXPATHLEN + 1]; /* pointer to the start of a path */
char p_path[PATH_MAX]; /* pointer to the start of a path */
} PATH_T;
extern PATH_T to;

3
bin/cp/utils.c
View File

@ -50,6 +50,7 @@ static const char rcsid[] =
#include <errno.h>
#include <fcntl.h>
#include <fts.h>
#include <limits.h>
#include <stdio.h>
#include <sysexits.h>
#include <unistd.h>
@ -209,7 +210,7 @@ copy_link(p, exists)
int exists;
{
int len;
char link[MAXPATHLEN];
char link[PATH_MAX];
if ((len = readlink(p->fts_path, link, sizeof(link) - 1)) == -1) {
warn("readlink: %s", p->fts_path);