From 5b0c24aa715b8dab77e2b156b880df545516852a Mon Sep 17 00:00:00 2001 From: Xavier Roche Date: Sun, 4 May 2014 15:16:59 +0000 Subject: Replaced ugly cat by snprintf --- src/htsparse.c | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) (limited to 'src/htsparse.c') diff --git a/src/htsparse.c b/src/htsparse.c index 23d7dd2..e12e94c 100644 --- a/src/htsparse.c +++ b/src/htsparse.c @@ -3527,8 +3527,6 @@ int hts_mirror_check_moved(htsmoduleStruct * str, if (HTTP_IS_REDIRECT(r->statuscode)) { //if (r->adr!=NULL) { // adr==null si fichier direct. [catch: davename normalement si cgi] //int i=0; - char *rn = NULL; - // char* p; hts_log_print(opt, LOG_WARNING, "%s for %s%s", r->msg, urladr, urlfil); @@ -3668,7 +3666,8 @@ int hts_mirror_check_moved(htsmoduleStruct * str, } // ident_url_xx if (get_it == 0) { // adresse vraiment différente et potentiellement en html (pas de possibilité de bouger la page tel quel à cause des et cie) - rn = (char *) calloct(8192, 1); + const size_t rn_size = 8192; + char *const rn = (char *) malloct(rn_size); if (rn != NULL) { hts_log_print(opt, LOG_WARNING, "File has moved from %s%s to %s", urladr, urlfil, mov_url); @@ -3682,25 +3681,20 @@ int hts_mirror_check_moved(htsmoduleStruct * str, } // On prépare une page qui sautera immédiatement sur la bonne URL // Le scanner re-changera, ensuite, cette URL, pour la mirrorer! - strcpybuff(rn, "" CRLF); - strcatbuff(rn, - "" CRLF); - strcatbuff(rn, - "" CRLF "Page has moved" CRLF - "" CRLF "" CRLF); - strcatbuff(rn, "" CRLF); - strcatbuff(rn, ""); - strcatbuff(rn, "Click here..." CRLF); - strcatbuff(rn, "" CRLF); - strcatbuff(rn, - "" CRLF); - strcatbuff(rn, "" CRLF); + snprintf(rn, rn_size, + "" CRLF + "" CRLF + "" CRLF + "" + "" + "Page has moved" CRLF + "" CRLF + "" CRLF + "

Click here...

" CRLF + "" CRLF + "" CRLF + "" CRLF, + mov_url, mov_url); // changer la page if (r->adr) { -- cgit v1.2.3