From e6eb8c0224e585735c113613b7fa42402778476d Mon Sep 17 00:00:00 2001 From: Xavier Roche Date: Tue, 18 Jun 2013 16:23:52 +0000 Subject: transfered => transferred --- html/faq.html | 4 ++-- html/fcguide.html | 4 ++-- html/httrack.man.html | 2 +- html/options.html | 2 +- html/plug.html | 2 +- man/httrack.1 | 2 +- src/htsalias.c | 2 +- src/htsback.c | 8 ++++---- src/htsback.h | 2 +- src/htscore.c | 6 +++--- src/htslib.c | 6 +++--- src/htsname.c | 4 ++-- src/htsparse.c | 10 +++++----- src/htsparse.h | 2 +- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/html/faq.html b/html/faq.html index 64aca51..d301459 100644 --- a/html/faq.html +++ b/html/faq.html @@ -736,7 +736,7 @@ files and pages from www.someweb.com.
Q: I have forgotten some URLs of files during a long mirror.. Should I redo all?
A: No, if you have kept the 'cache' files (in hts-cache), cached files will not be -retransfered.
+retransferred.

Q: I just want to retrieve all ZIP files or other files in a web site/in a page. How do I do it?
@@ -819,7 +819,7 @@ A: You can't! For security reasons, web servers do not allow that. A: Use the footer option (-%F, or see the WinHTTrack options)

Q: Do I have to select between ascii/binary transfer mode?
-A: No, http files are always transfered as binary files. Ftp files, too (even if ascii mode could be selected) +A: No, http files are always transferred as binary files. Ftp files, too (even if ascii mode could be selected)

Q: Can HTTrack perform form-based authentication?
A: Yes. See the URL capture abilities (--catchurl for command-line release, or in the WinHTTrack interface) diff --git a/html/fcguide.html b/html/fcguide.html index f86702f..7cb0d08 100644 --- a/html/fcguide.html +++ b/html/fcguide.html @@ -2527,7 +2527,7 @@ files and pages from www.all.net. mirror.. Should I redo all?

A: No, if you have kept the 'cache' files (in -hts-cache), cached files will not be retransfered. +hts-cache), cached files will not be retransferred.

Q: I just want to retrieve all ZIP files or other files in a web site/in a page. How do I do it? @@ -2636,7 +2636,7 @@ options)

Q: Do I have to select between ascii/binary transfer mode? -

A: No, http files are always transfered as binary +

A: No, http files are always transferred as binary files. Ftp files, too (even if ascii mode could be selected)

Q: Can HTTrack perform form-based authentication? diff --git a/html/httrack.man.html b/html/httrack.man.html index efceee6..42fec1f 100644 --- a/html/httrack.man.html +++ b/html/httrack.man.html @@ -1663,7 +1663,7 @@ doing)

