diff options
| author | Andi Gutmans <andi@php.net> | 1999-09-14 20:12:46 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 1999-09-14 20:12:46 +0000 |
| commit | 37d7b91d48a459fbd94be26090563fca197e4bc9 (patch) | |
| tree | 918d6d67f1daaeb5e942e5e0792b8971beb54a63 /main | |
| parent | 6a836bee6fac49b448ec0581265973feda28ef32 (diff) | |
| download | php-git-37d7b91d48a459fbd94be26090563fca197e4bc9.tar.gz | |
- First go at using strlcat().
Diffstat (limited to 'main')
| -rw-r--r-- | main/fopen_wrappers.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c index badbce3f60..09970821ee 100644 --- a/main/fopen_wrappers.c +++ b/main/fopen_wrappers.c @@ -346,7 +346,7 @@ PHPAPI FILE *php3_fopen_with_path(char *filename, char *mode, char *path, char * if(PG(doc_root)) { snprintf(trypath, MAXPATHLEN, "%s%s", PG(doc_root), filename); } else { - strncpy(trypath,filename,MAXPATHLEN); + strlcpy(trypath,filename,sizeof(trypath)); } if (!_php3_checkuid(trypath, cm)) { return NULL; @@ -494,24 +494,19 @@ static FILE *php3_fopen_url_wrapper(const char *path, char *mode, int options, i #endif /*win32 */ strcpy(hdr_line, "GET "); - len = 4; + /* tell remote http which file to get */ if (resource->path != NULL) { - strncat(hdr_line, resource->path, sizeof(hdr_line)-len); - len += strlen(resource->path); + strlcat(hdr_line, resource->path, sizeof(hdr_line)); } else { - strncat(hdr_line, "/", sizeof(hdr_line)-len); - len++; + strlcat(hdr_line, "/", sizeof(hdr_line)); } /* append the query string, if any */ if (resource->query != NULL) { - strncat(hdr_line, "?", sizeof(hdr_line)-len); - len++; - strncat(hdr_line, resource->query, sizeof(hdr_line)-len); - len += strlen(resource->query); + strlcat(hdr_line, "?", sizeof(hdr_line)); + strlcat(hdr_line, resource->query, sizeof(hdr_line)); } - strncat(hdr_line, " HTTP/1.0\r\n", sizeof(hdr_line)-len); - hdr_line[sizeof(hdr_line)-1] = '\0'; + strlcat(hdr_line, " HTTP/1.0\r\n", sizeof(hdr_line)); SOCK_WRITE(hdr_line, *socketd); /* send authorization header if we have user/pass */ |