Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

wresolver: use KDB_MAX_PATH_LENGTH instead of PATH_MAX #410

Merged
merged 1 commit into from
Dec 5, 2015
Merged

wresolver: use KDB_MAX_PATH_LENGTH instead of PATH_MAX #410

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/plugins/wresolver/wresolver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ static void elektraResolveSpec(resolverHandle *p, Key *errorKey)

static void elektraResolveDir(resolverHandle *p, Key *warningsKey)
{
p->filename = elektraMalloc(PATH_MAX);
p->filename = elektraMalloc(KDB_MAX_PATH_LENGTH);

# if defined(_WIN32)
CHAR dir[MAX_PATH];
Expand All @@ -163,24 +163,24 @@ static void elektraResolveDir(resolverHandle *p, Key *warningsKey)
}
escapePath(dir);
#else
char dir[PATH_MAX];
if (getcwd(dir, PATH_MAX) == 0)
char dir[KDB_MAX_PATH_LENGTH];
if (getcwd(dir, KDB_MAX_PATH_LENGTH) == 0)
{
ELEKTRA_ADD_WARNINGF(90, warningsKey, "getcwd failed: %s", strerror(errno));
}
#endif

strcpy (p->filename, dir);
strcat (p->filename, "/");
strncat (p->filename, p->path, PATH_MAX-strlen(dir)-3);
p->filename[PATH_MAX-1] = 0;
strncat (p->filename, p->path, KDB_MAX_PATH_LENGTH-strlen(dir)-3);
p->filename[KDB_MAX_PATH_LENGTH-1] = 0;

return;
}

static void elektraResolveUser(resolverHandle *p, Key *warningsKey)
{
p->filename = elektraMalloc(PATH_MAX);
p->filename = elektraMalloc(KDB_MAX_PATH_LENGTH);

# if defined(_WIN32)
CHAR home[MAX_PATH];
Expand All @@ -205,7 +205,7 @@ static void elektraResolveUser(resolverHandle *p, Key *warningsKey)

strcpy (p->filename, home);
strcat (p->filename, "/");
strncat (p->filename, p->path, PATH_MAX);
strncat (p->filename, p->path, KDB_MAX_PATH_LENGTH);
}

static void elektraResolveSystem(resolverHandle *p, Key *errorKey)
Expand Down