bypass built−in security -limits aimed to avoid bandwidth abuses (bandwidth, +limits aimed to avoid bandwith abuses (bandwidth, simultaneous connections) (−−disable−security−limits)

diff --git a/html/options.html b/html/options.html index f59b941..bdf86aa 100644 --- a/html/options.html +++ b/html/options.html @@ -259,7 +259,7 @@ This option define the maximum transfer rate Example: -A2000 GN pause transfer if N bytes reached, and wait until lock file is deleted -This option asks the engine to pause every time N bytes have been transfered, and restarts when the lock file "hts-pause.lock" is being deleted +This option asks the engine to pause every time N bytes have been transferred, and restarts when the lock file "hts-pause.lock" is being deleted Example: -G20000000 u check document type if unknown (cgi,asp..) diff --git a/html/plug.html b/html/plug.html index 1b82c46..93baccd 100755 --- a/html/plug.html +++ b/html/plug.html @@ -197,7 +197,7 @@ Below the list of callbacks, and associated external wrappers. check_mimeCalled when a link download has begun, and needs to be tested against its MIME type. The adr and fil are the address and URI of the link being tested, and the mime string contains the link type being processed. The passed status value has the following meaning: 0 if the link is to be accepted by default, 1 if the link is to be refused by default, and -1 if no decision has yet been taken by the engine
return value: same meaning as the passed status value ; you may generally return -1 to let the engine take the decision by itselfint mycallback(t_hts_callbackarg *carg, httrackp* opt, const char* adr, const char* fil, const char* mime, int status); pauseCalled when the engine must pause. When the lockfile passed is deleted, the function can return
return value: nonevoid mycallback(t_hts_callbackarg *carg, httrackp* opt, const char* lockfile); filesaveCalled when a file is to be saved on disk
return value: nonevoid mycallback(t_hts_callbackarg *carg, httrackp* opt, const char* file); -filesave2Called when a file is to be saved or checked on disk
The hostname, filename and local filename are given. Two additional flags tells if the local file is new (is_new), if the local file is to be modified (is_modified), and if the file was not updated remotely (not_updated).
(!is_new && !is_modified): the file is up-to-date, and will not be modified
(is_new && is_modified): a new file will be written (or an updated file is being written)
(!is_new && is_modified): a file is being updated (append)
(is_new && !is_modified): an empty file will be written ("do not recatch locally erased files")
not_updated: the file was not re-downloaded because it was up-to-date (no data transfered again)

return value: nonevoid mycallback(t_hts_callbackarg *carg, httrackp* opt, const char* hostname, const char* filename, const char* localfile, int is_new, int is_modified, int not_updated); +filesave2Called when a file is to be saved or checked on disk
The hostname, filename and local filename are given. Two additional flags tells if the local file is new (is_new), if the local file is to be modified (is_modified), and if the file was not updated remotely (not_updated).
(!is_new && !is_modified): the file is up-to-date, and will not be modified
(is_new && is_modified): a new file will be written (or an updated file is being written)
(!is_new && is_modified): a file is being updated (append)
(is_new && !is_modified): an empty file will be written ("do not recatch locally erased files")
not_updated: the file was not re-downloaded because it was up-to-date (no data transferred again)

return value: nonevoid mycallback(t_hts_callbackarg *carg, httrackp* opt, const char* hostname, const char* filename, const char* localfile, int is_new, int is_modified, int not_updated); linkdetectedCalled when a link has been detected
return value: 1 if the link can be analyzed, 0 if the link must not even be consideredint mycallback(t_hts_callbackarg *carg, httrackp* opt, char* link); linkdetected2Called when a link has been detected
return value: 1 if the link can be analyzed, 0 if the link must not even be consideredint mycallback(t_hts_callbackarg *carg, httrackp* opt, char* link, const const char* tag_start); diff --git a/man/httrack.1 b/man/httrack.1 index 8d035c2..7dc14f0 100644 --- a/man/httrack.1 +++ b/man/httrack.1 @@ -460,7 +460,7 @@ execute a shell command (\-#! "echo hello") (\-\-exec ) .SS Dangerous options: (do NOT use unless you exactly know what you are doing) .IP \-%! -bypass built\-in security limits aimed to avoid bandwidth abuses (bandwidth, simultaneous connections) (\-\-disable\-security\-limits) +bypass built\-in security limits aimed to avoid bandwith abuses (bandwidth, simultaneous connections) (\-\-disable\-security\-limits) .IP \-IMPORTANT NOTE: DANGEROUS OPTION, ONLY SUITABLE FOR EXPERTS .IP \-USE diff --git a/src/htsalias.c b/src/htsalias.c index 52c93e9..2066093 100644 --- a/src/htsalias.c +++ b/src/htsalias.c @@ -173,7 +173,7 @@ const char *hts_optalias[][4] = { {"structure", "-N", "param1", "user-defined structure"}, {"usercommand", "-V", "param1", "user-defined command"}, {"display", "-%v", "single", - "show files transfered and other funny realtime information"}, + "show files transferred and other funny realtime information"}, {"dos83", "-L0", "single", ""}, {"iso9660", "-L2", "single", ""}, {"disable-module", "-%w", "param1", ""}, diff --git a/src/htsback.c b/src/htsback.c index a51a1cf..0644de1 100644 --- a/src/htsback.c +++ b/src/htsback.c @@ -1843,7 +1843,7 @@ int back_add(struct_back * sback, httrackp * opt, cache_back * cache, char *adr, } else { hts_log_print(opt, LOG_NOTICE, "File partially present (" LLintP - " bytes) retransfered due to lack of cache: %s%s", + " bytes) retransferred due to lack of cache: %s%s", (LLint) sz, back[p].url_adr, back[p].url_fil); /* Sinon requête normale... */ back[p].http11 = 0; @@ -1861,7 +1861,7 @@ int back_add(struct_back * sback, httrackp * opt, cache_back * cache, char *adr, } else { hts_log_print(opt, LOG_NOTICE, "HTML file (" LLintP - " bytes) retransfered due to lack of cache: %s%s", + " bytes) retransferred due to lack of cache: %s%s", (LLint) sz, back[p].url_adr, back[p].url_fil); /* Sinon requête normale... */ back[p].http11 = 0; @@ -4041,7 +4041,7 @@ int back_checkmirror(httrackp * opt) { if (!opt->state.stop) { /* not yet stopped */ hts_log_print(opt, LOG_ERROR, "More than " LLintP - " bytes have been transfered.. giving up", + " bytes have been transferred.. giving up", (LLint) opt->maxsite); /* cancel mirror smoothly */ hts_request_stop(opt, 0); @@ -4064,7 +4064,7 @@ int back_checkmirror(httrackp * opt) { } // octets transférés + add -LLint back_transfered(LLint nb, struct_back * sback) { +LLint back_transferred(LLint nb, struct_back * sback) { lien_back *const back = sback->lnk; const int back_max = sback->count; int i; diff --git a/src/htsback.h b/src/htsback.h index a59dafc..82ceb9d 100644 --- a/src/htsback.h +++ b/src/htsback.h @@ -129,7 +129,7 @@ int back_finalize(httrackp * opt, cache_back * cache, struct_back * sback, const int p); void back_info(struct_back * sback, int i, int j, FILE * fp); void back_infostr(struct_back * sback, int i, int j, char *s); -LLint back_transfered(LLint add, struct_back * sback); +LLint back_transferred(LLint add, struct_back * sback); // hostback #if HTS_XGETHOST diff --git a/src/htscore.c b/src/htscore.c index 5872dd8..9aaf285 100644 --- a/src/htscore.c +++ b/src/htscore.c @@ -1970,7 +1970,7 @@ int httpmirror(char *url1, httrackp * opt) { /* updating-a-remotely-deteted-website hack - no much data transfered, no data saved + no much data transferred, no data saved we assume that something was bad (no connection) just backup old cache and restore everything @@ -1979,7 +1979,7 @@ int httpmirror(char *url1, httrackp * opt) { && (HTS_STAT.HTS_TOTAL_RECV < 32768) /* should be fine */ ) { hts_log_print(opt, LOG_INFO, - "No data seems to have been transfered during this session! : restoring previous one!"); + "No data seems to have been transferred during this session! : restoring previous one!"); XH_uninit; if ((fexist (fconcat @@ -2169,7 +2169,7 @@ int httpmirror(char *url1, httrackp * opt) { (int) ((LLint) (HTS_STAT.total_packed * 100) / HTS_STAT.total_unpacked); sprintf(finalInfo + strlen(finalInfo), ", " LLintP - " bytes transfered using HTTP compression in %d files, ratio %d%%", + " bytes transferred using HTTP compression in %d files, ratio %d%%", (LLint) HTS_STAT.total_unpacked, HTS_STAT.total_packedfiles, (int) packed_ratio); } diff --git a/src/htslib.c b/src/htslib.c index 04f4360..dbb7c59 100644 --- a/src/htslib.c +++ b/src/htslib.c @@ -4552,7 +4552,7 @@ LLint check_downloadable_bytes(int rate) { if (rate > 0) { TStamp time_now; TStamp elapsed_useconds; - LLint bytes_transfered_during_period; + LLint bytes_transferred_during_period; LLint left; // get the older timer @@ -4561,10 +4561,10 @@ LLint check_downloadable_bytes(int rate) { time_now = mtime_local(); elapsed_useconds = time_now - HTS_STAT.istat_timestart[id_timer]; // NO totally stupid - elapsed_useconds+=1000; // for the next second, too - bytes_transfered_during_period = + bytes_transferred_during_period = (HTS_STAT.HTS_TOTAL_RECV - HTS_STAT.istat_bytes[id_timer]); - left = ((rate * elapsed_useconds) / 1000) - bytes_transfered_during_period; + left = ((rate * elapsed_useconds) / 1000) - bytes_transferred_during_period; if (left <= 0) left = 0; diff --git a/src/htsname.c b/src/htsname.c index 0ca7591..4719ec5 100644 --- a/src/htsname.c +++ b/src/htsname.c @@ -84,7 +84,7 @@ static const char *hts_tbdev[] = { HTS_STAT.stat_warnings=fspc(opt,NULL,"warning"); \ HTS_STAT.stat_infos=fspc(opt,NULL,"info"); \ HTS_STAT.nbk=backlinks_done(sback,liens,lien_tot,ptr); \ - HTS_STAT.nb=back_transfered(HTS_STAT.stat_bytes,sback); \ + HTS_STAT.nb=back_transferred(HTS_STAT.stat_bytes,sback); \ /* Check */ \ { \ if (!RUN_CALLBACK7(opt, loop, sback->lnk, sback->count,-1,ptr,lien_tot,(int) (time_local()-HTS_STAT.stat_timestart),&HTS_STAT)) { \ @@ -530,7 +530,7 @@ int url_savename(char *adr_complete, char *fil_complete, char *save, HTS_STAT.stat_warnings = fspc(opt, NULL, "warning"); HTS_STAT.stat_infos = fspc(opt, NULL, "info"); HTS_STAT.nbk = backlinks_done(sback, liens, lien_tot, ptr); - HTS_STAT.nb = back_transfered(HTS_STAT.stat_bytes, sback); + HTS_STAT.nb = back_transferred(HTS_STAT.stat_bytes, sback); if (!RUN_CALLBACK7 (opt, loop, sback->lnk, sback->count, b, ptr, lien_tot, diff --git a/src/htsparse.c b/src/htsparse.c index e1380a0..1661e2b 100644 --- a/src/htsparse.c +++ b/src/htsparse.c @@ -3453,7 +3453,7 @@ int htsparse(htsmoduleStruct * str, htsmoduleStructExtended * stre) { HTS_STAT.stat_warnings = fspc(opt, NULL, "warning"); HTS_STAT.stat_infos = fspc(opt, NULL, "info"); HTS_STAT.nbk = backlinks_done(sback, liens, lien_tot, ptr); - HTS_STAT.nb = back_transfered(HTS_STAT.stat_bytes, sback); + HTS_STAT.nb = back_transferred(HTS_STAT.stat_bytes, sback); if (!RUN_CALLBACK7 (opt, loop, sback->lnk, sback->count, 0, ptr, lien_tot, @@ -4009,7 +4009,7 @@ void hts_mirror_process_user_interaction(htsmoduleStruct * str, HTS_STAT.stat_warnings = fspc(opt, NULL, "warning"); HTS_STAT.stat_infos = fspc(opt, NULL, "info"); HTS_STAT.nbk = backlinks_done(sback, liens, lien_tot, ptr); - HTS_STAT.nb = back_transfered(HTS_STAT.stat_bytes, sback); + HTS_STAT.nb = back_transferred(HTS_STAT.stat_bytes, sback); b = 0; if (!RUN_CALLBACK7 @@ -4137,7 +4137,7 @@ void hts_mirror_process_user_interaction(htsmoduleStruct * str, HTS_STAT.stat_warnings = fspc(opt, NULL, "warning"); HTS_STAT.stat_infos = fspc(opt, NULL, "info"); HTS_STAT.nbk = backlinks_done(sback, liens, lien_tot, ptr); - HTS_STAT.nb = back_transfered(HTS_STAT.stat_bytes, sback); + HTS_STAT.nb = back_transferred(HTS_STAT.stat_bytes, sback); if (!RUN_CALLBACK7 (opt, loop, sback->lnk, sback->count, b, ptr, lien_tot, @@ -4337,7 +4337,7 @@ int hts_mirror_wait_for_next_file(htsmoduleStruct * str, HTS_STAT.stat_warnings = fspc(opt, NULL, "warning"); HTS_STAT.stat_infos = fspc(opt, NULL, "info"); HTS_STAT.nbk = backlinks_done(sback, liens, lien_tot, ptr); - HTS_STAT.nb = back_transfered(HTS_STAT.stat_bytes, sback); + HTS_STAT.nb = back_transferred(HTS_STAT.stat_bytes, sback); if (!RUN_CALLBACK7 (opt, loop, sback->lnk, sback->count, b, ptr, lien_tot, @@ -4740,7 +4740,7 @@ int hts_wait_delayed(htsmoduleStruct * str, char *adr, char *fil, char *save, HTS_STAT.stat_warnings = fspc(opt, NULL, "warning"); HTS_STAT.stat_infos = fspc(opt, NULL, "info"); HTS_STAT.nbk = backlinks_done(sback, liens, lien_tot, ptr); - HTS_STAT.nb = back_transfered(HTS_STAT.stat_bytes, sback); + HTS_STAT.nb = back_transferred(HTS_STAT.stat_bytes, sback); if (!RUN_CALLBACK7 (opt, loop, sback->lnk, sback->count, b, ptr, lien_tot, diff --git a/src/htsparse.h b/src/htsparse.h index 9c0f401..5424437 100644 --- a/src/htsparse.h +++ b/src/htsparse.h @@ -188,7 +188,7 @@ int hts_wait_delayed(htsmoduleStruct * str, char *adr, char *fil, char *save, HTS_STAT.stat_warnings=fspc(opt,NULL,"warning"); \ HTS_STAT.stat_infos=fspc(opt,NULL,"info"); \ HTS_STAT.nbk=backlinks_done(sback,liens,lien_tot,ptr); \ - HTS_STAT.nb=back_transfered(HTS_STAT.stat_bytes,sback); \ + HTS_STAT.nb=back_transferred(HTS_STAT.stat_bytes,sback); \ /* Check */ \ if (!RUN_CALLBACK7(opt, loop, sback->lnk, sback->count, -1,ptr,lien_tot,(int) (time_local()-HTS_STAT.stat_timestart),&HTS_STAT)) { \ return -1; \ -- cgit v1.2.3