Skip to content

make rootpath and incpath consts for apr_filepath_root #3270

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

Merged
merged 1 commit into from
Oct 4, 2024
Merged

make rootpath and incpath consts for apr_filepath_root #3270

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions standalone/config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1028,7 +1028,8 @@ const char *process_command_config(server_rec *s,
ap_directive_t *newdir;
int optional;
char *err = NULL;
char *rootpath, *incpath;
const char *rootpath, *incpath;
char *configfilepath;
int li;

errmsg = populate_include_files(p, ptemp, ari, filename, 0);
Expand Down Expand Up @@ -1108,13 +1109,13 @@ const char *process_command_config(server_rec *s,

/* we allow APR_SUCCESS and APR_EINCOMPLETE */
if (APR_ERELATIVE == status) {
rootpath = apr_pstrdup(ptemp, parms->config_file->name);
li = strlen(rootpath) - 1;
configfilepath = apr_pstrdup(ptemp, parms->config_file->name);
li = strlen(configfilepath) - 1;

while(li >= 0 && rootpath[li] != '/' && rootpath[li] != '\\')
rootpath[li--] = 0;
while(li >= 0 && configfilepath[li] != '/' && configfilepath[li] != '\\')
configfilepath[li--] = 0;

w = apr_pstrcat(p, rootpath, w, NULL);
w = apr_pstrcat(p, configfilepath, w, NULL);
}
else if (APR_EBADPATH == status) {
ap_cfg_closefile(parms->config_file);
Expand Down
Loading