diff options
| author | Xavier Roche <xroche@users.noreply.github.com> | 2013-05-18 15:09:58 +0000 |
|---|---|---|
| committer | Xavier Roche <xroche@users.noreply.github.com> | 2013-05-18 15:09:58 +0000 |
| commit | fd153cb28d1634276fd9c0c94393cfca09278a6b (patch) | |
| tree | 7b063e7efc3cf51cab7430d8df5a534d2c1cac18 /src | |
| parent | 46b6d81f72c884ac521bd08e4ed6b2732f308ec5 (diff) | |
Fixed "Bogus charset on disk when filenames have non-ascii characters" (http://code.google.com/p/httrack/issues/detail?id=11)
Diffstat (limited to 'src')
| -rw-r--r-- | src/htsname.c | 12 | ||||
| -rw-r--r-- | src/htsparse.c | 7 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/htsname.c b/src/htsname.c index 779c27d..9f5d753 100644 --- a/src/htsname.c +++ b/src/htsname.c @@ -670,10 +670,10 @@ int url_savename2(char *adr_complete, char *fil_complete, char *save, strcpybuff(fil_complete, curr_fil); // copier adr, fil - return url_savename(curr_adr, curr_fil, save, NULL, NULL, - referer_adr, referer_fil, opt, liens, - lien_tot, sback, cache, hash, ptr, - numero_passe, NULL); + return url_savename2(curr_adr, curr_fil, save, NULL, NULL, + referer_adr, referer_fil, opt, liens, + lien_tot, sback, cache, hash, ptr, + numero_passe, NULL, charset); } // --- --- --- @@ -1380,8 +1380,8 @@ int url_savename2(char *adr_complete, char *fil_complete, char *save, if (s != NULL) { hts_log_print(opt, LOG_DEBUG, - "engine: save-name: charset conversion from '%s' to '%s'", - save, s); + "engine: save-name: charset conversion from '%s' to '%s' using charset '%s'", + save, s, charset); strcpybuff(save, s); free(s); } diff --git a/src/htsparse.c b/src/htsparse.c index 09367a0..1dd6e5f 100644 --- a/src/htsparse.c +++ b/src/htsparse.c @@ -4833,9 +4833,10 @@ int hts_wait_delayed(htsmoduleStruct * str, char *adr, char *fil, char *save, if (!continue_loop) { /* Recompute filename with MIME type */ save[0] = '\0'; - url_savename(adr, fil, save, former_adr, former_fil, - liens[ptr]->adr, liens[ptr]->fil, opt, liens, lien_tot, - sback, cache, hash, ptr, numero_passe, &delayed_back); + url_savename2(adr, fil, save, former_adr, former_fil, + liens[ptr]->adr, liens[ptr]->fil, opt, liens, lien_tot, + sback, cache, hash, ptr, numero_passe, &delayed_back, + str->page_charset_); /* Recompute authorization with MIME type */ { |