mirror of
https://github.com/xroche/httrack.git
synced 2026-05-17 08:26:14 +03:00
Merged revisions 1020-1023,1027-1029,1031,1033-1036,1038,1040,1042,1044-1054,1058-1072,1074-1087,1089-1112,1114-1124,1126-1128,1130-1133,1137,1139-1143,1145,1147-1159,1161,1163-1164 via svnmerge from
http://proliant/svn/httrack/trunk
........
r1020 | roche | 2014-05-13 22:08:53 +0200 (mar., 13 mai 2014) | 3 lines
#include <stdarg.h>
........
r1021 | roche | 2014-05-13 22:11:02 +0200 (mar., 13 mai 2014) | 3 lines
#include <stdarg.h>
........
r1022 | roche | 2014-05-13 22:11:41 +0200 (mar., 13 mai 2014) | 3 lines
#include <stdarg.h>
........
r1023 | roche | 2014-05-13 22:12:10 +0200 (mar., 13 mai 2014) | 3 lines
Better stdarg.h
........
r1027 | roche | 2014-05-14 19:45:51 +0200 (mer., 14 mai 2014) | 1 line
Added debug logging facility.
........
r1028 | roche | 2014-05-14 19:48:04 +0200 (mer., 14 mai 2014) | 3 lines
Fixed hashtable corruption because of dirty code directly modifying the host address in memory, leading to have hashtable positions not anymore valid.
This issue was especially triggered when a redirect was processed ("Warning moved treated for .." messages)
* closes: #43
........
r1029 | roche | 2014-05-14 19:51:09 +0200 (mer., 14 mai 2014) | 1 line
3.48.7
........
r1031 | roche | 2014-05-14 19:57:18 +0200 (mer., 14 mai 2014) | 3 lines
3.48.7
........
r1033 | roche | 2014-05-14 21:51:33 +0200 (mer., 14 mai 2014) | 1 line
Missing htsCallbackErr definition
........
r1034 | roche | 2014-05-14 22:12:42 +0200 (mer., 14 mai 2014) | 1 line
Clean hts_set_error_callback() and hts_get_error_callback()
........
r1035 | roche | 2014-05-14 22:20:01 +0200 (mer., 14 mai 2014) | 1 line
Fixed macro.
........
r1036 | roche | 2014-05-14 22:27:55 +0200 (mer., 14 mai 2014) | 1 line
Cosmetic
........
r1038 | roche | 2014-05-15 19:06:59 +0200 (jeu., 15 mai 2014) | 1 line
WIN32: zlib 1.2.8
........
r1040 | roche | 2014-05-15 19:08:29 +0200 (jeu., 15 mai 2014) | 1 line
3.48.8
........
r1042 | roche | 2014-05-15 19:22:16 +0200 (jeu., 15 mai 2014) | 3 lines
3.48.8-1
........
r1044 | roche | 2014-05-15 19:26:46 +0200 (jeu., 15 mai 2014) | 3 lines
Removed unused variable.
........
r1045 | roche | 2014-05-15 21:24:56 +0200 (jeu., 15 mai 2014) | 1 line
Fixed uint64_t vs. long long int
........
r1046 | roche | 2014-05-15 21:25:27 +0200 (jeu., 15 mai 2014) | 1 line
Compile-time checks.
........
r1047 | roche | 2014-05-15 21:27:29 +0200 (jeu., 15 mai 2014) | 1 line
Cosmetic.
........
r1048 | roche | 2014-05-15 21:33:38 +0200 (jeu., 15 mai 2014) | 3 lines
Added some asserts for Android.
........
r1049 | roche | 2014-05-15 21:44:28 +0200 (jeu., 15 mai 2014) | 3 lines
tr -d '\r'
........
r1050 | roche | 2014-05-17 14:31:37 +0200 (sam., 17 mai 2014) | 3 lines
Fixed potentiel overrun if the user injects a buggy user-defined structure with a non-terminated %[]
........
r1051 | roche | 2014-05-17 15:20:42 +0200 (sam., 17 mai 2014) | 1 line
Added hts_set_log_vprint_callback()
........
r1052 | roche | 2014-05-17 15:21:03 +0200 (sam., 17 mai 2014) | 1 line
Added hts_set_log_vprint_callback() definition
........
r1053 | roche | 2014-05-17 15:29:45 +0200 (sam., 17 mai 2014) | 1 line
Anonymous logging.
........
r1054 | roche | 2014-05-17 15:55:17 +0200 (sam., 17 mai 2014) | 1 line
Illegal use of strnlen(..., (size_t) -1)
........
r1058 | roche | 2014-05-18 11:49:24 +0200 (dim., 18 mai 2014) | 1 line
Cleanup in socket handling (less ugly casts!)
........
r1059 | roche | 2014-05-18 12:53:29 +0200 (dim., 18 mai 2014) | 1 line
Removed size member from SOCaddr
........
r1060 | roche | 2014-05-18 12:59:07 +0200 (dim., 18 mai 2014) | 3 lines
libtool: in_port_t and sa_family_t
........
r1061 | roche | 2014-05-18 15:11:40 +0200 (dim., 18 mai 2014) | 5 lines
Big cleanup in network address and dns functions:
* removed t_fullhostent insanity
* removed (struct sockaddr*) casts
* use SOCaddr everywhere rather than raw struct hostent*
........
r1062 | roche | 2014-05-18 15:43:09 +0200 (dim., 18 mai 2014) | 1 line
Cleanup in callbacks.
........
r1063 | roche | 2014-05-18 15:55:47 +0200 (dim., 18 mai 2014) | 3 lines
Backlog for web server to 10.
........
r1064 | roche | 2014-05-18 15:55:54 +0200 (dim., 18 mai 2014) | 3 lines
tr -d '\r'
........
r1065 | roche | 2014-05-18 16:02:06 +0200 (dim., 18 mai 2014) | 3 lines
Removed unused variable.
........
r1066 | roche | 2014-05-18 16:05:08 +0200 (dim., 18 mai 2014) | 1 line
Fixed __builtin___strncat_chk warning
........
r1067 | roche | 2014-05-19 21:12:27 +0200 (lun., 19 mai 2014) | 2 lines
Fixed segOutputSize < segSize assertion fails at htscharset.c:993
* closes:#44
........
r1068 | roche | 2014-05-19 21:15:16 +0200 (lun., 19 mai 2014) | 1 line
Added strlcpybuff() macro.
........
r1069 | roche | 2014-05-19 21:17:50 +0200 (lun., 19 mai 2014) | 1 line
char* => const char*
........
r1070 | roche | 2014-05-19 21:24:06 +0200 (lun., 19 mai 2014) | 3 lines
Added unit test for issue #44
........
r1071 | roche | 2014-05-19 21:37:40 +0200 (lun., 19 mai 2014) | 3 lines
tr -d '\r'
........
r1072 | roche | 2014-05-21 19:01:30 +0200 (mer., 21 mai 2014) | 1 line
Cleaner dup
........
r1074 | roche | 2014-05-21 19:21:29 +0200 (mer., 21 mai 2014) | 1 line
3.48.9
........
r1075 | roche | 2014-05-23 17:23:17 +0200 (ven., 23 mai 2014) | 3 lines
3.48.9-1 changelog
........
r1076 | roche | 2014-05-23 17:24:50 +0200 (ven., 23 mai 2014) | 3 lines
3.48.9 (autoconf)
........
r1077 | roche | 2014-05-23 17:28:55 +0200 (ven., 23 mai 2014) | 3 lines
Added symbol visibility features to the build to hide internal symbols (GCC)
........
r1078 | roche | 2014-05-23 23:33:43 +0200 (ven., 23 mai 2014) | 9 lines
"const correctness" cleanup
added the following default flags:
-Wformat
-Wformat-security
-Wmultichar
-Wwrite-strings
fixed several other warnings
........
r1079 | roche | 2014-05-24 09:45:12 +0200 (sam., 24 mai 2014) | 3 lines
Diff are better.
........
r1080 | roche | 2014-05-24 09:50:51 +0200 (sam., 24 mai 2014) | 3 lines
No diff.
........
r1081 | roche | 2014-05-24 09:56:11 +0200 (sam., 24 mai 2014) | 3 lines
Upgraded to minizip 1.1 from zlib 1.2.8
........
r1082 | roche | 2014-05-24 10:17:08 +0200 (sam., 24 mai 2014) | 3 lines
Missing zflush_file member.
........
r1083 | roche | 2014-05-24 10:37:21 +0200 (sam., 24 mai 2014) | 3 lines
Fixed minizip.
........
r1084 | roche | 2014-05-24 13:31:17 +0200 (sam., 24 mai 2014) | 3 lines
Removed ChangeLogUnzip
........
r1085 | roche | 2014-05-24 13:38:11 +0200 (sam., 24 mai 2014) | 3 lines
Fixed EXTRA_DIST
........
r1086 | roche | 2014-05-24 13:57:25 +0200 (sam., 24 mai 2014) | 3 lines
Minizip warning fixes.
........
r1087 | roche | 2014-05-26 21:27:46 +0200 (lun., 26 mai 2014) | 1 line
Big links heap handling cleanup, and removed very old and legacy macros
........
r1089 | roche | 2014-05-26 21:32:34 +0200 (lun., 26 mai 2014) | 3 lines
tr -d '\r'
........
r1090 | roche | 2014-05-27 18:05:09 +0200 (mar., 27 mai 2014) | 3 lines
Fixed symbol import.
........
r1091 | roche | 2014-05-27 18:05:28 +0200 (mar., 27 mai 2014) | 3 lines
tr -d '\r'
........
r1092 | roche | 2014-05-27 18:05:54 +0200 (mar., 27 mai 2014) | 3 lines
Export may_unknown and guess_httptype
........
r1093 | roche | 2014-05-27 18:35:57 +0200 (mar., 27 mai 2014) | 3 lines
Rewritten UTF8 writer to avoir spurious GCC 4.8.3 warnings.
........
r1094 | roche | 2014-05-27 19:45:18 +0200 (mar., 27 mai 2014) | 3 lines
Fixed help option, and too long help line (man: "cannot adjust line")
........
r1095 | roche | 2014-05-27 20:55:13 +0200 (mar., 27 mai 2014) | 1 line
Cleanup, const correctness
........
r1096 | roche | 2014-05-28 18:34:06 +0200 (mer., 28 mai 2014) | 3 lines
Added Vcs-Browser and Vcs-Svn fields to debian/control
........
r1097 | roche | 2014-05-28 18:36:24 +0200 (mer., 28 mai 2014) | 3 lines
Fixed dirty uint32_t cast leading to aliasing issues.
........
r1098 | roche | 2014-05-28 18:50:47 +0200 (mer., 28 mai 2014) | 3 lines
Added MD5 self-test
........
r1099 | roche | 2014-05-28 18:51:56 +0200 (mer., 28 mai 2014) | 3 lines
Fixed const T ** not being castable to const T **
........
r1100 | roche | 2014-05-28 18:58:37 +0200 (mer., 28 mai 2014) | 3 lines
Fixed build.
........
r1101 | roche | 2014-05-28 19:06:47 +0200 (mer., 28 mai 2014) | 3 lines
Really fixed.
........
r1102 | roche | 2014-05-28 19:41:42 +0200 (mer., 28 mai 2014) | 3 lines
Bad md5.
........
r1103 | roche | 2014-05-28 19:55:49 +0200 (mer., 28 mai 2014) | 19 lines
Added AM_PROG_CC_C_O and AM_PROG_LIBTOOL
Removed unused CXX
added the following default compiler flags:
-Wdeclaration-after-statement
-Wsequence-point
-Wparentheses
-Winit-self
-Wuninitialized
-Wformat
-fstrict-aliasing -Wstrict-aliasing=2
added the following default linker flags:
-Wl,--discard-all
-Wl,--no-undefined
Depending on autoconf-archive because using AX_CHECK_COMPILE_FLAG and AX_CHECK_LINK_FLAG
........
r1104 | roche | 2014-05-28 20:27:45 +0200 (mer., 28 mai 2014) | 3 lines
Fixed %%%
........
r1105 | roche | 2014-05-28 20:31:40 +0200 (mer., 28 mai 2014) | 1 line
Rewrite template formatting to be format-injection proof.
........
r1106 | roche | 2014-05-28 20:41:59 +0200 (mer., 28 mai 2014) | 1 line
Fixed heap crawl overflow
........
r1107 | roche | 2014-05-28 20:58:59 +0200 (mer., 28 mai 2014) | 1 line
Rewrite string template formatting to be format-injection proof.
........
r1108 | roche | 2014-05-28 21:03:07 +0200 (mer., 28 mai 2014) | 1 line
Fixed NULL terminated string.
........
r1109 | roche | 2014-05-28 21:03:26 +0200 (mer., 28 mai 2014) | 1 line
Replaced sprintf() by hts_template_format_str()
........
r1110 | roche | 2014-05-28 21:05:31 +0200 (mer., 28 mai 2014) | 1 line
Added assert
........
r1111 | roche | 2014-05-28 21:11:04 +0200 (mer., 28 mai 2014) | 3 lines
Added -Wformat-nonliteral flag.
........
r1112 | roche | 2014-05-29 10:20:07 +0200 (jeu., 29 mai 2014) | 1 line
Allocation cleanup (why "+2", why ?)
........
r1114 | roche | 2014-05-29 10:30:43 +0200 (jeu., 29 mai 2014) | 1 line
Added off_t_to_size_t()
........
r1115 | roche | 2014-05-29 11:34:37 +0200 (jeu., 29 mai 2014) | 3 lines
Fixes.
........
r1116 | roche | 2014-05-29 11:41:59 +0200 (jeu., 29 mai 2014) | 1 line
Removed duplicate opt->lien_tot and opt->liens members in some functions.
........
r1117 | roche | 2014-05-29 17:42:53 +0200 (jeu., 29 mai 2014) | 1 line
Big cleanup: introducing cleaner lien_adrfilsave and lien_adrfil structures holding address/uri or address/uri/filename rather than passing opaque char* of unknown size.
........
r1118 | roche | 2014-05-29 17:53:30 +0200 (jeu., 29 mai 2014) | 1 line
Unused function.
........
r1119 | roche | 2014-05-29 17:57:57 +0200 (jeu., 29 mai 2014) | 1 line
Fixed API change.
........
r1120 | roche | 2014-05-29 18:03:04 +0200 (jeu., 29 mai 2014) | 3 lines
tr -d '\r'
........
r1121 | roche | 2014-05-29 18:14:57 +0200 (jeu., 29 mai 2014) | 1 line
Fixed regression over ./
........
r1122 | roche | 2014-05-29 19:29:02 +0200 (jeu., 29 mai 2014) | 1 line
Take in account opt->maxlink is non-zero
........
r1123 | roche | 2014-05-29 19:58:05 +0200 (jeu., 29 mai 2014) | 1 line
Allocation failure handling.
........
r1124 | roche | 2014-05-29 20:10:14 +0200 (jeu., 29 mai 2014) | 1 line
Better "too many links" reporting.
........
r1126 | roche | 2014-05-30 18:09:02 +0200 (ven., 30 mai 2014) | 3 lines
Missing string.h (moe)
........
r1127 | roche | 2014-06-03 18:26:25 +0200 (mar., 03 juin 2014) | 1 line
Potential fix for htshash.c:330 assertion failure: "error invalidating hash entry"
........
r1128 | roche | 2014-06-04 18:10:38 +0200 (mer., 04 juin 2014) | 3 lines
Do not depend on SetDllDirectory (Windows 2003) as it breaks Windows 2000
* closes: #45
........
r1130 | roche | 2014-06-04 19:02:44 +0200 (mer., 04 juin 2014) | 3 lines
3.48-10
........
r1131 | roche | 2014-06-04 19:06:43 +0200 (mer., 04 juin 2014) | 1 line
3.48.10
........
r1132 | roche | 2014-06-04 19:10:40 +0200 (mer., 04 juin 2014) | 3 lines
Updated configure
........
r1133 | roche | 2014-06-04 19:41:42 +0200 (mer., 04 juin 2014) | 3 lines
Updated man
........
r1137 | roche | 2014-06-04 21:53:07 +0200 (mer., 04 juin 2014) | 3 lines
Fixed "this decimal constant is unsigned only in ISO C90"
........
r1139 | roche | 2014-06-05 17:59:49 +0200 (jeu., 05 juin 2014) | 1 line
changelog
........
r1140 | roche | 2014-06-05 18:00:05 +0200 (jeu., 05 juin 2014) | 3 lines
Added missing .h to -dev
........
r1141 | roche | 2014-06-06 17:47:38 +0200 (ven., 06 juin 2014) | 7 lines
Fixed assertion failure at htscore.c:244 (len + liensbuf->string_buffer_size < liensbuf->string_buffer_capa)
* closes:46
-Cette ligne, et les suivantes ci-dessous, seront ignorées--
M trunk/src/htscore.c
........
r1142 | roche | 2014-06-06 17:48:05 +0200 (ven., 06 juin 2014) | 3 lines
Additional check.
........
r1143 | roche | 2014-06-06 17:57:02 +0200 (ven., 06 juin 2014) | 1 line
3.48.11
........
r1145 | roche | 2014-06-06 18:02:35 +0200 (ven., 06 juin 2014) | 3 lines
3.48.11
........
r1147 | roche | 2014-06-06 20:43:50 +0200 (ven., 06 juin 2014) | 3 lines
Splitted typed arrays in htsarrays.h
Cleaned-up page generation
........
r1148 | roche | 2014-06-06 20:47:24 +0200 (ven., 06 juin 2014) | 3 lines
Updated man
........
r1149 | roche | 2014-06-06 20:47:39 +0200 (ven., 06 juin 2014) | 3 lines
tr -d '\r'
........
r1150 | roche | 2014-06-06 20:47:53 +0200 (ven., 06 juin 2014) | 3 lines
Added htsarrays.h to Makefile and devel libs
........
r1151 | roche | 2014-06-06 21:03:41 +0200 (ven., 06 juin 2014) | 1 line
Progressive power-of-two allocator for linked blocks.
........
r1152 | roche | 2014-06-06 21:08:47 +0200 (ven., 06 juin 2014) | 1 line
Cleanup.
........
r1153 | roche | 2014-06-06 22:58:35 +0200 (ven., 06 juin 2014) | 3 lines
Fixed initializer.
........
r1154 | roche | 2014-06-07 09:03:08 +0200 (sam., 07 juin 2014) | 3 lines
Fixed --advanced-maxlinks broken (Localhost)
........
r1155 | roche | 2014-06-07 09:03:13 +0200 (sam., 07 juin 2014) | 3 lines
Better.
........
r1156 | roche | 2014-06-08 11:26:46 +0200 (dim., 08 juin 2014) | 1 line
Typos
........
r1157 | roche | 2014-06-08 11:35:34 +0200 (dim., 08 juin 2014) | 3 lines
Fixed __cplusplus issues
........
r1158 | roche | 2014-06-08 13:12:21 +0200 (dim., 08 juin 2014) | 4 lines
Using subdir-objects for automake
Replaced legacy INCLUDES by AM_CPPFLAGS
........
r1159 | roche | 2014-06-08 13:22:41 +0200 (dim., 08 juin 2014) | 3 lines
3.48.12
........
r1161 | roche | 2014-06-08 15:02:43 +0200 (dim., 08 juin 2014) | 9 lines
Public definitions cleanup (especially for httraqt)
htsopt.h now has the following definitions:
* struct htsrequest_proxy
* struct htsrequest
* struct htsblk
* struct lien_url
* struct lien_back
........
r1163 | roche | 2014-06-08 15:58:57 +0200 (dim., 08 juin 2014) | 1 line
__cplusplus
........
r1164 | roche | 2014-06-08 17:43:28 +0200 (dim., 08 juin 2014) | 3 lines
3.48.13
........
This commit is contained in:
Xavier Roche
@@ -134,6 +134,7 @@ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
|
||||
distcleancheck_listfiles = find . -type f -print
|
||||
ACLOCAL = @ACLOCAL@
|
||||
AMTAR = @AMTAR@
|
||||
AM_CFLAGS = @AM_CFLAGS@
|
||||
AR = @AR@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
@@ -142,14 +143,12 @@ AWK = @AWK@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
CXXFLAGS = @CXXFLAGS@
|
||||
CYGPATH_W = @CYGPATH_W@
|
||||
DEFAULT_CFLAGS = @DEFAULT_CFLAGS@
|
||||
DEFAULT_LDFLAGS = @DEFAULT_LDFLAGS@
|
||||
DEFS = @DEFS@
|
||||
DEPDIR = @DEPDIR@
|
||||
DLLTOOL = @DLLTOOL@
|
||||
@@ -163,6 +162,7 @@ EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
FGREP = @FGREP@
|
||||
GREP = @GREP@
|
||||
HAVE_VISIBILITY = @HAVE_VISIBILITY@
|
||||
HTTPS_SUPPORT = @HTTPS_SUPPORT@
|
||||
ICONV_LIBS = @ICONV_LIBS@
|
||||
INSTALL = @INSTALL@
|
||||
@@ -218,7 +218,6 @@ abs_top_builddir = @abs_top_builddir@
|
||||
abs_top_srcdir = @abs_top_srcdir@
|
||||
ac_ct_AR = @ac_ct_AR@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
||||
am__include = @am__include@
|
||||
am__leading_dot = @am__leading_dot@
|
||||
|
||||
241
compile
241
compile
@@ -1,9 +1,10 @@
|
||||
#! /bin/sh
|
||||
# Wrapper for compilers which do not understand `-c -o'.
|
||||
# Wrapper for compilers which do not understand '-c -o'.
|
||||
|
||||
scriptversion=2005-05-14.22
|
||||
scriptversion=2012-03-05.13; # UTC
|
||||
|
||||
# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
|
||||
# Software Foundation, Inc.
|
||||
# Written by Tom Tromey <tromey@cygnus.com>.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
@@ -17,8 +18,7 @@ scriptversion=2005-05-14.22
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# As a special exception to the GNU General Public License, if you
|
||||
# distribute this file as part of a program that contains a
|
||||
@@ -29,21 +29,219 @@ scriptversion=2005-05-14.22
|
||||
# bugs to <bug-automake@gnu.org> or send patches to
|
||||
# <automake-patches@gnu.org>.
|
||||
|
||||
nl='
|
||||
'
|
||||
|
||||
# We need space, tab and new line, in precisely that order. Quoting is
|
||||
# there to prevent tools from complaining about whitespace usage.
|
||||
IFS=" "" $nl"
|
||||
|
||||
file_conv=
|
||||
|
||||
# func_file_conv build_file lazy
|
||||
# Convert a $build file to $host form and store it in $file
|
||||
# Currently only supports Windows hosts. If the determined conversion
|
||||
# type is listed in (the comma separated) LAZY, no conversion will
|
||||
# take place.
|
||||
func_file_conv ()
|
||||
{
|
||||
file=$1
|
||||
case $file in
|
||||
/ | /[!/]*) # absolute file, and not a UNC file
|
||||
if test -z "$file_conv"; then
|
||||
# lazily determine how to convert abs files
|
||||
case `uname -s` in
|
||||
MINGW*)
|
||||
file_conv=mingw
|
||||
;;
|
||||
CYGWIN*)
|
||||
file_conv=cygwin
|
||||
;;
|
||||
*)
|
||||
file_conv=wine
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
case $file_conv/,$2, in
|
||||
*,$file_conv,*)
|
||||
;;
|
||||
mingw/*)
|
||||
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
|
||||
;;
|
||||
cygwin/*)
|
||||
file=`cygpath -m "$file" || echo "$file"`
|
||||
;;
|
||||
wine/*)
|
||||
file=`winepath -w "$file" || echo "$file"`
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
# func_cl_dashL linkdir
|
||||
# Make cl look for libraries in LINKDIR
|
||||
func_cl_dashL ()
|
||||
{
|
||||
func_file_conv "$1"
|
||||
if test -z "$lib_path"; then
|
||||
lib_path=$file
|
||||
else
|
||||
lib_path="$lib_path;$file"
|
||||
fi
|
||||
linker_opts="$linker_opts -LIBPATH:$file"
|
||||
}
|
||||
|
||||
# func_cl_dashl library
|
||||
# Do a library search-path lookup for cl
|
||||
func_cl_dashl ()
|
||||
{
|
||||
lib=$1
|
||||
found=no
|
||||
save_IFS=$IFS
|
||||
IFS=';'
|
||||
for dir in $lib_path $LIB
|
||||
do
|
||||
IFS=$save_IFS
|
||||
if $shared && test -f "$dir/$lib.dll.lib"; then
|
||||
found=yes
|
||||
lib=$dir/$lib.dll.lib
|
||||
break
|
||||
fi
|
||||
if test -f "$dir/$lib.lib"; then
|
||||
found=yes
|
||||
lib=$dir/$lib.lib
|
||||
break
|
||||
fi
|
||||
done
|
||||
IFS=$save_IFS
|
||||
|
||||
if test "$found" != yes; then
|
||||
lib=$lib.lib
|
||||
fi
|
||||
}
|
||||
|
||||
# func_cl_wrapper cl arg...
|
||||
# Adjust compile command to suit cl
|
||||
func_cl_wrapper ()
|
||||
{
|
||||
# Assume a capable shell
|
||||
lib_path=
|
||||
shared=:
|
||||
linker_opts=
|
||||
for arg
|
||||
do
|
||||
if test -n "$eat"; then
|
||||
eat=
|
||||
else
|
||||
case $1 in
|
||||
-o)
|
||||
# configure might choose to run compile as 'compile cc -o foo foo.c'.
|
||||
eat=1
|
||||
case $2 in
|
||||
*.o | *.[oO][bB][jJ])
|
||||
func_file_conv "$2"
|
||||
set x "$@" -Fo"$file"
|
||||
shift
|
||||
;;
|
||||
*)
|
||||
func_file_conv "$2"
|
||||
set x "$@" -Fe"$file"
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
-I)
|
||||
eat=1
|
||||
func_file_conv "$2" mingw
|
||||
set x "$@" -I"$file"
|
||||
shift
|
||||
;;
|
||||
-I*)
|
||||
func_file_conv "${1#-I}" mingw
|
||||
set x "$@" -I"$file"
|
||||
shift
|
||||
;;
|
||||
-l)
|
||||
eat=1
|
||||
func_cl_dashl "$2"
|
||||
set x "$@" "$lib"
|
||||
shift
|
||||
;;
|
||||
-l*)
|
||||
func_cl_dashl "${1#-l}"
|
||||
set x "$@" "$lib"
|
||||
shift
|
||||
;;
|
||||
-L)
|
||||
eat=1
|
||||
func_cl_dashL "$2"
|
||||
;;
|
||||
-L*)
|
||||
func_cl_dashL "${1#-L}"
|
||||
;;
|
||||
-static)
|
||||
shared=false
|
||||
;;
|
||||
-Wl,*)
|
||||
arg=${1#-Wl,}
|
||||
save_ifs="$IFS"; IFS=','
|
||||
for flag in $arg; do
|
||||
IFS="$save_ifs"
|
||||
linker_opts="$linker_opts $flag"
|
||||
done
|
||||
IFS="$save_ifs"
|
||||
;;
|
||||
-Xlinker)
|
||||
eat=1
|
||||
linker_opts="$linker_opts $2"
|
||||
;;
|
||||
-*)
|
||||
set x "$@" "$1"
|
||||
shift
|
||||
;;
|
||||
*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
|
||||
func_file_conv "$1"
|
||||
set x "$@" -Tp"$file"
|
||||
shift
|
||||
;;
|
||||
*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
|
||||
func_file_conv "$1" mingw
|
||||
set x "$@" "$file"
|
||||
shift
|
||||
;;
|
||||
*)
|
||||
set x "$@" "$1"
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
shift
|
||||
done
|
||||
if test -n "$linker_opts"; then
|
||||
linker_opts="-link$linker_opts"
|
||||
fi
|
||||
exec "$@" $linker_opts
|
||||
exit 1
|
||||
}
|
||||
|
||||
eat=
|
||||
|
||||
case $1 in
|
||||
'')
|
||||
echo "$0: No command. Try \`$0 --help' for more information." 1>&2
|
||||
echo "$0: No command. Try '$0 --help' for more information." 1>&2
|
||||
exit 1;
|
||||
;;
|
||||
-h | --h*)
|
||||
cat <<\EOF
|
||||
Usage: compile [--help] [--version] PROGRAM [ARGS]
|
||||
|
||||
Wrapper for compilers which do not understand `-c -o'.
|
||||
Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
|
||||
Wrapper for compilers which do not understand '-c -o'.
|
||||
Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
|
||||
arguments, and rename the output as expected.
|
||||
|
||||
If you are trying to build a whole package this is not the
|
||||
right script to run: please start by reading the file `INSTALL'.
|
||||
right script to run: please start by reading the file 'INSTALL'.
|
||||
|
||||
Report bugs to <bug-automake@gnu.org>.
|
||||
EOF
|
||||
@@ -53,11 +251,13 @@ EOF
|
||||
echo "compile $scriptversion"
|
||||
exit $?
|
||||
;;
|
||||
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
|
||||
func_cl_wrapper "$@" # Doesn't return...
|
||||
;;
|
||||
esac
|
||||
|
||||
ofile=
|
||||
cfile=
|
||||
eat=
|
||||
|
||||
for arg
|
||||
do
|
||||
@@ -66,8 +266,8 @@ do
|
||||
else
|
||||
case $1 in
|
||||
-o)
|
||||
# configure might choose to run compile as `compile cc -o foo foo.c'.
|
||||
# So we strip `-o arg' only if arg is an object.
|
||||
# configure might choose to run compile as 'compile cc -o foo foo.c'.
|
||||
# So we strip '-o arg' only if arg is an object.
|
||||
eat=1
|
||||
case $2 in
|
||||
*.o | *.obj)
|
||||
@@ -94,22 +294,22 @@ do
|
||||
done
|
||||
|
||||
if test -z "$ofile" || test -z "$cfile"; then
|
||||
# If no `-o' option was seen then we might have been invoked from a
|
||||
# If no '-o' option was seen then we might have been invoked from a
|
||||
# pattern rule where we don't need one. That is ok -- this is a
|
||||
# normal compilation that the losing compiler can handle. If no
|
||||
# `.c' file was seen then we are probably linking. That is also
|
||||
# '.c' file was seen then we are probably linking. That is also
|
||||
# ok.
|
||||
exec "$@"
|
||||
fi
|
||||
|
||||
# Name of file we expect compiler to create.
|
||||
cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
|
||||
cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
|
||||
|
||||
# Create the lock directory.
|
||||
# Note: use `[/.-]' here to ensure that we don't use the same name
|
||||
# Note: use '[/\\:.-]' here to ensure that we don't use the same name
|
||||
# that we are using for the .o file. Also, base the name on the expected
|
||||
# object file name, since that is what matters with a parallel build.
|
||||
lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
|
||||
lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
|
||||
while true; do
|
||||
if mkdir "$lockdir" >/dev/null 2>&1; then
|
||||
break
|
||||
@@ -124,9 +324,9 @@ trap "rmdir '$lockdir'; exit 1" 1 2 15
|
||||
ret=$?
|
||||
|
||||
if test -f "$cofile"; then
|
||||
mv "$cofile" "$ofile"
|
||||
test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
|
||||
elif test -f "${cofile}bj"; then
|
||||
mv "${cofile}bj" "$ofile"
|
||||
test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
|
||||
fi
|
||||
|
||||
rmdir "$lockdir"
|
||||
@@ -138,5 +338,6 @@ exit $ret
|
||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
||||
# time-stamp-start: "scriptversion="
|
||||
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
||||
# time-stamp-end: "$"
|
||||
# time-stamp-time-zone: "UTC"
|
||||
# time-stamp-end: "; # UTC"
|
||||
# End:
|
||||
|
||||
13
config.h.in
13
config.h.in
@@ -42,6 +42,10 @@
|
||||
/* Define to 1 if you have the <unistd.h> header file. */
|
||||
#undef HAVE_UNISTD_H
|
||||
|
||||
/* Define to 1 or 0, depending whether the compiler supports simple visibility
|
||||
declarations. */
|
||||
#undef HAVE_VISIBILITY
|
||||
|
||||
/* Define to 1 if you have the `vsnprintf' function. */
|
||||
#undef HAVE_VSNPRINTF
|
||||
|
||||
@@ -67,6 +71,9 @@
|
||||
*/
|
||||
#undef LT_OBJDIR
|
||||
|
||||
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
|
||||
#undef NO_MINUS_C_MINUS_O
|
||||
|
||||
/* Name of package */
|
||||
#undef PACKAGE
|
||||
|
||||
@@ -108,3 +115,9 @@
|
||||
|
||||
/* Version number of package */
|
||||
#undef VERSION
|
||||
|
||||
/* in_port_t */
|
||||
#undef in_port_t
|
||||
|
||||
/* sa_family_t */
|
||||
#undef sa_family_t
|
||||
|
||||
80
configure.ac
80
configure.ac
@@ -1,18 +1,45 @@
|
||||
AC_INIT([httrack], [3.48.6], [roche+packaging@httrack.com], [httrack], [http://www.httrack.com/])
|
||||
AC_PREREQ(2.59)
|
||||
|
||||
AC_INIT([httrack], [3.48.13], [roche+packaging@httrack.com], [httrack], [http://www.httrack.com/])
|
||||
AC_COPYRIGHT([
|
||||
HTTrack Website Copier, Offline Browser for Windows and Unix
|
||||
Copyright (C) 1998-2014 Xavier Roche and other contributors
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
Important notes:
|
||||
|
||||
- We hereby ask people using this source NOT to use it in purpose of grabbing
|
||||
emails addresses, or collecting any other private information on persons.
|
||||
This would disgrace our work, and spoil the many hours we spent on it.
|
||||
|
||||
Please visit our Website: http://www.httrack.com
|
||||
])
|
||||
|
||||
AC_CONFIG_SRCDIR(src/httrack.c)
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
AC_CONFIG_HEADERS(config.h)
|
||||
AM_INIT_AUTOMAKE
|
||||
AM_INIT_AUTOMAKE([subdir-objects])
|
||||
VERSION_INFO="2:48:0"
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
AC_PREREQ(2.50)
|
||||
|
||||
AC_PROG_CC
|
||||
AC_PROG_CXX
|
||||
AM_PROG_CC_C_O
|
||||
AC_STDC_HEADERS
|
||||
LT_INIT
|
||||
AC_PROG_LN_S
|
||||
AM_PROG_LIBTOOL
|
||||
|
||||
# Export LD_LIBRARY_PATH name or equivalent.
|
||||
AC_SUBST(SHLIBPATH_VAR,$shlibpath_var)
|
||||
@@ -20,13 +47,34 @@ AC_SUBST(SHLIBPATH_VAR,$shlibpath_var)
|
||||
# Export .libs or equivalent.
|
||||
AC_SUBST(LT_CV_OBJDIR,$lt_cv_objdir)
|
||||
|
||||
### Default CFLAGS
|
||||
DEFAULT_CFLAGS="-Wall -Wcast-align -Wstrict-prototypes \
|
||||
-Wmissing-prototypes -Wmissing-declarations -Wpointer-arith \
|
||||
-Wnested-externs -D_REENTRANT"
|
||||
AC_SUBST(DEFAULT_CFLAGS)
|
||||
# Export version info
|
||||
AC_SUBST(VERSION_INFO)
|
||||
|
||||
### Default CFLAGS
|
||||
DEFAULT_CFLAGS="-Wall -Wformat -Wformat-security \
|
||||
-Wmultichar -Wwrite-strings -Wcast-align -Wstrict-prototypes \
|
||||
-Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement \
|
||||
-Wpointer-arith -Wsequence-point -Wnested-externs \
|
||||
-D_REENTRANT"
|
||||
AC_SUBST(DEFAULT_CFLAGS)
|
||||
DEFAULT_LDFLAGS=""
|
||||
AC_SUBST(DEFAULT_LDFLAGS)
|
||||
|
||||
### Additional flags (if supported)
|
||||
AX_CHECK_COMPILE_FLAG([-Wparentheses], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wparentheses"])
|
||||
AX_CHECK_COMPILE_FLAG([-Winit-self], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Winit-self"])
|
||||
AX_CHECK_COMPILE_FLAG([-Wuninitialized], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wuninitialized"])
|
||||
AX_CHECK_COMPILE_FLAG([-Wformat=2], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wformat=2"])
|
||||
AX_CHECK_COMPILE_FLAG([-Wformat-nonliteral], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -Wformat-nonliteral"])
|
||||
AX_CHECK_COMPILE_FLAG([-fstrict-aliasing -Wstrict-aliasing=2], [DEFAULT_CFLAGS="$DEFAULT_CFLAGS -fstrict-aliasing -Wstrict-aliasing=2"])
|
||||
AX_CHECK_LINK_FLAG([-Wl,--discard-all], [DEFAULT_LDLAGS="$DEFAULT_LDLAGS -Wl,--discard-all"])
|
||||
AX_CHECK_LINK_FLAG([-Wl,--no-undefined], [DEFAULT_LDLAGS="$DEFAULT_LDLAGS -Wl,--no-undefined"])
|
||||
|
||||
### Check for -fvisibility=hidden support
|
||||
gl_VISIBILITY
|
||||
AM_CFLAGS="$AM_CFLAGS $CFLAG_VISIBILITY"
|
||||
AC_SUBST([AM_CFLAGS])
|
||||
|
||||
### Check for platform
|
||||
#case $host in
|
||||
#AIX) AC_DEFINE(HTS_PLATFORM, 1, [Defined to build under AIX]);;
|
||||
@@ -47,6 +95,18 @@ AC_MSG_WARN([*** in_addr_t not found]),
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>])
|
||||
|
||||
# check for in_port_
|
||||
AC_CHECK_TYPE(in_port_t, [], [AC_DEFINE([in_port_t], [uint16_t], [in_port_t])], [
|
||||
#include <sys/types.h>
|
||||
#include <netinet/in.h>
|
||||
])
|
||||
|
||||
# check for sa_family_t
|
||||
AC_CHECK_TYPE(sa_family_t, [], [AC_DEFINE([sa_family_t], [uint16_t], [sa_family_t])], [
|
||||
#include <sys/types.h>
|
||||
#include <netinet/in.h>
|
||||
])
|
||||
|
||||
### zlib
|
||||
CHECK_ZLIB()
|
||||
|
||||
|
||||
44
debian/changelog
vendored
44
debian/changelog
vendored
@@ -1,3 +1,47 @@
|
||||
httrack (3.48.13-1) unstable; urgency=low
|
||||
|
||||
* Updated to 3.48.13 (3.48-13)
|
||||
closes:#750931
|
||||
|
||||
-- Xavier Roche <xavier@debian.org> Sun, 08 Jun 2014 16:22:13 +0200
|
||||
|
||||
httrack (3.48.12-1) unstable; urgency=low
|
||||
|
||||
* Updated to 3.48.12 (3.48-12)
|
||||
Should fix missing/broken .h for libhttrack-dev
|
||||
|
||||
-- Xavier Roche <xavier@debian.org> Sun, 08 Jun 2014 13:19:49 +0200
|
||||
|
||||
httrack (3.48.11-1) unstable; urgency=low
|
||||
|
||||
* Updated to 3.48.11 (3.48-11)
|
||||
|
||||
-- Xavier Roche <xavier@debian.org> Fri, 06 Jun 2014 17:58:12 +0200
|
||||
|
||||
httrack (3.48.10-1) unstable; urgency=low
|
||||
|
||||
* Updated to 3.48.10 (3.48-10)
|
||||
|
||||
-- Xavier Roche <xavier@debian.org> Wed, 04 Jun 2014 19:00:07 +0200
|
||||
|
||||
httrack (3.48.9-1) unstable; urgency=low
|
||||
|
||||
* Updated to 3.48.9 (3.48-9)
|
||||
|
||||
-- Xavier Roche <xavier@debian.org> Wed, 21 May 2014 19:22:04 +0200
|
||||
|
||||
httrack (3.48.8-1) unstable; urgency=low
|
||||
|
||||
* Updated to 3.48.8 (3.48-8)
|
||||
|
||||
-- Xavier Roche <xavier@debian.org> Thu, 15 May 2014 19:21:21 +0200
|
||||
|
||||
httrack (3.48.7-1) unstable; urgency=low
|
||||
|
||||
* Updated to 3.48.7 (3.48-7)
|
||||
|
||||
-- Xavier Roche <xavier@debian.org> Wed, 14 May 2014 19:51:57 +0200
|
||||
|
||||
httrack (3.48.6-1) unstable; urgency=low
|
||||
|
||||
* Updated to 3.48.6 (3.48-6)
|
||||
|
||||
4
debian/control
vendored
4
debian/control
vendored
@@ -3,8 +3,10 @@ Section: web
|
||||
Priority: optional
|
||||
Maintainer: Xavier Roche <roche@httrack.com>
|
||||
Standards-Version: 3.9.5
|
||||
Build-Depends: debhelper (>= 8.0.0), dh-autoreconf, autotools-dev, autoconf, automake, libtool, zlib1g-dev, libssl-dev
|
||||
Build-Depends: debhelper (>= 8.0.0), dh-autoreconf, autotools-dev, autoconf, autoconf-archive, automake, libtool, zlib1g-dev, libssl-dev
|
||||
Homepage: http://www.httrack.com
|
||||
Vcs-Svn: http://httrack.googlecode.com/svn/trunk
|
||||
Vcs-Browser: https://code.google.com/p/httrack/source/browse/trunk/src
|
||||
|
||||
Package: httrack
|
||||
Architecture: any
|
||||
|
||||
17
history.txt
17
history.txt
@@ -4,8 +4,21 @@ HTTrack Website Copier release history:
|
||||
|
||||
This file lists all changes and fixes that have been made for HTTrack.
|
||||
|
||||
3.48-6
|
||||
+ Fixed: mitigate the "hashtable internal error: cuckoo/stash collision" errors
|
||||
3.48-12
|
||||
+ Fixed: --advanced-maxlinks broken (Localhost)
|
||||
+ Fixed: -devel package should now be standalone
|
||||
+ Fixed: assertion failure at htscore.c:244 (len + liensbuf->string_buffer_size < liensbuf->string_buffer_capa)
|
||||
+ Fixed: injection-proof templates
|
||||
+ Fixed: htshash.c:330 assertion failure ("error invalidating hash entry") (Sergey)
|
||||
+ Fixed: Windows 2000 regression (fantozzi.usenet)
|
||||
+ Fixed: code cleanup (aliasing issues, const correctness, safe strings)
|
||||
+ New: handle --advanced-maxlinks=0 to disable maximum link limits
|
||||
+ New: updated ZIP routines (zlib 1.2.8)
|
||||
+ Fixed: broken 32-bit version
|
||||
+ Fixed: assertion "segOutputSize < segSize assertion fails at htscharset.c:993"
|
||||
+ Fixed: new zlib version fixing CVE-2004-0797 and CVE-2005-2096
|
||||
+ Fixed: more reliable crash reporting
|
||||
+ Fixed: fixed infamous "hashtable internal error: cuckoo/stash collision" errors
|
||||
+ Fixed: safety cleanup in many strings operations
|
||||
+ Fixed: buggy option pannels
|
||||
+ New: Enforce check against CVE-2014-0160
|
||||
|
||||
@@ -115,6 +115,7 @@ DATA = $(HelpHtml_DATA) $(HelpHtmlTxt_DATA) $(HelpHtmldiv_DATA) \
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
ACLOCAL = @ACLOCAL@
|
||||
AMTAR = @AMTAR@
|
||||
AM_CFLAGS = @AM_CFLAGS@
|
||||
AR = @AR@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
@@ -123,14 +124,12 @@ AWK = @AWK@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
CXXFLAGS = @CXXFLAGS@
|
||||
CYGPATH_W = @CYGPATH_W@
|
||||
DEFAULT_CFLAGS = @DEFAULT_CFLAGS@
|
||||
DEFAULT_LDFLAGS = @DEFAULT_LDFLAGS@
|
||||
DEFS = @DEFS@
|
||||
DEPDIR = @DEPDIR@
|
||||
DLLTOOL = @DLLTOOL@
|
||||
@@ -144,6 +143,7 @@ EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
FGREP = @FGREP@
|
||||
GREP = @GREP@
|
||||
HAVE_VISIBILITY = @HAVE_VISIBILITY@
|
||||
HTTPS_SUPPORT = @HTTPS_SUPPORT@
|
||||
ICONV_LIBS = @ICONV_LIBS@
|
||||
INSTALL = @INSTALL@
|
||||
@@ -199,7 +199,6 @@ abs_top_builddir = @abs_top_builddir@
|
||||
abs_top_srcdir = @abs_top_srcdir@
|
||||
ac_ct_AR = @ac_ct_AR@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
||||
am__include = @am__include@
|
||||
am__leading_dot = @am__leading_dot@
|
||||
|
||||
@@ -1032,8 +1032,8 @@ HTTP headers (−F "user−agent name")
|
||||
<td width="78%">
|
||||
|
||||
|
||||
<p>accepted formats (−%l
|
||||
"text/html,image/png,image/jpeg,image/gif;q=0.9,*/*;q=0.1"
|
||||
<p>accepted formats (−%a
|
||||
"text/html,image/png;q=0.9,*/*;q=0.1"
|
||||
(−−accept <param>)</p></td></tr>
|
||||
<tr valign="top" align="left">
|
||||
<td width="11%"></td>
|
||||
|
||||
@@ -104,6 +104,7 @@ DATA = $(lang_DATA) $(langroot_DATA)
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
ACLOCAL = @ACLOCAL@
|
||||
AMTAR = @AMTAR@
|
||||
AM_CFLAGS = @AM_CFLAGS@
|
||||
AR = @AR@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
@@ -112,14 +113,12 @@ AWK = @AWK@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
CXXFLAGS = @CXXFLAGS@
|
||||
CYGPATH_W = @CYGPATH_W@
|
||||
DEFAULT_CFLAGS = @DEFAULT_CFLAGS@
|
||||
DEFAULT_LDFLAGS = @DEFAULT_LDFLAGS@
|
||||
DEFS = @DEFS@
|
||||
DEPDIR = @DEPDIR@
|
||||
DLLTOOL = @DLLTOOL@
|
||||
@@ -133,6 +132,7 @@ EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
FGREP = @FGREP@
|
||||
GREP = @GREP@
|
||||
HAVE_VISIBILITY = @HAVE_VISIBILITY@
|
||||
HTTPS_SUPPORT = @HTTPS_SUPPORT@
|
||||
ICONV_LIBS = @ICONV_LIBS@
|
||||
INSTALL = @INSTALL@
|
||||
@@ -188,7 +188,6 @@ abs_top_builddir = @abs_top_builddir@
|
||||
abs_top_srcdir = @abs_top_srcdir@
|
||||
ac_ct_AR = @ac_ct_AR@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
||||
am__include = @am__include@
|
||||
am__leading_dot = @am__leading_dot@
|
||||
|
||||
@@ -3,7 +3,7 @@ exemplesdir = $(datadir)/httrack/libtest
|
||||
exemples_DATA = *.c *.h *.txt
|
||||
EXTRA_DIST = $(exemples_DATA)
|
||||
|
||||
INCLUDES = \
|
||||
AM_CPPFLAGS = \
|
||||
@DEFAULT_CFLAGS@ \
|
||||
@THREADS_CFLAGS@ \
|
||||
@V6_FLAG@ \
|
||||
@@ -13,7 +13,7 @@ INCLUDES = \
|
||||
-DDATADIR=\""$(datadir)"\" \
|
||||
-DLIBDIR=\""$(libdir)"\"
|
||||
|
||||
AM_CPPFLAGS = -I../src
|
||||
AM_CPPFLAGS += -I../src
|
||||
AM_LDFLAGS = -L../src
|
||||
|
||||
# Examples
|
||||
|
||||
@@ -201,6 +201,7 @@ CTAGS = ctags
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
ACLOCAL = @ACLOCAL@
|
||||
AMTAR = @AMTAR@
|
||||
AM_CFLAGS = @AM_CFLAGS@
|
||||
AR = @AR@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
@@ -209,14 +210,12 @@ AWK = @AWK@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
CXXFLAGS = @CXXFLAGS@
|
||||
CYGPATH_W = @CYGPATH_W@
|
||||
DEFAULT_CFLAGS = @DEFAULT_CFLAGS@
|
||||
DEFAULT_LDFLAGS = @DEFAULT_LDFLAGS@
|
||||
DEFS = @DEFS@
|
||||
DEPDIR = @DEPDIR@
|
||||
DLLTOOL = @DLLTOOL@
|
||||
@@ -230,6 +229,7 @@ EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
FGREP = @FGREP@
|
||||
GREP = @GREP@
|
||||
HAVE_VISIBILITY = @HAVE_VISIBILITY@
|
||||
HTTPS_SUPPORT = @HTTPS_SUPPORT@
|
||||
ICONV_LIBS = @ICONV_LIBS@
|
||||
INSTALL = @INSTALL@
|
||||
@@ -285,7 +285,6 @@ abs_top_builddir = @abs_top_builddir@
|
||||
abs_top_srcdir = @abs_top_srcdir@
|
||||
ac_ct_AR = @ac_ct_AR@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
||||
am__include = @am__include@
|
||||
am__leading_dot = @am__leading_dot@
|
||||
@@ -335,17 +334,9 @@ top_srcdir = @top_srcdir@
|
||||
exemplesdir = $(datadir)/httrack/libtest
|
||||
exemples_DATA = *.c *.h *.txt
|
||||
EXTRA_DIST = $(exemples_DATA)
|
||||
INCLUDES = \
|
||||
@DEFAULT_CFLAGS@ \
|
||||
@THREADS_CFLAGS@ \
|
||||
@V6_FLAG@ \
|
||||
@LFS_FLAG@ \
|
||||
-DPREFIX=\""$(prefix)"\" \
|
||||
-DSYSCONFDIR=\""$(sysconfdir)"\" \
|
||||
-DDATADIR=\""$(datadir)"\" \
|
||||
-DLIBDIR=\""$(libdir)"\"
|
||||
|
||||
AM_CPPFLAGS = -I../src
|
||||
AM_CPPFLAGS = @DEFAULT_CFLAGS@ @THREADS_CFLAGS@ @V6_FLAG@ @LFS_FLAG@ \
|
||||
-DPREFIX=\""$(prefix)"\" -DSYSCONFDIR=\""$(sysconfdir)"\" \
|
||||
-DDATADIR=\""$(datadir)"\" -DLIBDIR=\""$(libdir)"\" -I../src
|
||||
AM_LDFLAGS = -L../src
|
||||
|
||||
# Examples
|
||||
@@ -485,22 +476,25 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/callbacks-example-simple.Plo@am__quote@
|
||||
|
||||
.c.o:
|
||||
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
||||
@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
|
||||
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
|
||||
@am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ $<
|
||||
|
||||
.c.obj:
|
||||
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
||||
@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
|
||||
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
||||
@am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
|
||||
|
||||
.c.lo:
|
||||
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
||||
@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
|
||||
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
|
||||
|
||||
@@ -74,6 +74,7 @@ am__can_run_installinfo = \
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
ACLOCAL = @ACLOCAL@
|
||||
AMTAR = @AMTAR@
|
||||
AM_CFLAGS = @AM_CFLAGS@
|
||||
AR = @AR@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
@@ -82,14 +83,12 @@ AWK = @AWK@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
CXXFLAGS = @CXXFLAGS@
|
||||
CYGPATH_W = @CYGPATH_W@
|
||||
DEFAULT_CFLAGS = @DEFAULT_CFLAGS@
|
||||
DEFAULT_LDFLAGS = @DEFAULT_LDFLAGS@
|
||||
DEFS = @DEFS@
|
||||
DEPDIR = @DEPDIR@
|
||||
DLLTOOL = @DLLTOOL@
|
||||
@@ -103,6 +102,7 @@ EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
FGREP = @FGREP@
|
||||
GREP = @GREP@
|
||||
HAVE_VISIBILITY = @HAVE_VISIBILITY@
|
||||
HTTPS_SUPPORT = @HTTPS_SUPPORT@
|
||||
ICONV_LIBS = @ICONV_LIBS@
|
||||
INSTALL = @INSTALL@
|
||||
@@ -158,7 +158,6 @@ abs_top_builddir = @abs_top_builddir@
|
||||
abs_top_srcdir = @abs_top_srcdir@
|
||||
ac_ct_AR = @ac_ct_AR@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
||||
am__include = @am__include@
|
||||
am__leading_dot = @am__leading_dot@
|
||||
|
||||
@@ -105,6 +105,7 @@ MANS = $(man_MANS)
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
ACLOCAL = @ACLOCAL@
|
||||
AMTAR = @AMTAR@
|
||||
AM_CFLAGS = @AM_CFLAGS@
|
||||
AR = @AR@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
@@ -113,14 +114,12 @@ AWK = @AWK@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
CXXFLAGS = @CXXFLAGS@
|
||||
CYGPATH_W = @CYGPATH_W@
|
||||
DEFAULT_CFLAGS = @DEFAULT_CFLAGS@
|
||||
DEFAULT_LDFLAGS = @DEFAULT_LDFLAGS@
|
||||
DEFS = @DEFS@
|
||||
DEPDIR = @DEPDIR@
|
||||
DLLTOOL = @DLLTOOL@
|
||||
@@ -134,6 +133,7 @@ EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
FGREP = @FGREP@
|
||||
GREP = @GREP@
|
||||
HAVE_VISIBILITY = @HAVE_VISIBILITY@
|
||||
HTTPS_SUPPORT = @HTTPS_SUPPORT@
|
||||
ICONV_LIBS = @ICONV_LIBS@
|
||||
INSTALL = @INSTALL@
|
||||
@@ -189,7 +189,6 @@ abs_top_builddir = @abs_top_builddir@
|
||||
abs_top_srcdir = @abs_top_srcdir@
|
||||
ac_ct_AR = @ac_ct_AR@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
||||
am__include = @am__include@
|
||||
am__leading_dot = @am__leading_dot@
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
.\" Process this file with
|
||||
.\" groff -man -Tascii httrack.1
|
||||
.\"
|
||||
.TH httrack 1 "12 May 2014" "httrack website copier"
|
||||
.TH httrack 1 "08 June 2014" "httrack website copier"
|
||||
.SH NAME
|
||||
httrack \- offline browser : copy websites to a local directory
|
||||
.SH SYNOPSIS
|
||||
@@ -347,7 +347,7 @@ footer string in Html code (\-%F "Mirrored [from host %s [file %s [at %s]]]" (\-
|
||||
.IP \-%l
|
||||
preffered language (\-%l "fr, en, jp, *" (\-\-language <param>)
|
||||
.IP \-%a
|
||||
accepted formats (\-%l "text/html,image/png,image/jpeg,image/gif;q=0.9,*/*;q=0.1" (\-\-accept <param>)
|
||||
accepted formats (\-%a "text/html,image/png;q=0.9,*/*;q=0.1" (\-\-accept <param>)
|
||||
.IP \-%X
|
||||
additional HTTP header line (\-%X "X\-Magic: 42" (\-\-headers <param>)
|
||||
|
||||
|
||||
@@ -8,10 +8,14 @@ DevIncludes_DATA = \
|
||||
../config.h \
|
||||
htsmodules.h \
|
||||
htsbasenet.h \
|
||||
htsnet.h \
|
||||
htsbauth.h \
|
||||
htsdefines.h
|
||||
htsdefines.h \
|
||||
htsstrings.h \
|
||||
htsarrays.h \
|
||||
htssafe.h
|
||||
|
||||
INCLUDES = \
|
||||
AM_CPPFLAGS = \
|
||||
@DEFAULT_CFLAGS@ \
|
||||
@THREADS_CFLAGS@ \
|
||||
@V6_FLAG@ \
|
||||
@@ -56,7 +60,8 @@ libhttrack_la_SOURCES = htscore.c htsparse.c htsback.c htscache.c \
|
||||
htsmodules.h htsname.h htsnet.h \
|
||||
htsopt.h htsrobots.h htsthread.h \
|
||||
htstools.h htswizard.h htswrap.h htszlib.h \
|
||||
htsstrings.h httrack-library.h htscharset.h punycode.h htsencoding.h \
|
||||
htsstrings.h htsarrays.h httrack-library.h \
|
||||
htscharset.h punycode.h htsencoding.h \
|
||||
htsentities.h htsentities.sh htsbasiccharsets.sh htscodepages.h \
|
||||
md5.h murmurhash3.h \
|
||||
minizip/crypt.h minizip/ioapi.h minizip/mztools.h minizip/unzip.h minizip/zip.h
|
||||
@@ -69,9 +74,14 @@ libhtsjava_la_LIBADD = $(THREADS_LIBS) $(DL_LIBS) libhttrack.la
|
||||
libhtsjava_la_LDFLAGS = -version-info $(VERSION_INFO)
|
||||
|
||||
EXTRA_DIST = httrack.h webhttrack \
|
||||
minizip/ChangeLogUnzip \
|
||||
minizip/iowin32.c \
|
||||
minizip/iowin32.h \
|
||||
minizip/ioapi.c.diff \
|
||||
minizip/ioapi.h.diff \
|
||||
minizip/zip.c.diff \
|
||||
minizip/zip.h.diff \
|
||||
minizip/MiniZip64_Changes.txt \
|
||||
minizip/MiniZip64_info.txt \
|
||||
proxy/AUTHORS \
|
||||
proxy/COPYING \
|
||||
proxy/changelog.txt \
|
||||
|
||||
324
src/Makefile.in
324
src/Makefile.in
@@ -110,6 +110,7 @@ libhtsjava_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
libhttrack_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
|
||||
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
|
||||
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
|
||||
am__dirstamp = $(am__leading_dot)dirstamp
|
||||
am_libhttrack_la_OBJECTS = libhttrack_la-htscore.lo \
|
||||
libhttrack_la-htsparse.lo libhttrack_la-htsback.lo \
|
||||
libhttrack_la-htscache.lo libhttrack_la-htscatchurl.lo \
|
||||
@@ -125,8 +126,9 @@ am_libhttrack_la_OBJECTS = libhttrack_la-htscore.lo \
|
||||
libhttrack_la-htsconcat.lo libhttrack_la-htsmodules.lo \
|
||||
libhttrack_la-htscharset.lo libhttrack_la-punycode.lo \
|
||||
libhttrack_la-htsencoding.lo libhttrack_la-md5.lo \
|
||||
libhttrack_la-ioapi.lo libhttrack_la-mztools.lo \
|
||||
libhttrack_la-unzip.lo libhttrack_la-zip.lo
|
||||
minizip/libhttrack_la-ioapi.lo \
|
||||
minizip/libhttrack_la-mztools.lo \
|
||||
minizip/libhttrack_la-unzip.lo minizip/libhttrack_la-zip.lo
|
||||
libhttrack_la_OBJECTS = $(am_libhttrack_la_OBJECTS)
|
||||
libhttrack_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libhttrack_la_CFLAGS) \
|
||||
@@ -139,12 +141,14 @@ htsserver_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
|
||||
httrack_SOURCES = httrack.c
|
||||
httrack_OBJECTS = httrack.$(OBJEXT)
|
||||
httrack_DEPENDENCIES = $(am__DEPENDENCIES_1) libhttrack.la
|
||||
am_proxytrack_OBJECTS = proxytrack-main.$(OBJEXT) \
|
||||
proxytrack-proxytrack.$(OBJEXT) proxytrack-store.$(OBJEXT) \
|
||||
am_proxytrack_OBJECTS = proxy/proxytrack-main.$(OBJEXT) \
|
||||
proxy/proxytrack-proxytrack.$(OBJEXT) \
|
||||
proxy/proxytrack-store.$(OBJEXT) \
|
||||
proxytrack-htsinthash.$(OBJEXT) proxytrack-htsmd5.$(OBJEXT) \
|
||||
proxytrack-md5.$(OBJEXT) proxytrack-ioapi.$(OBJEXT) \
|
||||
proxytrack-mztools.$(OBJEXT) proxytrack-unzip.$(OBJEXT) \
|
||||
proxytrack-zip.$(OBJEXT)
|
||||
proxytrack-md5.$(OBJEXT) minizip/proxytrack-ioapi.$(OBJEXT) \
|
||||
minizip/proxytrack-mztools.$(OBJEXT) \
|
||||
minizip/proxytrack-unzip.$(OBJEXT) \
|
||||
minizip/proxytrack-zip.$(OBJEXT)
|
||||
proxytrack_OBJECTS = $(am_proxytrack_OBJECTS)
|
||||
proxytrack_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
|
||||
proxytrack_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
@@ -179,6 +183,7 @@ CTAGS = ctags
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
ACLOCAL = @ACLOCAL@
|
||||
AMTAR = @AMTAR@
|
||||
AM_CFLAGS = @AM_CFLAGS@
|
||||
AR = @AR@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
@@ -187,14 +192,12 @@ AWK = @AWK@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
CXXFLAGS = @CXXFLAGS@
|
||||
CYGPATH_W = @CYGPATH_W@
|
||||
DEFAULT_CFLAGS = @DEFAULT_CFLAGS@
|
||||
DEFAULT_LDFLAGS = @DEFAULT_LDFLAGS@
|
||||
DEFS = @DEFS@
|
||||
DEPDIR = @DEPDIR@
|
||||
DLLTOOL = @DLLTOOL@
|
||||
@@ -208,6 +211,7 @@ EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
FGREP = @FGREP@
|
||||
GREP = @GREP@
|
||||
HAVE_VISIBILITY = @HAVE_VISIBILITY@
|
||||
HTTPS_SUPPORT = @HTTPS_SUPPORT@
|
||||
ICONV_LIBS = @ICONV_LIBS@
|
||||
INSTALL = @INSTALL@
|
||||
@@ -263,7 +267,6 @@ abs_top_builddir = @abs_top_builddir@
|
||||
abs_top_srcdir = @abs_top_srcdir@
|
||||
ac_ct_AR = @ac_ct_AR@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
||||
am__include = @am__include@
|
||||
am__leading_dot = @am__leading_dot@
|
||||
@@ -320,10 +323,14 @@ DevIncludes_DATA = \
|
||||
../config.h \
|
||||
htsmodules.h \
|
||||
htsbasenet.h \
|
||||
htsnet.h \
|
||||
htsbauth.h \
|
||||
htsdefines.h
|
||||
htsdefines.h \
|
||||
htsstrings.h \
|
||||
htsarrays.h \
|
||||
htssafe.h
|
||||
|
||||
INCLUDES = \
|
||||
AM_CPPFLAGS = \
|
||||
@DEFAULT_CFLAGS@ \
|
||||
@THREADS_CFLAGS@ \
|
||||
@V6_FLAG@ \
|
||||
@@ -363,7 +370,8 @@ libhttrack_la_SOURCES = htscore.c htsparse.c htsback.c htscache.c \
|
||||
htsmodules.h htsname.h htsnet.h \
|
||||
htsopt.h htsrobots.h htsthread.h \
|
||||
htstools.h htswizard.h htswrap.h htszlib.h \
|
||||
htsstrings.h httrack-library.h htscharset.h punycode.h htsencoding.h \
|
||||
htsstrings.h htsarrays.h httrack-library.h \
|
||||
htscharset.h punycode.h htsencoding.h \
|
||||
htsentities.h htsentities.sh htsbasiccharsets.sh htscodepages.h \
|
||||
md5.h murmurhash3.h \
|
||||
minizip/crypt.h minizip/ioapi.h minizip/mztools.h minizip/unzip.h minizip/zip.h
|
||||
@@ -375,9 +383,14 @@ libhtsjava_la_SOURCES = htsjava.c htsjava.h
|
||||
libhtsjava_la_LIBADD = $(THREADS_LIBS) $(DL_LIBS) libhttrack.la
|
||||
libhtsjava_la_LDFLAGS = -version-info $(VERSION_INFO)
|
||||
EXTRA_DIST = httrack.h webhttrack \
|
||||
minizip/ChangeLogUnzip \
|
||||
minizip/iowin32.c \
|
||||
minizip/iowin32.h \
|
||||
minizip/ioapi.c.diff \
|
||||
minizip/ioapi.h.diff \
|
||||
minizip/zip.c.diff \
|
||||
minizip/zip.h.diff \
|
||||
minizip/MiniZip64_Changes.txt \
|
||||
minizip/MiniZip64_info.txt \
|
||||
proxy/AUTHORS \
|
||||
proxy/COPYING \
|
||||
proxy/changelog.txt \
|
||||
@@ -454,6 +467,20 @@ clean-libLTLIBRARIES:
|
||||
done
|
||||
libhtsjava.la: $(libhtsjava_la_OBJECTS) $(libhtsjava_la_DEPENDENCIES) $(EXTRA_libhtsjava_la_DEPENDENCIES)
|
||||
$(libhtsjava_la_LINK) -rpath $(libdir) $(libhtsjava_la_OBJECTS) $(libhtsjava_la_LIBADD) $(LIBS)
|
||||
minizip/$(am__dirstamp):
|
||||
@$(MKDIR_P) minizip
|
||||
@: > minizip/$(am__dirstamp)
|
||||
minizip/$(DEPDIR)/$(am__dirstamp):
|
||||
@$(MKDIR_P) minizip/$(DEPDIR)
|
||||
@: > minizip/$(DEPDIR)/$(am__dirstamp)
|
||||
minizip/libhttrack_la-ioapi.lo: minizip/$(am__dirstamp) \
|
||||
minizip/$(DEPDIR)/$(am__dirstamp)
|
||||
minizip/libhttrack_la-mztools.lo: minizip/$(am__dirstamp) \
|
||||
minizip/$(DEPDIR)/$(am__dirstamp)
|
||||
minizip/libhttrack_la-unzip.lo: minizip/$(am__dirstamp) \
|
||||
minizip/$(DEPDIR)/$(am__dirstamp)
|
||||
minizip/libhttrack_la-zip.lo: minizip/$(am__dirstamp) \
|
||||
minizip/$(DEPDIR)/$(am__dirstamp)
|
||||
libhttrack.la: $(libhttrack_la_OBJECTS) $(libhttrack_la_DEPENDENCIES) $(EXTRA_libhttrack_la_DEPENDENCIES)
|
||||
$(libhttrack_la_LINK) -rpath $(libdir) $(libhttrack_la_OBJECTS) $(libhttrack_la_LIBADD) $(LIBS)
|
||||
install-binPROGRAMS: $(bin_PROGRAMS)
|
||||
@@ -508,6 +535,26 @@ htsserver$(EXEEXT): $(htsserver_OBJECTS) $(htsserver_DEPENDENCIES) $(EXTRA_htsse
|
||||
httrack$(EXEEXT): $(httrack_OBJECTS) $(httrack_DEPENDENCIES) $(EXTRA_httrack_DEPENDENCIES)
|
||||
@rm -f httrack$(EXEEXT)
|
||||
$(LINK) $(httrack_OBJECTS) $(httrack_LDADD) $(LIBS)
|
||||
proxy/$(am__dirstamp):
|
||||
@$(MKDIR_P) proxy
|
||||
@: > proxy/$(am__dirstamp)
|
||||
proxy/$(DEPDIR)/$(am__dirstamp):
|
||||
@$(MKDIR_P) proxy/$(DEPDIR)
|
||||
@: > proxy/$(DEPDIR)/$(am__dirstamp)
|
||||
proxy/proxytrack-main.$(OBJEXT): proxy/$(am__dirstamp) \
|
||||
proxy/$(DEPDIR)/$(am__dirstamp)
|
||||
proxy/proxytrack-proxytrack.$(OBJEXT): proxy/$(am__dirstamp) \
|
||||
proxy/$(DEPDIR)/$(am__dirstamp)
|
||||
proxy/proxytrack-store.$(OBJEXT): proxy/$(am__dirstamp) \
|
||||
proxy/$(DEPDIR)/$(am__dirstamp)
|
||||
minizip/proxytrack-ioapi.$(OBJEXT): minizip/$(am__dirstamp) \
|
||||
minizip/$(DEPDIR)/$(am__dirstamp)
|
||||
minizip/proxytrack-mztools.$(OBJEXT): minizip/$(am__dirstamp) \
|
||||
minizip/$(DEPDIR)/$(am__dirstamp)
|
||||
minizip/proxytrack-unzip.$(OBJEXT): minizip/$(am__dirstamp) \
|
||||
minizip/$(DEPDIR)/$(am__dirstamp)
|
||||
minizip/proxytrack-zip.$(OBJEXT): minizip/$(am__dirstamp) \
|
||||
minizip/$(DEPDIR)/$(am__dirstamp)
|
||||
proxytrack$(EXEEXT): $(proxytrack_OBJECTS) $(proxytrack_DEPENDENCIES) $(EXTRA_proxytrack_DEPENDENCIES)
|
||||
@rm -f proxytrack$(EXEEXT)
|
||||
$(proxytrack_LINK) $(proxytrack_OBJECTS) $(proxytrack_LDADD) $(LIBS)
|
||||
@@ -549,6 +596,21 @@ uninstall-whttrackrunSCRIPTS:
|
||||
|
||||
mostlyclean-compile:
|
||||
-rm -f *.$(OBJEXT)
|
||||
-rm -f minizip/libhttrack_la-ioapi.$(OBJEXT)
|
||||
-rm -f minizip/libhttrack_la-ioapi.lo
|
||||
-rm -f minizip/libhttrack_la-mztools.$(OBJEXT)
|
||||
-rm -f minizip/libhttrack_la-mztools.lo
|
||||
-rm -f minizip/libhttrack_la-unzip.$(OBJEXT)
|
||||
-rm -f minizip/libhttrack_la-unzip.lo
|
||||
-rm -f minizip/libhttrack_la-zip.$(OBJEXT)
|
||||
-rm -f minizip/libhttrack_la-zip.lo
|
||||
-rm -f minizip/proxytrack-ioapi.$(OBJEXT)
|
||||
-rm -f minizip/proxytrack-mztools.$(OBJEXT)
|
||||
-rm -f minizip/proxytrack-unzip.$(OBJEXT)
|
||||
-rm -f minizip/proxytrack-zip.$(OBJEXT)
|
||||
-rm -f proxy/proxytrack-main.$(OBJEXT)
|
||||
-rm -f proxy/proxytrack-proxytrack.$(OBJEXT)
|
||||
-rm -f proxy/proxytrack-store.$(OBJEXT)
|
||||
|
||||
distclean-compile:
|
||||
-rm -f *.tab.c
|
||||
@@ -584,40 +646,43 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htswizard.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htswrap.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-htszlib.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-ioapi.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-md5.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-mztools.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-punycode.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-unzip.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhttrack_la-zip.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proxytrack-htsinthash.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proxytrack-htsmd5.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proxytrack-ioapi.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proxytrack-main.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proxytrack-md5.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proxytrack-mztools.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proxytrack-proxytrack.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proxytrack-store.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proxytrack-unzip.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proxytrack-zip.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@minizip/$(DEPDIR)/libhttrack_la-ioapi.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@minizip/$(DEPDIR)/libhttrack_la-mztools.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@minizip/$(DEPDIR)/libhttrack_la-unzip.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@minizip/$(DEPDIR)/libhttrack_la-zip.Plo@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@minizip/$(DEPDIR)/proxytrack-ioapi.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@minizip/$(DEPDIR)/proxytrack-mztools.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@minizip/$(DEPDIR)/proxytrack-unzip.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@minizip/$(DEPDIR)/proxytrack-zip.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@proxy/$(DEPDIR)/proxytrack-main.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@proxy/$(DEPDIR)/proxytrack-proxytrack.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@proxy/$(DEPDIR)/proxytrack-store.Po@am__quote@
|
||||
|
||||
.c.o:
|
||||
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
||||
@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
|
||||
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
|
||||
@am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ $<
|
||||
|
||||
.c.obj:
|
||||
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
||||
@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
|
||||
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
||||
@am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
|
||||
|
||||
.c.lo:
|
||||
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
||||
@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
|
||||
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
|
||||
@@ -825,75 +890,75 @@ libhttrack_la-md5.lo: md5.c
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhttrack_la_CFLAGS) $(CFLAGS) -c -o libhttrack_la-md5.lo `test -f 'md5.c' || echo '$(srcdir)/'`md5.c
|
||||
|
||||
libhttrack_la-ioapi.lo: minizip/ioapi.c
|
||||
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhttrack_la_CFLAGS) $(CFLAGS) -MT libhttrack_la-ioapi.lo -MD -MP -MF $(DEPDIR)/libhttrack_la-ioapi.Tpo -c -o libhttrack_la-ioapi.lo `test -f 'minizip/ioapi.c' || echo '$(srcdir)/'`minizip/ioapi.c
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libhttrack_la-ioapi.Tpo $(DEPDIR)/libhttrack_la-ioapi.Plo
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='minizip/ioapi.c' object='libhttrack_la-ioapi.lo' libtool=yes @AMDEPBACKSLASH@
|
||||
minizip/libhttrack_la-ioapi.lo: minizip/ioapi.c
|
||||
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhttrack_la_CFLAGS) $(CFLAGS) -MT minizip/libhttrack_la-ioapi.lo -MD -MP -MF minizip/$(DEPDIR)/libhttrack_la-ioapi.Tpo -c -o minizip/libhttrack_la-ioapi.lo `test -f 'minizip/ioapi.c' || echo '$(srcdir)/'`minizip/ioapi.c
|
||||
@am__fastdepCC_TRUE@ $(am__mv) minizip/$(DEPDIR)/libhttrack_la-ioapi.Tpo minizip/$(DEPDIR)/libhttrack_la-ioapi.Plo
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='minizip/ioapi.c' object='minizip/libhttrack_la-ioapi.lo' libtool=yes @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhttrack_la_CFLAGS) $(CFLAGS) -c -o libhttrack_la-ioapi.lo `test -f 'minizip/ioapi.c' || echo '$(srcdir)/'`minizip/ioapi.c
|
||||
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhttrack_la_CFLAGS) $(CFLAGS) -c -o minizip/libhttrack_la-ioapi.lo `test -f 'minizip/ioapi.c' || echo '$(srcdir)/'`minizip/ioapi.c
|
||||
|
||||
libhttrack_la-mztools.lo: minizip/mztools.c
|
||||
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhttrack_la_CFLAGS) $(CFLAGS) -MT libhttrack_la-mztools.lo -MD -MP -MF $(DEPDIR)/libhttrack_la-mztools.Tpo -c -o libhttrack_la-mztools.lo `test -f 'minizip/mztools.c' || echo '$(srcdir)/'`minizip/mztools.c
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libhttrack_la-mztools.Tpo $(DEPDIR)/libhttrack_la-mztools.Plo
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='minizip/mztools.c' object='libhttrack_la-mztools.lo' libtool=yes @AMDEPBACKSLASH@
|
||||
minizip/libhttrack_la-mztools.lo: minizip/mztools.c
|
||||
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhttrack_la_CFLAGS) $(CFLAGS) -MT minizip/libhttrack_la-mztools.lo -MD -MP -MF minizip/$(DEPDIR)/libhttrack_la-mztools.Tpo -c -o minizip/libhttrack_la-mztools.lo `test -f 'minizip/mztools.c' || echo '$(srcdir)/'`minizip/mztools.c
|
||||
@am__fastdepCC_TRUE@ $(am__mv) minizip/$(DEPDIR)/libhttrack_la-mztools.Tpo minizip/$(DEPDIR)/libhttrack_la-mztools.Plo
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='minizip/mztools.c' object='minizip/libhttrack_la-mztools.lo' libtool=yes @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhttrack_la_CFLAGS) $(CFLAGS) -c -o libhttrack_la-mztools.lo `test -f 'minizip/mztools.c' || echo '$(srcdir)/'`minizip/mztools.c
|
||||
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhttrack_la_CFLAGS) $(CFLAGS) -c -o minizip/libhttrack_la-mztools.lo `test -f 'minizip/mztools.c' || echo '$(srcdir)/'`minizip/mztools.c
|
||||
|
||||
libhttrack_la-unzip.lo: minizip/unzip.c
|
||||
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhttrack_la_CFLAGS) $(CFLAGS) -MT libhttrack_la-unzip.lo -MD -MP -MF $(DEPDIR)/libhttrack_la-unzip.Tpo -c -o libhttrack_la-unzip.lo `test -f 'minizip/unzip.c' || echo '$(srcdir)/'`minizip/unzip.c
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libhttrack_la-unzip.Tpo $(DEPDIR)/libhttrack_la-unzip.Plo
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='minizip/unzip.c' object='libhttrack_la-unzip.lo' libtool=yes @AMDEPBACKSLASH@
|
||||
minizip/libhttrack_la-unzip.lo: minizip/unzip.c
|
||||
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhttrack_la_CFLAGS) $(CFLAGS) -MT minizip/libhttrack_la-unzip.lo -MD -MP -MF minizip/$(DEPDIR)/libhttrack_la-unzip.Tpo -c -o minizip/libhttrack_la-unzip.lo `test -f 'minizip/unzip.c' || echo '$(srcdir)/'`minizip/unzip.c
|
||||
@am__fastdepCC_TRUE@ $(am__mv) minizip/$(DEPDIR)/libhttrack_la-unzip.Tpo minizip/$(DEPDIR)/libhttrack_la-unzip.Plo
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='minizip/unzip.c' object='minizip/libhttrack_la-unzip.lo' libtool=yes @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhttrack_la_CFLAGS) $(CFLAGS) -c -o libhttrack_la-unzip.lo `test -f 'minizip/unzip.c' || echo '$(srcdir)/'`minizip/unzip.c
|
||||
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhttrack_la_CFLAGS) $(CFLAGS) -c -o minizip/libhttrack_la-unzip.lo `test -f 'minizip/unzip.c' || echo '$(srcdir)/'`minizip/unzip.c
|
||||
|
||||
libhttrack_la-zip.lo: minizip/zip.c
|
||||
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhttrack_la_CFLAGS) $(CFLAGS) -MT libhttrack_la-zip.lo -MD -MP -MF $(DEPDIR)/libhttrack_la-zip.Tpo -c -o libhttrack_la-zip.lo `test -f 'minizip/zip.c' || echo '$(srcdir)/'`minizip/zip.c
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libhttrack_la-zip.Tpo $(DEPDIR)/libhttrack_la-zip.Plo
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='minizip/zip.c' object='libhttrack_la-zip.lo' libtool=yes @AMDEPBACKSLASH@
|
||||
minizip/libhttrack_la-zip.lo: minizip/zip.c
|
||||
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhttrack_la_CFLAGS) $(CFLAGS) -MT minizip/libhttrack_la-zip.lo -MD -MP -MF minizip/$(DEPDIR)/libhttrack_la-zip.Tpo -c -o minizip/libhttrack_la-zip.lo `test -f 'minizip/zip.c' || echo '$(srcdir)/'`minizip/zip.c
|
||||
@am__fastdepCC_TRUE@ $(am__mv) minizip/$(DEPDIR)/libhttrack_la-zip.Tpo minizip/$(DEPDIR)/libhttrack_la-zip.Plo
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='minizip/zip.c' object='minizip/libhttrack_la-zip.lo' libtool=yes @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhttrack_la_CFLAGS) $(CFLAGS) -c -o libhttrack_la-zip.lo `test -f 'minizip/zip.c' || echo '$(srcdir)/'`minizip/zip.c
|
||||
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libhttrack_la_CFLAGS) $(CFLAGS) -c -o minizip/libhttrack_la-zip.lo `test -f 'minizip/zip.c' || echo '$(srcdir)/'`minizip/zip.c
|
||||
|
||||
proxytrack-main.o: proxy/main.c
|
||||
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT proxytrack-main.o -MD -MP -MF $(DEPDIR)/proxytrack-main.Tpo -c -o proxytrack-main.o `test -f 'proxy/main.c' || echo '$(srcdir)/'`proxy/main.c
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/proxytrack-main.Tpo $(DEPDIR)/proxytrack-main.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='proxy/main.c' object='proxytrack-main.o' libtool=no @AMDEPBACKSLASH@
|
||||
proxy/proxytrack-main.o: proxy/main.c
|
||||
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT proxy/proxytrack-main.o -MD -MP -MF proxy/$(DEPDIR)/proxytrack-main.Tpo -c -o proxy/proxytrack-main.o `test -f 'proxy/main.c' || echo '$(srcdir)/'`proxy/main.c
|
||||
@am__fastdepCC_TRUE@ $(am__mv) proxy/$(DEPDIR)/proxytrack-main.Tpo proxy/$(DEPDIR)/proxytrack-main.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='proxy/main.c' object='proxy/proxytrack-main.o' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o proxytrack-main.o `test -f 'proxy/main.c' || echo '$(srcdir)/'`proxy/main.c
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o proxy/proxytrack-main.o `test -f 'proxy/main.c' || echo '$(srcdir)/'`proxy/main.c
|
||||
|
||||
proxytrack-main.obj: proxy/main.c
|
||||
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT proxytrack-main.obj -MD -MP -MF $(DEPDIR)/proxytrack-main.Tpo -c -o proxytrack-main.obj `if test -f 'proxy/main.c'; then $(CYGPATH_W) 'proxy/main.c'; else $(CYGPATH_W) '$(srcdir)/proxy/main.c'; fi`
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/proxytrack-main.Tpo $(DEPDIR)/proxytrack-main.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='proxy/main.c' object='proxytrack-main.obj' libtool=no @AMDEPBACKSLASH@
|
||||
proxy/proxytrack-main.obj: proxy/main.c
|
||||
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT proxy/proxytrack-main.obj -MD -MP -MF proxy/$(DEPDIR)/proxytrack-main.Tpo -c -o proxy/proxytrack-main.obj `if test -f 'proxy/main.c'; then $(CYGPATH_W) 'proxy/main.c'; else $(CYGPATH_W) '$(srcdir)/proxy/main.c'; fi`
|
||||
@am__fastdepCC_TRUE@ $(am__mv) proxy/$(DEPDIR)/proxytrack-main.Tpo proxy/$(DEPDIR)/proxytrack-main.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='proxy/main.c' object='proxy/proxytrack-main.obj' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o proxytrack-main.obj `if test -f 'proxy/main.c'; then $(CYGPATH_W) 'proxy/main.c'; else $(CYGPATH_W) '$(srcdir)/proxy/main.c'; fi`
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o proxy/proxytrack-main.obj `if test -f 'proxy/main.c'; then $(CYGPATH_W) 'proxy/main.c'; else $(CYGPATH_W) '$(srcdir)/proxy/main.c'; fi`
|
||||
|
||||
proxytrack-proxytrack.o: proxy/proxytrack.c
|
||||
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT proxytrack-proxytrack.o -MD -MP -MF $(DEPDIR)/proxytrack-proxytrack.Tpo -c -o proxytrack-proxytrack.o `test -f 'proxy/proxytrack.c' || echo '$(srcdir)/'`proxy/proxytrack.c
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/proxytrack-proxytrack.Tpo $(DEPDIR)/proxytrack-proxytrack.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='proxy/proxytrack.c' object='proxytrack-proxytrack.o' libtool=no @AMDEPBACKSLASH@
|
||||
proxy/proxytrack-proxytrack.o: proxy/proxytrack.c
|
||||
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT proxy/proxytrack-proxytrack.o -MD -MP -MF proxy/$(DEPDIR)/proxytrack-proxytrack.Tpo -c -o proxy/proxytrack-proxytrack.o `test -f 'proxy/proxytrack.c' || echo '$(srcdir)/'`proxy/proxytrack.c
|
||||
@am__fastdepCC_TRUE@ $(am__mv) proxy/$(DEPDIR)/proxytrack-proxytrack.Tpo proxy/$(DEPDIR)/proxytrack-proxytrack.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='proxy/proxytrack.c' object='proxy/proxytrack-proxytrack.o' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o proxytrack-proxytrack.o `test -f 'proxy/proxytrack.c' || echo '$(srcdir)/'`proxy/proxytrack.c
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o proxy/proxytrack-proxytrack.o `test -f 'proxy/proxytrack.c' || echo '$(srcdir)/'`proxy/proxytrack.c
|
||||
|
||||
proxytrack-proxytrack.obj: proxy/proxytrack.c
|
||||
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT proxytrack-proxytrack.obj -MD -MP -MF $(DEPDIR)/proxytrack-proxytrack.Tpo -c -o proxytrack-proxytrack.obj `if test -f 'proxy/proxytrack.c'; then $(CYGPATH_W) 'proxy/proxytrack.c'; else $(CYGPATH_W) '$(srcdir)/proxy/proxytrack.c'; fi`
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/proxytrack-proxytrack.Tpo $(DEPDIR)/proxytrack-proxytrack.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='proxy/proxytrack.c' object='proxytrack-proxytrack.obj' libtool=no @AMDEPBACKSLASH@
|
||||
proxy/proxytrack-proxytrack.obj: proxy/proxytrack.c
|
||||
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT proxy/proxytrack-proxytrack.obj -MD -MP -MF proxy/$(DEPDIR)/proxytrack-proxytrack.Tpo -c -o proxy/proxytrack-proxytrack.obj `if test -f 'proxy/proxytrack.c'; then $(CYGPATH_W) 'proxy/proxytrack.c'; else $(CYGPATH_W) '$(srcdir)/proxy/proxytrack.c'; fi`
|
||||
@am__fastdepCC_TRUE@ $(am__mv) proxy/$(DEPDIR)/proxytrack-proxytrack.Tpo proxy/$(DEPDIR)/proxytrack-proxytrack.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='proxy/proxytrack.c' object='proxy/proxytrack-proxytrack.obj' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o proxytrack-proxytrack.obj `if test -f 'proxy/proxytrack.c'; then $(CYGPATH_W) 'proxy/proxytrack.c'; else $(CYGPATH_W) '$(srcdir)/proxy/proxytrack.c'; fi`
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o proxy/proxytrack-proxytrack.obj `if test -f 'proxy/proxytrack.c'; then $(CYGPATH_W) 'proxy/proxytrack.c'; else $(CYGPATH_W) '$(srcdir)/proxy/proxytrack.c'; fi`
|
||||
|
||||
proxytrack-store.o: proxy/store.c
|
||||
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT proxytrack-store.o -MD -MP -MF $(DEPDIR)/proxytrack-store.Tpo -c -o proxytrack-store.o `test -f 'proxy/store.c' || echo '$(srcdir)/'`proxy/store.c
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/proxytrack-store.Tpo $(DEPDIR)/proxytrack-store.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='proxy/store.c' object='proxytrack-store.o' libtool=no @AMDEPBACKSLASH@
|
||||
proxy/proxytrack-store.o: proxy/store.c
|
||||
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT proxy/proxytrack-store.o -MD -MP -MF proxy/$(DEPDIR)/proxytrack-store.Tpo -c -o proxy/proxytrack-store.o `test -f 'proxy/store.c' || echo '$(srcdir)/'`proxy/store.c
|
||||
@am__fastdepCC_TRUE@ $(am__mv) proxy/$(DEPDIR)/proxytrack-store.Tpo proxy/$(DEPDIR)/proxytrack-store.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='proxy/store.c' object='proxy/proxytrack-store.o' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o proxytrack-store.o `test -f 'proxy/store.c' || echo '$(srcdir)/'`proxy/store.c
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o proxy/proxytrack-store.o `test -f 'proxy/store.c' || echo '$(srcdir)/'`proxy/store.c
|
||||
|
||||
proxytrack-store.obj: proxy/store.c
|
||||
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT proxytrack-store.obj -MD -MP -MF $(DEPDIR)/proxytrack-store.Tpo -c -o proxytrack-store.obj `if test -f 'proxy/store.c'; then $(CYGPATH_W) 'proxy/store.c'; else $(CYGPATH_W) '$(srcdir)/proxy/store.c'; fi`
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/proxytrack-store.Tpo $(DEPDIR)/proxytrack-store.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='proxy/store.c' object='proxytrack-store.obj' libtool=no @AMDEPBACKSLASH@
|
||||
proxy/proxytrack-store.obj: proxy/store.c
|
||||
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT proxy/proxytrack-store.obj -MD -MP -MF proxy/$(DEPDIR)/proxytrack-store.Tpo -c -o proxy/proxytrack-store.obj `if test -f 'proxy/store.c'; then $(CYGPATH_W) 'proxy/store.c'; else $(CYGPATH_W) '$(srcdir)/proxy/store.c'; fi`
|
||||
@am__fastdepCC_TRUE@ $(am__mv) proxy/$(DEPDIR)/proxytrack-store.Tpo proxy/$(DEPDIR)/proxytrack-store.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='proxy/store.c' object='proxy/proxytrack-store.obj' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o proxytrack-store.obj `if test -f 'proxy/store.c'; then $(CYGPATH_W) 'proxy/store.c'; else $(CYGPATH_W) '$(srcdir)/proxy/store.c'; fi`
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o proxy/proxytrack-store.obj `if test -f 'proxy/store.c'; then $(CYGPATH_W) 'proxy/store.c'; else $(CYGPATH_W) '$(srcdir)/proxy/store.c'; fi`
|
||||
|
||||
proxytrack-htsinthash.o: htsinthash.c
|
||||
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT proxytrack-htsinthash.o -MD -MP -MF $(DEPDIR)/proxytrack-htsinthash.Tpo -c -o proxytrack-htsinthash.o `test -f 'htsinthash.c' || echo '$(srcdir)/'`htsinthash.c
|
||||
@@ -937,67 +1002,68 @@ proxytrack-md5.obj: md5.c
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o proxytrack-md5.obj `if test -f 'md5.c'; then $(CYGPATH_W) 'md5.c'; else $(CYGPATH_W) '$(srcdir)/md5.c'; fi`
|
||||
|
||||
proxytrack-ioapi.o: minizip/ioapi.c
|
||||
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT proxytrack-ioapi.o -MD -MP -MF $(DEPDIR)/proxytrack-ioapi.Tpo -c -o proxytrack-ioapi.o `test -f 'minizip/ioapi.c' || echo '$(srcdir)/'`minizip/ioapi.c
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/proxytrack-ioapi.Tpo $(DEPDIR)/proxytrack-ioapi.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='minizip/ioapi.c' object='proxytrack-ioapi.o' libtool=no @AMDEPBACKSLASH@
|
||||
minizip/proxytrack-ioapi.o: minizip/ioapi.c
|
||||
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT minizip/proxytrack-ioapi.o -MD -MP -MF minizip/$(DEPDIR)/proxytrack-ioapi.Tpo -c -o minizip/proxytrack-ioapi.o `test -f 'minizip/ioapi.c' || echo '$(srcdir)/'`minizip/ioapi.c
|
||||
@am__fastdepCC_TRUE@ $(am__mv) minizip/$(DEPDIR)/proxytrack-ioapi.Tpo minizip/$(DEPDIR)/proxytrack-ioapi.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='minizip/ioapi.c' object='minizip/proxytrack-ioapi.o' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o proxytrack-ioapi.o `test -f 'minizip/ioapi.c' || echo '$(srcdir)/'`minizip/ioapi.c
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o minizip/proxytrack-ioapi.o `test -f 'minizip/ioapi.c' || echo '$(srcdir)/'`minizip/ioapi.c
|
||||
|
||||
proxytrack-ioapi.obj: minizip/ioapi.c
|
||||
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT proxytrack-ioapi.obj -MD -MP -MF $(DEPDIR)/proxytrack-ioapi.Tpo -c -o proxytrack-ioapi.obj `if test -f 'minizip/ioapi.c'; then $(CYGPATH_W) 'minizip/ioapi.c'; else $(CYGPATH_W) '$(srcdir)/minizip/ioapi.c'; fi`
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/proxytrack-ioapi.Tpo $(DEPDIR)/proxytrack-ioapi.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='minizip/ioapi.c' object='proxytrack-ioapi.obj' libtool=no @AMDEPBACKSLASH@
|
||||
minizip/proxytrack-ioapi.obj: minizip/ioapi.c
|
||||
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT minizip/proxytrack-ioapi.obj -MD -MP -MF minizip/$(DEPDIR)/proxytrack-ioapi.Tpo -c -o minizip/proxytrack-ioapi.obj `if test -f 'minizip/ioapi.c'; then $(CYGPATH_W) 'minizip/ioapi.c'; else $(CYGPATH_W) '$(srcdir)/minizip/ioapi.c'; fi`
|
||||
@am__fastdepCC_TRUE@ $(am__mv) minizip/$(DEPDIR)/proxytrack-ioapi.Tpo minizip/$(DEPDIR)/proxytrack-ioapi.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='minizip/ioapi.c' object='minizip/proxytrack-ioapi.obj' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o proxytrack-ioapi.obj `if test -f 'minizip/ioapi.c'; then $(CYGPATH_W) 'minizip/ioapi.c'; else $(CYGPATH_W) '$(srcdir)/minizip/ioapi.c'; fi`
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o minizip/proxytrack-ioapi.obj `if test -f 'minizip/ioapi.c'; then $(CYGPATH_W) 'minizip/ioapi.c'; else $(CYGPATH_W) '$(srcdir)/minizip/ioapi.c'; fi`
|
||||
|
||||
proxytrack-mztools.o: minizip/mztools.c
|
||||
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT proxytrack-mztools.o -MD -MP -MF $(DEPDIR)/proxytrack-mztools.Tpo -c -o proxytrack-mztools.o `test -f 'minizip/mztools.c' || echo '$(srcdir)/'`minizip/mztools.c
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/proxytrack-mztools.Tpo $(DEPDIR)/proxytrack-mztools.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='minizip/mztools.c' object='proxytrack-mztools.o' libtool=no @AMDEPBACKSLASH@
|
||||
minizip/proxytrack-mztools.o: minizip/mztools.c
|
||||
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT minizip/proxytrack-mztools.o -MD -MP -MF minizip/$(DEPDIR)/proxytrack-mztools.Tpo -c -o minizip/proxytrack-mztools.o `test -f 'minizip/mztools.c' || echo '$(srcdir)/'`minizip/mztools.c
|
||||
@am__fastdepCC_TRUE@ $(am__mv) minizip/$(DEPDIR)/proxytrack-mztools.Tpo minizip/$(DEPDIR)/proxytrack-mztools.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='minizip/mztools.c' object='minizip/proxytrack-mztools.o' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o proxytrack-mztools.o `test -f 'minizip/mztools.c' || echo '$(srcdir)/'`minizip/mztools.c
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o minizip/proxytrack-mztools.o `test -f 'minizip/mztools.c' || echo '$(srcdir)/'`minizip/mztools.c
|
||||
|
||||
proxytrack-mztools.obj: minizip/mztools.c
|
||||
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT proxytrack-mztools.obj -MD -MP -MF $(DEPDIR)/proxytrack-mztools.Tpo -c -o proxytrack-mztools.obj `if test -f 'minizip/mztools.c'; then $(CYGPATH_W) 'minizip/mztools.c'; else $(CYGPATH_W) '$(srcdir)/minizip/mztools.c'; fi`
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/proxytrack-mztools.Tpo $(DEPDIR)/proxytrack-mztools.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='minizip/mztools.c' object='proxytrack-mztools.obj' libtool=no @AMDEPBACKSLASH@
|
||||
minizip/proxytrack-mztools.obj: minizip/mztools.c
|
||||
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT minizip/proxytrack-mztools.obj -MD -MP -MF minizip/$(DEPDIR)/proxytrack-mztools.Tpo -c -o minizip/proxytrack-mztools.obj `if test -f 'minizip/mztools.c'; then $(CYGPATH_W) 'minizip/mztools.c'; else $(CYGPATH_W) '$(srcdir)/minizip/mztools.c'; fi`
|
||||
@am__fastdepCC_TRUE@ $(am__mv) minizip/$(DEPDIR)/proxytrack-mztools.Tpo minizip/$(DEPDIR)/proxytrack-mztools.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='minizip/mztools.c' object='minizip/proxytrack-mztools.obj' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o proxytrack-mztools.obj `if test -f 'minizip/mztools.c'; then $(CYGPATH_W) 'minizip/mztools.c'; else $(CYGPATH_W) '$(srcdir)/minizip/mztools.c'; fi`
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o minizip/proxytrack-mztools.obj `if test -f 'minizip/mztools.c'; then $(CYGPATH_W) 'minizip/mztools.c'; else $(CYGPATH_W) '$(srcdir)/minizip/mztools.c'; fi`
|
||||
|
||||
proxytrack-unzip.o: minizip/unzip.c
|
||||
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT proxytrack-unzip.o -MD -MP -MF $(DEPDIR)/proxytrack-unzip.Tpo -c -o proxytrack-unzip.o `test -f 'minizip/unzip.c' || echo '$(srcdir)/'`minizip/unzip.c
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/proxytrack-unzip.Tpo $(DEPDIR)/proxytrack-unzip.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='minizip/unzip.c' object='proxytrack-unzip.o' libtool=no @AMDEPBACKSLASH@
|
||||
minizip/proxytrack-unzip.o: minizip/unzip.c
|
||||
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT minizip/proxytrack-unzip.o -MD -MP -MF minizip/$(DEPDIR)/proxytrack-unzip.Tpo -c -o minizip/proxytrack-unzip.o `test -f 'minizip/unzip.c' || echo '$(srcdir)/'`minizip/unzip.c
|
||||
@am__fastdepCC_TRUE@ $(am__mv) minizip/$(DEPDIR)/proxytrack-unzip.Tpo minizip/$(DEPDIR)/proxytrack-unzip.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='minizip/unzip.c' object='minizip/proxytrack-unzip.o' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o proxytrack-unzip.o `test -f 'minizip/unzip.c' || echo '$(srcdir)/'`minizip/unzip.c
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o minizip/proxytrack-unzip.o `test -f 'minizip/unzip.c' || echo '$(srcdir)/'`minizip/unzip.c
|
||||
|
||||
proxytrack-unzip.obj: minizip/unzip.c
|
||||
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT proxytrack-unzip.obj -MD -MP -MF $(DEPDIR)/proxytrack-unzip.Tpo -c -o proxytrack-unzip.obj `if test -f 'minizip/unzip.c'; then $(CYGPATH_W) 'minizip/unzip.c'; else $(CYGPATH_W) '$(srcdir)/minizip/unzip.c'; fi`
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/proxytrack-unzip.Tpo $(DEPDIR)/proxytrack-unzip.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='minizip/unzip.c' object='proxytrack-unzip.obj' libtool=no @AMDEPBACKSLASH@
|
||||
minizip/proxytrack-unzip.obj: minizip/unzip.c
|
||||
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT minizip/proxytrack-unzip.obj -MD -MP -MF minizip/$(DEPDIR)/proxytrack-unzip.Tpo -c -o minizip/proxytrack-unzip.obj `if test -f 'minizip/unzip.c'; then $(CYGPATH_W) 'minizip/unzip.c'; else $(CYGPATH_W) '$(srcdir)/minizip/unzip.c'; fi`
|
||||
@am__fastdepCC_TRUE@ $(am__mv) minizip/$(DEPDIR)/proxytrack-unzip.Tpo minizip/$(DEPDIR)/proxytrack-unzip.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='minizip/unzip.c' object='minizip/proxytrack-unzip.obj' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o proxytrack-unzip.obj `if test -f 'minizip/unzip.c'; then $(CYGPATH_W) 'minizip/unzip.c'; else $(CYGPATH_W) '$(srcdir)/minizip/unzip.c'; fi`
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o minizip/proxytrack-unzip.obj `if test -f 'minizip/unzip.c'; then $(CYGPATH_W) 'minizip/unzip.c'; else $(CYGPATH_W) '$(srcdir)/minizip/unzip.c'; fi`
|
||||
|
||||
proxytrack-zip.o: minizip/zip.c
|
||||
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT proxytrack-zip.o -MD -MP -MF $(DEPDIR)/proxytrack-zip.Tpo -c -o proxytrack-zip.o `test -f 'minizip/zip.c' || echo '$(srcdir)/'`minizip/zip.c
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/proxytrack-zip.Tpo $(DEPDIR)/proxytrack-zip.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='minizip/zip.c' object='proxytrack-zip.o' libtool=no @AMDEPBACKSLASH@
|
||||
minizip/proxytrack-zip.o: minizip/zip.c
|
||||
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT minizip/proxytrack-zip.o -MD -MP -MF minizip/$(DEPDIR)/proxytrack-zip.Tpo -c -o minizip/proxytrack-zip.o `test -f 'minizip/zip.c' || echo '$(srcdir)/'`minizip/zip.c
|
||||
@am__fastdepCC_TRUE@ $(am__mv) minizip/$(DEPDIR)/proxytrack-zip.Tpo minizip/$(DEPDIR)/proxytrack-zip.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='minizip/zip.c' object='minizip/proxytrack-zip.o' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o proxytrack-zip.o `test -f 'minizip/zip.c' || echo '$(srcdir)/'`minizip/zip.c
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o minizip/proxytrack-zip.o `test -f 'minizip/zip.c' || echo '$(srcdir)/'`minizip/zip.c
|
||||
|
||||
proxytrack-zip.obj: minizip/zip.c
|
||||
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT proxytrack-zip.obj -MD -MP -MF $(DEPDIR)/proxytrack-zip.Tpo -c -o proxytrack-zip.obj `if test -f 'minizip/zip.c'; then $(CYGPATH_W) 'minizip/zip.c'; else $(CYGPATH_W) '$(srcdir)/minizip/zip.c'; fi`
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/proxytrack-zip.Tpo $(DEPDIR)/proxytrack-zip.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='minizip/zip.c' object='proxytrack-zip.obj' libtool=no @AMDEPBACKSLASH@
|
||||
minizip/proxytrack-zip.obj: minizip/zip.c
|
||||
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -MT minizip/proxytrack-zip.obj -MD -MP -MF minizip/$(DEPDIR)/proxytrack-zip.Tpo -c -o minizip/proxytrack-zip.obj `if test -f 'minizip/zip.c'; then $(CYGPATH_W) 'minizip/zip.c'; else $(CYGPATH_W) '$(srcdir)/minizip/zip.c'; fi`
|
||||
@am__fastdepCC_TRUE@ $(am__mv) minizip/$(DEPDIR)/proxytrack-zip.Tpo minizip/$(DEPDIR)/proxytrack-zip.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='minizip/zip.c' object='minizip/proxytrack-zip.obj' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o proxytrack-zip.obj `if test -f 'minizip/zip.c'; then $(CYGPATH_W) 'minizip/zip.c'; else $(CYGPATH_W) '$(srcdir)/minizip/zip.c'; fi`
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(proxytrack_CFLAGS) $(CFLAGS) -c -o minizip/proxytrack-zip.obj `if test -f 'minizip/zip.c'; then $(CYGPATH_W) 'minizip/zip.c'; else $(CYGPATH_W) '$(srcdir)/minizip/zip.c'; fi`
|
||||
|
||||
mostlyclean-libtool:
|
||||
-rm -f *.lo
|
||||
|
||||
clean-libtool:
|
||||
-rm -rf .libs _libs
|
||||
-rm -rf minizip/.libs minizip/_libs
|
||||
install-DevIncludesDATA: $(DevIncludes_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
@list='$(DevIncludes_DATA)'; test -n "$(DevIncludesdir)" || list=; \
|
||||
@@ -1137,6 +1203,10 @@ clean-generic:
|
||||
distclean-generic:
|
||||
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
||||
-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
|
||||
-rm -f minizip/$(DEPDIR)/$(am__dirstamp)
|
||||
-rm -f minizip/$(am__dirstamp)
|
||||
-rm -f proxy/$(DEPDIR)/$(am__dirstamp)
|
||||
-rm -f proxy/$(am__dirstamp)
|
||||
|
||||
maintainer-clean-generic:
|
||||
@echo "This command is intended for maintainers to use"
|
||||
@@ -1147,7 +1217,7 @@ clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
|
||||
clean-libtool mostlyclean-am
|
||||
|
||||
distclean: distclean-am
|
||||
-rm -rf ./$(DEPDIR)
|
||||
-rm -rf ./$(DEPDIR) minizip/$(DEPDIR) proxy/$(DEPDIR)
|
||||
-rm -f Makefile
|
||||
distclean-am: clean-am distclean-compile distclean-generic \
|
||||
distclean-tags
|
||||
@@ -1193,7 +1263,7 @@ install-ps-am:
|
||||
installcheck-am:
|
||||
|
||||
maintainer-clean: maintainer-clean-am
|
||||
-rm -rf ./$(DEPDIR)
|
||||
-rm -rf ./$(DEPDIR) minizip/$(DEPDIR) proxy/$(DEPDIR)
|
||||
-rm -f Makefile
|
||||
maintainer-clean-am: distclean-am maintainer-clean-generic
|
||||
|
||||
|
||||
@@ -189,10 +189,10 @@ const char *hts_optalias[][4] = {
|
||||
/* Badly documented */
|
||||
{"debug-testfilters", "-#0", "param1", "debug: test filters"},
|
||||
{"advanced-flushlogs", "-#f", "single", ""},
|
||||
{"advanced-maxfilters", "-#F", "param", ""},
|
||||
{"advanced-maxfilters", "-#F", "param", "maximum number of scan rules"},
|
||||
{"version", "-#h", "single", ""},
|
||||
{"debug-scanstdin", "-#K", "single", ""},
|
||||
{"advanced-maxlinks", "-#L", "single", ""},
|
||||
{"advanced-maxlinks", "-#L", "param", "maximum number of links (0 to disable limit)"},
|
||||
{"advanced-progressinfo", "-#p", "single", "deprecated"},
|
||||
{"catch-url", "-#P", "single", "catch complex URL through proxy"},
|
||||
/*{"debug-oldftp","-#R","single",""}, */
|
||||
@@ -517,9 +517,9 @@ int optinclude_file(const char *name, int *argc, char **argv, char *x_argvblk,
|
||||
tmp_argv[1] = _tmp_argv[1];
|
||||
tmp_argv[2] = _tmp_argv[2];
|
||||
tmp_argv[3] = _tmp_argv[3];
|
||||
strcpybuff(tmp_argv[0], "--");
|
||||
strcatbuff(tmp_argv[0], a);
|
||||
strcpybuff(tmp_argv[1], b);
|
||||
strcpybuff(_tmp_argv[0], "--");
|
||||
strcatbuff(_tmp_argv[0], a);
|
||||
strcpybuff(_tmp_argv[1], b);
|
||||
|
||||
result =
|
||||
optalias_check(2, (const char *const *) tmp_argv, 0, &return_argc,
|
||||
@@ -560,8 +560,8 @@ int optinclude_file(const char *name, int *argc, char **argv, char *x_argvblk,
|
||||
|
||||
/* Get home directory, '.' if failed */
|
||||
/* example: /home/smith */
|
||||
char *hts_gethome(void) {
|
||||
char *home = getenv("HOME");
|
||||
const char *hts_gethome(void) {
|
||||
const char *home = getenv("HOME");
|
||||
|
||||
if (home)
|
||||
return home;
|
||||
|
||||
@@ -48,7 +48,7 @@ const char *optreal_value(int p);
|
||||
const char *optalias_value(int p);
|
||||
const char *opttype_value(int p);
|
||||
const char *opthelp_value(int p);
|
||||
char *hts_gethome(void);
|
||||
const char *hts_gethome(void);
|
||||
void expand_home(String * str);
|
||||
#endif
|
||||
|
||||
|
||||
149
src/htsarrays.h
Normal file
149
src/htsarrays.h
Normal file
@@ -0,0 +1,149 @@
|
||||
/* ------------------------------------------------------------ */
|
||||
/*
|
||||
HTTrack Website Copier, Offline Browser for Windows and Unix
|
||||
Copyright (C) 1998-2014 Xavier Roche and other contributors
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
Important notes:
|
||||
|
||||
- We hereby ask people using this source NOT to use it in purpose of grabbing
|
||||
emails addresses, or collecting any other private information on persons.
|
||||
This would disgrace our work, and spoil the many hours we spent on it.
|
||||
|
||||
Please visit our Website: http://www.httrack.com
|
||||
*/
|
||||
|
||||
/* ------------------------------------------------------------ */
|
||||
/* File: Arrays */
|
||||
/* Author: Xavier Roche */
|
||||
/* ------------------------------------------------------------ */
|
||||
|
||||
#ifndef HTS_ARRAYS_DEFSTATIC
|
||||
#define HTS_ARRAYS_DEFSTATIC
|
||||
|
||||
/* System definitions. */
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "htssafe.h"
|
||||
|
||||
/* Memory allocation assertion failure */
|
||||
static void hts_record_assert_memory_failed(const size_t size) {
|
||||
fprintf(stderr, "memory allocation failed (%lu bytes)", \
|
||||
(long int) size); \
|
||||
assertf(! "memory allocation failed"); \
|
||||
}
|
||||
|
||||
/** Dynamic array of T elements. **/
|
||||
#define TypedArray(T) \
|
||||
struct { \
|
||||
/** Elements. **/ \
|
||||
union { \
|
||||
/** Typed. **/ \
|
||||
T* elts; \
|
||||
/** Opaque. **/ \
|
||||
void* ptr; \
|
||||
} data; \
|
||||
/** Count. **/ \
|
||||
size_t size; \
|
||||
/** Capacity. **/ \
|
||||
size_t capa; \
|
||||
}
|
||||
#define EMPTY_TYPED_ARRAY { { NULL }, 0, 0 }
|
||||
|
||||
/** Array size, in elements. **/
|
||||
#define TypedArraySize(A) ((A).size)
|
||||
|
||||
/** Array capacity, in elements. **/
|
||||
#define TypedArrayCapa(A) ((A).capa)
|
||||
|
||||
/**
|
||||
* Remaining free space, in elements.
|
||||
* Macro, first element evaluated multiple times.
|
||||
**/
|
||||
#define TypedArrayRoom(A) ( TypedArrayCapa(A) - TypedArraySize(A) )
|
||||
|
||||
/** Array elements, of type T*. **/
|
||||
#define TypedArrayElts(A) ((A).data.elts)
|
||||
|
||||
/** Array pointer, of type void*. **/
|
||||
#define TypedArrayPtr(A) ((A).data.ptr)
|
||||
|
||||
/** Size of T. **/
|
||||
#define TypedArrayWidth(A) (sizeof(*TypedArrayElts(A)))
|
||||
|
||||
/** Nth element of the array. **/
|
||||
#define TypedArrayNth(A, N) (TypedArrayElts(A)[N])
|
||||
|
||||
/**
|
||||
* Tail of the array (outside the array).
|
||||
* The returned pointer points to the beginning of TypedArrayRoom(A)
|
||||
* free elements.
|
||||
**/
|
||||
#define TypedArrayTail(A) (TypedArrayNth(A, TypedArraySize(A)))
|
||||
|
||||
/**
|
||||
* Ensure at least 'ROOM' elements can be put in the remaining space.
|
||||
* After a call to this macro, TypedArrayRoom(A) is guaranteed to be at
|
||||
* least equal to 'ROOM'.
|
||||
**/
|
||||
#define TypedArrayEnsureRoom(A, ROOM) do { \
|
||||
const size_t room_ = (ROOM); \
|
||||
while (TypedArrayRoom(A) < room_) { \
|
||||
TypedArrayCapa(A) = TypedArrayCapa(A) < 16 ? 16 : TypedArrayCapa(A) * 2; \
|
||||
} \
|
||||
TypedArrayPtr(A) = realloc(TypedArrayPtr(A), \
|
||||
TypedArrayCapa(A)*TypedArrayWidth(A)); \
|
||||
if (TypedArrayPtr(A) == NULL) { \
|
||||
hts_record_assert_memory_failed(TypedArrayCapa(A)*TypedArrayWidth(A)); \
|
||||
} \
|
||||
} while(0)
|
||||
|
||||
/** Add an element. Macro, first element evaluated multiple times. **/
|
||||
#define TypedArrayAdd(A, E) do { \
|
||||
TypedArrayEnsureRoom(A, 1); \
|
||||
assertf(TypedArraySize(A) < TypedArrayCapa(A)); \
|
||||
TypedArrayTail(A) = (E); \
|
||||
TypedArraySize(A)++; \
|
||||
} while(0)
|
||||
|
||||
/**
|
||||
* Add 'COUNT' elements from 'PTR'.
|
||||
* Macro, first element evaluated multiple times.
|
||||
**/
|
||||
#define TypedArrayAppend(A, PTR, COUNT) do { \
|
||||
const size_t count_ = (COUNT); \
|
||||
/* This 1-case is to benefit from type safety. */ \
|
||||
if (count_ == 1) { \
|
||||
TypedArrayAdd(A, *(PTR)); \
|
||||
} else { \
|
||||
const void *const source_ = (PTR); \
|
||||
TypedArrayEnsureRoom(A, count_); \
|
||||
assertf(count_ <= TypedArrayRoom(A)); \
|
||||
memcpy(&TypedArrayTail(A), source_, count_ * TypedArrayWidth(A)); \
|
||||
TypedArraySize(A) += count_; \
|
||||
} \
|
||||
} while(0)
|
||||
|
||||
/** Clear an array, freeing memory and clearing size and capacity. **/
|
||||
#define TypedArrayFree(A) do { \
|
||||
if (TypedArrayPtr(A) != NULL) { \
|
||||
TypedArrayCapa(A) = TypedArraySize(A) = 0; \
|
||||
free(TypedArrayPtr(A)); \
|
||||
TypedArrayPtr(A) = NULL; \
|
||||
} \
|
||||
} while(0)
|
||||
|
||||
#endif
|
||||
@@ -117,7 +117,7 @@ void back_delete_all(httrackp * opt, cache_back * cache, struct_back * sback) {
|
||||
|
||||
while((item = inthash_enum_next(&e))) {
|
||||
#ifndef HTS_NO_BACK_ON_DISK
|
||||
char *filename = (char *) item->value.ptr;
|
||||
const char *filename = (char *) item->value.ptr;
|
||||
|
||||
if (filename != NULL) {
|
||||
(void) UNLINK(filename);
|
||||
@@ -139,19 +139,19 @@ void back_delete_all(httrackp * opt, cache_back * cache, struct_back * sback) {
|
||||
// ---
|
||||
// routines de backing
|
||||
|
||||
static int back_index_ready(httrackp * opt, struct_back * sback, char *adr,
|
||||
char *fil, char *sav, int getIndex);
|
||||
static int back_index_fetch(httrackp * opt, struct_back * sback, char *adr,
|
||||
char *fil, char *sav, int getIndex);
|
||||
static int back_index_ready(httrackp * opt, struct_back * sback, const char *adr,
|
||||
const char *fil, const char *sav, int getIndex);
|
||||
static int back_index_fetch(httrackp * opt, struct_back * sback, const char *adr,
|
||||
const char *fil, const char *sav, int getIndex);
|
||||
|
||||
// retourne l'index d'un lien dans un tableau de backing
|
||||
int back_index(httrackp * opt, struct_back * sback, char *adr, char *fil,
|
||||
char *sav) {
|
||||
int back_index(httrackp * opt, struct_back * sback, const char *adr, const char *fil,
|
||||
const char *sav) {
|
||||
return back_index_fetch(opt, sback, adr, fil, sav, 1);
|
||||
}
|
||||
|
||||
static int back_index_fetch(httrackp * opt, struct_back * sback, char *adr,
|
||||
char *fil, char *sav, int getIndex) {
|
||||
static int back_index_fetch(httrackp * opt, struct_back * sback, const char *adr,
|
||||
const char *fil, const char *sav, int getIndex) {
|
||||
lien_back *const back = sback->lnk;
|
||||
const int back_max = sback->count;
|
||||
int index = -1;
|
||||
@@ -177,8 +177,8 @@ static int back_index_fetch(httrackp * opt, struct_back * sback, char *adr,
|
||||
}
|
||||
|
||||
/* resurrect stored entry */
|
||||
static int back_index_ready(httrackp * opt, struct_back * sback, char *adr,
|
||||
char *fil, char *sav, int getIndex) {
|
||||
static int back_index_ready(httrackp * opt, struct_back * sback, const char *adr,
|
||||
const char *fil, const char *sav, int getIndex) {
|
||||
lien_back *const back = sback->lnk;
|
||||
void *ptr = NULL;
|
||||
|
||||
@@ -194,7 +194,7 @@ static int back_index_ready(httrackp * opt, struct_back * sback, char *adr,
|
||||
|
||||
#ifndef HTS_NO_BACK_ON_DISK
|
||||
FILE *fp;
|
||||
char *fileback = (char *) ptr;
|
||||
const char *fileback = (char *) ptr;
|
||||
char catbuff[CATBUFF_SIZE];
|
||||
|
||||
if ((fp = FOPEN(fconv(catbuff, sizeof(catbuff), fileback), "rb")) != NULL) {
|
||||
@@ -349,8 +349,8 @@ int back_cleanup_background(httrackp * opt, cache_back * cache,
|
||||
}
|
||||
|
||||
// nombre d'entrées libres dans le backing
|
||||
int back_available(struct_back * sback) {
|
||||
lien_back *const back = sback->lnk;
|
||||
int back_available(const struct_back * sback) {
|
||||
const lien_back *const back = sback->lnk;
|
||||
const int back_max = sback->count;
|
||||
int i;
|
||||
int nb = 0;
|
||||
@@ -362,8 +362,8 @@ int back_available(struct_back * sback) {
|
||||
}
|
||||
|
||||
// retourne estimation de la taille des html et fichiers stockés en mémoire
|
||||
LLint back_incache(struct_back * sback) {
|
||||
lien_back *const back = sback->lnk;
|
||||
LLint back_incache(const struct_back * sback) {
|
||||
const lien_back *const back = sback->lnk;
|
||||
const int back_max = sback->count;
|
||||
int i;
|
||||
LLint sum = 0;
|
||||
@@ -391,8 +391,8 @@ LLint back_incache(struct_back * sback) {
|
||||
}
|
||||
|
||||
// retourne estimation de la taille des html et fichiers stockés en mémoire
|
||||
int back_done_incache(struct_back * sback) {
|
||||
lien_back *const back = sback->lnk;
|
||||
int back_done_incache(const struct_back * sback) {
|
||||
const lien_back *const back = sback->lnk;
|
||||
const int back_max = sback->count;
|
||||
int i;
|
||||
int n = 0;
|
||||
@@ -420,14 +420,14 @@ int back_done_incache(struct_back * sback) {
|
||||
}
|
||||
|
||||
// le lien a-t-il été mis en backing?
|
||||
HTS_INLINE int back_exist(struct_back * sback, httrackp * opt, char *adr,
|
||||
char *fil, char *sav) {
|
||||
HTS_INLINE int back_exist(struct_back * sback, httrackp * opt, const char *adr,
|
||||
const char *fil, const char *sav) {
|
||||
return (back_index_fetch(opt, sback, adr, fil, sav, /*don't fetch */ 0) >= 0);
|
||||
}
|
||||
|
||||
// nombre de sockets en tâche de fond
|
||||
int back_nsoc(struct_back * sback) {
|
||||
lien_back *const back = sback->lnk;
|
||||
int back_nsoc(const struct_back * sback) {
|
||||
const lien_back *const back = sback->lnk;
|
||||
const int back_max = sback->count;
|
||||
int n = 0;
|
||||
int i;
|
||||
@@ -438,8 +438,8 @@ int back_nsoc(struct_back * sback) {
|
||||
|
||||
return n;
|
||||
}
|
||||
int back_nsoc_overall(struct_back * sback) {
|
||||
lien_back *const back = sback->lnk;
|
||||
int back_nsoc_overall(const struct_back * sback) {
|
||||
const lien_back *const back = sback->lnk;
|
||||
const int back_max = sback->count;
|
||||
int n = 0;
|
||||
int i;
|
||||
@@ -515,7 +515,7 @@ int back_finalize(httrackp * opt, cache_back * cache, struct_back * sback,
|
||||
&& (back[p].r.statuscode > 0) // not internal error
|
||||
) {
|
||||
if (!back[p].testmode) { // not test mode
|
||||
char *state = "unknown";
|
||||
const char *state = "unknown";
|
||||
|
||||
/* décompression */
|
||||
#if HTS_USEZLIB
|
||||
@@ -626,7 +626,7 @@ int back_finalize(httrackp * opt, cache_back * cache, struct_back * sback,
|
||||
FILE *fp = FOPEN(back[p].url_sav, "rb");
|
||||
|
||||
if (fp) {
|
||||
back[p].r.adr = malloct((int) sz + 2);
|
||||
back[p].r.adr = malloct((size_t) sz + 1);
|
||||
if (back[p].r.adr) {
|
||||
if (fread(back[p].r.adr, 1, sz, fp) == sz) {
|
||||
back[p].r.size = sz;
|
||||
@@ -980,7 +980,7 @@ int back_unserialize(FILE * fp, lien_back ** dst) {
|
||||
/* serialize a reference ; used to store references of files being downloaded in case of broken download */
|
||||
/* Note: NOT utf-8 */
|
||||
int back_serialize_ref(httrackp * opt, const lien_back * src) {
|
||||
char *filename =
|
||||
const char *filename =
|
||||
url_savename_refname_fullpath(opt, src->url_adr, src->url_fil);
|
||||
FILE *fp = fopen(filename, "wb");
|
||||
|
||||
@@ -1012,7 +1012,7 @@ int back_serialize_ref(httrackp * opt, const lien_back * src) {
|
||||
/* unserialize a reference ; used to store references of files being downloaded in case of broken download */
|
||||
int back_unserialize_ref(httrackp * opt, const char *adr, const char *fil,
|
||||
lien_back ** dst) {
|
||||
char *filename = url_savename_refname_fullpath(opt, adr, fil);
|
||||
const char *filename = url_savename_refname_fullpath(opt, adr, fil);
|
||||
FILE *fp = FOPEN(filename, "rb");
|
||||
|
||||
if (fp != NULL) {
|
||||
@@ -1148,7 +1148,7 @@ int back_trylive(httrackp * opt, cache_back * cache, struct_back * sback,
|
||||
}
|
||||
|
||||
/* search for a live position, or, if not possible, try to return a new one */
|
||||
int back_searchlive(httrackp * opt, struct_back * sback, char *search_addr) {
|
||||
int back_searchlive(httrackp * opt, struct_back * sback, const char *search_addr) {
|
||||
lien_back *const back = sback->lnk;
|
||||
const int back_max = sback->count;
|
||||
int i;
|
||||
@@ -1400,8 +1400,8 @@ int back_stack_available(struct_back * sback) {
|
||||
|
||||
// ajouter un lien en backing
|
||||
int back_add_if_not_exists(struct_back * sback, httrackp * opt,
|
||||
cache_back * cache, char *adr, char *fil, char *save,
|
||||
char *referer_adr, char *referer_fil, int test) {
|
||||
cache_back * cache, const char *adr, const char *fil, const char *save,
|
||||
const char *referer_adr, const char *referer_fil, int test) {
|
||||
back_clean(opt, cache, sback); /* first cleanup the backlog to ensure that we have some entry left */
|
||||
if (!back_exist(sback, opt, adr, fil, save)) {
|
||||
return back_add(sback, opt, cache, adr, fil, save, referer_adr, referer_fil,
|
||||
@@ -1410,8 +1410,8 @@ int back_add_if_not_exists(struct_back * sback, httrackp * opt,
|
||||
return 0;
|
||||
}
|
||||
|
||||
int back_add(struct_back * sback, httrackp * opt, cache_back * cache, char *adr,
|
||||
char *fil, char *save, char *referer_adr, char *referer_fil,
|
||||
int back_add(struct_back * sback, httrackp * opt, cache_back * cache, const char *adr,
|
||||
const char *fil, const char *save, const char *referer_adr, const char *referer_fil,
|
||||
int test) {
|
||||
lien_back *const back = sback->lnk;
|
||||
const int back_max = sback->count;
|
||||
@@ -1974,7 +1974,7 @@ int back_add(struct_back * sback, httrackp * opt, cache_back * cache, char *adr,
|
||||
printf("ok, dns cache ready..\n");
|
||||
#endif
|
||||
soc =
|
||||
http_xfopen(opt, 0, 0, 0, back[p].send_too, adr, fil, &(back[p].r));
|
||||
http_xfopen(opt, 0, 0, 0, back[p].send_too, adr, fil, &back[p].r);
|
||||
if (soc == INVALID_SOCKET) {
|
||||
back[p].status = STATUS_READY; // fini, erreur
|
||||
back_set_finished(sback, p);
|
||||
|
||||
@@ -74,21 +74,21 @@ void back_free(struct_back ** sback);
|
||||
// backing
|
||||
#define BACK_ADD_TEST "(dummy)"
|
||||
#define BACK_ADD_TEST2 "(dummy2)"
|
||||
int back_index(httrackp * opt, struct_back * sback, char *adr, char *fil,
|
||||
char *sav);
|
||||
int back_available(struct_back * sback);
|
||||
LLint back_incache(struct_back * sback);
|
||||
int back_done_incache(struct_back * sback);
|
||||
HTS_INLINE int back_exist(struct_back * sback, httrackp * opt, char *adr,
|
||||
char *fil, char *sav);
|
||||
int back_nsoc(struct_back * sback);
|
||||
int back_nsoc_overall(struct_back * sback);
|
||||
int back_add(struct_back * sback, httrackp * opt, cache_back * cache, char *adr,
|
||||
char *fil, char *save, char *referer_adr, char *referer_fil,
|
||||
int back_index(httrackp * opt, struct_back * sback, const char *adr, const char *fil,
|
||||
const char *sav);
|
||||
int back_available(const struct_back * sback);
|
||||
LLint back_incache(const struct_back * sback);
|
||||
int back_done_incache(const struct_back * sback);
|
||||
HTS_INLINE int back_exist(struct_back * sback, httrackp * opt, const char *adr,
|
||||
const char *fil, const char *sav);
|
||||
int back_nsoc(const struct_back * sback);
|
||||
int back_nsoc_overall(const struct_back * sback);
|
||||
int back_add(struct_back * sback, httrackp * opt, cache_back * cache, const char *adr,
|
||||
const char *fil, const char *save, const char *referer_adr, const char *referer_fil,
|
||||
int test);
|
||||
int back_add_if_not_exists(struct_back * sback, httrackp * opt,
|
||||
cache_back * cache, char *adr, char *fil, char *save,
|
||||
char *referer_adr, char *referer_fil, int test);
|
||||
cache_back * cache, const char *adr, const char *fil, const char *save,
|
||||
const char *referer_adr, const char *referer_fil, int test);
|
||||
int back_stack_available(struct_back * sback);
|
||||
int back_search(httrackp * opt, struct_back * sback);
|
||||
int back_search_quick(struct_back * sback);
|
||||
@@ -99,7 +99,7 @@ void back_wait(struct_back * sback, httrackp * opt, cache_back * cache,
|
||||
TStamp stat_timestart);
|
||||
int back_letlive(httrackp * opt, cache_back * cache, struct_back * sback,
|
||||
const int p);
|
||||
int back_searchlive(httrackp * opt, struct_back * sback, char *search_addr);
|
||||
int back_searchlive(httrackp * opt, struct_back * sback, const char *search_addr);
|
||||
void back_connxfr(htsblk * src, htsblk * dst);
|
||||
void back_move(lien_back * src, lien_back * dst);
|
||||
void back_copy_static(const lien_back * src, lien_back * dst);
|
||||
|
||||
@@ -54,12 +54,13 @@ Please visit our Website: http://www.httrack.com
|
||||
|
||||
#endif
|
||||
|
||||
typedef struct hostent FAR t_hostent;
|
||||
|
||||
#else
|
||||
#define HTS_USESCOPEID
|
||||
#define INVALID_SOCKET -1
|
||||
typedef struct hostent t_hostent;
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#if HTS_USEOPENSSL
|
||||
@@ -157,4 +158,8 @@ typedef enum HTTrackStatus {
|
||||
STATUS_FTP_READY = 1001
|
||||
} HTTrackStatus;
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
@@ -38,14 +38,15 @@ Please visit our Website: http://www.httrack.com
|
||||
/* specific definitions */
|
||||
#include "htsglobal.h"
|
||||
#include "htslib.h"
|
||||
#include "htscore.h"
|
||||
|
||||
/* END specific definitions */
|
||||
|
||||
// gestion des cookie
|
||||
// ajoute, dans l'ordre
|
||||
// !=0 : erreur
|
||||
int cookie_add(t_cookie * cookie, char *cook_name, char *cook_value,
|
||||
char *domain, char *path) {
|
||||
int cookie_add(t_cookie * cookie, const char *cook_name, const char *cook_value,
|
||||
const char *domain, const char *path) {
|
||||
char buffer[8192];
|
||||
char *a = cookie->data;
|
||||
char *insert;
|
||||
@@ -53,20 +54,20 @@ int cookie_add(t_cookie * cookie, char *cook_name, char *cook_value,
|
||||
|
||||
// effacer éventuel cookie en double
|
||||
cookie_del(cookie, cook_name, domain, path);
|
||||
if ((int) strlen(cook_value) > 1024)
|
||||
if (strlen(cook_value) > 1024)
|
||||
return -1; // trop long
|
||||
if ((int) strlen(cook_name) > 256)
|
||||
if (strlen(cook_name) > 256)
|
||||
return -1; // trop long
|
||||
if ((int) strlen(domain) > 256)
|
||||
if (strlen(domain) > 256)
|
||||
return -1; // trop long
|
||||
if ((int) strlen(path) > 256)
|
||||
if (strlen(path) > 256)
|
||||
return -1; // trop long
|
||||
if ((int) (strlen(cookie->data)
|
||||
if (strlen(cookie->data)
|
||||
+ strlen(cook_value)
|
||||
+ strlen(cook_name)
|
||||
+ strlen(domain)
|
||||
+ strlen(path)
|
||||
+ 256) > cookie->max_len)
|
||||
+ 256 > cookie->max_len)
|
||||
return -1; // impossible d'ajouter
|
||||
|
||||
insert = a; // insérer ici
|
||||
@@ -99,7 +100,7 @@ int cookie_add(t_cookie * cookie, char *cook_name, char *cook_value,
|
||||
strcatbuff(cook, "\t");
|
||||
strcatbuff(cook, cook_value);
|
||||
strcatbuff(cook, "\n");
|
||||
if (!(((int) strlen(cookie->data) + (int) strlen(cook)) < cookie->max_len))
|
||||
if (!((strlen(cookie->data) + strlen(cook)) < cookie->max_len))
|
||||
return -1; // impossible d'ajouter
|
||||
cookie_insert(insert, cook);
|
||||
#if DEBUG_COOK
|
||||
@@ -111,13 +112,13 @@ int cookie_add(t_cookie * cookie, char *cook_name, char *cook_value,
|
||||
}
|
||||
|
||||
// effacer cookie si existe
|
||||
int cookie_del(t_cookie * cookie, char *cook_name, char *domain, char *path) {
|
||||
int cookie_del(t_cookie * cookie, const char *cook_name, const char *domain, const char *path) {
|
||||
char *a, *b;
|
||||
|
||||
b = cookie_find(cookie->data, cook_name, domain, path);
|
||||
if (b) {
|
||||
a = cookie_nextfield(b);
|
||||
cookie_delete(b, (int) (a - b));
|
||||
cookie_delete(b, a - b);
|
||||
#if DEBUG_COOK
|
||||
printf("deleted old cookie: %s %s %s\n", cook_name, domain, path);
|
||||
#endif
|
||||
@@ -128,7 +129,7 @@ int cookie_del(t_cookie * cookie, char *cook_name, char *domain, char *path) {
|
||||
// Matches wildcard cookie domains that start with a dot
|
||||
// chk_dom: the domain stored in the cookie (potentially wildcard).
|
||||
// domain: query domain
|
||||
static int cookie_cmp_wildcard_domain(char *chk_dom, char *domain) {
|
||||
static int cookie_cmp_wildcard_domain(const char *chk_dom, const char *domain) {
|
||||
const size_t n = strlen(chk_dom);
|
||||
const size_t m = strlen(domain);
|
||||
const size_t l = n < m ? n : m;
|
||||
@@ -152,7 +153,7 @@ static int cookie_cmp_wildcard_domain(char *chk_dom, char *domain) {
|
||||
// renvoie pointeur sur ligne, ou NULL si introuvable
|
||||
// path est aligné à droite et cook_name peut être vide (chercher alors tout cookie)
|
||||
// .doubleclick.net TRUE / FALSE 1999999999 id A
|
||||
char *cookie_find(char *s, char *cook_name, char *domain, char *path) {
|
||||
char *cookie_find(char *s, const char *cook_name, const char *domain, const char *path) {
|
||||
char buffer[8192];
|
||||
char *a = s;
|
||||
|
||||
@@ -165,15 +166,15 @@ char *cookie_find(char *s, char *cook_name, char *domain, char *path) {
|
||||
t = (strcmp(cookie_get(buffer, a, 5), cook_name) == 0); // tester si même nom
|
||||
if (t) { // même nom ou nom qualconque
|
||||
//
|
||||
char *chk_dom = cookie_get(buffer, a, 0); // domaine concerné par le cookie
|
||||
const char *chk_dom = cookie_get(buffer, a, 0); // domaine concerné par le cookie
|
||||
|
||||
if (((int) strlen(chk_dom) <= (int) strlen(domain) &&
|
||||
if ((strlen(chk_dom) <= strlen(domain) &&
|
||||
strcmp(chk_dom, domain + strlen(domain) - strlen(chk_dom)) == 0) ||
|
||||
!cookie_cmp_wildcard_domain(chk_dom, domain)) { // même domaine
|
||||
//
|
||||
char *chk_path = cookie_get(buffer, a, 2); // chemin concerné par le cookie
|
||||
const char *chk_path = cookie_get(buffer, a, 2); // chemin concerné par le cookie
|
||||
|
||||
if ((int) strlen(chk_path) <= (int) strlen(path)) {
|
||||
if (strlen(chk_path) <= strlen(path)) {
|
||||
if (strncmp(path, chk_path, strlen(chk_path)) == 0) { // même chemin
|
||||
return a;
|
||||
}
|
||||
@@ -231,15 +232,14 @@ int cookie_load(t_cookie * cookie, const char *fpath, const char *name) {
|
||||
char dummy[512];
|
||||
|
||||
//
|
||||
char domain[256]; // domaine cookie (.netscape.com)
|
||||
char path[256]; // chemin (/)
|
||||
lien_adrfil af; // chemin (/)
|
||||
int cookie_merged = 0;
|
||||
|
||||
//
|
||||
// Read all cookies
|
||||
while(!feof(fp)) {
|
||||
cook_name[0] = cook_value[0] = domainpathpath[0]
|
||||
= dummy[0] = domain[0] = path[0] = '\0';
|
||||
= dummy[0] = af.adr[0] = af.fil[0] = '\0';
|
||||
linput(fp, cook_name, 250);
|
||||
if (!feof(fp)) {
|
||||
linput(fp, cook_value, 250);
|
||||
@@ -254,8 +254,8 @@ int cookie_load(t_cookie * cookie, const char *fpath, const char *name) {
|
||||
if (strnotempty(cook_name)
|
||||
&& strnotempty(cook_value)
|
||||
&& strnotempty(domainpathpath)) {
|
||||
if (ident_url_absolute(domainpathpath, domain, path) >= 0) {
|
||||
cookie_add(cookie, cook_name, cook_value, domain, path);
|
||||
if (ident_url_absolute(domainpathpath, &af) >= 0) {
|
||||
cookie_add(cookie, cook_name, cook_value, af.adr, af.fil);
|
||||
cookie_merged = 1;
|
||||
}
|
||||
}
|
||||
@@ -311,7 +311,7 @@ int cookie_load(t_cookie * cookie, const char *fpath, const char *name) {
|
||||
|
||||
// écrire cookies.txt
|
||||
// !=0 : erreur
|
||||
int cookie_save(t_cookie * cookie, char *name) {
|
||||
int cookie_save(t_cookie * cookie, const char *name) {
|
||||
char catbuff[CATBUFF_SIZE];
|
||||
|
||||
if (strnotempty(cookie->data)) {
|
||||
@@ -337,13 +337,13 @@ int cookie_save(t_cookie * cookie, char *name) {
|
||||
}
|
||||
|
||||
// insertion chaine ins avant s
|
||||
void cookie_insert(char *s, char *ins) {
|
||||
void cookie_insert(char *s, const char *ins) {
|
||||
char *buff;
|
||||
|
||||
if (strnotempty(s) == 0) { // rien à faire, juste concat
|
||||
strcatbuff(s, ins);
|
||||
} else {
|
||||
buff = (char *) malloct(strlen(s) + 2);
|
||||
buff = (char *) malloct(strlen(s) + 1);
|
||||
if (buff) {
|
||||
strcpybuff(buff, s); // copie temporaire
|
||||
strcpybuff(s, ins); // insérer
|
||||
@@ -354,13 +354,13 @@ void cookie_insert(char *s, char *ins) {
|
||||
}
|
||||
|
||||
// destruction chaine dans s position pos
|
||||
void cookie_delete(char *s, int pos) {
|
||||
void cookie_delete(char *s, size_t pos) {
|
||||
char *buff;
|
||||
|
||||
if (strnotempty(s + pos) == 0) { // rien à faire, effacer
|
||||
s[0] = '\0';
|
||||
} else {
|
||||
buff = (char *) malloct(strlen(s + pos) + 2);
|
||||
buff = (char *) malloct(strlen(s + pos) + 1);
|
||||
if (buff) {
|
||||
strcpybuff(buff, s + pos); // copie temporaire
|
||||
strcpybuff(s, buff); // copier
|
||||
@@ -371,8 +371,8 @@ void cookie_delete(char *s, int pos) {
|
||||
|
||||
// renvoie champ param de la chaine cookie_base
|
||||
// ex: cookie_get("ceci est<tab>un<tab>exemple",1) renvoi "un"
|
||||
char *cookie_get(char *buffer, char *cookie_base, int param) {
|
||||
char *limit;
|
||||
const char *cookie_get(char *buffer, const char *cookie_base, int param) {
|
||||
const char *limit;
|
||||
|
||||
while(*cookie_base == '\n')
|
||||
cookie_base++;
|
||||
@@ -393,7 +393,7 @@ char *cookie_get(char *buffer, char *cookie_base, int param) {
|
||||
}
|
||||
if (cookie_base) {
|
||||
if (cookie_base < limit) {
|
||||
char *a = cookie_base;
|
||||
const char *a = cookie_base;
|
||||
|
||||
while((*a) && (*a != '\t') && (*a != '\n'))
|
||||
a++;
|
||||
@@ -413,7 +413,7 @@ char *cookie_get(char *buffer, char *cookie_base, int param) {
|
||||
// -- basic auth --
|
||||
|
||||
/* déclarer un répertoire comme possédant une authentification propre */
|
||||
int bauth_add(t_cookie * cookie, char *adr, char *fil, char *auth) {
|
||||
int bauth_add(t_cookie * cookie, const char *adr, const char *fil, const char *auth) {
|
||||
char buffer[HTS_URLMAXSIZE * 2];
|
||||
|
||||
if (cookie) {
|
||||
@@ -439,7 +439,7 @@ int bauth_add(t_cookie * cookie, char *adr, char *fil, char *auth) {
|
||||
|
||||
/* tester adr et fil, et retourner authentification si nécessaire */
|
||||
/* sinon, retourne NULL */
|
||||
char *bauth_check(t_cookie * cookie, char *adr, char *fil) {
|
||||
char *bauth_check(t_cookie * cookie, const char *adr, const char *fil) {
|
||||
char buffer[HTS_URLMAXSIZE * 2];
|
||||
|
||||
if (cookie) {
|
||||
@@ -458,7 +458,7 @@ char *bauth_check(t_cookie * cookie, char *adr, char *fil) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
char *bauth_prefix(char *prefix, char *adr, char *fil) {
|
||||
char *bauth_prefix(char *prefix, const char *adr, const char *fil) {
|
||||
char *a;
|
||||
|
||||
strcpybuff(prefix, jump_identification(adr));
|
||||
|
||||
@@ -34,6 +34,8 @@ Please visit our Website: http://www.httrack.com
|
||||
#ifndef HTSBAUTH_DEFH
|
||||
#define HTSBAUTH_DEFH
|
||||
|
||||
#include <sys/types.h>
|
||||
|
||||
// robots wizard
|
||||
#ifndef HTS_DEF_FWSTRUCT_bauth_chain
|
||||
#define HTS_DEF_FWSTRUCT_bauth_chain
|
||||
@@ -60,21 +62,21 @@ struct t_cookie {
|
||||
#ifdef HTS_INTERNAL_BYTECODE
|
||||
|
||||
// cookies
|
||||
int cookie_add(t_cookie * cookie, char *cook_name, char *cook_value,
|
||||
char *domain, char *path);
|
||||
int cookie_del(t_cookie * cookie, char *cook_name, char *domain, char *path);
|
||||
int cookie_add(t_cookie * cookie, const char *cook_name, const char *cook_value,
|
||||
const char *domain, const char *path);
|
||||
int cookie_del(t_cookie * cookie, const char *cook_name, const char *domain, const char *path);
|
||||
int cookie_load(t_cookie * cookie, const char *path, const char *name);
|
||||
int cookie_save(t_cookie * cookie, char *name);
|
||||
void cookie_insert(char *s, char *ins);
|
||||
void cookie_delete(char *s, int pos);
|
||||
char *cookie_get(char *buffer, char *cookie_base, int param);
|
||||
char *cookie_find(char *s, char *cook_name, char *domain, char *path);
|
||||
int cookie_save(t_cookie * cookie, const char *name);
|
||||
void cookie_insert(char *s, const char *ins);
|
||||
void cookie_delete(char *s, size_t pos);
|
||||
const char *cookie_get(char *buffer, const char *cookie_base, int param);
|
||||
char *cookie_find(char *s, const char *cook_name, const char *domain, const char *path);
|
||||
char *cookie_nextfield(char *a);
|
||||
|
||||
// basic auth
|
||||
int bauth_add(t_cookie * cookie, char *adr, char *fil, char *auth);
|
||||
char *bauth_check(t_cookie * cookie, char *adr, char *fil);
|
||||
char *bauth_prefix(char *buffer, char *adr, char *fil);
|
||||
int bauth_add(t_cookie * cookie, const char *adr, const char *fil, const char *auth);
|
||||
char *bauth_check(t_cookie * cookie, const char *adr, const char *fil);
|
||||
char *bauth_prefix(char *buffer, const char *adr, const char *fil);
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@@ -2016,12 +2016,12 @@ void cache_init(cache_back * cache, httrackp * opt) {
|
||||
|
||||
// lire un fichier.. (compatible \0)
|
||||
/* Note: NOT utf-8 */
|
||||
char *readfile(char *fil) {
|
||||
char *readfile(const char *fil) {
|
||||
return readfile2(fil, NULL);
|
||||
}
|
||||
|
||||
/* Note: NOT utf-8 */
|
||||
char *readfile2(char *fil, LLint * size) {
|
||||
char *readfile2(const char *fil, LLint * size) {
|
||||
char *adr = NULL;
|
||||
char catbuff[CATBUFF_SIZE];
|
||||
INTsys len = 0;
|
||||
@@ -2049,7 +2049,7 @@ char *readfile2(char *fil, LLint * size) {
|
||||
}
|
||||
|
||||
/* Note: utf-8 */
|
||||
char *readfile_utf8(char *fil) {
|
||||
char *readfile_utf8(const char *fil) {
|
||||
char *adr = NULL;
|
||||
char catbuff[CATBUFF_SIZE];
|
||||
const off_t len = fsize_utf8(fil);
|
||||
@@ -2074,8 +2074,8 @@ char *readfile_utf8(char *fil) {
|
||||
}
|
||||
|
||||
/* Note: NOT utf-8 */
|
||||
char *readfile_or(char *fil, char *defaultdata) {
|
||||
char *realfile = fil;
|
||||
char *readfile_or(const char *fil, const char *defaultdata) {
|
||||
const char *realfile = fil;
|
||||
char *ret;
|
||||
char catbuff[CATBUFF_SIZE];
|
||||
|
||||
@@ -2085,7 +2085,7 @@ char *readfile_or(char *fil, char *defaultdata) {
|
||||
if (ret)
|
||||
return ret;
|
||||
else {
|
||||
char *adr = malloct(strlen(defaultdata) + 2);
|
||||
char *adr = malloct(strlen(defaultdata) + 1);
|
||||
|
||||
if (adr) {
|
||||
strcpybuff(adr, defaultdata);
|
||||
|
||||
@@ -40,6 +40,7 @@ Please visit our Website: http://www.httrack.com
|
||||
#include "htsbase.h"
|
||||
#include "htsnet.h"
|
||||
#include "htslib.h"
|
||||
#include "htscore.h"
|
||||
#include <fcntl.h>
|
||||
#ifdef _WIN32
|
||||
#else
|
||||
@@ -77,40 +78,25 @@ HTSEXT_API T_SOC catch_url_init_std(int *port_prox, char *adr_prox) {
|
||||
// 1- Init the URL catcher
|
||||
|
||||
// catch_url_init(&port,&return_host);
|
||||
HTSEXT_API T_SOC catch_url_init(int *port, char *adr) {
|
||||
HTSEXT_API T_SOC catch_url_init(int *port, /* 128 bytes */ char *adr) {
|
||||
T_SOC soc = INVALID_SOCKET;
|
||||
char h_loc[256 + 2];
|
||||
char h_loc[256];
|
||||
|
||||
if (gethostname(h_loc, 256) == 0) { // host name
|
||||
if (gethostname(h_loc, sizeof(h_loc)) == 0) { // host name
|
||||
SOCaddr server;
|
||||
int server_size = sizeof(server);
|
||||
t_hostent *hp_loc;
|
||||
t_fullhostent buffer;
|
||||
|
||||
// effacer structure
|
||||
memset(&server, 0, sizeof(server));
|
||||
|
||||
if ((hp_loc = vxgethostbyname(h_loc, &buffer))) { // notre host
|
||||
|
||||
// copie adresse
|
||||
SOCaddr_copyaddr(server, server_size, hp_loc->h_addr_list[0],
|
||||
hp_loc->h_length);
|
||||
|
||||
if (hts_dns_resolve_nocache(h_loc, &server) != NULL) { // notre host
|
||||
if ((soc =
|
||||
(T_SOC) socket(SOCaddr_sinfamily(server), SOCK_STREAM,
|
||||
0)) != INVALID_SOCKET) {
|
||||
SOCaddr_initport(server, *port);
|
||||
if (bind(soc, (struct sockaddr *) &server, server_size) == 0) {
|
||||
if (bind(soc, &SOCaddr_sockaddr(server), SOCaddr_size(server)) == 0) {
|
||||
SOCaddr server2;
|
||||
SOClen len;
|
||||
SOClen len = SOCaddr_capacity(server2);
|
||||
|
||||
len = sizeof(server2);
|
||||
// effacer structure
|
||||
memset(&server2, 0, sizeof(server2));
|
||||
if (getsockname(soc, (struct sockaddr *) &server2, &len) == 0) {
|
||||
if (getsockname(soc, &SOCaddr_sockaddr(server2), &len) == 0) {
|
||||
*port = ntohs(SOCaddr_sinport(server)); // récupérer port
|
||||
if (listen(soc, 10) >= 0) { // au pif le 10
|
||||
SOCaddr_inetntoa(adr, 128, server2, len);
|
||||
if (listen(soc, 1) >= 0) {
|
||||
SOCaddr_inetntoa(adr, 128, server2);
|
||||
} else {
|
||||
#ifdef _WIN32
|
||||
closesocket(soc);
|
||||
@@ -168,15 +154,13 @@ HTSEXT_API int catch_url(T_SOC soc, char *url, char *method, char *data) {
|
||||
/* INFOS */
|
||||
{
|
||||
SOCaddr server2;
|
||||
SOClen len = sizeof(server2);
|
||||
SOClen len = SOCaddr_capacity(server2);
|
||||
|
||||
// effacer structure
|
||||
memset(&server2, 0, sizeof(server2));
|
||||
if (getpeername(soc, (struct sockaddr *) &server2, &len) == 0) {
|
||||
if (getpeername(soc, &SOCaddr_sockaddr(server2), &len) == 0) {
|
||||
char dot[256 + 2];
|
||||
|
||||
SOCaddr_inetntoa(dot, 256, server2, sizeof(server2));
|
||||
sprintf(url, "%s:%d", dot, htons(SOCaddr_sinport(server2)));
|
||||
SOCaddr_inetntoa(dot, sizeof(dot), server2);
|
||||
sprintf(url, "%s:%d", dot, ntohs(SOCaddr_sinport(server2)));
|
||||
}
|
||||
}
|
||||
/* INFOS */
|
||||
@@ -191,21 +175,20 @@ HTSEXT_API int catch_url(T_SOC soc, char *url, char *method, char *data) {
|
||||
socinput(soc, line, 1000);
|
||||
if (strnotempty(line)) {
|
||||
if (sscanf(line, "%s %s %s", method, url, protocol) == 3) {
|
||||
char BIGSTK url_adr[HTS_URLMAXSIZE * 2];
|
||||
char BIGSTK url_fil[HTS_URLMAXSIZE * 2];
|
||||
lien_adrfil af;
|
||||
|
||||
// méthode en majuscule
|
||||
size_t i;
|
||||
int r = 0;
|
||||
|
||||
url_adr[0] = url_fil[0] = '\0';
|
||||
af.adr[0] = af.fil[0] = '\0';
|
||||
//
|
||||
for(i = 0; method[i] != '\0'; i++) {
|
||||
if ((method[i] >= 'a') && (method[i] <= 'z'))
|
||||
method[i] -= ('a' - 'A');
|
||||
}
|
||||
// adresse du lien
|
||||
if (ident_url_absolute(url, url_adr, url_fil) >= 0) {
|
||||
if (ident_url_absolute(url, &af) >= 0) {
|
||||
// Traitement des en-têtes
|
||||
char BIGSTK loc[HTS_URLMAXSIZE * 2];
|
||||
htsblk blkretour;
|
||||
@@ -214,7 +197,7 @@ HTSEXT_API int catch_url(T_SOC soc, char *url, char *method, char *data) {
|
||||
//memset(&blkretour, 0, sizeof(htsblk)); // effacer
|
||||
blkretour.location = loc; // si non nul, contiendra l'adresse véritable en cas de moved xx
|
||||
// Lire en têtes restants
|
||||
sprintf(data, "%s %s %s\r\n", method, url_fil, protocol);
|
||||
sprintf(data, "%s %s %s\r\n", method, af.fil, protocol);
|
||||
while(strnotempty(line)) {
|
||||
socinput(soc, line, 1000);
|
||||
treathead(NULL, NULL, NULL, &blkretour, line); // traiter
|
||||
|
||||
@@ -723,43 +723,21 @@ static unsigned int nlz8(unsigned char x) {
|
||||
26 U+200000 U+3FFFFFF 5 111110xx
|
||||
31 U+4000000 U+7FFFFFFF 6 1111110x
|
||||
*/
|
||||
#define ADD_SEQ(UC, BITS, EMITTER) do { \
|
||||
/* number of data bits in first octet */ \
|
||||
const unsigned int bits = BITS % 6; \
|
||||
/* shift for first octet */ \
|
||||
const unsigned int shift0 = BITS - bits; \
|
||||
/* first octet */ \
|
||||
const unsigned char lead = \
|
||||
/* leading bits */ \
|
||||
( 0xff ^ ( ( 1 << ( bits + 1 ) ) - 1 ) ) \
|
||||
/* encoded bits */ \
|
||||
| ( ( (UC) >> shift0 ) & ( ( 1 << ( bits + 1 ) ) - 1 ) ) \
|
||||
; \
|
||||
/* further bytes are encoding 6 bits */ \
|
||||
const unsigned char second = \
|
||||
0x80 | ( ( (UC) >> ( shift0 - 6 ) ) & 0x3f ); \
|
||||
EMITTER(lead); \
|
||||
EMITTER(second); \
|
||||
if (BITS > 6*2) { \
|
||||
const unsigned char next = \
|
||||
0x80 | ( ( (UC) >> ( shift0 - 6*2 ) ) & 0x3f ); \
|
||||
EMITTER(next); \
|
||||
if (BITS > 6*3) { \
|
||||
const unsigned char next = \
|
||||
0x80 | ( ( (UC) >> ( shift0 - 6*3 ) ) & 0x3f ); \
|
||||
EMITTER(next); \
|
||||
if (BITS > 6*4) { \
|
||||
const unsigned char next = \
|
||||
0x80 | ( ( (UC) >> ( shift0 - 6*4 ) ) & 0x3f ); \
|
||||
EMITTER(next); \
|
||||
if (BITS > 6*5) { \
|
||||
const unsigned char next = \
|
||||
0x80 | ( ( (UC) >> ( shift0 - 6*5 ) ) & 0x3f ); \
|
||||
EMITTER(next); \
|
||||
} \
|
||||
} \
|
||||
} \
|
||||
} \
|
||||
#define ADD_FIRST_SEQ(UC, LEN, EMITTER) do { \
|
||||
/* first octet */ \
|
||||
const unsigned char lead = \
|
||||
/* leading bits: LEN "1" bits */ \
|
||||
~ ( ( 1 << (unsigned) ( 8 - LEN ) ) - 1 ) \
|
||||
/* encoded bits */ \
|
||||
| ( (UC) >> (unsigned) ( ( LEN - 1 ) * 6 ) ); \
|
||||
EMITTER(lead); \
|
||||
} while(0)
|
||||
|
||||
#define ADD_NEXT_SEQ(UC, SHIFT, EMITTER) do { \
|
||||
/* further bytes are encoding 6 bits */ \
|
||||
const unsigned char next = \
|
||||
0x80 | ( ( (UC) >> SHIFT ) & 0x3f ); \
|
||||
EMITTER(next); \
|
||||
} while(0)
|
||||
|
||||
/* UC is a constant. EMITTER is a macro function taking an unsigned int. */
|
||||
@@ -767,15 +745,30 @@ static unsigned int nlz8(unsigned char x) {
|
||||
if ((UC) < 0x80) { \
|
||||
EMITTER(((unsigned char) (UC))); \
|
||||
} else if ((UC) < 0x0800) { \
|
||||
ADD_SEQ(UC, 11, EMITTER); \
|
||||
ADD_FIRST_SEQ(UC, 2, EMITTER); \
|
||||
ADD_NEXT_SEQ(UC, 0, EMITTER); \
|
||||
} else if ((UC) < 0x10000) { \
|
||||
ADD_SEQ(UC, 16, EMITTER); \
|
||||
ADD_FIRST_SEQ(UC, 3, EMITTER); \
|
||||
ADD_NEXT_SEQ(UC, 6, EMITTER); \
|
||||
ADD_NEXT_SEQ(UC, 0, EMITTER); \
|
||||
} else if ((UC) < 0x200000) { \
|
||||
ADD_SEQ(UC, 21, EMITTER); \
|
||||
ADD_FIRST_SEQ(UC, 4, EMITTER); \
|
||||
ADD_NEXT_SEQ(UC, 12, EMITTER); \
|
||||
ADD_NEXT_SEQ(UC, 6, EMITTER); \
|
||||
ADD_NEXT_SEQ(UC, 0, EMITTER); \
|
||||
} else if ((UC) < 0x4000000) { \
|
||||
ADD_SEQ(UC, 26, EMITTER); \
|
||||
ADD_FIRST_SEQ(UC, 5, EMITTER); \
|
||||
ADD_NEXT_SEQ(UC, 18, EMITTER); \
|
||||
ADD_NEXT_SEQ(UC, 12, EMITTER); \
|
||||
ADD_NEXT_SEQ(UC, 6, EMITTER); \
|
||||
ADD_NEXT_SEQ(UC, 0, EMITTER); \
|
||||
} else { \
|
||||
ADD_SEQ(UC, 31, EMITTER); \
|
||||
ADD_FIRST_SEQ(UC, 6, EMITTER); \
|
||||
ADD_NEXT_SEQ(UC, 24, EMITTER); \
|
||||
ADD_NEXT_SEQ(UC, 18, EMITTER); \
|
||||
ADD_NEXT_SEQ(UC, 12, EMITTER); \
|
||||
ADD_NEXT_SEQ(UC, 6, EMITTER); \
|
||||
ADD_NEXT_SEQ(UC, 0, EMITTER); \
|
||||
} \
|
||||
} while(0)
|
||||
|
||||
@@ -966,24 +959,29 @@ char *hts_convertStringUTF8ToIDNA(const char *s, size_t size) {
|
||||
if (HTS_IS_LEADING_UTF8(c)) {
|
||||
/* commit sequence ? */
|
||||
if (utfSeq != (size_t) -1) {
|
||||
/* unicode character */
|
||||
punycode_uint uc = 0;
|
||||
|
||||
/* Reader: can read bytes up to j */
|
||||
#define RD ( utfSeq < j ? segData[utfSeq++] : -1 )
|
||||
|
||||
/* Writer: upon error, return FFFD (replacement character) */
|
||||
#define WR(C) uc = C != -1 ? (punycode_uint) C : (punycode_uint) 0xfffd
|
||||
#define WR(C) do { \
|
||||
if ((C) != -1) { \
|
||||
/* copy character */ \
|
||||
assertf(segOutputSize < segSize); \
|
||||
segInt[segOutputSize++] = (C); \
|
||||
} \
|
||||
/* In case of error, abort. */ \
|
||||
else { \
|
||||
FREE_BUFFER(); \
|
||||
return NULL; \
|
||||
} \
|
||||
} while(0)
|
||||
|
||||
/* Read Unicode character. */
|
||||
/* Read/Write Unicode character. */
|
||||
READ_UNICODE(RD, WR);
|
||||
#undef RD
|
||||
#undef WR
|
||||
|
||||
/* copy character */
|
||||
assertf(segOutputSize < segSize);
|
||||
segInt[segOutputSize++] = uc;
|
||||
|
||||
/* not anymore in sequence */
|
||||
utfSeq = (size_t) -1;
|
||||
}
|
||||
|
||||
@@ -105,7 +105,7 @@ char *fslash(char *catbuff, size_t size, const char *a) {
|
||||
}
|
||||
|
||||
// extension : html,gif..
|
||||
HTSEXT_API char *get_ext(char *catbuff, size_t size, const char *fil) {
|
||||
HTSEXT_API const char *get_ext(char *catbuff, size_t size, const char *fil) {
|
||||
size_t i, last;
|
||||
|
||||
RUNTIME_TIME_CHECK_SIZE(size);
|
||||
|
||||
776
src/htscore.c
776
src/htscore.c
File diff suppressed because it is too large
Load Diff
134
src/htscore.h
134
src/htscore.h
@@ -129,78 +129,24 @@ typedef struct filecreate_params filecreate_params;
|
||||
|
||||
#include "hts-indextmpl.h"
|
||||
|
||||
// structure d'un lien
|
||||
#ifndef HTS_DEF_FWSTRUCT_lien_url
|
||||
#define HTS_DEF_FWSTRUCT_lien_url
|
||||
typedef struct lien_url lien_url;
|
||||
// adr, fil
|
||||
#ifndef HTS_DEF_FWSTRUCT_lien_adrfil
|
||||
#define HTS_DEF_FWSTRUCT_lien_adrfil
|
||||
typedef struct lien_adrfil lien_adrfil;
|
||||
#endif
|
||||
struct lien_url {
|
||||
char firstblock; // flag 1=premier malloc
|
||||
char link_import; // lien importé à la suite d'un moved - ne pas appliquer les règles classiques up/down
|
||||
int depth; // profondeur autorisée lien ; >0 forte 0=faible
|
||||
int pass2; // traiter après les autres, seconde passe. si == -1, lien traité en background
|
||||
int premier; // pointeur sur le premier lien qui a donné lieu aux autres liens du domaine
|
||||
int precedent; // pointeur sur le lien qui a donné lieu à ce lien précis
|
||||
//int moved; // pointeur sur moved
|
||||
int retry; // nombre de retry restants
|
||||
int testmode; // mode test uniquement, envoyer juste un head!
|
||||
char *adr; // adresse
|
||||
char *fil; // nom du fichier distant
|
||||
char *sav; // nom à sauver sur disque (avec chemin éventuel)
|
||||
char *cod; // chemin codebase éventuel si classe java
|
||||
char *former_adr; // adresse initiale (avant éventuel moved), peut être nulle
|
||||
char *former_fil; // nom du fichier distant initial (avant éventuel moved), peut être nul
|
||||
struct lien_adrfil {
|
||||
char adr[HTS_URLMAXSIZE * 2]; // adresse
|
||||
char fil[HTS_URLMAXSIZE * 2]; // nom du fichier distant
|
||||
};
|
||||
|
||||
// chargement de fichiers en 'arrière plan'
|
||||
#ifndef HTS_DEF_FWSTRUCT_lien_back
|
||||
#define HTS_DEF_FWSTRUCT_lien_back
|
||||
typedef struct lien_back lien_back;
|
||||
#endif
|
||||
struct lien_back {
|
||||
#if DEBUG_CHECKINT
|
||||
char magic;
|
||||
#endif
|
||||
char url_adr[HTS_URLMAXSIZE * 2]; // adresse
|
||||
char url_fil[HTS_URLMAXSIZE * 2]; // nom du fichier distant
|
||||
char url_sav[HTS_URLMAXSIZE * 2]; // nom à sauver sur disque (avec chemin éventuel)
|
||||
char referer_adr[HTS_URLMAXSIZE * 2]; // adresse host page referer
|
||||
char referer_fil[HTS_URLMAXSIZE * 2]; // fichier page referer
|
||||
char location_buffer[HTS_URLMAXSIZE * 2]; // "location" en cas de "moved" (302,..)
|
||||
char *tmpfile; // nom à sauver temporairement (compressé)
|
||||
char tmpfile_buffer[HTS_URLMAXSIZE * 2]; // buffer pour le nom à sauver temporairement
|
||||
char send_too[1024]; // données à envoyer en même temps que le header
|
||||
int status; // status (-1=non utilisé, 0: prêt, >0: opération en cours)
|
||||
int locked; // locked (to be used soon)
|
||||
int testmode; // mode de test
|
||||
int timeout; // gérer des timeouts? (!=0 : nombre de secondes)
|
||||
TStamp timeout_refresh; // si oui, time refresh
|
||||
int rateout; // timeout refresh? (!=0 : taux minimum toléré en octets/s)
|
||||
TStamp rateout_time; // si oui, date de départ
|
||||
LLint maxfile_nonhtml; // taille max d'un fichier non html
|
||||
LLint maxfile_html; // idem pour un ficheir html
|
||||
htsblk r; // structure htsblk de chaque objet en background
|
||||
int is_update; // mode update
|
||||
int head_request; // requète HEAD?
|
||||
LLint range_req_size; // range utilisé
|
||||
TStamp ka_time_start; // refresh time for KA
|
||||
//
|
||||
int http11; // L'en tête doit être signé HTTP/1.1 et non HTTP/1.0
|
||||
int is_chunk; // chunk?
|
||||
char *chunk_adr; // adresse chunk en cours de chargement
|
||||
LLint chunk_size; // taille chunk en cours de chargement
|
||||
LLint chunk_blocksize; // taille data declaree par le chunk
|
||||
LLint compressed_size; // taille compressés (stats uniquement)
|
||||
//
|
||||
//int links_index; // to access liens[links_index]
|
||||
//
|
||||
char info[256]; // éventuel status pour le ftp
|
||||
int stop_ftp; // flag stop pour ftp
|
||||
int finalized; // finalized (optim memory)
|
||||
int early_add; // was added before link heap saw it
|
||||
#if DEBUG_CHECKINT
|
||||
char magic2;
|
||||
// adr, fil, save
|
||||
#ifndef HTS_DEF_FWSTRUCT_lien_adrfilsave
|
||||
#define HTS_DEF_FWSTRUCT_lien_adrfilsave
|
||||
typedef struct lien_adrfilsave lien_adrfilsave;
|
||||
#endif
|
||||
struct lien_adrfilsave {
|
||||
lien_adrfil af;
|
||||
char save[HTS_URLMAXSIZE * 2]; // nom à sauver sur disque (avec chemin éventuel)
|
||||
};
|
||||
|
||||
#ifndef HTS_DEF_FWSTRUCT_struct_back
|
||||
@@ -255,7 +201,7 @@ typedef struct hash_struct hash_struct;
|
||||
#endif
|
||||
struct hash_struct {
|
||||
/* Links big array reference */
|
||||
const lien_url **liens;
|
||||
const lien_url ***liens;
|
||||
/* Savename (case insensitive ; lowercased) */
|
||||
inthash sav;
|
||||
/* Address and path */
|
||||
@@ -278,6 +224,20 @@ struct filecreate_params {
|
||||
char path[HTS_URLMAXSIZE * 2];
|
||||
};
|
||||
|
||||
/* Access macros. */
|
||||
#define heap(N) (opt->liens[N])
|
||||
#define heap_top_index() (opt->lien_tot - 1)
|
||||
#define heap_top() (heap(heap_top_index()))
|
||||
#define urladr() (heap(ptr)->adr)
|
||||
#define urlfil() (heap(ptr)->fil)
|
||||
#define savename() (heap(ptr)->sav)
|
||||
#define parenturladr() (heap(heap(ptr)->precedent)->adr)
|
||||
#define parenturlfil() (heap(heap(ptr)->precedent)->fil)
|
||||
#define parentsavename() (heap(heap(ptr)->precedent)->sav)
|
||||
#define relativeurladr() ((!parent_relative)?urladr():parenturladr())
|
||||
#define relativeurlfil() ((!parent_relative)?urlfil():parenturlfil())
|
||||
#define relativesavename() ((!parent_relative)?savename():parentsavename())
|
||||
|
||||
/* Library internal definictions */
|
||||
#ifdef HTS_INTERNAL_BYTECODE
|
||||
|
||||
@@ -302,7 +262,21 @@ char *hts_cancel_file_pop(httrackp * opt);
|
||||
|
||||
#endif
|
||||
|
||||
//
|
||||
// add a link on the heap
|
||||
int hts_record_link(httrackp * opt,
|
||||
const char *address, const char *file, const char *save,
|
||||
const char *ref_address, const char *ref_file,
|
||||
const char *codebase);
|
||||
|
||||
// index of the latest added link
|
||||
size_t hts_record_link_latest(httrackp *opt);
|
||||
|
||||
// invalidate an entry
|
||||
void hts_invalidate_link(httrackp * opt, int lpos);
|
||||
|
||||
// wipe all records
|
||||
void hts_record_init(httrackp *opt);
|
||||
void hts_record_free(httrackp *opt);
|
||||
|
||||
//int httpmirror(char* url,int level,httrackp opt);
|
||||
int httpmirror(char *url1, httrackp * opt);
|
||||
@@ -312,8 +286,7 @@ int filesave(httrackp * opt, const char *adr, int len, const char *s,
|
||||
char *hts_cancel_file_pop(httrackp * opt);
|
||||
int check_fatal_io_errno(void);
|
||||
int engine_stats(void);
|
||||
void host_ban(httrackp * opt, lien_url ** liens, int ptr, int lien_tot,
|
||||
struct_back * sback, char *host);
|
||||
void host_ban(httrackp * opt, int ptr, struct_back * sback, const char *host);
|
||||
FILE *filecreate(filenote_strc * strct, const char *s);
|
||||
FILE *fileappend(filenote_strc * strct, const char *s);
|
||||
int filecreateempty(filenote_strc * strct, const char *filename);
|
||||
@@ -329,10 +302,10 @@ int fspc(httrackp * opt, FILE * fp, const char *type);
|
||||
char *next_token(char *p, int flag);
|
||||
|
||||
//
|
||||
char *readfile(char *fil);
|
||||
char *readfile2(char *fil, LLint * size);
|
||||
char *readfile_utf8(char *fil);
|
||||
char *readfile_or(char *fil, char *defaultdata);
|
||||
char *readfile(const char *fil);
|
||||
char *readfile2(const char *fil, LLint * size);
|
||||
char *readfile_utf8(const char *fil);
|
||||
char *readfile_or(const char *fil, const char *defaultdata);
|
||||
|
||||
#if 0
|
||||
void check_rate(TStamp stat_timestart, int maxrate);
|
||||
@@ -346,11 +319,11 @@ int liens_record(char *adr, char *fil, char *save, char *former_adr,
|
||||
int back_pluggable_sockets(struct_back * sback, httrackp * opt);
|
||||
int back_pluggable_sockets_strict(struct_back * sback, httrackp * opt);
|
||||
int back_fill(struct_back * sback, httrackp * opt, cache_back * cache,
|
||||
lien_url ** liens, int ptr, int numero_passe, int lien_tot);
|
||||
int backlinks_done(struct_back * sback, lien_url ** liens, int lien_tot,
|
||||
int ptr);
|
||||
int ptr, int numero_passe);
|
||||
int backlinks_done(const struct_back * sback, lien_url ** liens,
|
||||
int lien_tot, int ptr);
|
||||
int back_fillmax(struct_back * sback, httrackp * opt, cache_back * cache,
|
||||
lien_url ** liens, int ptr, int numero_passe, int lien_tot);
|
||||
int ptr, int numero_passe);
|
||||
|
||||
int ask_continue(httrackp * opt);
|
||||
int nombre_digit(int n);
|
||||
@@ -374,7 +347,6 @@ int htsAddLink(htsmoduleStruct * str, char *link);
|
||||
|
||||
// Void
|
||||
void voidf(void);
|
||||
|
||||
#define HTS_TOPINDEX "TOP_INDEX_HTTRACK"
|
||||
|
||||
#endif
|
||||
|
||||
@@ -45,6 +45,7 @@ Please visit our Website: http://www.httrack.com
|
||||
#include "htszlib.h"
|
||||
#include "htscharset.h"
|
||||
#include "htsencoding.h"
|
||||
#include "htsmd5.h"
|
||||
|
||||
#include <ctype.h>
|
||||
#if USE_BEGINTHREAD
|
||||
@@ -2006,8 +2007,7 @@ HTSEXT_API int hts_main2(int argc, char **argv, httrackp * opt) {
|
||||
cache.hashtable = (void *) cache_hashtable; /* copy backcache hash */
|
||||
cache.ro = 1; /* read only */
|
||||
if (cache.hashtable) {
|
||||
char BIGSTK adr[HTS_URLMAXSIZE * 2];
|
||||
char BIGSTK fil[HTS_URLMAXSIZE * 2];
|
||||
lien_adrfilsave afs;
|
||||
char BIGSTK url[HTS_URLMAXSIZE * 2];
|
||||
char linepos[256];
|
||||
int pos;
|
||||
@@ -2030,52 +2030,50 @@ HTSEXT_API int hts_main2(int argc, char **argv, httrackp * opt) {
|
||||
/* */
|
||||
a++;
|
||||
/* read "host/file" */
|
||||
a += binput(a, adr, HTS_URLMAXSIZE);
|
||||
a += binput(a, fil, HTS_URLMAXSIZE);
|
||||
a += binput(a, afs.af.adr, HTS_URLMAXSIZE);
|
||||
a += binput(a, afs.af.fil, HTS_URLMAXSIZE);
|
||||
url[0] = '\0';
|
||||
if (!link_has_authority(adr))
|
||||
if (!link_has_authority(afs.af.adr))
|
||||
strcatbuff(url, "http://");
|
||||
strcatbuff(url, adr);
|
||||
strcatbuff(url, fil);
|
||||
strcatbuff(url, afs.af.adr);
|
||||
strcatbuff(url, afs.af.fil);
|
||||
/* read position */
|
||||
a += binput(a, linepos, 200);
|
||||
sscanf(linepos, "%d", &pos);
|
||||
if (!hasFilter
|
||||
|| (strjoker(url, filter, NULL, NULL) != NULL)
|
||||
) {
|
||||
r = cache_read_ro(opt, &cache, adr, fil, "", NULL); // lire entrée cache + data
|
||||
r = cache_read_ro(opt, &cache, afs.af.adr, afs.af.fil, "", NULL); // lire entrée cache + data
|
||||
if (r.statuscode != -1) { // No errors
|
||||
found++;
|
||||
if (!hasFilter) {
|
||||
fprintf(stdout, "%s%s%s\r\n",
|
||||
(link_has_authority(adr)) ? "" :
|
||||
"http://", adr, fil);
|
||||
(link_has_authority(afs.af.adr)) ? "" :
|
||||
"http://", afs.af.adr, afs.af.fil);
|
||||
} else {
|
||||
char msg[256], cdate[256];
|
||||
char BIGSTK sav[HTS_URLMAXSIZE * 2];
|
||||
|
||||
infostatuscode(msg, r.statuscode);
|
||||
time_gmt_rfc822(cdate);
|
||||
|
||||
fprintf(stdout, "HTTP/1.1 %d %s\r\n",
|
||||
r.statuscode, r.msg[0] ? r.msg : msg);
|
||||
fprintf(stdout, "X-Host: %s\r\n", adr);
|
||||
fprintf(stdout, "X-File: %s\r\n", fil);
|
||||
fprintf(stdout, "X-Host: %s\r\n", afs.af.adr);
|
||||
fprintf(stdout, "X-File: %s\r\n", afs.af.fil);
|
||||
fprintf(stdout, "X-URL: %s%s%s\r\n",
|
||||
(link_has_authority(adr)) ? "" :
|
||||
"http://", adr, fil);
|
||||
(link_has_authority(afs.af.adr)) ? "" :
|
||||
"http://", afs.af.adr, afs.af.fil);
|
||||
if (url_savename
|
||||
(adr, fil, sav, /*former_adr */ NULL,
|
||||
/*former_fil */ NULL, /*referer_adr */
|
||||
(&afs, /*former */ NULL,
|
||||
/*referer_adr */
|
||||
NULL, /*referer_fil */ NULL,
|
||||
/*opt */ opt, /*liens */ NULL,
|
||||
/*lien_tot */ 0, /*sback */ NULL,
|
||||
/*opt */ opt, /*sback */ NULL,
|
||||
/*cache */ &cache, /*hash */ NULL, /*ptr */
|
||||
0, /*numero_passe */ 0, /*mime_type */
|
||||
NULL) != -1) {
|
||||
if (fexist(sav)) {
|
||||
if (fexist(afs.save)) {
|
||||
fprintf(stdout, "Content-location: %s\r\n",
|
||||
sav);
|
||||
afs.save);
|
||||
}
|
||||
}
|
||||
fprintf(stdout, "Date: %s\r\n", cdate);
|
||||
@@ -2410,6 +2408,7 @@ HTSEXT_API int hts_main2(int argc, char **argv, httrackp * opt) {
|
||||
return 0;
|
||||
break;
|
||||
case '7': // hashtable selftest: httrack -#7 nb_entries
|
||||
md5selftest();
|
||||
if (++na < argc) {
|
||||
char *const snum = strdup(argv[na]);
|
||||
unsigned long count = 0;
|
||||
|
||||
@@ -231,8 +231,15 @@ struct t_hts_callback_ref {
|
||||
size_t offset;
|
||||
};
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
extern const t_hts_htmlcheck_callbacks default_callbacks;
|
||||
extern const t_hts_callback_ref default_callbacks_ref[];
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#define HT_PRINT(A) strcatbuff(opt->state.HTbuff,A);
|
||||
#define HT_REQUEST_START opt->state.HTbuff[0]='\0';
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -56,7 +56,7 @@ EOF
|
||||
i=$[${i}+1]
|
||||
done
|
||||
echo -e " /* $A */"
|
||||
echo -e " case ${hash}:"
|
||||
echo -e " case ${hash}u:"
|
||||
echo -e " if (len == ${#ent} /* && strncmp(ent, \"${ent}\") == 0 */) {"
|
||||
echo -e " return ${code};"
|
||||
echo -e " }"
|
||||
|
||||
@@ -54,7 +54,7 @@ Please visit our Website: http://www.httrack.com
|
||||
// optionnel: taille à contrôller (ou numéro, etc) en pointeur
|
||||
// (en de détection de *size, la taille limite est écrite par dessus *size)
|
||||
// exemple: +-*.gif*[<5] == supprimer GIF si <5KB
|
||||
int fa_strjoker(int type, char **filters, int nfil, char *nom, LLint * size,
|
||||
int fa_strjoker(int type, char **filters, int nfil, const char *nom, LLint * size,
|
||||
int *size_flag, int *depth) {
|
||||
int verdict = 0; // on sait pas
|
||||
int i;
|
||||
@@ -101,7 +101,7 @@ int fa_strjoker(int type, char **filters, int nfil, char *nom, LLint * size,
|
||||
// cet algo est 'un peu' récursif mais ne consomme pas trop de tm
|
||||
// * = toute lettre
|
||||
// --?-- : spécifique à HTTrack et aux ?
|
||||
HTS_INLINE char *strjoker(char *chaine, char *joker, LLint * size,
|
||||
HTS_INLINE const char *strjoker(const char *chaine, const char *joker, LLint * size,
|
||||
int *size_flag) {
|
||||
//int err=0;
|
||||
if (strnotempty(joker) == 0) { // fin de chaine joker
|
||||
@@ -262,7 +262,7 @@ HTS_INLINE char *strjoker(char *chaine, char *joker, LLint * size,
|
||||
|
||||
{
|
||||
int i, max;
|
||||
char *adr;
|
||||
const char *adr;
|
||||
|
||||
// la chaine doit se terminer exactement
|
||||
if (cut) {
|
||||
@@ -335,8 +335,8 @@ HTS_INLINE char *strjoker(char *chaine, char *joker, LLint * size,
|
||||
// exemple: find dans un texte de strcpybuff(*[A-Z,a-z],"*[0-9]"); va rechercher la première occurence
|
||||
// d'un strcpy sur une variable ayant un nom en lettres et copiant une chaine de chiffres
|
||||
// ATTENTION!! Eviter les jokers en début, où gare au temps machine!
|
||||
char *strjokerfind(char *chaine, char *joker) {
|
||||
char *adr;
|
||||
const char *strjokerfind(const char *chaine, const char *joker) {
|
||||
const char *adr;
|
||||
|
||||
while(*chaine) {
|
||||
if ((adr = strjoker(chaine, joker, NULL, NULL))) { // ok trouvé
|
||||
|
||||
@@ -39,11 +39,11 @@ Please visit our Website: http://www.httrack.com
|
||||
|
||||
#include "htsbase.h"
|
||||
|
||||
int fa_strjoker(int type, char **filters, int nfil, char *nom, LLint * size,
|
||||
int fa_strjoker(int type, char **filters, int nfil, const char *nom, LLint * size,
|
||||
int *size_flag, int *depth);
|
||||
HTS_INLINE char *strjoker(char *chaine, char *joker, LLint * size,
|
||||
HTS_INLINE const char *strjoker(const char *chaine, const char *joker, LLint * size,
|
||||
int *size_flag);
|
||||
char *strjokerfind(char *chaine, char *joker);
|
||||
const char *strjokerfind(const char *chaine, const char *joker);
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
84
src/htsftp.c
84
src/htsftp.c
@@ -142,21 +142,17 @@ int run_launch_ftp(FTPDownloadStruct * pStruct) {
|
||||
#endif
|
||||
char BIGSTK adr_ip[1024];
|
||||
char *adr, *real_adr;
|
||||
char *ftp_filename = "";
|
||||
const char *ftp_filename = "";
|
||||
int timeout = 300; // timeout
|
||||
int timeout_onfly = 8; // attente réponse supplémentaire
|
||||
int transfer_list = 0; // directory
|
||||
int rest_understood = 0; // rest command understood
|
||||
t_fullhostent fullhostent_buffer; // buffer pour resolver
|
||||
|
||||
//
|
||||
T_SOC soc_ctl = INVALID_SOCKET;
|
||||
T_SOC soc_servdat = INVALID_SOCKET;
|
||||
T_SOC soc_dat = INVALID_SOCKET;
|
||||
|
||||
//
|
||||
SOCaddr server_data;
|
||||
int server_data_size = sizeof(server_data);
|
||||
|
||||
//
|
||||
line_retr[0] = adr_ip[0] = '\0';
|
||||
@@ -249,8 +245,6 @@ int run_launch_ftp(FTPDownloadStruct * pStruct) {
|
||||
// connexion
|
||||
{
|
||||
SOCaddr server;
|
||||
int server_size = sizeof(server);
|
||||
t_hostent *hp;
|
||||
char *a;
|
||||
char _adr[256];
|
||||
const char *error = "unknown error";
|
||||
@@ -270,8 +264,7 @@ int run_launch_ftp(FTPDownloadStruct * pStruct) {
|
||||
|
||||
// récupérer adresse résolue
|
||||
strcpybuff(back->info, "host name");
|
||||
hp = hts_gethostbyname2(opt, _adr, &fullhostent_buffer, &error);
|
||||
if (hp == NULL) {
|
||||
if (hts_dns_resolve2(opt, _adr, &server, &error) == NULL) {
|
||||
snprintf(back->r.msg, sizeof(back->r.msg),
|
||||
"Unable to get server's address: %s", error);
|
||||
// back->status=STATUS_FTP_READY; // fini
|
||||
@@ -280,12 +273,8 @@ int run_launch_ftp(FTPDownloadStruct * pStruct) {
|
||||
}
|
||||
_CHECK_HALT_FTP;
|
||||
|
||||
// copie adresse
|
||||
SOCaddr_copyaddr(server, server_size, hp->h_addr_list[0], hp->h_length);
|
||||
// copie adresse pour cnx data
|
||||
SOCaddr_copyaddr(server_data, server_data_size, hp->h_addr_list[0],
|
||||
hp->h_length);
|
||||
// memcpy(&server.sin_addr, hp->h_addr, hp->h_length);
|
||||
SOCaddr_copy_SOCaddr(server_data, server);
|
||||
|
||||
// créer ("attachement") une socket (point d'accès) internet,en flot
|
||||
soc_ctl = (T_SOC) socket(SOCaddr_sinfamily(server), SOCK_STREAM, 0);
|
||||
@@ -302,12 +291,7 @@ int run_launch_ftp(FTPDownloadStruct * pStruct) {
|
||||
// connexion (bloquante, on est en thread)
|
||||
strcpybuff(back->info, "connect");
|
||||
|
||||
#ifdef _WIN32
|
||||
if (connect(soc_ctl, (const struct sockaddr FAR *) &server, server_size) !=
|
||||
0) {
|
||||
#else
|
||||
if (connect(soc_ctl, (struct sockaddr *) &server, server_size) == -1) {
|
||||
#endif
|
||||
if (connect(soc_ctl, &SOCaddr_sockaddr(server), SOCaddr_size(server)) != 0) {
|
||||
strcpybuff(back->r.msg, "Unable to connect to the server");
|
||||
// back->status=STATUS_FTP_READY; // fini
|
||||
back->r.statuscode = STATUSCODE_INVALID;
|
||||
@@ -419,7 +403,7 @@ int run_launch_ftp(FTPDownloadStruct * pStruct) {
|
||||
// Pré-REST
|
||||
//
|
||||
#if FTP_PASV
|
||||
if (SOCaddr_getproto(server, server_size) == '1') {
|
||||
if (SOCaddr_getproto(server) == '1') {
|
||||
strcpybuff(back->info, "pasv");
|
||||
snprintf(line, sizeof(line), "PASV");
|
||||
send_line(soc_ctl, line);
|
||||
@@ -581,7 +565,6 @@ int run_launch_ftp(FTPDownloadStruct * pStruct) {
|
||||
if (port_pasv) {
|
||||
SOCaddr server;
|
||||
int server_size = sizeof(server);
|
||||
t_hostent *hp;
|
||||
const char *error = "unknown error";
|
||||
|
||||
// effacer structure
|
||||
@@ -592,16 +575,9 @@ int run_launch_ftp(FTPDownloadStruct * pStruct) {
|
||||
|
||||
// résoudre
|
||||
if (adr_ip[0]) {
|
||||
hp = hts_gethostbyname2(opt, adr_ip, &fullhostent_buffer, &error);
|
||||
if (hp) {
|
||||
SOCaddr_copyaddr(server, server_size, hp->h_addr_list[0],
|
||||
hp->h_length);
|
||||
} else {
|
||||
server_size = 0;
|
||||
}
|
||||
hts_dns_resolve2(opt, adr_ip, &server, &error);
|
||||
} else {
|
||||
memcpy(&server, &server_data, sizeof(server_data));
|
||||
server_size = server_data_size;
|
||||
SOCaddr_copy_SOCaddr(server, server_data);
|
||||
}
|
||||
|
||||
// infos
|
||||
@@ -615,15 +591,7 @@ int run_launch_ftp(FTPDownloadStruct * pStruct) {
|
||||
if (soc_dat != INVALID_SOCKET) {
|
||||
// structure: connexion au domaine internet, port 80 (ou autre)
|
||||
SOCaddr_initport(server, port_pasv);
|
||||
// server.sin_port = htons((unsigned short int) port_pasv);
|
||||
#ifdef _WIN32
|
||||
if (connect
|
||||
(soc_dat, (const struct sockaddr FAR *) &server,
|
||||
server_size) == 0) {
|
||||
#else
|
||||
if (connect(soc_dat, (struct sockaddr *) &server, server_size) !=
|
||||
-1) {
|
||||
#endif
|
||||
if (connect(soc_dat, &SOCaddr_sockaddr(server), SOCaddr_size(server)) == 0) {
|
||||
strcpybuff(back->info, "retr");
|
||||
strcpybuff(line, line_retr);
|
||||
send_line(soc_ctl, line);
|
||||
@@ -856,33 +824,19 @@ T_SOC get_datasocket(char *to_send, size_t to_send_size) {
|
||||
to_send[0] = '\0';
|
||||
if (gethostname(h_loc, 256) == 0) { // host name
|
||||
SOCaddr server;
|
||||
int server_size = sizeof(server);
|
||||
t_hostent *hp_loc;
|
||||
t_fullhostent buffer;
|
||||
|
||||
// effacer structure
|
||||
memset(&server, 0, sizeof(server));
|
||||
|
||||
if ((hp_loc = vxgethostbyname(h_loc, &buffer))) { // notre host
|
||||
|
||||
// copie adresse
|
||||
SOCaddr_copyaddr(server, server_size, hp_loc->h_addr_list[0],
|
||||
hp_loc->h_length);
|
||||
|
||||
if (hts_dns_resolve_nocache(h_loc, &server) != NULL) { // notre host
|
||||
if ((soc =
|
||||
(T_SOC) socket(SOCaddr_sinfamily(server), SOCK_STREAM,
|
||||
0)) != INVALID_SOCKET) {
|
||||
|
||||
if (bind(soc, (struct sockaddr *) &server, server_size) == 0) {
|
||||
if (bind(soc, &SOCaddr_sockaddr(server), SOCaddr_size(server)) == 0) {
|
||||
SOCaddr server2;
|
||||
SOClen len;
|
||||
SOClen len = SOCaddr_capacity(server2);
|
||||
|
||||
len = sizeof(server2);
|
||||
// effacer structure
|
||||
memset(&server2, 0, sizeof(server2));
|
||||
if (getsockname(soc, (struct sockaddr *) &server2, &len) == 0) {
|
||||
if (getsockname(soc, &SOCaddr_sockaddr(server2), &len) == 0) {
|
||||
// *port=ntohs(server.sin_port); // récupérer port
|
||||
if (listen(soc, 10) >= 0) { // au pif le 10
|
||||
if (listen(soc, 1) >= 0) {
|
||||
#if HTS_INET6==0
|
||||
unsigned short int a, n1, n2;
|
||||
|
||||
@@ -895,7 +849,7 @@ T_SOC get_datasocket(char *to_send, size_t to_send_size) {
|
||||
char dot[256 + 2];
|
||||
char *a;
|
||||
|
||||
SOCaddr_inetntoa(dot, 256, server2, sizeof(server2));
|
||||
SOCaddr_inetntoa(dot, 256, server2);
|
||||
//
|
||||
dots[0] = '\0';
|
||||
strncatbuff(dots, dot, 128);
|
||||
@@ -913,9 +867,9 @@ T_SOC get_datasocket(char *to_send, size_t to_send_size) {
|
||||
{
|
||||
char dot[256 + 2];
|
||||
|
||||
SOCaddr_inetntoa(dot, 256, server2, len);
|
||||
SOCaddr_inetntoa(dot, 256, server2);
|
||||
snprintf(to_send, to_send_size, "EPRT |%c|%s|%d|",
|
||||
SOCaddr_getproto(server2, len), dot,
|
||||
SOCaddr_getproto(server2), dot,
|
||||
SOCaddr_sinport(server2));
|
||||
}
|
||||
#endif
|
||||
@@ -959,7 +913,7 @@ FILE *dd = NULL;
|
||||
|
||||
// routines de réception/émission
|
||||
// 0 = ERROR
|
||||
int send_line(T_SOC soc, char *data) {
|
||||
int send_line(T_SOC soc, const char *data) {
|
||||
char BIGSTK line[1024];
|
||||
|
||||
if (_DEBUG_HEAD) {
|
||||
@@ -1093,7 +1047,7 @@ int check_socket(T_SOC soc) {
|
||||
tv.tv_sec = 0;
|
||||
tv.tv_usec = 0;
|
||||
// poll!
|
||||
select(soc + 1, &fds, NULL, &fds_e, &tv);
|
||||
select((int) soc + 1, &fds, NULL, &fds_e, &tv);
|
||||
if (FD_ISSET(soc, &fds_e)) { // error detected
|
||||
return -1;
|
||||
} else if (FD_ISSET(soc, &fds)) {
|
||||
@@ -1116,7 +1070,7 @@ int check_socket_connect(T_SOC soc) {
|
||||
tv.tv_sec = 0;
|
||||
tv.tv_usec = 0;
|
||||
// poll!
|
||||
select(soc + 1, NULL, &fds, &fds_e, &tv);
|
||||
select((int) soc + 1, NULL, &fds, &fds_e, &tv);
|
||||
if (FD_ISSET(soc, &fds_e)) { // error detected
|
||||
return -1;
|
||||
} else if (FD_ISSET(soc, &fds)) {
|
||||
|
||||
@@ -68,7 +68,7 @@ int back_launch_ftp(FTPDownloadStruct * params);
|
||||
#endif
|
||||
|
||||
int run_launch_ftp(FTPDownloadStruct * params);
|
||||
int send_line(T_SOC soc, char *data);
|
||||
int send_line(T_SOC soc, const char *data);
|
||||
int get_ftp_line(T_SOC soc, char *line, size_t line_size, int timeout);
|
||||
T_SOC get_datasocket(char *to_send, size_t to_send_size);
|
||||
int stop_ftp(lien_back * back);
|
||||
|
||||
@@ -36,8 +36,8 @@ Please visit our Website: http://www.httrack.com
|
||||
#define HTTRACK_GLOBAL_DEFH
|
||||
|
||||
// Version (also check external version information)
|
||||
#define HTTRACK_VERSION "3.48-6"
|
||||
#define HTTRACK_VERSIONID "3.48.6"
|
||||
#define HTTRACK_VERSION "3.48-13"
|
||||
#define HTTRACK_VERSIONID "3.48.13"
|
||||
#define HTTRACK_AFF_VERSION "3.x"
|
||||
#define HTTRACK_LIB_VERSION "2.0"
|
||||
|
||||
@@ -132,11 +132,6 @@ Please visit our Website: http://www.httrack.com
|
||||
|
||||
#endif
|
||||
|
||||
// don't spare memory usage by default
|
||||
#ifndef HTS_SPARE_MEMORY
|
||||
#define HTS_SPARE_MEMORY 0
|
||||
#endif
|
||||
|
||||
#ifndef BIGSTK
|
||||
#define BIGSTK
|
||||
#endif
|
||||
@@ -206,17 +201,10 @@ Please visit our Website: http://www.httrack.com
|
||||
|
||||
#endif
|
||||
|
||||
#if HTS_SPARE_MEMORY==0
|
||||
/* Taille max d'une URL */
|
||||
#define HTS_URLMAXSIZE 1024
|
||||
/* Taille max ligne de commande (>=HTS_URLMAXSIZE*2) */
|
||||
#define HTS_CDLMAXSIZE 1024
|
||||
#else
|
||||
/* Taille max d'une URL */
|
||||
#define HTS_URLMAXSIZE 256
|
||||
/* Taille max ligne de commande (>=HTS_URLMAXSIZE*2) */
|
||||
#define HTS_CDLMAXSIZE 1024
|
||||
#endif
|
||||
|
||||
/* Copyright (C) 1998-2014 Xavier Roche and other contributors */
|
||||
#define HTTRACK_AFF_AUTHORS "[XR&CO'2014]"
|
||||
@@ -257,8 +245,14 @@ Please visit our Website: http://www.httrack.com
|
||||
#define HTSEXT_API __declspec(dllimport)
|
||||
#endif
|
||||
#else
|
||||
/* See <http://gcc.gnu.org/wiki/Visibility> */
|
||||
#if ( ( defined(__GNUC__) && ( __GNUC__ >= 4 ) ) \
|
||||
|| ( defined(HAVE_VISIBILITY) && HAVE_VISIBILITY ) )
|
||||
#define HTSEXT_API __attribute__ ((visibility ("default")))
|
||||
#else
|
||||
#define HTSEXT_API
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifndef HTS_LONGLONG
|
||||
#ifdef HTS_NO_64_BIT
|
||||
@@ -329,11 +323,6 @@ typedef unsigned __int32 T_SOC;
|
||||
typedef int T_SOC;
|
||||
#endif
|
||||
|
||||
/* Default alignement */
|
||||
#ifndef HTS_ALIGN
|
||||
#define HTS_ALIGN (sizeof(void*))
|
||||
#endif
|
||||
|
||||
/* IPV4, IPV6 and various unified structures */
|
||||
#define HTS_MAXADDRLEN 64
|
||||
|
||||
@@ -378,11 +367,7 @@ typedef int T_SOC;
|
||||
#define LOCAL_SOCKET_ID -2
|
||||
|
||||
// taille de chaque buffer (10 sockets 650 ko)
|
||||
#if HTS_SPARE_MEMORY==0
|
||||
#define TAILLE_BUFFER 65536
|
||||
#else
|
||||
#define TAILLE_BUFFER 8192
|
||||
#endif
|
||||
|
||||
#ifdef HTS_DO_NOT_USE_PTHREAD
|
||||
#error needs threads support
|
||||
|
||||
@@ -85,6 +85,14 @@ static int key_sav_equals(void *arg, const char *a, const char *b) {
|
||||
return strcasecmp(a, b) == 0;
|
||||
}
|
||||
|
||||
static const char* key_sav_debug_print(void *arg, const char *a) {
|
||||
return a;
|
||||
}
|
||||
|
||||
static const char* value_sav_debug_print(void *arg, void *a) {
|
||||
return (char*) a;
|
||||
}
|
||||
|
||||
/* Pseudo-key (lien_url structure) hash function */
|
||||
static inthash_keys key_adrfil_hashes_generic(void *arg, const char *value_,
|
||||
const int former) {
|
||||
@@ -151,6 +159,31 @@ static int key_adrfil_equals_generic(void *arg, const char *a_, const char *b_,
|
||||
}
|
||||
}
|
||||
|
||||
static const char* key_adrfil_debug_print_(void *arg, const char *a_, const int former) {
|
||||
hash_struct *const hash = (hash_struct*) arg;
|
||||
const lien_url*const a = (lien_url*) a_;
|
||||
const char *const a_adr = !former ? a->adr : a->former_adr;
|
||||
const char *const a_fil = !former ? a->fil : a->former_fil;
|
||||
snprintf(hash->normfil, sizeof(hash->normfil), "%s%s", a_adr, a_fil);
|
||||
return hash->normfil;
|
||||
}
|
||||
|
||||
static const char* key_adrfil_debug_print(void *arg, const char *a_) {
|
||||
return key_adrfil_debug_print_(arg, a_, 0);
|
||||
}
|
||||
|
||||
static const char* key_former_adrfil_debug_print(void *arg, const char *a_) {
|
||||
return key_adrfil_debug_print_(arg, a_, 1);
|
||||
}
|
||||
|
||||
static const char* value_adrfil_debug_print(void *arg, void *value) {
|
||||
hash_struct *const hash = (hash_struct*) arg;
|
||||
inthash_value v;
|
||||
v.ptr = value;
|
||||
snprintf(hash->normfil2, sizeof(hash->normfil2), "%d", (int) v.intg);
|
||||
return hash->normfil2;
|
||||
}
|
||||
|
||||
/* "adr"/"fil" lien_url structure members hashing function */
|
||||
static inthash_keys key_adrfil_hashes(void *arg, const char *value_) {
|
||||
return key_adrfil_hashes_generic(arg, value_, 0);
|
||||
@@ -207,6 +240,20 @@ void hash_init(httrackp *opt, hash_struct * hash, int normalized) {
|
||||
key_former_adrfil_hashes,
|
||||
key_former_adrfil_equals,
|
||||
hash);
|
||||
|
||||
/* pretty-printing */
|
||||
inthash_set_print_handler(hash->sav,
|
||||
key_sav_debug_print,
|
||||
value_sav_debug_print,
|
||||
NULL);
|
||||
inthash_set_print_handler(hash->adrfil,
|
||||
key_adrfil_debug_print,
|
||||
value_adrfil_debug_print,
|
||||
hash);
|
||||
inthash_set_print_handler(hash->former_adrfil,
|
||||
key_former_adrfil_debug_print,
|
||||
value_adrfil_debug_print,
|
||||
hash);
|
||||
}
|
||||
|
||||
void hash_free(hash_struct *hash) {
|
||||
@@ -260,15 +307,15 @@ int hash_read(const hash_struct * hash, const char *nom1, const char *nom2,
|
||||
}
|
||||
|
||||
// enregistrement lien lpos dans les 3 tables hash1..3
|
||||
void hash_write(hash_struct * hash, int lpos) {
|
||||
void hash_write(hash_struct * hash, size_t lpos) {
|
||||
/* first entry: destination filename (lowercased) */
|
||||
inthash_write(hash->sav, hash->liens[lpos]->sav, lpos);
|
||||
inthash_write(hash->sav, (*hash->liens)[lpos]->sav, lpos);
|
||||
|
||||
/* second entry: URL address and path */
|
||||
inthash_write(hash->adrfil, (char*) hash->liens[lpos], lpos);
|
||||
inthash_write(hash->adrfil, (char*) (*hash->liens)[lpos], lpos);
|
||||
|
||||
/* third entry: URL address and path before redirect */
|
||||
if (hash->liens[lpos]->former_adr) { // former_adr existe?
|
||||
inthash_write(hash->former_adrfil, (char*) hash->liens[lpos], lpos);
|
||||
if ((*hash->liens)[lpos]->former_adr) { // former_adr existe?
|
||||
inthash_write(hash->former_adrfil, (char*) (*hash->liens)[lpos], lpos);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -55,7 +55,7 @@ void hash_init(httrackp *opt, hash_struct *hash, int normalized);
|
||||
void hash_free(hash_struct *hash);
|
||||
int hash_read(const hash_struct * hash, const char *nom1, const char *nom2,
|
||||
hash_struct_type type);
|
||||
void hash_write(hash_struct * hash, int lpos);
|
||||
void hash_write(hash_struct * hash, size_t lpos);
|
||||
int *hash_calc_chaine(hash_struct * hash, hash_struct_type type, int pos);
|
||||
unsigned long int hash_cle(const char *nom1, const char *nom2);
|
||||
#endif
|
||||
|
||||
@@ -52,7 +52,7 @@ Please visit our Website: http://www.httrack.com
|
||||
/* END specific definitions */
|
||||
|
||||
#define waitkey if (more) { char s[4]; printf("\nMORE.. q to quit\n"); linput(stdin,s,4); if (strcmp(s,"q")==0) quit=1; else printf("Page %d\n\n",++m); }
|
||||
void infomsg(char *msg) {
|
||||
void infomsg(const char *msg) {
|
||||
int l = 0;
|
||||
int m = 0;
|
||||
int more = 0;
|
||||
@@ -332,7 +332,7 @@ void help_wizard(httrackp * opt) {
|
||||
printf("\n");
|
||||
|
||||
// couper en morceaux
|
||||
argv[0] = "winhttrack";
|
||||
argv[0] = strdup("winhttrack");
|
||||
argv[1] = cmd;
|
||||
argc++;
|
||||
while(cmd[i]) {
|
||||
@@ -364,15 +364,15 @@ void help_wizard(httrackp * opt) {
|
||||
#undef str
|
||||
#undef argv
|
||||
}
|
||||
int help_query(char *list, int def) {
|
||||
int help_query(const char *list, int def) {
|
||||
char s[256];
|
||||
char *a;
|
||||
const char *a;
|
||||
int opt;
|
||||
int n = 1;
|
||||
|
||||
a = list;
|
||||
while(strnotempty(a)) {
|
||||
char *b = strchr(a, '|');
|
||||
const char *b = strchr(a, '|');
|
||||
|
||||
if (b) {
|
||||
char str[256];
|
||||
@@ -455,7 +455,7 @@ void help_catchurl(const char *dest_path) {
|
||||
}
|
||||
|
||||
// Créer un index.html vide
|
||||
void make_empty_index(char *str) {
|
||||
void make_empty_index(const char *str) {
|
||||
#if 0
|
||||
if (!fexist(fconcat(str, "index.html"))) {
|
||||
FILE *fp = fopen(fconcat(str, "index.html"), "wb");
|
||||
@@ -473,7 +473,7 @@ void make_empty_index(char *str) {
|
||||
|
||||
// mini-aide (h: help)
|
||||
// y
|
||||
void help(char *app, int more) {
|
||||
void help(const char *app, int more) {
|
||||
char info[2048];
|
||||
|
||||
infomsg("");
|
||||
@@ -605,7 +605,7 @@ void help(char *app, int more) {
|
||||
infomsg
|
||||
(" %F footer string in Html code (-%F \"Mirrored [from host %s [file %s [at %s]]]\"");
|
||||
infomsg(" %l preffered language (-%l \"fr, en, jp, *\"");
|
||||
infomsg(" %a accepted formats (-%l \"text/html,image/png,image/jpeg,image/gif;q=0.9,*/*;q=0.1\"");
|
||||
infomsg(" %a accepted formats (-%a \"text/html,image/png;q=0.9,*/*;q=0.1\"");
|
||||
infomsg(" %X additional HTTP header line (-%X \"X-Magic: 42\"");
|
||||
infomsg("");
|
||||
infomsg("Log, index, cache");
|
||||
|
||||
@@ -43,11 +43,11 @@ Please visit our Website: http://www.httrack.com
|
||||
typedef struct httrackp httrackp;
|
||||
#endif
|
||||
|
||||
void infomsg(char *msg);
|
||||
void help(char *app, int more);
|
||||
void make_empty_index(char *str);
|
||||
void infomsg(const char *msg);
|
||||
void help(const char *app, int more);
|
||||
void make_empty_index(const char *str);
|
||||
void help_wizard(httrackp * opt);
|
||||
int help_query(char *list, int def);
|
||||
int help_query(const char *list, int def);
|
||||
void help_catchurl(const char *dest_path);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -103,7 +103,7 @@ Please visit our Website: http://www.httrack.com
|
||||
|
||||
/* End of Keyword Indexer Parameters */
|
||||
|
||||
int strcpos(char *adr, char c);
|
||||
int strcpos(const char *adr, char c);
|
||||
int mystrcmp(const void *_e1, const void *_e2);
|
||||
|
||||
// Global variables
|
||||
@@ -468,8 +468,8 @@ void index_finish(const char *indexpath, int mode) {
|
||||
/* Subroutines */
|
||||
|
||||
#if HTS_MAKE_KEYWORD_INDEX
|
||||
int strcpos(char *adr, char c) {
|
||||
char *apos = strchr(adr, c);
|
||||
int strcpos(const char *adr, char c) {
|
||||
const char *apos = strchr(adr, c);
|
||||
|
||||
if (apos)
|
||||
return (int) (apos - adr);
|
||||
|
||||
@@ -187,6 +187,16 @@ struct struct_inthash {
|
||||
/** hashtable name for logging **/
|
||||
const char *name;
|
||||
} error;
|
||||
|
||||
/** How to handle pretty-print (debug) (might be NULL). **/
|
||||
struct {
|
||||
/** key print() **/
|
||||
t_inthash_printkeyhandler key;
|
||||
/** value print() **/
|
||||
t_inthash_printvaluehandler value;
|
||||
/** opaque argument **/
|
||||
void *arg;
|
||||
} print;
|
||||
} custom;
|
||||
};
|
||||
|
||||
@@ -889,10 +899,62 @@ static int inthash_add_item_(inthash hashtable, inthash_item item) {
|
||||
(int) hashtable->stash.size);
|
||||
return 1; /* added */
|
||||
} else {
|
||||
/* debugging */
|
||||
if (hashtable->custom.print.key != NULL
|
||||
&& hashtable->custom.print.value != NULL) {
|
||||
size_t i;
|
||||
for(i = 0 ; i < hashtable->stash.size ; i++) {
|
||||
inthash_item *const item = &hashtable->stash.items[i];
|
||||
const size_t pos1 = inthash_hash_to_pos(hashtable, item->hashes.hash1);
|
||||
const size_t pos2 = inthash_hash_to_pos(hashtable, item->hashes.hash2);
|
||||
inthash_crit(hashtable,
|
||||
"stash[%u]: key='%s' value='%s' pos1=%d pos2=%d hash1=%04x hash2=%04x",
|
||||
(int) i,
|
||||
hashtable->custom.print.key(hashtable->custom.print.arg, item->name),
|
||||
hashtable->custom.print.value(hashtable->custom.print.arg, item->value.ptr),
|
||||
(int) pos1, (int) pos2,
|
||||
item->hashes.hash1, item->hashes.hash2);
|
||||
if (!inthash_is_free(hashtable, pos1)) {
|
||||
inthash_item *const item = &hashtable->items[pos1];
|
||||
const size_t pos1 = inthash_hash_to_pos(hashtable, item->hashes.hash1);
|
||||
const size_t pos2 = inthash_hash_to_pos(hashtable, item->hashes.hash2);
|
||||
inthash_crit(hashtable,
|
||||
"\t.. collisionning with key='%s' value='%s' pos1=%d pos2=%d hash1=%04x hash2=%04x",
|
||||
hashtable->custom.print.key(hashtable->custom.print.arg, item->name),
|
||||
hashtable->custom.print.value(hashtable->custom.print.arg, item->value.ptr),
|
||||
(int) pos1, (int) pos2,
|
||||
item->hashes.hash1, item->hashes.hash2);
|
||||
} else {
|
||||
inthash_crit(hashtable, "\t.. collisionning with a free slot (%d)!", (int) pos1);
|
||||
}
|
||||
if (!inthash_is_free(hashtable, pos2)) {
|
||||
inthash_item *const item = &hashtable->items[pos2];
|
||||
const size_t pos1 = inthash_hash_to_pos(hashtable, item->hashes.hash1);
|
||||
const size_t pos2 = inthash_hash_to_pos(hashtable, item->hashes.hash2);
|
||||
inthash_crit(hashtable,
|
||||
"\t.. collisionning with key='%s' value='%s' pos1=%d pos2=%d hash1=%04x hash2=%04x",
|
||||
hashtable->custom.print.key(hashtable->custom.print.arg, item->name),
|
||||
hashtable->custom.print.value(hashtable->custom.print.arg, item->value.ptr),
|
||||
(int) pos1, (int) pos2,
|
||||
item->hashes.hash1, item->hashes.hash2);
|
||||
} else {
|
||||
inthash_crit(hashtable, "\t.. collisionning with a free slot (%d)!", (int) pos2);
|
||||
}
|
||||
}
|
||||
//struct_inthash_enum e = inthash_enum_new(hashtable);
|
||||
//while((item = inthash_enum_next(&e)) != NULL) {
|
||||
// inthash_crit(hashtable, "element key='%s' value='%s' hash1=%04x hash2=%04x",
|
||||
// hashtable->custom.print.key(hashtable->custom.print.arg, item->name),
|
||||
// hashtable->custom.print.value(hashtable->custom.print.arg, item->value.ptr),
|
||||
// item->hashes.hash1, item->hashes.hash2);
|
||||
//}
|
||||
}
|
||||
|
||||
/* we are doomed. hopefully the probability is lower than being killed
|
||||
by a wandering radioactive monkey */
|
||||
inthash_log_stats(hashtable);
|
||||
inthash_assert(hashtable, ! "hashtable internal error: cuckoo/stash collision");
|
||||
|
||||
/* not reachable code */
|
||||
return -1;
|
||||
}
|
||||
@@ -934,7 +996,7 @@ int inthash_write_value(inthash hashtable, const char *name,
|
||||
inthash_warning(hashtable,
|
||||
"stash size still full despite %"UINT_64_FORMAT
|
||||
" elements used out of %"UINT_64_FORMAT,
|
||||
hashtable->used, half_size*2);
|
||||
(uint64_t) hashtable->used, (uint64_t) half_size*2);
|
||||
}
|
||||
|
||||
/* statistics */
|
||||
@@ -1235,9 +1297,13 @@ inthash inthash_new(size_t initial_size) {
|
||||
hashtable->custom.key.hash = NULL;
|
||||
hashtable->custom.key.equals = NULL;
|
||||
hashtable->custom.key.arg = NULL;
|
||||
hashtable->custom.error.log = NULL;
|
||||
hashtable->custom.error.fatal = NULL;
|
||||
hashtable->custom.error.name = NULL;
|
||||
hashtable->custom.error.arg = NULL;
|
||||
hashtable->custom.print.key = NULL;
|
||||
hashtable->custom.print.value = NULL;
|
||||
hashtable->custom.print.arg = NULL;
|
||||
}
|
||||
return hashtable;
|
||||
}
|
||||
@@ -1288,12 +1354,20 @@ void inthash_set_assert_handler(inthash hashtable,
|
||||
t_inthash_loghandler log,
|
||||
t_inthash_asserthandler fatal,
|
||||
void *arg) {
|
||||
inthash_assert(hashtable, fatal != NULL);
|
||||
hashtable->custom.error.log = log;
|
||||
hashtable->custom.error.fatal = fatal;
|
||||
hashtable->custom.error.arg = arg;
|
||||
}
|
||||
|
||||
void inthash_set_print_handler(inthash hashtable,
|
||||
t_inthash_printkeyhandler key,
|
||||
t_inthash_printvaluehandler value,
|
||||
void *arg) {
|
||||
hashtable->custom.print.key = key;
|
||||
hashtable->custom.print.value = value;
|
||||
hashtable->custom.print.arg = arg;
|
||||
}
|
||||
|
||||
size_t inthash_nitems(inthash hashtable) {
|
||||
if (hashtable != NULL)
|
||||
return hashtable->used;
|
||||
|
||||
@@ -67,6 +67,7 @@ typedef unsigned __int64 uint64_t;
|
||||
#else
|
||||
#include <stdint.h>
|
||||
#endif
|
||||
#include <stdarg.h>
|
||||
|
||||
/** Value. **/
|
||||
typedef union inthash_value {
|
||||
@@ -140,6 +141,12 @@ typedef void (*t_inthash_loghandler)(void *arg, inthash_loglevel level,
|
||||
/** Hashtable fatal assertion failure. **/
|
||||
typedef void (*t_inthash_asserthandler)(void *arg, const char* exp, const char* file, int line);
|
||||
|
||||
/** Key printer (debug) **/
|
||||
typedef const char* (*t_inthash_printkeyhandler)(void *arg, const char *name);
|
||||
|
||||
/** Value printer (debug) **/
|
||||
typedef const char* (*t_inthash_printvaluehandler)(void *arg, void *value);
|
||||
|
||||
/**
|
||||
* Value comparison handler (returns non-zero value if strings are equal).
|
||||
**/
|
||||
@@ -166,6 +173,10 @@ struct struct_inthash_enum {
|
||||
/* Library internal definictions */
|
||||
#ifdef HTS_INTERNAL_BYTECODE
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Create a new hashtable, with initial bucket size of 'size'.
|
||||
* If size is 0, use the default minimal bucket size.
|
||||
@@ -240,6 +251,18 @@ void inthash_set_assert_handler(inthash hashtable,
|
||||
t_inthash_asserthandler fatal,
|
||||
void *arg);
|
||||
|
||||
/**
|
||||
* Set pretty print loggers (debug). Both handlers must return a string
|
||||
* pointer which shall be valid until the next call. Both key and value
|
||||
* pointers shall be valid at the same time.
|
||||
* name: handler called to print the string representation of the name
|
||||
* value: handler called to print the string representation of the value
|
||||
**/
|
||||
void inthash_set_print_handler(inthash hashtable,
|
||||
t_inthash_printkeyhandler key,
|
||||
t_inthash_printvaluehandler value,
|
||||
void *arg);
|
||||
|
||||
/**
|
||||
* Set the hashtable name, for degugging purpose.
|
||||
* name: the hashtable name (ASCII or UTF-8)
|
||||
@@ -358,6 +381,10 @@ inthash_keys inthash_hash_value(const char *value);
|
||||
void inthash_set_global_assert_handler(t_inthash_loghandler log,
|
||||
t_inthash_asserthandler fatal);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
@@ -493,8 +493,9 @@ static char *printname(char rname[1024], char name[1024]) {
|
||||
|
||||
p = &name[0];
|
||||
|
||||
if (*p != '[')
|
||||
return "";
|
||||
if (*p != '[') {
|
||||
return rname; // ""
|
||||
}
|
||||
p += 2;
|
||||
//rname=(char*)calloct(strlen(name)+8,sizeof(char));
|
||||
p1 = rname;
|
||||
@@ -504,13 +505,13 @@ static char *printname(char rname[1024], char name[1024]) {
|
||||
if (*p == ';') {
|
||||
*p1 = '\0';
|
||||
strcat(rname, ".class");
|
||||
return (rname);
|
||||
return rname;
|
||||
} else
|
||||
*p1 = *p;
|
||||
p1++;
|
||||
}
|
||||
p1 -= 3;
|
||||
*p1 = '\0';
|
||||
return (rname);
|
||||
return rname;
|
||||
|
||||
}
|
||||
|
||||
540
src/htslib.c
540
src/htslib.c
@@ -62,6 +62,7 @@ Please visit our Website: http://www.httrack.com
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
#endif /* _WIN32 */
|
||||
#include <stdarg.h>
|
||||
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
@@ -83,6 +84,13 @@ static long int timezone = 0;
|
||||
#include <sys/stat.h>
|
||||
/* END specific definitions */
|
||||
|
||||
/* Windows might be missing va_copy */
|
||||
#ifdef _WIN32
|
||||
#ifndef va_copy
|
||||
#define va_copy(dst, src) ((dst) = (src))
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// Debugging
|
||||
#if _HTS_WIDE
|
||||
FILE *DEBUG_fp = NULL;
|
||||
@@ -601,7 +609,7 @@ void hts_init_htsblk(htsblk * r) {
|
||||
|
||||
// ouvre une liaison http, envoie une requète GET et réceptionne le header
|
||||
// retour: socket
|
||||
T_SOC http_fopen(httrackp * opt, char *adr, char *fil, htsblk * retour) {
|
||||
T_SOC http_fopen(httrackp * opt, const char *adr, const char *fil, htsblk * retour) {
|
||||
// / GET, traiter en-tête
|
||||
return http_xfopen(opt, 0, 1, 1, NULL, adr, fil, retour);
|
||||
}
|
||||
@@ -612,10 +620,11 @@ T_SOC http_fopen(httrackp * opt, char *adr, char *fil, htsblk * retour) {
|
||||
// waitconnect: attendre le connect()
|
||||
// note: dans retour, on met les params du proxy
|
||||
T_SOC http_xfopen(httrackp * opt, int mode, int treat, int waitconnect,
|
||||
char *xsend, char *adr, char *fil, htsblk * retour) {
|
||||
const char *xsend, const char *adr, const char *fil, htsblk * retour) {
|
||||
//htsblk retour;
|
||||
//int bufl=TAILLE_BUFFER; // 8Ko de buffer
|
||||
T_SOC soc = INVALID_SOCKET;
|
||||
char BIGSTK tempo_fil[HTS_URLMAXSIZE * 2];
|
||||
|
||||
//char *p,*q;
|
||||
|
||||
@@ -691,10 +700,8 @@ T_SOC http_xfopen(httrackp * opt, int mode, int treat, int waitconnect,
|
||||
(fconv
|
||||
(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
|
||||
unescape_http(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt), fil + 1)))) {
|
||||
char BIGSTK tempo[HTS_URLMAXSIZE * 2];
|
||||
|
||||
strcpybuff(tempo, fil + 1);
|
||||
strcpybuff(fil, tempo);
|
||||
strcpybuff(tempo_fil, fil + 1);
|
||||
fil = tempo_fil;
|
||||
}
|
||||
// Ouvrir
|
||||
retour->totalsize = fsize(fconv(OPT_GET_BUFF(opt), OPT_GET_BUFF_SIZE(opt),
|
||||
@@ -837,15 +844,16 @@ static void print_buffer(buff_struct*const str, const char *format, ...) {
|
||||
}
|
||||
|
||||
// envoi d'une requète
|
||||
int http_sendhead(httrackp * opt, t_cookie * cookie, int mode, char *xsend,
|
||||
char *adr, char *fil, char *referer_adr, char *referer_fil,
|
||||
int http_sendhead(httrackp * opt, t_cookie * cookie, int mode,
|
||||
const char *xsend, const char *adr, const char *fil,
|
||||
const char *referer_adr, const char *referer_fil,
|
||||
htsblk * retour) {
|
||||
char BIGSTK buffer_head_request[8192];
|
||||
buff_struct bstr = { buffer_head_request, sizeof(buffer_head_request), 0 };
|
||||
|
||||
//int use_11=0; // HTTP 1.1 utilisé
|
||||
int direct_url = 0; // ne pas analyser l'url (exemple: ftp://)
|
||||
char *search_tag = NULL;
|
||||
const char *search_tag = NULL;
|
||||
|
||||
// Initialize buffer
|
||||
buffer_head_request[0] = '\0';
|
||||
@@ -1046,7 +1054,7 @@ int http_sendhead(httrackp * opt, t_cookie * cookie, int mode, char *xsend,
|
||||
}
|
||||
|
||||
{
|
||||
char *real_adr = jump_identification(adr);
|
||||
const char *real_adr = jump_identification(adr);
|
||||
|
||||
// Mandatory per RFC2616
|
||||
if (!direct_url) { // pas ftp:// par exemple
|
||||
@@ -1091,12 +1099,12 @@ int http_sendhead(httrackp * opt, t_cookie * cookie, int mode, char *xsend,
|
||||
/* Authentification */
|
||||
{
|
||||
char autorisation[1100];
|
||||
char *a;
|
||||
const char *a;
|
||||
|
||||
autorisation[0] = '\0';
|
||||
if (link_has_authorization(adr)) { // ohh une authentification!
|
||||
char *a = jump_identification(adr);
|
||||
char *astart = jump_protocol(adr);
|
||||
const char *a = jump_identification(adr);
|
||||
const char *astart = jump_protocol(adr);
|
||||
|
||||
if (!direct_url) { // pas ftp:// par exemple
|
||||
char user_pass[256];
|
||||
@@ -1176,8 +1184,8 @@ int http_sendhead(httrackp * opt, t_cookie * cookie, int mode, char *xsend,
|
||||
}
|
||||
|
||||
// traiter 1ere ligne d'en tête
|
||||
void treatfirstline(htsblk * retour, char *rcvd) {
|
||||
char *a = rcvd;
|
||||
void treatfirstline(htsblk * retour, const char *rcvd) {
|
||||
const char *a = rcvd;
|
||||
|
||||
// exemple:
|
||||
// HTTP/1.0 200 OK
|
||||
@@ -1247,7 +1255,7 @@ void treatfirstline(htsblk * retour, char *rcvd) {
|
||||
|
||||
// traiter ligne par ligne l'en tête
|
||||
// gestion des cookies
|
||||
void treathead(t_cookie * cookie, char *adr, char *fil, htsblk * retour,
|
||||
void treathead(t_cookie * cookie, const char *adr, const char *fil, htsblk * retour,
|
||||
char *rcvd) {
|
||||
int p;
|
||||
|
||||
@@ -1380,7 +1388,7 @@ void treathead(t_cookie * cookie, char *adr, char *fil, htsblk * retour,
|
||||
}
|
||||
} else if ((p = strfield(rcvd, "Content-Range:")) != 0) {
|
||||
// Content-Range: bytes 0-70870/70871
|
||||
char *a;
|
||||
const char *a;
|
||||
|
||||
for(a = rcvd + p; is_space(*a); a++) ;
|
||||
if (strncasecmp(a, "bytes ", 6) == 0) {
|
||||
@@ -1976,42 +1984,12 @@ LLint http_xfread1(htsblk * r, int bufl) {
|
||||
}
|
||||
}
|
||||
|
||||
// teste une adresse, et suit l'éventuel chemin "moved"
|
||||
// retourne 200 ou le code d'erreur (404=NOT FOUND, etc)
|
||||
// copie dans loc la véritable adresse si celle-ci est différente
|
||||
htsblk http_location(httrackp * opt, char *adr, char *fil, char *loc) {
|
||||
htsblk retour;
|
||||
int retry = 0;
|
||||
int tryagain;
|
||||
|
||||
// note: "RFC says"
|
||||
// 5 boucles au plus, on en teste au plus 8 ici
|
||||
// sinon abandon..
|
||||
do {
|
||||
tryagain = 0;
|
||||
switch ((retour = http_test(opt, adr, fil, loc)).statuscode) {
|
||||
case HTTP_OK:
|
||||
break; // ok!
|
||||
case HTTP_MOVED_PERMANENTLY:
|
||||
case HTTP_FOUND:
|
||||
case HTTP_SEE_OTHER:
|
||||
case HTTP_TEMPORARY_REDIRECT: // moved!
|
||||
// recalculer adr et fil!
|
||||
if (ident_url_absolute(loc, adr, fil) != -1) {
|
||||
tryagain = 1; // retenter
|
||||
retry++; // ..encore une fois
|
||||
}
|
||||
}
|
||||
} while((tryagain) && (retry < 5 + 3));
|
||||
return retour;
|
||||
}
|
||||
|
||||
// teste si une URL (validité, header, taille)
|
||||
// retourne 200 ou le code d'erreur (404=NOT FOUND, etc)
|
||||
// en cas de moved xx, dans location
|
||||
// abandonne désormais au bout de 30 secondes (aurevoir les sites
|
||||
// qui nous font poireauter 5 heures..) -> -2=timeout
|
||||
htsblk http_test(httrackp * opt, char *adr, char *fil, char *loc) {
|
||||
htsblk http_test(httrackp * opt, const char *adr, const char *fil, char *loc) {
|
||||
T_SOC soc;
|
||||
htsblk retour;
|
||||
|
||||
@@ -2118,27 +2096,16 @@ htsblk http_test(httrackp * opt, char *adr, char *fil, char *loc) {
|
||||
// peut ouvrir avec des connect() non bloquants: waitconnect=0/1
|
||||
T_SOC newhttp(httrackp * opt, const char *_iadr, htsblk * retour, int port,
|
||||
int waitconnect) {
|
||||
t_fullhostent fullhostent_buffer; // buffer pour resolver
|
||||
T_SOC soc; // descipteur de la socket
|
||||
char *iadr;
|
||||
|
||||
// unsigned short int port;
|
||||
|
||||
// si iadr="#" alors c'est une fausse URL, mais un vrai fichier
|
||||
// local.
|
||||
// utile pour les tests!
|
||||
//## if (iadr[0]!=lOCAL_CHAR) {
|
||||
if (strcmp(_iadr, "file://") != 0) { /* non fichier */
|
||||
SOCaddr server;
|
||||
int server_size = sizeof(server);
|
||||
t_hostent *hp;
|
||||
const char *error = "unknown error";
|
||||
|
||||
// effacer structure
|
||||
memset(&server, 0, sizeof(server));
|
||||
|
||||
// tester un éventuel id:pass et virer id:pass@ si détecté
|
||||
iadr = jump_identification(_iadr);
|
||||
const char *const iadr = jump_identification(_iadr);
|
||||
|
||||
SOCaddr_clear(server);
|
||||
|
||||
#if HDEBUG
|
||||
printf("gethostbyname\n");
|
||||
@@ -2156,7 +2123,8 @@ T_SOC newhttp(httrackp * opt, const char *_iadr, htsblk * retour, int port,
|
||||
#else
|
||||
port = 80; // port par défaut
|
||||
#endif
|
||||
if (a) {
|
||||
|
||||
if (a != NULL) {
|
||||
char BIGSTK iadr2[HTS_URLMAXSIZE * 2];
|
||||
int i = -1;
|
||||
|
||||
@@ -2165,25 +2133,24 @@ T_SOC newhttp(httrackp * opt, const char *_iadr, htsblk * retour, int port,
|
||||
if (i != -1) {
|
||||
port = (unsigned short int) i;
|
||||
}
|
||||
|
||||
// adresse véritable (sans :xx)
|
||||
strncatbuff(iadr2, iadr, (int) (a - iadr));
|
||||
|
||||
// adresse sans le :xx
|
||||
hp = hts_gethostbyname2(opt, iadr2, &fullhostent_buffer, &error);
|
||||
hts_dns_resolve2(opt, iadr2, &server, &error);
|
||||
|
||||
} else {
|
||||
|
||||
// adresse normale (port par défaut par la suite)
|
||||
hp = hts_gethostbyname2(opt, iadr, &fullhostent_buffer, &error);
|
||||
hts_dns_resolve2(opt, iadr, &server, &error);
|
||||
}
|
||||
|
||||
} else // port défini
|
||||
hp = hts_gethostbyname2(opt, iadr, &fullhostent_buffer, &error);
|
||||
} else { // port défini
|
||||
hts_dns_resolve2(opt, iadr, &server, &error);
|
||||
}
|
||||
|
||||
// Conversion iadr -> adresse
|
||||
// structure recevant le nom de l'hôte, etc
|
||||
//struct hostent *hp;
|
||||
if (hp == NULL) {
|
||||
if (!SOCaddr_is_valid(server)) {
|
||||
#if DEBUG
|
||||
printf("erreur gethostbyname\n");
|
||||
#endif
|
||||
@@ -2198,13 +2165,10 @@ T_SOC newhttp(httrackp * opt, const char *_iadr, htsblk * retour, int port,
|
||||
}
|
||||
return INVALID_SOCKET;
|
||||
}
|
||||
// copie adresse
|
||||
SOCaddr_copyaddr(server, server_size, hp->h_addr_list[0], hp->h_length);
|
||||
|
||||
// make a copy for external clients
|
||||
retour->address_size = sizeof(retour->address);
|
||||
SOCaddr_copyaddr(retour->address, retour->address_size, hp->h_addr_list[0],
|
||||
hp->h_length);
|
||||
// memcpy(&SOCaddr_sinaddr(server), hp->h_addr_list[0], hp->h_length);
|
||||
SOCaddr_copy_SOCaddr(retour->address, server);
|
||||
retour->address_size = SOCaddr_size(retour->address);
|
||||
|
||||
// créer ("attachement") une socket (point d'accès) internet,en flot
|
||||
#if HDEBUG
|
||||
@@ -2238,14 +2202,13 @@ T_SOC newhttp(httrackp * opt, const char *_iadr, htsblk * retour, int port,
|
||||
}
|
||||
// bind this address
|
||||
if (retour != NULL && strnotempty(retour->req.proxy.bindhost)) {
|
||||
t_fullhostent bind_buffer;
|
||||
const char *error = "unknown error";
|
||||
SOCaddr bind_addr;
|
||||
|
||||
hp = hts_gethostbyname2(opt, retour->req.proxy.bindhost, &bind_buffer,
|
||||
&error);
|
||||
if (hp == NULL
|
||||
|| bind(soc, (struct sockaddr *) hp->h_addr_list[0],
|
||||
hp->h_length) != 0) {
|
||||
if (hts_dns_resolve2(opt, retour->req.proxy.bindhost,
|
||||
&bind_addr, &error) == NULL
|
||||
|| bind(soc, &SOCaddr_sockaddr(bind_addr),
|
||||
SOCaddr_size(bind_addr)) != 0) {
|
||||
if (retour && retour->msg) {
|
||||
#ifdef _WIN32
|
||||
snprintf(retour->msg, sizeof(retour->msg),
|
||||
@@ -2297,25 +2260,20 @@ T_SOC newhttp(httrackp * opt, const char *_iadr, htsblk * retour, int port,
|
||||
#if HTS_WIDE_DEBUG
|
||||
DEBUG_W("connect\n");
|
||||
#endif
|
||||
#ifdef _WIN32
|
||||
if (connect(soc, (const struct sockaddr FAR *) &server, server_size) != 0) {
|
||||
#else
|
||||
if (connect(soc, (struct sockaddr *) &server, server_size) == -1) {
|
||||
#endif
|
||||
|
||||
if (connect(soc, &SOCaddr_sockaddr(server), SOCaddr_size(server)) != 0) {
|
||||
// bloquant
|
||||
if (waitconnect) {
|
||||
#if HDEBUG
|
||||
printf("unable to connect!\n");
|
||||
#endif
|
||||
if (retour && retour->msg) {
|
||||
if (retour != NULL && retour->msg) {
|
||||
#ifdef _WIN32
|
||||
int last_errno = WSAGetLastError();
|
||||
const int last_errno = WSAGetLastError();
|
||||
|
||||
sprintf(retour->msg, "Unable to connect to the server: %s",
|
||||
strerror(last_errno));
|
||||
#else
|
||||
int last_errno = errno;
|
||||
const int last_errno = errno;
|
||||
|
||||
sprintf(retour->msg, "Unable to connect to the server: %s",
|
||||
strerror(last_errno));
|
||||
@@ -2352,12 +2310,12 @@ T_SOC newhttp(httrackp * opt, const char *_iadr, htsblk * retour, int port,
|
||||
// couper http://www.truc.fr/pub/index.html -> www.truc.fr /pub/index.html
|
||||
// retour=-1 si erreur.
|
||||
// si file://... alors adresse=file:// (et coupe le ?query dans ce cas)
|
||||
int ident_url_absolute(const char *url, char *adr, char *fil) {
|
||||
int ident_url_absolute(const char *url, lien_adrfil *adrfil) {
|
||||
int pos = 0;
|
||||
int scheme = 0;
|
||||
|
||||
// effacer adr et fil
|
||||
adr[0] = fil[0] = '\0';
|
||||
// effacer adrfil->adr et adrfil->fil
|
||||
adrfil->adr[0] = adrfil->fil[0] = '\0';
|
||||
|
||||
#if HDEBUG
|
||||
printf("protocol: %s\n", url);
|
||||
@@ -2376,15 +2334,15 @@ int ident_url_absolute(const char *url, char *adr, char *fil) {
|
||||
// 1. optional scheme ":"
|
||||
if ((pos = strfield(url, "file:"))) { // fichier local!! (pour les tests)
|
||||
//!!p+=3;
|
||||
strcpybuff(adr, "file://");
|
||||
strcpybuff(adrfil->adr, "file://");
|
||||
} else if ((pos = strfield(url, "http:"))) { // HTTP
|
||||
//!!p+=3;
|
||||
} else if ((pos = strfield(url, "ftp:"))) { // FTP
|
||||
strcpybuff(adr, "ftp://"); // FTP!!
|
||||
strcpybuff(adrfil->adr, "ftp://"); // FTP!!
|
||||
//!!p+=3;
|
||||
#if HTS_USEOPENSSL
|
||||
} else if ((pos = strfield(url, "https:"))) { // HTTPS
|
||||
strcpybuff(adr, "https://");
|
||||
strcpybuff(adrfil->adr, "https://");
|
||||
#endif
|
||||
} else if (scheme) {
|
||||
return -1; // erreur non reconnu
|
||||
@@ -2397,13 +2355,13 @@ int ident_url_absolute(const char *url, char *adr, char *fil) {
|
||||
|
||||
// (url+pos) now points to the path (not net path)
|
||||
|
||||
//## if (adr[0]!=lOCAL_CHAR) { // adresse normale http
|
||||
if (!strfield(adr, "file:")) { // PAS file://
|
||||
//## if (adrfil->adr[0]!=lOCAL_CHAR) { // adrfil->adresse normale http
|
||||
if (!strfield(adrfil->adr, "file:")) { // PAS adrfil->file://
|
||||
const char *p, *q;
|
||||
|
||||
p = url + pos;
|
||||
|
||||
// p pointe sur le début de l'adresse, ex: www.truc.fr/sommaire/index.html
|
||||
// p pointe sur le début de l'adrfil->adresse, ex: www.truc.fr/sommaire/index.html
|
||||
q = strchr(jump_identification(p), '/');
|
||||
if (q == 0)
|
||||
q = strchr(jump_identification(p), '?'); // http://www.foo.com?bar=1
|
||||
@@ -2416,53 +2374,53 @@ int ident_url_absolute(const char *url, char *adr, char *fil) {
|
||||
//strcpybuff(retour.msg,"Path too long");
|
||||
return -1; // erreur
|
||||
}
|
||||
// recopier adresse www..
|
||||
strncatbuff(adr, p, ((int) (q - p)));
|
||||
// *( adr+( ((int) q) - ((int) p) ) )=0; // faut arrêter la fumette!
|
||||
// recopier adrfil->adresse www..
|
||||
strncatbuff(adrfil->adr, p, ((int) (q - p)));
|
||||
// *( adrfil->adr+( ((int) q) - ((int) p) ) )=0; // faut arrêter la fumette!
|
||||
// recopier chemin /pub/..
|
||||
if (q[0] != '/') // page par défaut (/)
|
||||
strcatbuff(fil, "/");
|
||||
strcatbuff(fil, q);
|
||||
strcatbuff(adrfil->fil, "/");
|
||||
strcatbuff(adrfil->fil, q);
|
||||
// SECURITE:
|
||||
// simplifier url pour les ../
|
||||
fil_simplifie(fil);
|
||||
} else { // localhost file://
|
||||
fil_simplifie(adrfil->fil);
|
||||
} else { // localhost adrfil->file://
|
||||
const char *p;
|
||||
size_t i;
|
||||
char *a;
|
||||
|
||||
p = url + pos;
|
||||
if (*p == '/' || *p == '\\') { /* file:///.. */
|
||||
strcatbuff(fil, p); // fichier local ; adr="#"
|
||||
if (*p == '/' || *p == '\\') { /* adrfil->file:///.. */
|
||||
strcatbuff(adrfil->fil, p); // fichier local ; adrfil->adr="#"
|
||||
} else {
|
||||
if (p[1] != ':') {
|
||||
strcatbuff(fil, "//"); /* file://server/foo */
|
||||
strcatbuff(fil, p);
|
||||
strcatbuff(adrfil->fil, "//"); /* adrfil->file://server/foo */
|
||||
strcatbuff(adrfil->fil, p);
|
||||
} else {
|
||||
strcatbuff(fil, p); // file://C:\..
|
||||
strcatbuff(adrfil->fil, p); // adrfil->file://C:\..
|
||||
}
|
||||
}
|
||||
|
||||
a = strchr(fil, '?');
|
||||
a = strchr(adrfil->fil, '?');
|
||||
if (a)
|
||||
*a = '\0'; /* couper query (inutile pour file:// lors de la requête) */
|
||||
// filtrer les \\ -> / pour les fichiers DOS
|
||||
for(i = 0; fil[i] != '\0'; i++)
|
||||
if (fil[i] == '\\')
|
||||
fil[i] = '/';
|
||||
*a = '\0'; /* couper query (inutile pour adrfil->file:// lors de la requête) */
|
||||
// adrfil->filtrer les \\ -> / pour les fichiers DOS
|
||||
for(i = 0; adrfil->fil[i] != '\0'; i++)
|
||||
if (adrfil->fil[i] == '\\')
|
||||
adrfil->fil[i] = '/';
|
||||
}
|
||||
|
||||
// no hostname
|
||||
if (!strnotempty(adr))
|
||||
if (!strnotempty(adrfil->adr))
|
||||
return -1; // erreur non reconnu
|
||||
|
||||
// nommer au besoin.. (non utilisé normalement)
|
||||
if (!strnotempty(fil))
|
||||
strcpybuff(fil, "default-index.html");
|
||||
if (!strnotempty(adrfil->fil))
|
||||
strcpybuff(adrfil->fil, "default-index.html");
|
||||
|
||||
// case insensitive pour adresse
|
||||
// case insensitive pour adrfil->adresse
|
||||
{
|
||||
char *a = jump_identification(adr);
|
||||
char *a = jump_identification(adrfil->adr);
|
||||
|
||||
while(*a) {
|
||||
if ((*a >= 'A') && (*a <= 'Z'))
|
||||
@@ -2983,13 +2941,13 @@ int sendc(htsblk * r, const char *s) {
|
||||
}
|
||||
|
||||
// Remplace read
|
||||
int finput(int fd, char *s, int max) {
|
||||
int finput(T_SOC fd, char *s, int max) {
|
||||
char c;
|
||||
int j = 0;
|
||||
|
||||
do {
|
||||
//c=fgetc(fp);
|
||||
if (read(fd, &c, 1) <= 0) {
|
||||
if (read((int) fd, &c, 1) <= 0) {
|
||||
c = 0;
|
||||
}
|
||||
if (c != 0) {
|
||||
@@ -3093,7 +3051,7 @@ int linputsoc_t(T_SOC soc, char *s, int max, int timeout) {
|
||||
}
|
||||
int linput_trim(FILE * fp, char *s, int max) {
|
||||
int rlen = 0;
|
||||
char *ls = (char *) malloct(max + 2);
|
||||
char *ls = (char *) malloct(max + 1);
|
||||
|
||||
s[0] = '\0';
|
||||
if (ls) {
|
||||
@@ -3165,8 +3123,8 @@ void rawlinput(FILE * fp, char *s, int max) {
|
||||
}
|
||||
|
||||
//cherche chaine, case insensitive
|
||||
char *strstrcase(char *s, char *o) {
|
||||
while((*s) && (strfield(s, o) == 0))
|
||||
char *strstrcase(char *s, const char *o) {
|
||||
while(*s && strfield(s, o) == 0)
|
||||
s++;
|
||||
if (*s == '\0')
|
||||
return NULL;
|
||||
@@ -4289,7 +4247,7 @@ int may_unknown2(httrackp * opt, const char *mime, const char *filename) {
|
||||
// -- Utils fichiers
|
||||
|
||||
// pretty print for i/o
|
||||
void fprintfio(FILE * fp, char *buff, char *prefix) {
|
||||
void fprintfio(FILE * fp, const char *buff, const char *prefix) {
|
||||
char nl = 1;
|
||||
|
||||
while(*buff) {
|
||||
@@ -4404,15 +4362,17 @@ typedef struct {
|
||||
char path[1024 + 4];
|
||||
int init;
|
||||
} hts_rootdir_strc;
|
||||
HTSEXT_API char *hts_rootdir(char *file) {
|
||||
HTSEXT_API const char *hts_rootdir(char *file) {
|
||||
static hts_rootdir_strc strc = { "", 0 };
|
||||
if (file) {
|
||||
if (!strc.init) {
|
||||
strc.path[0] = '\0';
|
||||
strc.init = 1;
|
||||
if (strnotempty(file)) {
|
||||
const size_t file_len = strlen(file);
|
||||
char *a;
|
||||
|
||||
assertf(file_len < sizeof(strc.path));
|
||||
strcpybuff(strc.path, file);
|
||||
while((a = strrchr(strc.path, '\\')))
|
||||
*a = '/';
|
||||
@@ -4422,7 +4382,7 @@ HTSEXT_API char *hts_rootdir(char *file) {
|
||||
strc.path[0] = '\0';
|
||||
}
|
||||
if (!strnotempty(strc.path)) {
|
||||
if (getcwd(strc.path, 1024) == NULL)
|
||||
if (getcwd(strc.path, sizeof(strc.path)) == NULL)
|
||||
strc.path[0] = '\0';
|
||||
else
|
||||
strcatbuff(strc.path, "/");
|
||||
@@ -4558,7 +4518,6 @@ int hts_read(htsblk * r, char *buff, int size) {
|
||||
|
||||
// -- Gestion cache DNS --
|
||||
// 'RX98
|
||||
#if HTS_DNSCACHE
|
||||
|
||||
// 'capsule' contenant uniquement le cache
|
||||
t_dnscache *_hts_cache(httrackp * opt) {
|
||||
@@ -4592,63 +4551,47 @@ void hts_cache_free(t_dnscache *const root) {
|
||||
// routine pour le cache - retour optionnel à donner à chaque fois
|
||||
// NULL: nom non encore testé dans le cache
|
||||
// si h_length==0 alors le nom n'existe pas dans le dns
|
||||
static t_hostent *hts_ghbn(const t_dnscache *cache, const char *const iadr, t_hostent *retour) {
|
||||
static SOCaddr* hts_ghbn(const t_dnscache *cache, const char *const iadr, SOCaddr *const addr) {
|
||||
assertf(addr != NULL);
|
||||
for(; cache != NULL; cache = cache->n) {
|
||||
assertf(cache != NULL);
|
||||
assertf(iadr != NULL);
|
||||
if (cache->iadr != NULL && strcmp(cache->iadr, iadr) == 0) { // ok trouvé
|
||||
if (cache->host_length > 0) { // entrée valide
|
||||
if (retour->h_addr_list[0])
|
||||
memcpy(retour->h_addr_list[0], cache->host_addr, cache->host_length);
|
||||
retour->h_length = cache->host_length;
|
||||
SOCaddr_copyaddr2(*addr, cache->host_addr, cache->host_length);
|
||||
return addr;
|
||||
} else if (cache->host_length == 0) { // en cours
|
||||
return NULL;
|
||||
} else { // erreur dans le dns, déja vérifié
|
||||
if (retour->h_addr_list[0])
|
||||
retour->h_addr_list[0][0] = '\0';
|
||||
retour->h_length = 0; // erreur, n'existe pas
|
||||
SOCaddr_clear(*addr);
|
||||
return addr;
|
||||
}
|
||||
return retour;
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static t_hostent *vxgethostbyname2_(const char *const hostname,
|
||||
void *const v_buffer, const char **error) {
|
||||
t_fullhostent *buffer = (t_fullhostent *) v_buffer;
|
||||
|
||||
/* Clear */
|
||||
fullhostent_init(buffer);
|
||||
|
||||
static SOCaddr* hts_dns_resolve_nocache2_(const char *const hostname,
|
||||
SOCaddr *const addr,
|
||||
const char **error) {
|
||||
{
|
||||
#if HTS_INET6==0
|
||||
/*
|
||||
ipV4 resolver
|
||||
*/
|
||||
t_hostent *hp = gethostbyname(hostname);
|
||||
/* IPv4 resolver */
|
||||
struct hostent *const hp = gethostbyname(hostname);
|
||||
|
||||
if (hp != NULL) {
|
||||
if ((hp->h_length)
|
||||
&& (((unsigned int) hp->h_length) <= buffer->addr_maxlen)) {
|
||||
memcpy(buffer->hp.h_addr_list[0], hp->h_addr_list[0], hp->h_length);
|
||||
buffer->hp.h_length = hp->h_length;
|
||||
return &(buffer->hp);
|
||||
}
|
||||
SOCaddr_copyaddr2(addr, hp->h_addr_list[0], hp->h_length);
|
||||
return SOCaddr_is_valid(addr) ? &addr : NULL;
|
||||
} else {
|
||||
SOCaddr_clear(*addr);
|
||||
}
|
||||
#else
|
||||
/*
|
||||
ipV6 resolver
|
||||
*/
|
||||
/*
|
||||
int error_num=0;
|
||||
t_hostent* hp=getipnodebyname(hostname, AF_INET6, AI_DEFAULT, &error_num);
|
||||
oops, deprecated :(
|
||||
*/
|
||||
/* IPv6 resolver */
|
||||
struct addrinfo *res = NULL;
|
||||
struct addrinfo hints;
|
||||
int gerr;
|
||||
|
||||
SOCaddr_clear(*addr);
|
||||
memset(&hints, 0, sizeof(hints));
|
||||
if (IPV6_resolver == 1) // V4 only (for bogus V6 entries)
|
||||
hints.ai_family = PF_INET;
|
||||
@@ -4659,13 +4602,9 @@ static t_hostent *vxgethostbyname2_(const char *const hostname,
|
||||
hints.ai_socktype = SOCK_STREAM;
|
||||
hints.ai_protocol = IPPROTO_TCP;
|
||||
if ( ( gerr = getaddrinfo(hostname, NULL, &hints, &res) ) == 0) {
|
||||
if (res) {
|
||||
if ((res->ai_addr) && (res->ai_addrlen)
|
||||
&& (res->ai_addrlen <= buffer->addr_maxlen)) {
|
||||
memcpy(buffer->hp.h_addr_list[0], res->ai_addr, res->ai_addrlen);
|
||||
buffer->hp.h_length = (short) res->ai_addrlen;
|
||||
freeaddrinfo(res);
|
||||
return &(buffer->hp);
|
||||
if (res != NULL) {
|
||||
if (res->ai_addr != NULL && res->ai_addrlen != 0) {
|
||||
SOCaddr_copyaddr2(*addr, res->ai_addr, res->ai_addrlen);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
@@ -4678,11 +4617,12 @@ static t_hostent *vxgethostbyname2_(const char *const hostname,
|
||||
}
|
||||
#endif
|
||||
}
|
||||
return NULL;
|
||||
|
||||
return SOCaddr_is_valid(*addr) ? addr : NULL;
|
||||
}
|
||||
|
||||
HTSEXT_API t_hostent *vxgethostbyname2(const char *const hostname,
|
||||
void *const v_buffer, const char **error) {
|
||||
HTSEXT_API SOCaddr* hts_dns_resolve_nocache2(const char *const hostname,
|
||||
SOCaddr *const addr, const char **error) {
|
||||
/* Protection */
|
||||
if (!strnotempty(hostname)) {
|
||||
return NULL;
|
||||
@@ -4693,43 +4633,40 @@ HTSEXT_API t_hostent *vxgethostbyname2(const char *const hostname,
|
||||
The resolver doesn't seem to handle IP6 addresses in brackets
|
||||
*/
|
||||
if ((hostname[0] == '[') && (hostname[strlen(hostname) - 1] == ']')) {
|
||||
t_hostent *ret;
|
||||
SOCaddr *ret;
|
||||
size_t size = strlen(hostname);
|
||||
char *copy = malloct(size + 1);
|
||||
assertf(copy != NULL);
|
||||
copy[0] = '\0';
|
||||
strncat(copy, hostname + 1, size - 2);
|
||||
ret = vxgethostbyname2_(copy, v_buffer, error);
|
||||
ret = hts_dns_resolve_nocache2_(copy, addr, error);
|
||||
freet(copy);
|
||||
return ret;
|
||||
} else {
|
||||
return vxgethostbyname2_(hostname, v_buffer, error);
|
||||
return hts_dns_resolve_nocache2_(hostname, addr, error);
|
||||
}
|
||||
}
|
||||
|
||||
HTSEXT_API t_hostent *vxgethostbyname(const char *const hostname, void *v_buffer) {
|
||||
return vxgethostbyname2(hostname, v_buffer, NULL);
|
||||
HTSEXT_API SOCaddr* hts_dns_resolve_nocache(const char *const hostname, SOCaddr *const addr) {
|
||||
return hts_dns_resolve_nocache2(hostname, addr, NULL);
|
||||
}
|
||||
|
||||
HTSEXT_API int check_hostname_dns(const char *const hostname) {
|
||||
t_fullhostent buffer;
|
||||
return vxgethostbyname(hostname, &buffer) != NULL;
|
||||
SOCaddr buffer;
|
||||
return hts_dns_resolve_nocache(hostname, &buffer) != NULL;
|
||||
}
|
||||
|
||||
// Needs locking
|
||||
// cache dns interne à HTS // ** FREE A FAIRE sur la chaine
|
||||
static t_hostent *hts_gethostbyname_(httrackp * opt, const char *_iadr, void *v_buffer, const char **error) {
|
||||
static SOCaddr* hts_dns_resolve_(httrackp * opt, const char *_iadr,
|
||||
SOCaddr *const addr, const char **error) {
|
||||
char BIGSTK iadr[HTS_URLMAXSIZE * 2];
|
||||
t_fullhostent *buffer = (t_fullhostent *) v_buffer;
|
||||
t_dnscache *cache = _hts_cache(opt); // adresse du cache
|
||||
t_hostent *hp;
|
||||
SOCaddr *sa;
|
||||
|
||||
assertf(opt != NULL);
|
||||
assertf(_iadr != NULL);
|
||||
assertf(v_buffer != NULL);
|
||||
|
||||
/* Clear */
|
||||
fullhostent_init(buffer);
|
||||
assertf(addr != NULL);
|
||||
|
||||
strcpybuff(iadr, jump_identification(_iadr));
|
||||
// couper éventuel :
|
||||
@@ -4741,92 +4678,56 @@ static t_hostent *hts_gethostbyname_(httrackp * opt, const char *_iadr, void *v_
|
||||
}
|
||||
|
||||
/* get IP from the dns cache */
|
||||
hp = hts_ghbn(cache, iadr, &buffer->hp);
|
||||
if (hp) {
|
||||
if (hp->h_length > 0)
|
||||
return hp;
|
||||
else
|
||||
return NULL; // entrée erronée (erreur DNS) dans le DNS
|
||||
sa = hts_ghbn(cache, iadr, addr);
|
||||
if (sa != NULL) {
|
||||
return SOCaddr_is_valid(*sa) ? sa : NULL;
|
||||
} else { // non présent dans le cache dns, tester
|
||||
// find queue
|
||||
for(; cache->n != NULL; cache = cache->n) ;
|
||||
|
||||
#if HTS_WIDE_DEBUG
|
||||
DEBUG_W("gethostbyname\n");
|
||||
#endif
|
||||
#if HDEBUG
|
||||
printf("gethostbyname (not in cache)\n");
|
||||
#endif
|
||||
{
|
||||
unsigned long inetaddr;
|
||||
|
||||
#ifdef _WIN32
|
||||
if ((inetaddr = inet_addr(iadr)) == INADDR_NONE) {
|
||||
#else
|
||||
if ((inetaddr = inet_addr(iadr)) == (in_addr_t) - 1) {
|
||||
#endif
|
||||
#if DEBUGDNS
|
||||
printf("resolving (not cached) %s\n", iadr);
|
||||
printf("resolving (not cached) %s\n", iadr);
|
||||
#endif
|
||||
hp = vxgethostbyname2(iadr, buffer, error); // calculer IP host
|
||||
} else { // numérique, convertir sans passer par le dns
|
||||
buffer->hp.h_addr_list[0] = (char *) &inetaddr;
|
||||
buffer->hp.h_length = 4;
|
||||
hp = &buffer->hp;
|
||||
}
|
||||
}
|
||||
|
||||
sa = hts_dns_resolve_nocache2(iadr, addr, error); // calculer IP host
|
||||
|
||||
#if HTS_WIDE_DEBUG
|
||||
DEBUG_W("gethostbyname done\n");
|
||||
#endif
|
||||
|
||||
/* attempt to store new entry */
|
||||
cache->n = (t_dnscache *) calloct(1, sizeof(t_dnscache));
|
||||
if (cache->n != NULL) {
|
||||
strcpybuff(cache->n->iadr, iadr);
|
||||
if (hp != NULL) {
|
||||
memcpy(cache->n->host_addr, hp->h_addr_list[0], hp->h_length);
|
||||
cache->n->host_length = hp->h_length;
|
||||
if (sa != NULL) {
|
||||
cache->n->host_length = SOCaddr_size(*sa);
|
||||
assertf(cache->n->host_length < sizeof(cache->n->host_addr));
|
||||
memcpy(cache->n->host_addr, &SOCaddr_sockaddr(*sa), cache->n->host_length);
|
||||
} else {
|
||||
cache->n->host_addr[0] = '\0';
|
||||
cache->n->host_length = 0; // non existant dans le dns
|
||||
}
|
||||
cache->n->n = NULL;
|
||||
return hp;
|
||||
} else { // on peut pas noter, mais on peut renvoyer le résultat
|
||||
return hp;
|
||||
return sa;
|
||||
}
|
||||
|
||||
/* return result if any */
|
||||
return sa;
|
||||
} // retour hp du cache
|
||||
}
|
||||
|
||||
t_hostent *hts_gethostbyname2(httrackp * opt, const char *_iadr, void *v_buffer, const char **error) {
|
||||
t_hostent *ret;
|
||||
SOCaddr* hts_dns_resolve2(httrackp * opt, const char *_iadr, SOCaddr *const addr, const char **error) {
|
||||
SOCaddr *ret;
|
||||
hts_mutexlock(&opt->state.lock);
|
||||
ret = hts_gethostbyname_(opt, _iadr, v_buffer, error);
|
||||
ret = hts_dns_resolve_(opt, _iadr, addr, error);
|
||||
hts_mutexrelease(&opt->state.lock);
|
||||
return ret;
|
||||
}
|
||||
|
||||
t_hostent *hts_gethostbyname(httrackp * opt, const char *_iadr, void *v_buffer) {
|
||||
return hts_gethostbyname2(opt ,_iadr, v_buffer, NULL);
|
||||
SOCaddr* hts_dns_resolve(httrackp * opt, const char *_iadr, SOCaddr *const addr) {
|
||||
return hts_dns_resolve2(opt, _iadr, addr, NULL);
|
||||
}
|
||||
|
||||
#else
|
||||
static HTS_INLINE t_hostent *hts_gethostbyname(httrackp * opt, char *iadr,
|
||||
t_fullhostent * buffer) {
|
||||
t_hostent *retour;
|
||||
|
||||
#if HTS_WIDE_DEBUG
|
||||
DEBUG_W("gethostbyname (2)\n");
|
||||
#endif
|
||||
#if DEBUGDNS
|
||||
printf("blocking method gethostbyname() in progress for %s\n", iadr);
|
||||
#endif
|
||||
retour = vxgethostbyname(jump_identification(iadr),);
|
||||
#if HTS_WIDE_DEBUG
|
||||
DEBUG_W("gethostbyname (2) done\n");
|
||||
#endif
|
||||
return retour;
|
||||
}
|
||||
#endif
|
||||
|
||||
// --- Tracage des mallocs() ---
|
||||
#ifdef HTS_TRACE_MALLOC
|
||||
//#define htsLocker(A, N) htsLocker(A, N)
|
||||
@@ -5112,6 +5013,17 @@ static int ssl_vulnerable(const char *version) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* user abort callback */
|
||||
htsErrorCallback htsCallbackErr = NULL;
|
||||
|
||||
HTSEXT_API void hts_set_error_callback(htsErrorCallback handler) {
|
||||
htsCallbackErr = handler;
|
||||
}
|
||||
|
||||
HTSEXT_API htsErrorCallback hts_get_error_callback() {
|
||||
return htsCallbackErr;
|
||||
}
|
||||
|
||||
static void default_inthash_asserthandler(void *arg, const char* exp, const char* file, int line) {
|
||||
abortf_(exp, file, line);
|
||||
}
|
||||
@@ -5278,8 +5190,21 @@ HTSEXT_API int hts_log(httrackp * opt, const char *prefix, const char *msg) {
|
||||
return 1; /* Error */
|
||||
}
|
||||
|
||||
static void (*hts_log_print_callback)(httrackp * opt, int type, const char *format, va_list args) = NULL;
|
||||
|
||||
HTSEXT_API void hts_set_log_vprint_callback(void (*callback)(httrackp * opt,
|
||||
int type, const char *format, va_list args)) {
|
||||
hts_log_print_callback = callback;
|
||||
}
|
||||
|
||||
HTSEXT_API void hts_log_vprint(httrackp * opt, int type, const char *format, va_list args) {
|
||||
assertf(format != NULL);
|
||||
if (hts_log_print_callback != NULL) {
|
||||
va_list args_copy;
|
||||
va_copy(args_copy, args);
|
||||
hts_log_print_callback(opt, type, format, args);
|
||||
va_end(args_copy);
|
||||
}
|
||||
if (opt != NULL && opt->log != NULL) {
|
||||
const int save_errno = errno;
|
||||
const char *s_type = "unknown";
|
||||
@@ -5325,13 +5250,11 @@ HTSEXT_API void hts_log_vprint(httrackp * opt, int type, const char *format, va_
|
||||
}
|
||||
|
||||
HTSEXT_API void hts_log_print(httrackp * opt, int type, const char *format, ...) {
|
||||
va_list args;
|
||||
assertf(format != NULL);
|
||||
if (opt != NULL && opt->log != NULL) {
|
||||
va_list args;
|
||||
va_start(args, format);
|
||||
hts_log_vprint(opt, type, format, args);
|
||||
va_end(args);
|
||||
}
|
||||
va_start(args, format);
|
||||
hts_log_vprint(opt, type, format, args);
|
||||
va_end(args);
|
||||
}
|
||||
|
||||
HTSEXT_API void set_wrappers(httrackp * opt) { // LEGACY
|
||||
@@ -5538,13 +5461,8 @@ HTSEXT_API httrackp *hts_create_opt(void) {
|
||||
StringCopy(opt->path_log, "");
|
||||
StringCopy(opt->path_bin, "");
|
||||
//
|
||||
#if HTS_SPARE_MEMORY==0
|
||||
opt->maxlink = 100000; // 100,000 liens max par défaut (400Kb)
|
||||
opt->maxlink = 100000; // 100,000 liens max par défaut
|
||||
opt->maxfilter = 200; // 200 filtres max par défaut
|
||||
#else
|
||||
opt->maxlink = 10000; // 10,000 liens max par défaut (40Kb)
|
||||
opt->maxfilter = 50; // 50 filtres max par défaut
|
||||
#endif
|
||||
opt->maxcache = 1048576 * 32; // a peu près 32Mo en cache max -- OPTION NON PARAMETRABLE POUR L'INSTANT --
|
||||
//opt->maxcache_anticipate=256; // maximum de liens à anticiper
|
||||
opt->maxtime = -1; // temps max en secondes
|
||||
@@ -5583,6 +5501,10 @@ HTSEXT_API httrackp *hts_create_opt(void) {
|
||||
return opt;
|
||||
}
|
||||
|
||||
HTSEXT_API size_t hts_sizeof_opt(void) {
|
||||
return sizeof(httrackp);
|
||||
}
|
||||
|
||||
HTSEXT_API void hts_free_opt(httrackp * opt) {
|
||||
if (opt != NULL) {
|
||||
|
||||
@@ -5835,68 +5757,56 @@ const t_hts_htmlcheck_callbacks default_callbacks = {
|
||||
{htsdefault_parse, NULL}
|
||||
};
|
||||
|
||||
#define CHARCAST(A) ( (char*) (A) )
|
||||
#define OFFSET_OF(TYPE, MEMBER) ( (size_t) ( CHARCAST(&(((TYPE*) NULL)->MEMBER)) - CHARCAST((TYPE*) NULL) ) )
|
||||
#define CALLBACK_REF(name, fun) \
|
||||
{ name, OFFSET_OF(t_hts_htmlcheck_callbacks, fun) }
|
||||
#define MEMBER_OF(STRUCT, OFFSET, TYPE) ( * ((TYPE*)((char*)(STRUCT) + (OFFSET))) )
|
||||
#define CALLBACK_OP(CB, NAME, OPERATION, S, FUN) do { \
|
||||
if (strcmp(NAME, S) == 0) { \
|
||||
OPERATION(t_hts_htmlcheck_ ##FUN, (CB)->FUN.fun); \
|
||||
} \
|
||||
} while(0)
|
||||
|
||||
const t_hts_callback_ref default_callbacks_ref[] = {
|
||||
CALLBACK_REF("init", init),
|
||||
CALLBACK_REF("free", uninit),
|
||||
CALLBACK_REF("start", start),
|
||||
CALLBACK_REF("end", end),
|
||||
CALLBACK_REF("change-options", chopt),
|
||||
CALLBACK_REF("preprocess-html", preprocess),
|
||||
CALLBACK_REF("postprocess-html", postprocess),
|
||||
CALLBACK_REF("check-html", check_html),
|
||||
CALLBACK_REF("query", query),
|
||||
CALLBACK_REF("query2", query2),
|
||||
CALLBACK_REF("query3", query3),
|
||||
CALLBACK_REF("loop", loop),
|
||||
CALLBACK_REF("check-link", check_link),
|
||||
CALLBACK_REF("check-mime", check_mime),
|
||||
CALLBACK_REF("pause", pause),
|
||||
CALLBACK_REF("save-file", filesave),
|
||||
CALLBACK_REF("save-file2", filesave2),
|
||||
CALLBACK_REF("link-detected", linkdetected),
|
||||
CALLBACK_REF("link-detected2", linkdetected2),
|
||||
CALLBACK_REF("transfer-status", xfrstatus),
|
||||
CALLBACK_REF("save-name", savename),
|
||||
CALLBACK_REF("send-header", sendhead),
|
||||
CALLBACK_REF("receive-header", receivehead),
|
||||
{NULL, 0}
|
||||
};
|
||||
|
||||
size_t hts_get_callback_offs(const char *name) {
|
||||
const t_hts_callback_ref *ref;
|
||||
|
||||
for(ref = &default_callbacks_ref[0]; ref->name != NULL; ref++) {
|
||||
if (strcmp(name, ref->name) == 0) {
|
||||
return ref->offset;
|
||||
}
|
||||
}
|
||||
return (size_t) (-1);
|
||||
}
|
||||
#define DISPATCH_CALLBACK(CB, NAME, OPERATION) do { \
|
||||
CALLBACK_OP(CB, NAME, OPERATION, "init", init); \
|
||||
CALLBACK_OP(CB, NAME, OPERATION, "free", uninit); \
|
||||
CALLBACK_OP(CB, NAME, OPERATION, "start", start); \
|
||||
CALLBACK_OP(CB, NAME, OPERATION, "end", end); \
|
||||
CALLBACK_OP(CB, NAME, OPERATION, "change-options", chopt); \
|
||||
CALLBACK_OP(CB, NAME, OPERATION, "preprocess-html", preprocess); \
|
||||
CALLBACK_OP(CB, NAME, OPERATION, "postprocess-html", postprocess); \
|
||||
CALLBACK_OP(CB, NAME, OPERATION, "check-html", check_html); \
|
||||
CALLBACK_OP(CB, NAME, OPERATION, "query", query); \
|
||||
CALLBACK_OP(CB, NAME, OPERATION, "query2", query2); \
|
||||
CALLBACK_OP(CB, NAME, OPERATION, "query3", query3); \
|
||||
CALLBACK_OP(CB, NAME, OPERATION, "loop", loop); \
|
||||
CALLBACK_OP(CB, NAME, OPERATION, "check-link", check_link); \
|
||||
CALLBACK_OP(CB, NAME, OPERATION, "check-mime", check_mime); \
|
||||
CALLBACK_OP(CB, NAME, OPERATION, "pause", pause); \
|
||||
CALLBACK_OP(CB, NAME, OPERATION, "save-file", filesave); \
|
||||
CALLBACK_OP(CB, NAME, OPERATION, "save-file2", filesave2); \
|
||||
CALLBACK_OP(CB, NAME, OPERATION, "link-detected", linkdetected); \
|
||||
CALLBACK_OP(CB, NAME, OPERATION, "link-detected2", linkdetected2); \
|
||||
CALLBACK_OP(CB, NAME, OPERATION, "transfer-status", xfrstatus); \
|
||||
CALLBACK_OP(CB, NAME, OPERATION, "save-name", savename); \
|
||||
CALLBACK_OP(CB, NAME, OPERATION, "send-header", sendhead); \
|
||||
CALLBACK_OP(CB, NAME, OPERATION, "receive-header", receivehead); \
|
||||
} while(0)
|
||||
|
||||
int hts_set_callback(t_hts_htmlcheck_callbacks * callbacks, const char *name,
|
||||
void *function) {
|
||||
size_t offs = hts_get_callback_offs(name);
|
||||
|
||||
if (offs != (size_t) - 1) {
|
||||
MEMBER_OF(callbacks, offs, void *) = function;
|
||||
|
||||
return 0;
|
||||
}
|
||||
return 1;
|
||||
int error = 1;
|
||||
#define CALLBACK_OPERATION(TYPE, FUNCTION) do { \
|
||||
FUNCTION = (TYPE) function; \
|
||||
error = 0; \
|
||||
} while(0)
|
||||
DISPATCH_CALLBACK(callbacks, name, CALLBACK_OPERATION);
|
||||
#undef CALLBACK_OPERATION
|
||||
return error;
|
||||
}
|
||||
|
||||
void *hts_get_callback(t_hts_htmlcheck_callbacks * callbacks, const char *name) {
|
||||
size_t offs = hts_get_callback_offs(name);
|
||||
|
||||
if (offs != (size_t) - 1) {
|
||||
return MEMBER_OF(callbacks, offs, void *);
|
||||
}
|
||||
#define CALLBACK_OPERATION(TYPE, FUNCTION) do { \
|
||||
return (void*) FUNCTION; \
|
||||
} while(0)
|
||||
DISPATCH_CALLBACK(callbacks, name, CALLBACK_OPERATION);
|
||||
#undef CALLBACK_OPERATION
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
140
src/htslib.h
140
src/htslib.h
@@ -50,6 +50,14 @@ typedef struct htsblk htsblk;
|
||||
#define HTS_DEF_FWSTRUCT_t_dnscache
|
||||
typedef struct t_dnscache t_dnscache;
|
||||
#endif
|
||||
#ifndef HTS_DEF_FWSTRUCT_lien_adrfil
|
||||
#define HTS_DEF_FWSTRUCT_lien_adrfil
|
||||
typedef struct lien_adrfil lien_adrfil;
|
||||
#endif
|
||||
#ifndef HTS_DEF_FWSTRUCT_lien_adrfilsave
|
||||
#define HTS_DEF_FWSTRUCT_lien_adrfilsave
|
||||
typedef struct lien_adrfilsave lien_adrfilsave;
|
||||
#endif
|
||||
|
||||
/* définitions globales */
|
||||
#include "htsglobal.h"
|
||||
@@ -97,86 +105,6 @@ MSVC2003INLINEBUG HTS_STATIC char *getHtsOptBuff_(httrackp * opt) {
|
||||
#define OPT_GET_BUFF(OPT) ( getHtsOptBuff_(OPT) )
|
||||
#define OPT_GET_BUFF_SIZE(OPT) ( sizeof(opt->state.concat.buff[0]) )
|
||||
|
||||
// structure pour paramètres supplémentaires lors de la requête
|
||||
#ifndef HTS_DEF_FWSTRUCT_htsrequest_proxy
|
||||
#define HTS_DEF_FWSTRUCT_htsrequest_proxy
|
||||
typedef struct htsrequest_proxy htsrequest_proxy;
|
||||
#endif
|
||||
struct htsrequest_proxy {
|
||||
int active;
|
||||
const char* name;
|
||||
int port;
|
||||
const char* bindhost; // bind this host
|
||||
};
|
||||
|
||||
#ifndef HTS_DEF_FWSTRUCT_htsrequest
|
||||
#define HTS_DEF_FWSTRUCT_htsrequest
|
||||
typedef struct htsrequest htsrequest;
|
||||
#endif
|
||||
struct htsrequest {
|
||||
short int user_agent_send; // user agent (ex: httrack/1.0 [sun])
|
||||
short int http11; // l'en tête peut (doit) être signé HTTP/1.1 et non HTTP/1.0
|
||||
short int nokeepalive; // pas de keep-alive
|
||||
short int range_used; // Range utilisé
|
||||
short int nocompression; // Pas de compression
|
||||
short int flush_garbage; // recycled
|
||||
const char* user_agent;
|
||||
const char* referer;
|
||||
const char* from;
|
||||
const char* lang_iso;
|
||||
const char* accept;
|
||||
const char* headers;
|
||||
htsrequest_proxy proxy; // proxy
|
||||
};
|
||||
|
||||
// structure pour retour d'une connexion/prise d'en tête
|
||||
#ifndef HTS_DEF_FWSTRUCT_htsblk
|
||||
#define HTS_DEF_FWSTRUCT_htsblk
|
||||
typedef struct htsblk htsblk;
|
||||
#endif
|
||||
struct htsblk {
|
||||
int statuscode; // status-code, -1=erreur, 200=OK,201=..etc (cf RFC1945)
|
||||
short int notmodified; // page ou fichier NON modifié (transféré)
|
||||
short int is_write; // sortie sur disque (out) ou en mémoire (adr)
|
||||
short int is_chunk; // mode chunk
|
||||
short int compressed; // compressé?
|
||||
short int empty; // vide?
|
||||
short int keep_alive; // Keep-Alive?
|
||||
short int keep_alive_trailers; // ..with trailers extension
|
||||
int keep_alive_t; // KA timeout
|
||||
int keep_alive_max; // KA number of requests
|
||||
char *adr; // adresse du bloc de mémoire, NULL=vide
|
||||
char *headers; // adresse des en têtes si présents
|
||||
FILE *out; // écriture directe sur disque (si is_write=1)
|
||||
LLint size; // taille fichier
|
||||
char msg[80]; // message éventuel si échec ("\0"=non précisé)
|
||||
char contenttype[64]; // content-type ("text/html" par exemple)
|
||||
char charset[64]; // charset ("iso-8859-1" par exemple)
|
||||
char contentencoding[64]; // content-encoding ("gzip" par exemple)
|
||||
char *location; // on copie dedans éventuellement la véritable 'location'
|
||||
LLint totalsize; // taille totale à télécharger (-1=inconnue)
|
||||
short int is_file; // ce n'est pas une socket mais un descripteur de fichier si 1
|
||||
T_SOC soc; // ID socket
|
||||
SOCaddr address; // IP address
|
||||
int address_size; // IP address structure length
|
||||
FILE *fp; // fichier pour file://
|
||||
#if HTS_USEOPENSSL
|
||||
short int ssl; // is this connection a SSL one? (https)
|
||||
// BIO* ssl_soc; // SSL structure
|
||||
SSL *ssl_con; // connection structure
|
||||
#endif
|
||||
char lastmodified[64]; // Last-Modified
|
||||
char etag[256]; // Etag
|
||||
char cdispo[256]; // Content-Disposition coupé
|
||||
LLint crange; // Content-Range
|
||||
LLint crange_start; // Content-Range
|
||||
LLint crange_end; // Content-Range
|
||||
int debugid; // debug connection
|
||||
/* */
|
||||
htsrequest req; // paramètres pour la requête
|
||||
/*char digest[32+2]; // digest md5 généré par le moteur ("" si non généré) */
|
||||
};
|
||||
|
||||
/* ANCIENNE STURCTURE pour cache 1.0 */
|
||||
#ifndef HTS_DEF_FWSTRUCT_OLD_t_proxy
|
||||
#define HTS_DEF_FWSTRUCT_OLD_t_proxy
|
||||
@@ -249,11 +177,12 @@ LLint check_downloadable_bytes(int rate);
|
||||
HTSEXT_API int hts_uninit_module(void);
|
||||
|
||||
// fonctions principales
|
||||
T_SOC http_fopen(httrackp * opt, char *adr, char *fil, htsblk * retour);
|
||||
T_SOC http_fopen(httrackp * opt, const char *adr, const char *fil, htsblk * retour);
|
||||
T_SOC http_xfopen(httrackp * opt, int mode, int treat, int waitconnect,
|
||||
char *xsend, char *adr, char *fil, htsblk * retour);
|
||||
int http_sendhead(httrackp * opt, t_cookie * cookie, int mode, char *xsend,
|
||||
char *adr, char *fil, char *referer_adr, char *referer_fil,
|
||||
const char *xsend, const char *adr, const char *fil, htsblk * retour);
|
||||
int http_sendhead(httrackp * opt, t_cookie * cookie, int mode, const char *xsend,
|
||||
const char *adr, const char *fil,
|
||||
const char *referer_adr, const char *referer_fil,
|
||||
htsblk * retour);
|
||||
|
||||
//int newhttp(char* iadr,char* err=NULL);
|
||||
@@ -263,22 +192,25 @@ HTS_INLINE void deletehttp(htsblk * r);
|
||||
HTS_INLINE int deleteaddr(htsblk * r);
|
||||
HTS_INLINE void deletesoc(T_SOC soc);
|
||||
HTS_INLINE void deletesoc_r(htsblk * r);
|
||||
htsblk http_location(httrackp * opt, char *adr, char *fil, char *loc);
|
||||
htsblk http_test(httrackp * opt, char *adr, char *fil, char *loc);
|
||||
htsblk http_test(httrackp * opt, const char *adr, const char *fil, char *loc);
|
||||
int check_readinput(htsblk * r);
|
||||
int check_readinput_t(T_SOC soc, int timeout);
|
||||
void treathead(t_cookie * cookie, char *adr, char *fil, htsblk * retour,
|
||||
void treathead(t_cookie * cookie, const char *adr, const char *fil, htsblk * retour,
|
||||
char *rcvd);
|
||||
void treatfirstline(htsblk * retour, char *rcvd);
|
||||
void treatfirstline(htsblk * retour, const char *rcvd);
|
||||
|
||||
// sous-fonctions
|
||||
LLint http_xfread1(htsblk * r, int bufl);
|
||||
HTS_INLINE t_hostent *hts_gethostbyname2(httrackp * opt, const char *iadr,
|
||||
void *v_buffer, const char **error);
|
||||
HTS_INLINE t_hostent *hts_gethostbyname(httrackp * opt, const char *iadr,
|
||||
void *v_buffer);
|
||||
HTSEXT_API t_hostent *vxgethostbyname2(const char *const hostname, void *v_buffer, const char **error);
|
||||
HTSEXT_API t_hostent *vxgethostbyname(const char *const hostname, void *v_buffer);
|
||||
HTS_INLINE SOCaddr* hts_dns_resolve2(httrackp * opt, const char *iadr,
|
||||
SOCaddr *const addr,
|
||||
const char **error);
|
||||
HTS_INLINE SOCaddr* hts_dns_resolve(httrackp * opt, const char *iadr,
|
||||
SOCaddr *const addr);
|
||||
HTSEXT_API SOCaddr* hts_dns_resolve_nocache2(const char *const hostname,
|
||||
SOCaddr *const addr,
|
||||
const char **error);
|
||||
HTSEXT_API SOCaddr* hts_dns_resolve_nocache(const char *const hostname,
|
||||
SOCaddr *const addr);
|
||||
HTSEXT_API int check_hostname_dns(const char *const hostname);
|
||||
|
||||
int ftp_available(void);
|
||||
@@ -303,7 +235,7 @@ HTS_INLINE void time_rfc822(char *s, struct tm *A);
|
||||
HTS_INLINE void time_rfc822_local(char *s, struct tm *A);
|
||||
|
||||
HTS_INLINE int sendc(htsblk * r, const char *s);
|
||||
int finput(int fd, char *s, int max);
|
||||
int finput(T_SOC fd, char *s, int max);
|
||||
int binput(char *buff, char *s, int max);
|
||||
int linput(FILE * fp, char *s, int max);
|
||||
int linputsoc(T_SOC soc, char *s, int max);
|
||||
@@ -311,8 +243,8 @@ int linputsoc_t(T_SOC soc, char *s, int max, int timeout);
|
||||
int linput_trim(FILE * fp, char *s, int max);
|
||||
int linput_cpp(FILE * fp, char *s, int max);
|
||||
void rawlinput(FILE * fp, char *s, int max);
|
||||
char *strstrcase(char *s, char *o);
|
||||
int ident_url_absolute(const char *url, char *adr, char *fil);
|
||||
char *strstrcase(char *s, const char *o);
|
||||
int ident_url_absolute(const char *url, lien_adrfil *adrfil);
|
||||
void fil_simplifie(char *f);
|
||||
int is_unicode_utf8(const char *buffer, const size_t size);
|
||||
void map_characters(unsigned char *buffer, unsigned int size,
|
||||
@@ -320,12 +252,10 @@ void map_characters(unsigned char *buffer, unsigned int size,
|
||||
int ishtml(httrackp * opt, const char *urlfil);
|
||||
int ishtml_ext(const char *a);
|
||||
int ishttperror(int err);
|
||||
void guess_httptype(httrackp * opt, char *s, const char *fil);
|
||||
|
||||
int get_userhttptype(httrackp * opt, char *s, const char *fil);
|
||||
void give_mimext(char *s, const char *st);
|
||||
|
||||
int may_unknown(httrackp * opt, const char *st);
|
||||
int may_bogus_multiple(httrackp * opt, const char *mime, const char *filename);
|
||||
int may_unknown2(httrackp * opt, const char *mime, const char *filename);
|
||||
|
||||
@@ -341,7 +271,7 @@ void hts_lowcase(char *s);
|
||||
void hts_replace(char *s, char from, char to);
|
||||
int multipleStringMatch(const char *s, const char *match);
|
||||
|
||||
void fprintfio(FILE * fp, char *buff, char *prefix);
|
||||
void fprintfio(FILE * fp, const char *buff, const char *prefix);
|
||||
|
||||
#ifdef _WIN32
|
||||
#else
|
||||
@@ -384,7 +314,6 @@ extern void *getFunctionPtr(void *handle, const char *fncname);
|
||||
extern void closeFunctionLib(void *handle);
|
||||
|
||||
extern void clearCallbacks(htscallbacks * chain);
|
||||
extern size_t hts_get_callback_offs(const char *name);
|
||||
int hts_set_callback(t_hts_htmlcheck_callbacks * callbacks,
|
||||
const char *name, void *function);
|
||||
void *hts_get_callback(t_hts_htmlcheck_callbacks * callbacks,
|
||||
@@ -610,6 +539,15 @@ HTS_STATIC int compare_mime(httrackp * opt, const char *mime, const char *file,
|
||||
|
||||
#endif
|
||||
|
||||
// returns (size_t) -1 upon error
|
||||
static HTS_UNUSED size_t off_t_to_size_t(off_t o) {
|
||||
if (o >= 0 && o < ( (size_t) -1 ) / 2) {
|
||||
return (size_t) o;
|
||||
} else {
|
||||
return (size_t) -1;
|
||||
}
|
||||
}
|
||||
|
||||
/* dirent() compatibility */
|
||||
#ifdef _WIN32
|
||||
#define HTS_DIRENT_SIZE 256
|
||||
|
||||
26
src/htsmd5.c
26
src/htsmd5.c
@@ -1,4 +1,4 @@
|
||||
/* ------------------------------------------------------------ */
|
||||
|
||||
/*
|
||||
HTTrack Website Copier, Offline Browser for Windows and Unix
|
||||
Copyright (C) 1998-2014 Xavier Roche and other contributors
|
||||
@@ -41,8 +41,10 @@ Please visit our Website: http://www.httrack.com
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <assert.h>
|
||||
#include "htsmd5.h"
|
||||
#include "md5.h"
|
||||
#include "htssafe.h"
|
||||
|
||||
int domd5mem(const char *buf, size_t len, char *digest, int asAscii) {
|
||||
int endian = 1;
|
||||
@@ -77,3 +79,25 @@ unsigned long int md5sum32(const char *buff) {
|
||||
domd5mem(buff, strlen(buff), u.md5digest, 0);
|
||||
return u.hash;
|
||||
}
|
||||
|
||||
void md5selftest() {
|
||||
static const char str1[] = "The quick brown fox jumps over the lazy dog\n";
|
||||
static const char str1m[] = "37c4b87edffc5d198ff5a185cee7ee09";
|
||||
static const char str2[] = "Hello";
|
||||
static const char str2m[] = "8b1a9953c4611296a827abf8c47804d7";
|
||||
char digest[64];
|
||||
#define MDCHECK(VAR, VARMD) do { \
|
||||
memset(digest, 0xCC, sizeof(digest)); \
|
||||
domd5mem(VAR, sizeof(VAR) - 1, digest, 1); \
|
||||
if (strcmp(digest, VARMD) != 0) { \
|
||||
fprintf(stderr, \
|
||||
"error: md5 selftest failed: '%s' => '%s' (!= '%s')\n", \
|
||||
VAR, digest, VARMD); \
|
||||
assert(! "md5 selftest failed"); \
|
||||
} \
|
||||
} while(0)
|
||||
MDCHECK(str1, str1m);
|
||||
MDCHECK(str2, str2m);
|
||||
#undef MDCHECK
|
||||
fprintf(stderr, "md5 selftest succeeded\n");
|
||||
}
|
||||
|
||||
@@ -42,6 +42,7 @@ Please visit our Website: http://www.httrack.com
|
||||
#ifdef HTS_INTERNAL_BYTECODE
|
||||
int domd5mem(const char *buf, size_t len, char *digest, int asAscii);
|
||||
unsigned long int md5sum32(const char *buff);
|
||||
void md5selftest(void);
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
@@ -218,17 +218,17 @@ void htspe_init(void) {
|
||||
/* See CVE-2010-5252 */
|
||||
#if (defined(_WIN32) && (!defined(_DEBUG)))
|
||||
{
|
||||
/* >= Windows Server 2003 (Andy Hewitt) */
|
||||
const DWORD dwVersion = GetVersion();
|
||||
const DWORD dwMajorVersion = (DWORD)(LOBYTE(LOWORD(dwVersion)));
|
||||
const DWORD dwMinorVersion = (DWORD)(HIBYTE(LOWORD(dwVersion)));
|
||||
const int hasSetDllDirectory =
|
||||
dwMajorVersion >= 6 || ( dwMajorVersion == 5 && dwMinorVersion >= 2 );
|
||||
/* See KB 2389418
|
||||
"If this parameter is an empty string (""), the call removes the
|
||||
current directory from the default DLL search order" */
|
||||
if (hasSetDllDirectory && !SetDllDirectory("")) {
|
||||
BOOL (WINAPI*const k32_SetDllDirectoryA)(LPCSTR) =
|
||||
(BOOL (WINAPI *)(LPCSTR))
|
||||
GetProcAddress(GetModuleHandle("kernel32.dll"), "SetDllDirectoryA");
|
||||
if (k32_SetDllDirectoryA != NULL && !k32_SetDllDirectoryA("")) {
|
||||
/* Do no choke on NT or 98SE with KernelEx NT API (James Blough) */
|
||||
const DWORD dwVersion = GetVersion();
|
||||
const DWORD dwMajorVersion = (DWORD)(LOBYTE(LOWORD(dwVersion)));
|
||||
const DWORD dwMinorVersion = (DWORD)(HIBYTE(LOWORD(dwVersion)));
|
||||
if (dwMajorVersion >= 5) {
|
||||
assertf(!"SetDllDirectory failed");
|
||||
}
|
||||
|
||||
@@ -104,22 +104,21 @@ struct htsmoduleStruct {
|
||||
httrackp *opt;
|
||||
|
||||
/* Internal use - please don't touch */
|
||||
lien_url **liens;
|
||||
struct_back *sback;
|
||||
cache_back *cache;
|
||||
hash_struct *hashptr;
|
||||
int numero_passe;
|
||||
int add_tab_alloc;
|
||||
/* */
|
||||
int *lien_tot_;
|
||||
int *ptr_;
|
||||
size_t *lien_size_;
|
||||
char **lien_buffer_;
|
||||
const char *page_charset_;
|
||||
/* Internal use - please don't touch */
|
||||
|
||||
};
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/* Used to wrap module initialization */
|
||||
/* return 1 if init was ok */
|
||||
typedef int (*t_htsWrapperInit) (char *fn, char *args);
|
||||
@@ -138,4 +137,8 @@ extern int hts_parse_externals(htsmoduleStruct * str);
|
||||
extern int V6_is_available;
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
347
src/htsname.c
347
src/htsname.c
@@ -47,15 +47,15 @@ Please visit our Website: http://www.httrack.com
|
||||
{ /* ajout nom */\
|
||||
char BIGSTK buff[HTS_URLMAXSIZE*2];\
|
||||
buff[0]='\0';\
|
||||
strncatbuff(buff,start_pos,(int) (nom_pos - start_pos));\
|
||||
url_savename_addstr(save,buff);\
|
||||
strncatbuff(buff,start_pos,nom_pos - start_pos);\
|
||||
url_savename_addstr(afs->save, buff);\
|
||||
}
|
||||
|
||||
#define ADD_STANDARD_NAME(shortname) \
|
||||
{ /* ajout nom */\
|
||||
char BIGSTK buff[HTS_URLMAXSIZE*2];\
|
||||
standard_name(buff,dot_pos,nom_pos,fil_complete,(shortname));\
|
||||
url_savename_addstr(save,buff);\
|
||||
url_savename_addstr(afs->save, buff);\
|
||||
}
|
||||
|
||||
/* Avoid stupid DOS system folders/file such as 'nul' */
|
||||
@@ -82,11 +82,11 @@ static const char *hts_tbdev[] = {
|
||||
HTS_STAT.stat_errors=fspc(opt,NULL,"error"); \
|
||||
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.nbk=backlinks_done(sback,opt->liens,opt->lien_tot,ptr); \
|
||||
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)) { \
|
||||
if (!RUN_CALLBACK7(opt, loop, sback->lnk, sback->count,-1,ptr,opt->lien_tot,(int) (time_local()-HTS_STAT.stat_timestart),&HTS_STAT)) { \
|
||||
return -1; \
|
||||
} \
|
||||
} \
|
||||
@@ -139,10 +139,10 @@ static void cleanEndingSpaceOrDot(char *s) {
|
||||
|
||||
// forme le nom du fichier à sauver (save) à partir de fil et adr
|
||||
// système intelligent, qui renomme en cas de besoin (exemple: deux INDEX.HTML et index.html)
|
||||
int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
char *former_adr, char *former_fil, char *referer_adr,
|
||||
char *referer_fil, httrackp * opt, lien_url ** liens,
|
||||
int lien_tot, struct_back * sback, cache_back * cache,
|
||||
int url_savename(lien_adrfilsave *const afs,
|
||||
lien_adrfil *const former,
|
||||
const char *referer_adr, const char *referer_fil,
|
||||
httrackp * opt, struct_back * sback, cache_back * cache,
|
||||
hash_struct * hash, int ptr, int numero_passe,
|
||||
const lien_back * headers) {
|
||||
char catbuff[CATBUFF_SIZE];
|
||||
@@ -152,7 +152,10 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
lien_back *const back = sback->lnk;
|
||||
|
||||
/* */
|
||||
char BIGSTK newfil[HTS_URLMAXSIZE * 2]; /* ="" */
|
||||
char BIGSTK fil[HTS_URLMAXSIZE * 2]; /* ="" */
|
||||
|
||||
const char *const adr_complete = afs->af.adr;
|
||||
const char *const fil_complete = afs->af.fil;
|
||||
|
||||
/*char BIGSTK normadr_[HTS_URLMAXSIZE*2]; */
|
||||
char BIGSTK normadr_[HTS_URLMAXSIZE * 2], normfil_[HTS_URLMAXSIZE * 2];
|
||||
@@ -162,12 +165,11 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
{ "http", "https", "ftp", "file", "unknown" };
|
||||
int protocol = PROTOCOL_HTTP;
|
||||
const char *const adr = jump_identification(adr_complete);
|
||||
char *fil = fil_complete;
|
||||
// copy of fil, used for lookups (see urlhack)
|
||||
const char *normadr = adr;
|
||||
const char *normfil = fil;
|
||||
const char *normfil = fil_complete;
|
||||
const char *const print_adr = jump_protocol(adr);
|
||||
char *start_pos = NULL, *nom_pos = NULL, *dot_pos = NULL; // Position nom et point
|
||||
const char *start_pos = NULL, *nom_pos = NULL, *dot_pos = NULL; // Position nom et point
|
||||
|
||||
// pour changement d'extension ou de nom (content-disposition)
|
||||
int ext_chg = 0, ext_chg_delayed = 0;
|
||||
@@ -176,8 +178,8 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
int max_char = 0;
|
||||
|
||||
//CLEAR
|
||||
newfil[0] = ext[0] = '\0';
|
||||
save[0] = '\0';
|
||||
fil[0] = ext[0] = '\0';
|
||||
afs->save[0] = '\0';
|
||||
|
||||
/* 8-3 ? */
|
||||
switch (opt->savename_83) {
|
||||
@@ -199,7 +201,7 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
if (opt->urlhack) {
|
||||
// copy of adr (without protocol), used for lookups (see urlhack)
|
||||
normadr = adr_normalized(adr, normadr_);
|
||||
normfil = fil_normalized(fil, normfil_);
|
||||
normfil = fil_normalized(fil_complete, normfil_);
|
||||
} else {
|
||||
if (link_has_authority(adr_complete)) { // https or other protocols : in "http/" subfolder
|
||||
char *pos = strchr(adr_complete, ':');
|
||||
@@ -227,8 +229,8 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
|
||||
// court-circuit pour lien primaire
|
||||
if (strnotempty(adr) == 0) {
|
||||
if (strcmp(fil, "primary") == 0) {
|
||||
strcatbuff(save, "primary.html");
|
||||
if (strcmp(fil_complete, "primary") == 0) {
|
||||
strcatbuff(afs->save, "primary.html");
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
@@ -259,21 +261,21 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
// vérifier que le nom n'a pas déja été calculé (si oui le renvoyer tel que)
|
||||
// vérifier que le nom n'est pas déja pris...
|
||||
// NOTE: si on cherche /toto/ et que /toto est trouvé on le prend (et réciproquqment) ** // **
|
||||
if (liens != NULL) {
|
||||
if (opt->liens != NULL) {
|
||||
int i;
|
||||
|
||||
i = hash_read(hash, normadr, normfil, HASH_STRUCT_ADR_PATH); // recherche table 1 (adr+fil)
|
||||
if (i >= 0) { // ok, trouvé
|
||||
strcpybuff(save, liens[i]->sav);
|
||||
strcpybuff(afs->save, heap(i)->sav);
|
||||
return 0;
|
||||
}
|
||||
i = hash_read(hash, normadr, normfil, HASH_STRUCT_ORIGINAL_ADR_PATH); // recherche table 2 (former_adr+former_fil)
|
||||
i = hash_read(hash, normadr, normfil, HASH_STRUCT_ORIGINAL_ADR_PATH); // recherche table 2 (former->adr+former->fil)
|
||||
if (i >= 0) { // ok, trouvé
|
||||
// copier location moved!
|
||||
strcpybuff(adr_complete, liens[i]->adr);
|
||||
strcpybuff(fil_complete, liens[i]->fil);
|
||||
strcpybuff(afs->af.adr, heap(i)->adr);
|
||||
strcpybuff(afs->af.fil, heap(i)->fil);
|
||||
// et save
|
||||
strcpybuff(save, liens[i]->sav); // copier (formé à partir du nouveau lien!)
|
||||
strcpybuff(afs->save, heap(i)->sav); // copier (formé à partir du nouveau lien!)
|
||||
return 0;
|
||||
}
|
||||
// chercher sans / ou avec / dans former
|
||||
@@ -286,13 +288,13 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
fil_complete_patche[strlen(fil_complete_patche) - 1] = '\0';
|
||||
else
|
||||
strcatbuff(fil_complete_patche, "/");
|
||||
i = hash_read(hash, normadr, fil_complete_patche, HASH_STRUCT_ORIGINAL_ADR_PATH); // recherche table 2 (former_adr+former_fil)
|
||||
i = hash_read(hash, normadr, fil_complete_patche, HASH_STRUCT_ORIGINAL_ADR_PATH); // recherche table 2 (former->adr+former->fil)
|
||||
if (i >= 0) {
|
||||
// écraser fil et adr (pas former_fil?????)
|
||||
strcpybuff(adr_complete, liens[i]->adr);
|
||||
strcpybuff(fil_complete, liens[i]->fil);
|
||||
// écraser fil et adr (pas former->fil?????)
|
||||
strcpybuff(afs->af.adr, heap(i)->adr);
|
||||
strcpybuff(afs->af.fil, heap(i)->fil);
|
||||
// écrire save
|
||||
strcpybuff(save, liens[i]->sav);
|
||||
strcpybuff(afs->save, heap(i)->sav);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
@@ -303,13 +305,12 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
{
|
||||
char *a;
|
||||
|
||||
a = strchr(fil, '?');
|
||||
a = strchr(fil_complete, '?');
|
||||
if (a != NULL) {
|
||||
strncatbuff(newfil, fil, (int) (a - fil));
|
||||
strncatbuff(fil, fil_complete, a - fil_complete);
|
||||
} else {
|
||||
strcpybuff(newfil, fil);
|
||||
strcpybuff(fil, fil_complete);
|
||||
}
|
||||
fil = newfil;
|
||||
}
|
||||
|
||||
// decode remaining % (normally not necessary; already done in htsparse.c)
|
||||
@@ -465,8 +466,7 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
//
|
||||
int hihp = opt->state._hts_in_html_parsing;
|
||||
int has_been_moved = 0;
|
||||
char BIGSTK curr_adr[HTS_URLMAXSIZE * 2],
|
||||
curr_fil[HTS_URLMAXSIZE * 2];
|
||||
lien_adrfil current;
|
||||
|
||||
/* Ensure we don't use too many sockets by using a "testing" one
|
||||
If we have only 1 simultaneous connection authorized, wait for pending download
|
||||
@@ -475,20 +475,20 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
URLSAVENAME_WAIT_FOR_AVAILABLE_SOCKET();
|
||||
|
||||
/* Rock'in */
|
||||
curr_adr[0] = curr_fil[0] = '\0';
|
||||
current.adr[0] = current.fil[0] = '\0';
|
||||
opt->state._hts_in_html_parsing = 2; // test
|
||||
hts_log_print(opt, LOG_DEBUG, "Testing link type %s%s",
|
||||
adr_complete, fil_complete);
|
||||
strcpybuff(curr_adr, adr_complete);
|
||||
strcpybuff(curr_fil, fil_complete);
|
||||
strcpybuff(current.adr, adr_complete);
|
||||
strcpybuff(current.fil, fil_complete);
|
||||
// ajouter dans le backing le fichier en mode test
|
||||
// savename: rien car en mode test
|
||||
if (back_add
|
||||
(sback, opt, cache, curr_adr, curr_fil, BACK_ADD_TEST,
|
||||
(sback, opt, cache, current.adr, current.fil, BACK_ADD_TEST,
|
||||
referer_adr, referer_fil, 1) != -1) {
|
||||
int b;
|
||||
|
||||
b = back_index(opt, sback, curr_adr, curr_fil, BACK_ADD_TEST);
|
||||
b = back_index(opt, sback, current.adr, current.fil, BACK_ADD_TEST);
|
||||
if (b >= 0) {
|
||||
int stop_looping = 0;
|
||||
int petits_tours = 0;
|
||||
@@ -500,8 +500,7 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
back_wait(sback, opt, cache, 0);
|
||||
}
|
||||
if (ptr >= 0) {
|
||||
back_fillmax(sback, opt, cache, liens, ptr, numero_passe,
|
||||
lien_tot);
|
||||
back_fillmax(sback, opt, cache, ptr, numero_passe);
|
||||
}
|
||||
// on est obligé d'appeler le shell pour le refresh..
|
||||
// Transfer rate
|
||||
@@ -512,11 +511,11 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
HTS_STAT.stat_errors = fspc(opt, NULL, "error");
|
||||
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.nbk = backlinks_done(sback, opt->liens, opt->lien_tot, ptr);
|
||||
HTS_STAT.nb = back_transferred(HTS_STAT.stat_bytes, sback);
|
||||
|
||||
if (!RUN_CALLBACK7
|
||||
(opt, loop, sback->lnk, sback->count, b, ptr, lien_tot,
|
||||
(opt, loop, sback->lnk, sback->count, b, ptr, opt->lien_tot,
|
||||
(int) (time_local() - HTS_STAT.stat_timestart),
|
||||
&HTS_STAT)) {
|
||||
return -1;
|
||||
@@ -527,42 +526,40 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
// traitement des 304,303..
|
||||
if (back[b].status <= 0) {
|
||||
if (HTTP_IS_REDIRECT(back[b].r.statuscode)) { // agh moved.. un tit tour de plus
|
||||
if ((petits_tours < 5) && (former_adr) && (former_fil)) { // on va pas tourner en rond non plus!
|
||||
if ((int) strnotempty(back[b].r.location)) { // location existe!
|
||||
char BIGSTK mov_url[HTS_URLMAXSIZE * 2],
|
||||
mov_adr[HTS_URLMAXSIZE * 2],
|
||||
mov_fil[HTS_URLMAXSIZE * 2];
|
||||
mov_url[0] = mov_adr[0] = mov_fil[0] = '\0';
|
||||
if ((petits_tours < 5) && former != NULL) { // on va pas tourner en rond non plus!
|
||||
if (strnotempty(back[b].r.location)) { // location existe!
|
||||
char BIGSTK mov_url[HTS_URLMAXSIZE * 2];
|
||||
lien_adrfil moved;
|
||||
mov_url[0] = moved.adr[0] = moved.fil[0] = '\0';
|
||||
//
|
||||
strcpybuff(mov_url, back[b].r.location); // copier URL
|
||||
if (ident_url_relatif
|
||||
(mov_url, curr_adr, curr_fil, mov_adr,
|
||||
mov_fil) >= 0) {
|
||||
(mov_url, current.adr, current.fil, &moved) >= 0) {
|
||||
// si non bouclage sur soi même, ou si test avec GET non testé
|
||||
if ((strcmp(mov_adr, curr_adr))
|
||||
|| (strcmp(mov_fil, curr_fil))
|
||||
if ((strcmp(moved.adr, current.adr))
|
||||
|| (strcmp(moved.fil, current.fil))
|
||||
|| (get_test_request == 0)) {
|
||||
// bouclage?
|
||||
if ((!strcmp(mov_adr, curr_adr))
|
||||
&& (!strcmp(mov_fil, curr_fil)))
|
||||
if ((!strcmp(moved.adr, current.adr))
|
||||
&& (!strcmp(moved.fil, current.fil)))
|
||||
get_test_request = 1; // faire requète avec GET
|
||||
|
||||
// recopier former_adr/fil?
|
||||
if ((former_adr) && (former_fil)) {
|
||||
if (strnotempty(former_adr) == 0) { // Pas déja noté
|
||||
strcpybuff(former_adr, curr_adr);
|
||||
strcpybuff(former_fil, curr_fil);
|
||||
// recopier former->adr/fil?
|
||||
if (former != NULL) {
|
||||
if (strnotempty(former->adr) == 0) { // Pas déja noté
|
||||
strcpybuff(former->adr, current.adr);
|
||||
strcpybuff(former->fil, current.fil);
|
||||
}
|
||||
}
|
||||
// check explicit forbidden - don't follow 3xx in this case
|
||||
{
|
||||
int set_prio_to = 0;
|
||||
|
||||
if (hts_acceptlink(opt, ptr, lien_tot, liens, mov_adr, mov_fil, NULL, NULL, &set_prio_to, NULL) == 1) { /* forbidden */
|
||||
if (hts_acceptlink(opt, ptr, moved.adr, moved.fil, NULL, NULL, &set_prio_to, NULL) == 1) { /* forbidden */
|
||||
has_been_moved = 1;
|
||||
back_maydelete(opt, cache, sback, b); // ok
|
||||
strcpybuff(curr_adr, mov_adr);
|
||||
strcpybuff(curr_fil, mov_fil);
|
||||
strcpybuff(current.adr, moved.adr);
|
||||
strcpybuff(current.fil, moved.fil);
|
||||
mov_url[0] = '\0';
|
||||
stop_looping = 1;
|
||||
}
|
||||
@@ -573,11 +570,11 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
) { // ftp, ok on arrête
|
||||
has_been_moved = 1;
|
||||
back_maydelete(opt, cache, sback, b); // ok
|
||||
strcpybuff(curr_adr, mov_adr);
|
||||
strcpybuff(curr_fil, mov_fil);
|
||||
strcpybuff(current.adr, moved.adr);
|
||||
strcpybuff(current.fil, moved.fil);
|
||||
stop_looping = 1;
|
||||
} else if (*mov_url) {
|
||||
char *methode;
|
||||
const char *methode;
|
||||
|
||||
if (!get_test_request)
|
||||
methode = BACK_ADD_TEST; // tester avec HEAD
|
||||
@@ -585,24 +582,24 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
methode = BACK_ADD_TEST2; // tester avec GET
|
||||
hts_log_print(opt, LOG_WARNING,
|
||||
"Loop with HEAD request (during prefetch) at %s%s",
|
||||
curr_adr, curr_fil);
|
||||
current.adr, current.fil);
|
||||
}
|
||||
// Ajouter
|
||||
URLSAVENAME_WAIT_FOR_AVAILABLE_SOCKET();
|
||||
if (back_add(sback, opt, cache, mov_adr, mov_fil, methode, referer_adr, referer_fil, 1) != -1) { // OK
|
||||
if (back_add(sback, opt, cache, moved.adr, moved.fil, methode, referer_adr, referer_fil, 1) != -1) { // OK
|
||||
hts_log_print(opt, LOG_DEBUG,
|
||||
"(during prefetch) %s (%d) to link %s at %s%s",
|
||||
back[b].r.msg,
|
||||
back[b].r.statuscode,
|
||||
back[b].r.location, curr_adr,
|
||||
curr_fil);
|
||||
back[b].r.location, current.adr,
|
||||
current.fil);
|
||||
|
||||
// libérer emplacement backing actuel et attendre le prochain
|
||||
back_maydelete(opt, cache, sback, b);
|
||||
strcpybuff(curr_adr, mov_adr);
|
||||
strcpybuff(curr_fil, mov_fil);
|
||||
strcpybuff(current.adr, moved.adr);
|
||||
strcpybuff(current.fil, moved.fil);
|
||||
b =
|
||||
back_index(opt, sback, curr_adr, curr_fil,
|
||||
back_index(opt, sback, current.adr, current.fil,
|
||||
methode);
|
||||
if (!get_test_request)
|
||||
has_been_moved = 1; // sinon ne pas forcer has_been_moved car non déplacé
|
||||
@@ -611,7 +608,7 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
} else { // sinon on fait rien et on s'en va.. (ftp etc)
|
||||
hts_log_print(opt, LOG_DEBUG,
|
||||
"Warning: Savename redirect backing error at %s%s",
|
||||
mov_adr, mov_fil);
|
||||
moved.adr, moved.fil);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
@@ -673,13 +670,13 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
// oops, a été déplacé.. on recalcule en récursif (osons!)
|
||||
if (has_been_moved) {
|
||||
// copier adr, fil (optionnel, mais sinon marche pas pour le rip)
|
||||
strcpybuff(adr_complete, curr_adr);
|
||||
strcpybuff(fil_complete, curr_fil);
|
||||
strcpybuff(afs->af.adr, current.adr);
|
||||
strcpybuff(afs->af.fil, current.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,
|
||||
return url_savename(afs, NULL,
|
||||
referer_adr, referer_fil, opt,
|
||||
sback, cache, hash, ptr,
|
||||
numero_passe, NULL);
|
||||
}
|
||||
// --- --- ---
|
||||
@@ -749,7 +746,7 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
}
|
||||
// Rechercher premier / et dernier .
|
||||
{
|
||||
char *a = fil + strlen(fil) - 1;
|
||||
const char *a = fil + strlen(fil) - 1;
|
||||
|
||||
// passer structures
|
||||
start_pos = fil;
|
||||
@@ -770,7 +767,7 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
// ajouter nom du site éventuellement en premier
|
||||
if (opt->savename_type == -1) { // utiliser savename_userdef! (%h%p/%n%q.%t)
|
||||
const char *a = StringBuff(opt->savename_userdef);
|
||||
char *b = save;
|
||||
char *b = afs->save;
|
||||
|
||||
/*char *nom_pos=NULL,*dot_pos=NULL; // Position nom et point */
|
||||
char tok;
|
||||
@@ -791,7 +788,7 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
*/
|
||||
|
||||
// Construire nom
|
||||
while((*a) && (((int) (b - save)) < HTS_URLMAXSIZE)) { // parser, et pas trop long..
|
||||
while((*a) && (((int) (b - afs->save)) < HTS_URLMAXSIZE)) { // parser, et pas trop long..
|
||||
if (*a == '%') {
|
||||
int short_ver = 0;
|
||||
|
||||
@@ -812,7 +809,7 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
name[pos][0] = '\0';
|
||||
}
|
||||
pos = 0;
|
||||
while(*a != ']') {
|
||||
while(*a != '\0' && *a != ']') {
|
||||
if (pos < 5) {
|
||||
if (*a == ':') { // next token
|
||||
c = name[++pos];
|
||||
@@ -823,7 +820,9 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
}
|
||||
}
|
||||
}
|
||||
a++;
|
||||
if (*a == ']') {
|
||||
a++;
|
||||
}
|
||||
strcatbuff(name[0], "="); /* param=.. */
|
||||
c = strchr(fil_complete, '?');
|
||||
/* parameters exists */
|
||||
@@ -1046,26 +1045,26 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
|
||||
// adresse url
|
||||
if (!opt->savename_83) { // noms longs (et pas de .)
|
||||
strcatbuff(save, final_adr);
|
||||
strcatbuff(afs->save, final_adr);
|
||||
} else { // noms 8-3
|
||||
if (strlen(final_adr) > 4) {
|
||||
if (strfield(final_adr, "www."))
|
||||
hts_appendStringUTF8(save, final_adr + 4, max_char);
|
||||
hts_appendStringUTF8(afs->save, final_adr + 4, max_char);
|
||||
else
|
||||
hts_appendStringUTF8(save, final_adr, max_char);
|
||||
hts_appendStringUTF8(afs->save, final_adr, max_char);
|
||||
} else
|
||||
hts_appendStringUTF8(save, final_adr, max_char);
|
||||
hts_appendStringUTF8(afs->save, final_adr, max_char);
|
||||
}
|
||||
|
||||
/* release */
|
||||
RELEASE_ADR();
|
||||
|
||||
if (*fil != '/')
|
||||
strcatbuff(save, "/");
|
||||
strcatbuff(afs->save, "/");
|
||||
}
|
||||
}
|
||||
|
||||
hts_lowcase(save);
|
||||
hts_lowcase(afs->save);
|
||||
|
||||
/*
|
||||
// ne sert à rien car a déja été filtré normalement
|
||||
@@ -1091,42 +1090,42 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
DECLARE_ADR(final_adr);
|
||||
|
||||
if (!opt->savename_83) { // noms longs
|
||||
strcatbuff(save, final_adr);
|
||||
strcatbuff(save, "/");
|
||||
strcatbuff(afs->save, final_adr);
|
||||
strcatbuff(afs->save, "/");
|
||||
} else { // noms 8-3
|
||||
if (strlen(final_adr) > 4) {
|
||||
if (strfield(final_adr, "www."))
|
||||
hts_appendStringUTF8(save, final_adr + 4, max_char);
|
||||
hts_appendStringUTF8(afs->save, final_adr + 4, max_char);
|
||||
else
|
||||
hts_appendStringUTF8(save, final_adr, max_char);
|
||||
strcatbuff(save, "/");
|
||||
hts_appendStringUTF8(afs->save, final_adr, max_char);
|
||||
strcatbuff(afs->save, "/");
|
||||
} else {
|
||||
hts_appendStringUTF8(save, final_adr, max_char);
|
||||
strcatbuff(save, "/");
|
||||
hts_appendStringUTF8(afs->save, final_adr, max_char);
|
||||
strcatbuff(afs->save, "/");
|
||||
}
|
||||
}
|
||||
|
||||
/* release */
|
||||
RELEASE_ADR();
|
||||
} else {
|
||||
strcatbuff(save, "web/"); // répertoire général
|
||||
strcatbuff(afs->save, "web/"); // répertoire général
|
||||
}
|
||||
}
|
||||
// si un html à coup sûr
|
||||
if ((ext_chg != 0) ? (ishtml_ext(ext) == 1) : (ishtml(opt, fil) == 1)) {
|
||||
if (opt->savename_type % 100 == 2) { // html/
|
||||
strcatbuff(save, "html/");
|
||||
strcatbuff(afs->save, "html/");
|
||||
}
|
||||
} else {
|
||||
if ((opt->savename_type % 100 == 1) || (opt->savename_type % 100 == 2)) { // html & images
|
||||
strcatbuff(save, "images/");
|
||||
strcatbuff(afs->save, "images/");
|
||||
}
|
||||
}
|
||||
|
||||
switch (opt->savename_type % 100) {
|
||||
case 4:
|
||||
case 5:{ // séparer par types
|
||||
char *a = fil + strlen(fil) - 1;
|
||||
const char *a = fil + strlen(fil) - 1;
|
||||
|
||||
// passer structures
|
||||
while((a > fil) && (*a != '/') && (*a != '\\'))
|
||||
@@ -1137,17 +1136,17 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
// html?
|
||||
if ((ext_chg != 0) ? (ishtml_ext(ext) == 1) : (ishtml(opt, fil) == 1)) {
|
||||
if (opt->savename_type % 100 == 5)
|
||||
strcatbuff(save, "html/");
|
||||
strcatbuff(afs->save, "html/");
|
||||
} else {
|
||||
char *a = fil + strlen(fil) - 1;
|
||||
const char *a = fil + strlen(fil) - 1;
|
||||
|
||||
while((a > fil) && (*a != '/') && (*a != '.'))
|
||||
a--;
|
||||
if (*a != '.')
|
||||
strcatbuff(save, "other");
|
||||
strcatbuff(afs->save, "other");
|
||||
else
|
||||
strcatbuff(save, a + 1);
|
||||
strcatbuff(save, "/");
|
||||
strcatbuff(afs->save, a + 1);
|
||||
strcatbuff(afs->save, "/");
|
||||
}
|
||||
/*strcatbuff(save,a); */
|
||||
/* add name */
|
||||
@@ -1156,8 +1155,8 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
break;
|
||||
case 99:{ // 'codé' .. c'est un gadget
|
||||
size_t i;
|
||||
int j;
|
||||
char *a;
|
||||
size_t j;
|
||||
const char *a;
|
||||
char C[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-";
|
||||
int L;
|
||||
|
||||
@@ -1173,19 +1172,19 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
}
|
||||
srand(s);
|
||||
|
||||
j = (int) strlen(save);
|
||||
j = strlen(afs->save);
|
||||
for(i = 0; i < 8; i++) {
|
||||
char c = C[(rand() % L)];
|
||||
|
||||
save[i + j] = c;
|
||||
afs->save[i + j] = c;
|
||||
}
|
||||
save[i + j] = '\0';
|
||||
afs->save[i + j] = '\0';
|
||||
// ajouter extension
|
||||
a = fil + strlen(fil) - 1;
|
||||
while((a > fil) && (*a != '/') && (*a != '.'))
|
||||
a--;
|
||||
if (*a == '.') {
|
||||
strcatbuff(save, a); // ajouter
|
||||
strcatbuff(afs->save, a); // ajouter
|
||||
}
|
||||
}
|
||||
break;
|
||||
@@ -1204,10 +1203,10 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
break;
|
||||
}
|
||||
|
||||
hts_lowcase(save);
|
||||
hts_lowcase(afs->save);
|
||||
|
||||
if (save[strlen(save) - 1] == '/')
|
||||
strcatbuff(save, DEFAULT_HTML); // nommer page par défaut!!
|
||||
if (afs->save[strlen(afs->save) - 1] == '/')
|
||||
strcatbuff(afs->save, DEFAULT_HTML); // nommer page par défaut!!
|
||||
}
|
||||
|
||||
// vérifier qu'on ne doit pas forcer l'extension
|
||||
@@ -1225,23 +1224,23 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
// de même en cas de manque d'extension on en place une de manière forcée..
|
||||
// cela évite les /chez/toto et les /chez/toto/index.html incompatibles
|
||||
if (opt->savename_type != -1 && opt->savename_delayed != 2) {
|
||||
char *a = save + strlen(save) - 1;
|
||||
char *a = afs->save + strlen(afs->save) - 1;
|
||||
|
||||
while((a > save) && (*a != '.') && (*a != '/'))
|
||||
while((a > afs->save) && (*a != '.') && (*a != '/'))
|
||||
a--;
|
||||
if (*a != '.') { // agh pas de point
|
||||
//strcatbuff(save,".none"); // a éviter
|
||||
strcatbuff(save, ".html"); // préférable!
|
||||
strcatbuff(afs->save, ".html"); // préférable!
|
||||
hts_log_print(opt, LOG_DEBUG, "Default HTML type set for %s%s => %s",
|
||||
adr_complete, fil_complete, save);
|
||||
adr_complete, fil_complete, afs->save);
|
||||
}
|
||||
}
|
||||
// effacer pass au besoin pour les autentifications
|
||||
// (plus la peine : masqué au début)
|
||||
/*
|
||||
{
|
||||
char* a=jump_identification(save);
|
||||
if (a!=save) {
|
||||
char* a=jump_identification(afs->save);
|
||||
if (a!=afs->save) {
|
||||
char BIGSTK tempo[HTS_URLMAXSIZE*2];
|
||||
char *b;
|
||||
tempo[0]='\0';
|
||||
@@ -1258,18 +1257,18 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
*/
|
||||
|
||||
// éviter les / au début (cause: N100)
|
||||
if (save[0] == '/') {
|
||||
if (afs->save[0] == '/') {
|
||||
char BIGSTK tempo[HTS_URLMAXSIZE * 2];
|
||||
|
||||
strcpybuff(tempo, save + 1);
|
||||
strcpybuff(save, tempo);
|
||||
strcpybuff(tempo, afs->save + 1);
|
||||
strcpybuff(afs->save, tempo);
|
||||
}
|
||||
|
||||
/* Cleanup reserved or forbidden characters. */
|
||||
{
|
||||
size_t i;
|
||||
for(i = 0 ; save[i] != '\0' ; i++) {
|
||||
unsigned char c = (unsigned char) save[i];
|
||||
for(i = 0 ; afs->save[i] != '\0' ; i++) {
|
||||
unsigned char c = (unsigned char) afs->save[i];
|
||||
if (c < 32 // control
|
||||
|| c == 127 // unwise
|
||||
|| c == '~' // unix unwise
|
||||
@@ -1294,13 +1293,13 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
)
|
||||
)
|
||||
{
|
||||
save[i] = '_';
|
||||
afs->save[i] = '_';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// éliminer les // (comme ftp://)
|
||||
cleanDoubleSlash(save);
|
||||
cleanDoubleSlash(afs->save);
|
||||
|
||||
#if HTS_OVERRIDE_DOS_FOLDERS
|
||||
/* Replace /foo/nul/bar by /foo/nul_/bar */
|
||||
@@ -1308,7 +1307,7 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
int i = 0;
|
||||
|
||||
while(hts_tbdev[i][0]) {
|
||||
char *a = save;
|
||||
char *a = afs->save;
|
||||
|
||||
while((a = strstrcase(a, (char *) hts_tbdev[i]))) {
|
||||
switch ((int) a[strlen(hts_tbdev[i])]) {
|
||||
@@ -1319,10 +1318,10 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
char BIGSTK tempo[HTS_URLMAXSIZE * 2];
|
||||
|
||||
tempo[0] = '\0';
|
||||
strncatbuff(tempo, save, (int) (a - save) + strlen(hts_tbdev[i]));
|
||||
strncatbuff(tempo, afs->save, (int) (a - afs->save) + strlen(hts_tbdev[i]));
|
||||
strcatbuff(tempo, "_");
|
||||
strcatbuff(tempo, a + strlen(hts_tbdev[i]));
|
||||
strcpybuff(save, tempo);
|
||||
strcpybuff(afs->save, tempo);
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -1333,7 +1332,7 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
}
|
||||
|
||||
/* Strip ending . or ' ' forbidden on windoz */
|
||||
cleanEndingSpaceOrDot(save);
|
||||
cleanEndingSpaceOrDot(afs->save);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -1341,8 +1340,8 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
if (opt->savename_83) {
|
||||
char BIGSTK n83[HTS_URLMAXSIZE * 2];
|
||||
|
||||
long_to_83(opt->savename_83, n83, save);
|
||||
strcpybuff(save, n83);
|
||||
long_to_83(opt->savename_83, n83, afs->save);
|
||||
strcpybuff(afs->save, n83);
|
||||
}
|
||||
// enforce stricter ISO9660 compliance (bug reported by Steffo Carlsson)
|
||||
// Level 1 File names are restricted to 8 characters with a 3 character extension,
|
||||
@@ -1353,12 +1352,12 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
if (opt->savename_83 > 0) {
|
||||
char *a, *last;
|
||||
|
||||
for(last = save + strlen(save) - 1;
|
||||
last != save && *last != '/' && *last != '\\' && *last != '.'; last--) ;
|
||||
for(last = afs->save + strlen(afs->save) - 1;
|
||||
last != afs->save && *last != '/' && *last != '\\' && *last != '.'; last--) ;
|
||||
if (*last != '.') {
|
||||
last = NULL;
|
||||
}
|
||||
for(a = save; *a != '\0'; a++) {
|
||||
for(a = afs->save; *a != '\0'; a++) {
|
||||
if (*a >= 'a' && *a <= 'z') {
|
||||
*a -= 'a' - 'A';
|
||||
} else if (*a == '.') {
|
||||
@@ -1375,7 +1374,7 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
}
|
||||
|
||||
/* ensure that there is no ../ (potential vulnerability) */
|
||||
fil_simplifie(save);
|
||||
fil_simplifie(afs->save);
|
||||
|
||||
/* convert name to UTF-8 ? Note: already done while parsing. */
|
||||
//if (charset != NULL && charset[0] != '\0') {
|
||||
@@ -1392,17 +1391,17 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
|
||||
/* callback */
|
||||
RUN_CALLBACK5(opt, savename, adr_complete, fil_complete, referer_adr,
|
||||
referer_fil, save);
|
||||
referer_fil, afs->save);
|
||||
|
||||
hts_log_print(opt, LOG_DEBUG, "engine: save-name: local name: %s%s -> %s",
|
||||
adr, fil, save);
|
||||
adr, fil, afs->save);
|
||||
|
||||
/* Ensure that the MANDATORY "temporary" extension is set */
|
||||
if (ext_chg_delayed) {
|
||||
char *ptr;
|
||||
char *lastDot = NULL;
|
||||
|
||||
for(ptr = save; *ptr != 0; ptr++) {
|
||||
for(ptr = afs->save; *ptr != 0; ptr++) {
|
||||
if (*ptr == '.') {
|
||||
lastDot = ptr;
|
||||
} else if (*ptr == '/' || *ptr == '\\') {
|
||||
@@ -1410,8 +1409,8 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
}
|
||||
}
|
||||
if (lastDot == NULL) {
|
||||
strcatbuff(save, "." DELAYED_EXT);
|
||||
} else if (!IS_DELAYED_EXT(save)) {
|
||||
strcatbuff(afs->save, "." DELAYED_EXT);
|
||||
} else if (!IS_DELAYED_EXT(afs->save)) {
|
||||
strcatbuff(lastDot, "." DELAYED_EXT);
|
||||
}
|
||||
}
|
||||
@@ -1424,12 +1423,12 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
#define MIN_LAST_SEG_RESERVE 12
|
||||
#define MAX_LAST_SEG_RESERVE 24
|
||||
#define MAX_SEG_LEN 48
|
||||
if (hts_stringLengthUTF8(save) +
|
||||
if (hts_stringLengthUTF8(afs->save) +
|
||||
hts_stringLengthUTF8(StringBuff(opt->path_html_utf8)) >=
|
||||
HTS_MAX_PATH_LEN) {
|
||||
// convert to Unicode (much simpler)
|
||||
size_t wsaveLen;
|
||||
hts_UCS4 *const wsave = hts_convertUTF8StringToUCS4(save, strlen(save), &wsaveLen);
|
||||
hts_UCS4 *const wsave = hts_convertUTF8StringToUCS4(afs->save, strlen(afs->save), &wsaveLen);
|
||||
if (wsave != NULL) {
|
||||
const size_t parentLen =
|
||||
hts_stringLengthUTF8(StringBuff(opt->path_html_utf8));
|
||||
@@ -1484,7 +1483,7 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
// copy final name and cleanup
|
||||
saveFinal = hts_convertUCS4StringToUTF8(wsave, j);
|
||||
if (saveFinal != NULL) {
|
||||
strcpybuff(save, saveFinal);
|
||||
strcpybuff(afs->save, saveFinal);
|
||||
free(saveFinal);
|
||||
} else {
|
||||
hts_log_print(opt, LOG_ERROR, "Could not revert to UTF-8: %s%s",
|
||||
@@ -1494,13 +1493,13 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
|
||||
// log in debug
|
||||
hts_log_print(opt, LOG_DEBUG, "Too long filename shortened: %s%s => %s",
|
||||
adr_complete, fil_complete, save);
|
||||
adr_complete, fil_complete, afs->save);
|
||||
} else {
|
||||
hts_log_print(opt, LOG_ERROR, "Could not read UTF-8: %s", save);
|
||||
hts_log_print(opt, LOG_ERROR, "Could not read UTF-8: %s", afs->save);
|
||||
}
|
||||
|
||||
// Re-check again ending space or dot after cut (see bug #5)
|
||||
cleanEndingSpaceOrDot(save);
|
||||
cleanEndingSpaceOrDot(afs->save);
|
||||
}
|
||||
#undef MAX_UTF8_SEQ_CHARS
|
||||
#undef MIN_LAST_SEG_RESERVE
|
||||
@@ -1511,11 +1510,11 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
char BIGSTK tempo[HTS_URLMAXSIZE * 2];
|
||||
|
||||
strcpybuff(tempo, StringBuff(opt->path_html_utf8));
|
||||
strcatbuff(tempo, save);
|
||||
strcpybuff(save, tempo);
|
||||
strcatbuff(tempo, afs->save);
|
||||
strcpybuff(afs->save, tempo);
|
||||
}
|
||||
// vérifier que le nom n'est pas déja pris...
|
||||
if (liens != NULL) {
|
||||
if (opt->liens != NULL) {
|
||||
int nom_ok;
|
||||
|
||||
do {
|
||||
@@ -1529,20 +1528,20 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
printf("\nStart search\n");
|
||||
#endif
|
||||
|
||||
i = hash_read(hash, save, NULL, HASH_STRUCT_FILENAME); // lecture type 0 (sav)
|
||||
i = hash_read(hash, afs->save, NULL, HASH_STRUCT_FILENAME); // lecture type 0 (sav)
|
||||
if (i >= 0) {
|
||||
int sameAdr = (strfield2(liens[i]->adr, normadr) != 0);
|
||||
int sameAdr = (strfield2(heap(i)->adr, normadr) != 0);
|
||||
int sameFil;
|
||||
|
||||
// NO - URL hack is only for stripping // and www.
|
||||
//if (opt->urlhack != 0)
|
||||
// sameFil = ( strfield2(liens[i]->fil, normfil) != 0);
|
||||
// sameFil = ( strfield2(heap(i)->fil, normfil) != 0);
|
||||
//else
|
||||
sameFil = (strcmp(liens[i]->fil, normfil) == 0);
|
||||
sameFil = (strcmp(heap(i)->fil, normfil) == 0);
|
||||
if (sameAdr && sameFil) { // ok c'est le même lien, adresse déja définie
|
||||
/* Take the existing name not to screw up with cAsE sEnSiTiViTy of Linux/Unix */
|
||||
if (strcmp(liens[i]->sav, save) != 0) {
|
||||
strcpybuff(save, liens[i]->sav);
|
||||
if (strcmp(heap(i)->sav, afs->save) != 0) {
|
||||
strcpybuff(afs->save, heap(i)->sav);
|
||||
}
|
||||
i = 0;
|
||||
#if DEBUG_SAVENAME
|
||||
@@ -1550,7 +1549,7 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
#endif
|
||||
} else { // utilisé par un AUTRE, changer de nom
|
||||
char BIGSTK tempo[HTS_URLMAXSIZE * 2];
|
||||
char *a = save + strlen(save) - 1;
|
||||
char *a = afs->save + strlen(afs->save) - 1;
|
||||
char *b;
|
||||
int n = 2;
|
||||
char collisionSeparator = ((opt->savename_83 != 2) ? '-' : '_');
|
||||
@@ -1558,18 +1557,18 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
tempo[0] = '\0';
|
||||
|
||||
#if DEBUG_SAVENAME
|
||||
printf("\nWRONG CASE UNMATCH : \n%s\n%s, REDEFINE\n", liens[i]->fil,
|
||||
printf("\nWRONG CASE UNMATCH : \n%s\n%s, REDEFINE\n", heap(i)->fil,
|
||||
fil_complete);
|
||||
#endif
|
||||
nom_ok = 0;
|
||||
i = 0;
|
||||
|
||||
while((a > save) && (*a != '.') && (*a != '\\') && (*a != '/'))
|
||||
while((a > afs->save) && (*a != '.') && (*a != '\\') && (*a != '/'))
|
||||
a--;
|
||||
if (*a == '.')
|
||||
strncatbuff(tempo, save, (int) (a - save));
|
||||
strncatbuff(tempo, afs->save, a - afs->save);
|
||||
else
|
||||
strcatbuff(tempo, save);
|
||||
strcatbuff(tempo, afs->save);
|
||||
|
||||
// tester la présence d'un -xx (ex: index-2.html -> index-3.html)
|
||||
b = tempo + strlen(tempo) - 1;
|
||||
@@ -1600,7 +1599,7 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
if (*a == '.')
|
||||
strcatbuff(tempo, a);
|
||||
|
||||
strcpybuff(save, tempo);
|
||||
strcpybuff(afs->save, tempo);
|
||||
|
||||
//printf("switched: %s\n",save);
|
||||
|
||||
@@ -1618,7 +1617,7 @@ int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
}
|
||||
|
||||
/* nom avec md5 urilisé partout */
|
||||
void standard_name(char *b, char *dot_pos, char *nom_pos, char *fil_complete,
|
||||
void standard_name(char *b, const char *dot_pos, const char *nom_pos, const char *fil,
|
||||
int short_ver) {
|
||||
char md5[32 + 2];
|
||||
|
||||
@@ -1626,9 +1625,9 @@ void standard_name(char *b, char *dot_pos, char *nom_pos, char *fil_complete,
|
||||
/* Nom */
|
||||
if (dot_pos) {
|
||||
if (!short_ver) // Noms longs
|
||||
strncatbuff(b, nom_pos, (int) (dot_pos - nom_pos));
|
||||
strncatbuff(b, nom_pos, (dot_pos - nom_pos));
|
||||
else
|
||||
strncatbuff(b, nom_pos, min((int) (dot_pos - nom_pos), 8));
|
||||
strncatbuff(b, nom_pos, min(dot_pos - nom_pos, 8));
|
||||
} else {
|
||||
if (!short_ver) // Noms longs
|
||||
strcatbuff(b, nom_pos);
|
||||
@@ -1636,7 +1635,7 @@ void standard_name(char *b, char *dot_pos, char *nom_pos, char *fil_complete,
|
||||
strncatbuff(b, nom_pos, 8);
|
||||
}
|
||||
/* MD5 - 16 bits */
|
||||
strncatbuff(b, url_md5(md5, fil_complete), 4);
|
||||
strncatbuff(b, url_md5(md5, fil), 4);
|
||||
/* Ext */
|
||||
if (dot_pos) {
|
||||
strcatbuff(b, ".");
|
||||
@@ -1657,11 +1656,11 @@ void standard_name(char *b, char *dot_pos, char *nom_pos, char *fil_complete,
|
||||
}
|
||||
|
||||
/* Petit md5 */
|
||||
char *url_md5(char *digest, char *fil_complete) {
|
||||
char *url_md5(char *digest, const char *fil) {
|
||||
char *a;
|
||||
|
||||
digest[0] = '\0';
|
||||
a = strchr(fil_complete, '?');
|
||||
a = strchr(fil, '?');
|
||||
if (a) {
|
||||
if (strlen(a)) {
|
||||
char BIGSTK buff[HTS_URLMAXSIZE * 2];
|
||||
@@ -1676,7 +1675,7 @@ char *url_md5(char *digest, char *fil_complete) {
|
||||
}
|
||||
|
||||
// interne à url_savename: ajoute une chaîne à une autre avec \ -> /
|
||||
void url_savename_addstr(char *d, char *s) {
|
||||
void url_savename_addstr(char *d, const char *s) {
|
||||
int i = (int) strlen(d);
|
||||
|
||||
while(*s) {
|
||||
@@ -1695,9 +1694,9 @@ void url_savename_refname(const char *adr, const char *fil, char *filename) {
|
||||
MD5_CTX ctx;
|
||||
|
||||
MD5Init(&ctx, 0);
|
||||
MD5Update(&ctx, (const unsigned char *) adr, strlen(adr));
|
||||
MD5Update(&ctx, (const unsigned char *) adr, (int) strlen(adr));
|
||||
MD5Update(&ctx, (const unsigned char *) ",", 1);
|
||||
MD5Update(&ctx, (const unsigned char *) fil, strlen(fil));
|
||||
MD5Update(&ctx, (const unsigned char *) fil, (int) strlen(fil));
|
||||
MD5Final(bindigest, &ctx);
|
||||
sprintf(filename,
|
||||
CACHE_REFNAME "/" "%02x%02x%02x%02x%02x%02x%02x%02x"
|
||||
|
||||
@@ -80,18 +80,27 @@ typedef struct hash_struct hash_struct;
|
||||
#define HTS_DEF_FWSTRUCT_lien_back
|
||||
typedef struct lien_back lien_back;
|
||||
#endif
|
||||
#ifndef HTS_DEF_FWSTRUCT_lien_adrfil
|
||||
#define HTS_DEF_FWSTRUCT_lien_adrfil
|
||||
typedef struct lien_adrfil lien_adrfil;
|
||||
#endif
|
||||
#ifndef HTS_DEF_FWSTRUCT_lien_adrfilsave
|
||||
#define HTS_DEF_FWSTRUCT_lien_adrfilsave
|
||||
typedef struct lien_adrfilsave lien_adrfilsave;
|
||||
#endif
|
||||
|
||||
// note: 'headers' can either be null, or incomplete (only r member filled)
|
||||
int url_savename(char *adr_complete, char *fil_complete, char *save,
|
||||
char *former_adr, char *former_fil, char *referer_adr,
|
||||
char *referer_fil, httrackp * opt, lien_url ** liens,
|
||||
int lien_tot, struct_back * sback, cache_back * cache,
|
||||
int url_savename(lien_adrfilsave *const afs,
|
||||
lien_adrfil *const former,
|
||||
const char *referer_adr, const char *referer_fil,
|
||||
httrackp * opt, struct_back * sback, cache_back * cache,
|
||||
hash_struct * hash, int ptr, int numero_passe,
|
||||
const lien_back * headers);
|
||||
void standard_name(char *b, char *dot_pos, char *nom_pos, char *fil_complete,
|
||||
void standard_name(char *b, const char *dot_pos, const char *nom_pos,
|
||||
const char *fil_complete,
|
||||
int short_ver);
|
||||
void url_savename_addstr(char *d, char *s);
|
||||
char *url_md5(char *digest_buffer, char *fil_complete);
|
||||
void url_savename_addstr(char *d, const char *s);
|
||||
char *url_md5(char *digest_buffer, const char *fil_complete);
|
||||
void url_savename_refname(const char *adr, const char *fil, char *filename);
|
||||
char *url_savename_refname_fullpath(httrackp * opt, const char *adr,
|
||||
const char *fil);
|
||||
|
||||
313
src/htsnet.h
313
src/htsnet.h
@@ -38,13 +38,17 @@ Please visit our Website: http://www.httrack.com
|
||||
/* basic net definitions */
|
||||
#include "htsglobal.h"
|
||||
#include "htsbasenet.h"
|
||||
#include "htssafe.h"
|
||||
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
#ifdef _WIN32
|
||||
// pour read
|
||||
#include <io.h>
|
||||
// pour FindFirstFile
|
||||
#include <winbase.h>
|
||||
typedef USHORT in_port_t;
|
||||
typedef ADDRESS_FAMILY sa_family_t;
|
||||
#else
|
||||
//typedef int T_SOC;
|
||||
#define INVALID_SOCKET -1
|
||||
@@ -70,87 +74,16 @@ typedef unsigned long in_addr_t;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
** ipV4 **
|
||||
*/
|
||||
#if HTS_INET6==0
|
||||
|
||||
/* Ipv4 structures */
|
||||
typedef struct in_addr INaddr;
|
||||
|
||||
/* This should handle all cases */
|
||||
#ifndef HTS_DEF_FWSTRUCT_SOCaddr
|
||||
#define HTS_DEF_FWSTRUCT_SOCaddr
|
||||
typedef struct SOCaddr SOCaddr;
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
struct SOCaddr {
|
||||
union {
|
||||
struct sockaddr_in in;
|
||||
struct sockaddr sa;
|
||||
unsigned char v4data[4];
|
||||
unsigned char v6data[16];
|
||||
unsigned char pad[128];
|
||||
} m_addr;
|
||||
};
|
||||
|
||||
/* Ipv4 structure members */
|
||||
#define SOCaddr_sinaddr(server) ((server).m_addr.in.sin_addr)
|
||||
#define SOCaddr_sinfamily(server) ((server).m_addr.in.sin_family)
|
||||
#define SOCaddr_sinport(server) ((server).m_addr.in.sin_port)
|
||||
|
||||
/* AF_xx */
|
||||
#define AFinet AF_INET
|
||||
|
||||
/* Set port to sockaddr structure */
|
||||
#define SOCaddr_initport(server, port) do { \
|
||||
SOCaddr_sinport(server) = htons((unsigned short int) (port)); \
|
||||
} while(0)
|
||||
|
||||
#define SOCaddr_initany(server, server_len) do { \
|
||||
SOCaddr_sinfamily(server) = AF_INET; \
|
||||
memset(&SOCaddr_sinaddr(server), 0, sizeof(struct sockaddr_in)); \
|
||||
server_len=sizeof(struct sockaddr_in); \
|
||||
} while(0)
|
||||
|
||||
/* Copy sockaddr to another one */
|
||||
#define SOCaddr_copyaddr(server, server_len, hpaddr, hpsize) do { \
|
||||
if (hpsize == sizeof(struct sockaddr_in)) { \
|
||||
server_len=sizeof(struct sockaddr_in); \
|
||||
SOCaddr_sinfamily(server) = (*(struct sockaddr_in*)(hpaddr)).sin_family; \
|
||||
SOCaddr_sinport(server) = (*(struct sockaddr_in*)(hpaddr)).sin_port; \
|
||||
memcpy(&SOCaddr_sinaddr(server), &(*(struct sockaddr_in*)(hpaddr)).sin_addr, sizeof(SOCaddr_sinaddr(server))); \
|
||||
} else if (hpsize == 4) {\
|
||||
server_len=sizeof(struct sockaddr_in); \
|
||||
SOCaddr_sinfamily(server) = AF_INET; \
|
||||
SOCaddr_sinport(server) = 0; \
|
||||
memcpy(&SOCaddr_sinaddr(server), (hpaddr), sizeof(SOCaddr_sinaddr(server))); \
|
||||
} else if ((hpsize > 0) && (hpsize <= sizeof(server))) { \
|
||||
server_len=hpsize; \
|
||||
memcpy(&(server), hpaddr, hpsize); \
|
||||
} else { \
|
||||
server_len=0; \
|
||||
} \
|
||||
} while(0)
|
||||
|
||||
/* Get dotted address */
|
||||
#define SOCaddr_inetntoa(namebuf, namebuflen, ss, sslen) do { \
|
||||
char* dot = (char*) inet_ntoa(SOCaddr_sinaddr(ss)); \
|
||||
(namebuf)[0]='\0'; \
|
||||
if (dot) { \
|
||||
strcpy(namebuf, dot); \
|
||||
} \
|
||||
} while(0)
|
||||
|
||||
/* Get protocol ID */
|
||||
#define SOCaddr_getproto(ss, sslen) ('1')
|
||||
|
||||
/*
|
||||
** ipV6 **
|
||||
*/
|
||||
#else
|
||||
|
||||
/* Ipv4 structures */
|
||||
#if HTS_INET6 != 0
|
||||
typedef struct in6_addr INaddr;
|
||||
#else
|
||||
typedef struct in_addr INaddr;
|
||||
#endif
|
||||
|
||||
/* This should handle all cases */
|
||||
#ifndef HTS_DEF_FWSTRUCT_SOCaddr
|
||||
@@ -159,117 +92,173 @@ typedef struct SOCaddr SOCaddr;
|
||||
#endif
|
||||
struct SOCaddr {
|
||||
union {
|
||||
struct sockaddr_in6 in6;
|
||||
struct sockaddr_in in;
|
||||
/* Generic version, for network functions such as getnameinfo() */
|
||||
struct sockaddr sa;
|
||||
unsigned char v4data[4];
|
||||
unsigned char v6data[16];
|
||||
unsigned char pad[128];
|
||||
/* IPv4 */
|
||||
struct sockaddr_in in;
|
||||
#if HTS_INET6 != 0
|
||||
/* IPv6 */
|
||||
struct sockaddr_in6 in6;
|
||||
#endif
|
||||
} m_addr;
|
||||
};
|
||||
|
||||
/* Ipv4 structure members */
|
||||
#define SOCaddr_sinaddr(server) ((server).m_addr.in6.sin6_addr)
|
||||
#define SOCaddr_sinfamily(server) ((server).m_addr.in6.sin6_family)
|
||||
#define SOCaddr_sinport(server) ((server).m_addr.in6.sin6_port)
|
||||
#define SOCaddr_sinflowinfo(server) ((server).m_addr.in6.sin6_flowinfo)
|
||||
/* #define SOCaddr_sinscopeid(a) ((a).m_addr.in6.sin6_scope_id) */
|
||||
static HTS_INLINE HTS_UNUSED in_port_t* SOCaddr_sinport_(SOCaddr *const addr,
|
||||
const char *file, const int line) {
|
||||
assertf_(addr != NULL, file, line);
|
||||
switch(addr->m_addr.sa.sa_family) {
|
||||
case AF_INET:
|
||||
return &addr->m_addr.in.sin_port;
|
||||
break;
|
||||
#if HTS_INET6 != 0
|
||||
case AF_INET6:
|
||||
return &addr->m_addr.in6.sin6_port;
|
||||
break;
|
||||
#endif
|
||||
default:
|
||||
assertf_(! "invalid structure", file, line);
|
||||
return 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static HTS_INLINE HTS_UNUSED socklen_t SOCaddr_size_(const SOCaddr*const addr,
|
||||
const char *file, const int line) {
|
||||
assertf_(addr != NULL, file, line);
|
||||
switch(addr->m_addr.sa.sa_family) {
|
||||
case AF_INET:
|
||||
return sizeof(addr->m_addr.in);
|
||||
break;
|
||||
#if HTS_INET6 != 0
|
||||
case AF_INET6:
|
||||
return sizeof(addr->m_addr.in6);
|
||||
break;
|
||||
#endif
|
||||
default:
|
||||
return 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static HTS_INLINE HTS_UNUSED void SOCaddr_clear_(SOCaddr*const addr,
|
||||
const char *file, const int line) {
|
||||
assertf_(addr != NULL, file, line);
|
||||
addr->m_addr.sa.sa_family = AF_UNSPEC;
|
||||
}
|
||||
|
||||
/* Ipv4/6 structure members */
|
||||
#define SOCaddr_sinfamily(server) ((server).m_addr.sa.sa_family)
|
||||
#define SOCaddr_sinport(server) (*SOCaddr_sinport_(&(server), __FILE__, __LINE__))
|
||||
#define SOCaddr_size(server) (SOCaddr_size_(&(server), __FILE__, __LINE__))
|
||||
#define SOCaddr_is_valid(server) (SOCaddr_size_(&(server), __FILE__, __LINE__) != 0 )
|
||||
#define SOCaddr_clear(server) SOCaddr_clear_(&(server), __FILE__, __LINE__)
|
||||
#define SOCaddr_sockaddr(server) ((server).m_addr.sa)
|
||||
#define SOCaddr_capacity(server) sizeof((server).m_addr)
|
||||
|
||||
/* AF_xx */
|
||||
#if HTS_INET6 != 0
|
||||
#define AFinet AF_INET6
|
||||
#else
|
||||
#define AFinet AF_INET
|
||||
#endif
|
||||
|
||||
/* Set port to sockaddr structure */
|
||||
#define SOCaddr_initport(server, port) do { \
|
||||
SOCaddr_sinport(server) = htons((unsigned short int) (port)); \
|
||||
SOCaddr_sinport(server) = htons((in_port_t) (port)); \
|
||||
} while(0)
|
||||
|
||||
#define SOCaddr_initany(server, server_len) do { \
|
||||
SOCaddr_sinfamily(server) = AF_INET; \
|
||||
memset(&SOCaddr_sinaddr(server), 0, sizeof(struct sockaddr_in)); \
|
||||
server_len=sizeof(struct sockaddr_in); \
|
||||
static HTS_INLINE HTS_UNUSED socklen_t SOCaddr_initany_(SOCaddr*const addr,
|
||||
const char *file, const int line) {
|
||||
assertf_(addr != NULL, file, line);
|
||||
memset(&addr->m_addr.in, 0, sizeof(addr->m_addr.in));
|
||||
addr->m_addr.in.sin_family = AF_INET;
|
||||
return SOCaddr_size_(addr, file, line);
|
||||
}
|
||||
|
||||
#define SOCaddr_initany(server) do { \
|
||||
SOCaddr_initany_(&(server), __FILE__, __LINE__); \
|
||||
} while(0)
|
||||
|
||||
/*
|
||||
Copy sockaddr to SOCaddr
|
||||
|
||||
Note;
|
||||
The '> sizeof(struct sockaddr_in6)' hack if for the VC6 structure which
|
||||
lacks the scope id
|
||||
Copy sockaddr_in/sockaddr_in6/raw IPv4/raw IPv6 to our opaque SOCaddr
|
||||
*/
|
||||
static HTS_UNUSED socklen_t SOCaddr_copyaddr_(SOCaddr*const server,
|
||||
const void *data, const size_t data_size,
|
||||
const char *file, const int line) {
|
||||
assertf_(server != NULL, file, line);
|
||||
assertf_(data != NULL, file, line);
|
||||
|
||||
if (data_size == sizeof(struct sockaddr_in)) {
|
||||
memcpy(&server->m_addr.in, data, sizeof(struct sockaddr_in));
|
||||
assertf_(server->m_addr.sa.sa_family == AF_INET, file, line);
|
||||
#if HTS_INET6 != 0
|
||||
} else if (data_size == sizeof(struct sockaddr_in6)) {
|
||||
memcpy(&server->m_addr.in6, data, sizeof(struct sockaddr_in6));
|
||||
assertf_(server->m_addr.sa.sa_family == AF_INET6, file, line);
|
||||
#endif
|
||||
} else if (data_size == 4) {
|
||||
memset(&server->m_addr.in, 0, sizeof(server->m_addr.in));
|
||||
server->m_addr.in.sin_family = AF_INET;
|
||||
server->m_addr.in.sin_port = 0;
|
||||
memcpy(&server->m_addr.in.sin_addr, data, 4);
|
||||
#if HTS_INET6 != 0
|
||||
} else if (data_size == 16) {
|
||||
memset(&server->m_addr.in6, 0, sizeof(server->m_addr.in6));
|
||||
server->m_addr.in6.sin6_family = AF_INET6;
|
||||
server->m_addr.in6.sin6_port = 0;
|
||||
memcpy(&server->m_addr.in6.sin6_addr, data, 16);
|
||||
#endif
|
||||
} else {
|
||||
server->m_addr.in.sin_family = AF_INET;
|
||||
}
|
||||
return SOCaddr_size_(server, file, line);
|
||||
}
|
||||
|
||||
#define SOCaddr_copyaddr(server, server_len, hpaddr, hpsize) do { \
|
||||
if (hpsize == sizeof(struct sockaddr_in6)) { \
|
||||
server_len=sizeof(struct sockaddr_in6); \
|
||||
SOCaddr_sinfamily(server) = (*(struct sockaddr_in6*)(hpaddr)).sin6_family; \
|
||||
SOCaddr_sinport(server) = (*(struct sockaddr_in6*)(hpaddr)).sin6_port; \
|
||||
SOCaddr_sinflowinfo(server) = (*(struct sockaddr_in6*)(hpaddr)).sin6_flowinfo; \
|
||||
memcpy(&SOCaddr_sinaddr(server), &(*(struct sockaddr_in6*)(hpaddr)).sin6_addr, sizeof(SOCaddr_sinaddr(server))); \
|
||||
} else if (hpsize > sizeof(struct sockaddr_in6)) { \
|
||||
server_len=hpsize; \
|
||||
SOCaddr_sinport(server) = 0; \
|
||||
memcpy(&(server), hpaddr, hpsize); \
|
||||
} else if (hpsize == sizeof(struct sockaddr_in)) { \
|
||||
server_len=sizeof(struct sockaddr_in); \
|
||||
(*(struct sockaddr_in*)(&server)).sin_family = AF_INET; \
|
||||
SOCaddr_sinport(server) = (*(struct sockaddr_in*)(hpaddr)).sin_port; \
|
||||
memcpy(&(*(struct sockaddr_in*)&(server)).sin_addr, &(*(struct sockaddr_in*)(hpaddr)).sin_addr, sizeof((*(struct sockaddr_in*)(hpaddr)).sin_addr)); \
|
||||
} else if (hpsize == 4) {\
|
||||
server_len=sizeof(struct sockaddr_in); \
|
||||
(*(struct sockaddr_in*)(&server)).sin_family = AF_INET; \
|
||||
SOCaddr_sinport(server) = 0; \
|
||||
memcpy(&(*(struct sockaddr_in*)&(server)).sin_addr, hpaddr, 4); \
|
||||
} else if (hpsize == 16) {\
|
||||
server_len=sizeof(struct sockaddr_in6); \
|
||||
SOCaddr_sinfamily(server) = AF_INET6; \
|
||||
SOCaddr_sinport(server) = 0; \
|
||||
memcpy(&SOCaddr_sinaddr(server), (hpaddr), 16); \
|
||||
} else if ((hpsize > 0) && (hpsize <= sizeof(server))) { \
|
||||
server_len=hpsize; \
|
||||
memcpy(&(server), hpaddr, hpsize); \
|
||||
} else { \
|
||||
server_len=0; \
|
||||
} \
|
||||
server_len = (int) SOCaddr_copyaddr_(&(server), hpaddr, hpsize, __FILE__, __LINE__); \
|
||||
} while(0)
|
||||
|
||||
#define SOCaddr_copyaddr2(server, hpaddr, hpsize) do { \
|
||||
(void) SOCaddr_copyaddr_(&(server), hpaddr, hpsize, __FILE__, __LINE__); \
|
||||
} while(0)
|
||||
|
||||
#define SOCaddr_copy_SOCaddr(dest, src) do { \
|
||||
SOCaddr_copyaddr_(&(dest), &(src).m_addr.sa, SOCaddr_size(src), __FILE__, __LINE__); \
|
||||
} while(0)
|
||||
|
||||
/* Get dotted address */
|
||||
#define SOCaddr_inetntoa(namebuf, namebuflen, ss, sslen) do { \
|
||||
char *pos_; \
|
||||
(namebuf)[0]='\0'; \
|
||||
getnameinfo((struct sockaddr *)&(ss), sslen, \
|
||||
(namebuf), namebuflen, NULL, 0, NI_NUMERICHOST); \
|
||||
/* remove scope id */ \
|
||||
pos_ = strrchr(namebuf, '%'); \
|
||||
if (pos_ != NULL) { \
|
||||
*pos_ = '\0'; \
|
||||
} \
|
||||
} while(0)
|
||||
|
||||
static HTS_UNUSED void SOCaddr_inetntoa_(char *namebuf, size_t namebuflen,
|
||||
SOCaddr *const ss,
|
||||
const char *file, const int line) {
|
||||
assertf_(namebuf != NULL, file, line);
|
||||
assertf_(ss != NULL, file, line);
|
||||
|
||||
if (getnameinfo(&ss->m_addr.sa, sizeof(ss->m_addr),
|
||||
namebuf, namebuflen,
|
||||
NULL, 0,
|
||||
NI_NUMERICHOST) == 0) {
|
||||
/* remove scope id(s) */
|
||||
char *const pos = strchr(namebuf, '%');
|
||||
if (pos != NULL) {
|
||||
*pos = '\0';
|
||||
}
|
||||
} else {
|
||||
namebuf[0] = '\0';
|
||||
}
|
||||
}
|
||||
|
||||
#define SOCaddr_inetntoa(namebuf, namebuflen, ss) \
|
||||
SOCaddr_inetntoa_(namebuf, namebuflen, &(ss), __FILE__, __LINE__)
|
||||
|
||||
/* Get protocol ID */
|
||||
#define SOCaddr_getproto(ss, sslen) ((sslen == sizeof(struct sockaddr_in6))?('2'):('1'))
|
||||
|
||||
#endif
|
||||
#define SOCaddr_getproto(ss) ( SOCaddr_size(ss) == sizeof(struct sockaddr_in) ? '1' : '2')
|
||||
|
||||
/* Socket length type */
|
||||
typedef socklen_t SOClen;
|
||||
|
||||
/* Buffer structure to copy various hostent structures */
|
||||
#ifndef HTS_DEF_FWSTRUCT_t_fullhostent
|
||||
#define HTS_DEF_FWSTRUCT_t_fullhostent
|
||||
typedef struct t_fullhostent t_fullhostent;
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
struct t_fullhostent {
|
||||
t_hostent hp;
|
||||
char *list[2];
|
||||
char addr[HTS_MAXADDRLEN]; /* various struct sockaddr structures */
|
||||
unsigned int addr_maxlen;
|
||||
};
|
||||
|
||||
/* Initialize a t_fullhostent structure */
|
||||
#define fullhostent_init(h) do { \
|
||||
memset((h), 0, sizeof(t_fullhostent)); \
|
||||
(h)->hp.h_addr_list = (char **) & ((h)->list); \
|
||||
(h)->list[0] = (char *) & ((h)->addr); \
|
||||
(h)->list[1] = NULL; \
|
||||
(h)->addr_maxlen = HTS_MAXADDRLEN; \
|
||||
} while(0)
|
||||
|
||||
#endif
|
||||
|
||||
175
src/htsopt.h
175
src/htsopt.h
@@ -35,7 +35,13 @@ Please visit our Website: http://www.httrack.com
|
||||
#define HTTRACK_DEFOPT
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include "htsglobal.h"
|
||||
#include "htsnet.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/* Forward definitions */
|
||||
#ifndef HTS_DEF_FWSTRUCT_t_hts_htmlcheck_callbacks
|
||||
@@ -274,6 +280,11 @@ typedef enum htsparsejava_flags {
|
||||
HTSPARSE_NO_AGGRESSIVE = 8 // don't aggressively parse .js or .java
|
||||
} htsparsejava_flags;
|
||||
|
||||
#ifndef HTS_DEF_FWSTRUCT_lien_buffers
|
||||
#define HTS_DEF_FWSTRUCT_lien_buffers
|
||||
typedef struct lien_buffers lien_buffers;
|
||||
#endif
|
||||
|
||||
// paramètres httrack (options)
|
||||
#ifndef HTS_DEF_FWSTRUCT_httrackp
|
||||
#define HTS_DEF_FWSTRUCT_httrackp
|
||||
@@ -362,7 +373,9 @@ struct httrackp {
|
||||
String urllist; // fichier liste de filtres à inclure
|
||||
htsfilters filters; // contient les pointeurs pour les filtres
|
||||
hash_struct *hash; // hash structure
|
||||
lien_url **liens; // liens
|
||||
lien_url **liens; // links
|
||||
int lien_tot; // top index of "links" heap (always out-of-range)
|
||||
lien_buffers *liensbuf; // links buffers
|
||||
robots_wizard *robotsptr; // robots ptr
|
||||
String lang_iso; // en, fr ..
|
||||
String accept; // Accept:
|
||||
@@ -374,7 +387,7 @@ struct httrackp {
|
||||
int maxlink; // nombre max de liens
|
||||
int maxfilter; // nombre max de filtres
|
||||
//
|
||||
char *exec; // adresse du nom de l'éxecutable
|
||||
const char *exec; // adresse du nom de l'éxecutable
|
||||
//
|
||||
int quiet; // poser des questions autres que wizard?
|
||||
int keyboard; // vérifier stdin
|
||||
@@ -432,4 +445,162 @@ struct hts_stat_struct {
|
||||
TStamp last_request; // last request issued
|
||||
};
|
||||
|
||||
// structure pour paramètres supplémentaires lors de la requête
|
||||
#ifndef HTS_DEF_FWSTRUCT_htsrequest_proxy
|
||||
#define HTS_DEF_FWSTRUCT_htsrequest_proxy
|
||||
typedef struct htsrequest_proxy htsrequest_proxy;
|
||||
#endif
|
||||
struct htsrequest_proxy {
|
||||
int active;
|
||||
const char* name;
|
||||
int port;
|
||||
const char* bindhost; // bind this host
|
||||
};
|
||||
|
||||
#ifndef HTS_DEF_FWSTRUCT_htsrequest
|
||||
#define HTS_DEF_FWSTRUCT_htsrequest
|
||||
typedef struct htsrequest htsrequest;
|
||||
#endif
|
||||
struct htsrequest {
|
||||
short int user_agent_send; // user agent (ex: httrack/1.0 [sun])
|
||||
short int http11; // l'en tête peut (doit) être signé HTTP/1.1 et non HTTP/1.0
|
||||
short int nokeepalive; // pas de keep-alive
|
||||
short int range_used; // Range utilisé
|
||||
short int nocompression; // Pas de compression
|
||||
short int flush_garbage; // recycled
|
||||
const char* user_agent;
|
||||
const char* referer;
|
||||
const char* from;
|
||||
const char* lang_iso;
|
||||
const char* accept;
|
||||
const char* headers;
|
||||
htsrequest_proxy proxy; // proxy
|
||||
};
|
||||
|
||||
// structure pour retour d'une connexion/prise d'en tête
|
||||
#ifndef HTS_DEF_FWSTRUCT_htsblk
|
||||
#define HTS_DEF_FWSTRUCT_htsblk
|
||||
typedef struct htsblk htsblk;
|
||||
#endif
|
||||
struct htsblk {
|
||||
int statuscode; // status-code, -1=erreur, 200=OK,201=..etc (cf RFC1945)
|
||||
short int notmodified; // page ou fichier NON modifié (transféré)
|
||||
short int is_write; // sortie sur disque (out) ou en mémoire (adr)
|
||||
short int is_chunk; // mode chunk
|
||||
short int compressed; // compressé?
|
||||
short int empty; // vide?
|
||||
short int keep_alive; // Keep-Alive?
|
||||
short int keep_alive_trailers; // ..with trailers extension
|
||||
int keep_alive_t; // KA timeout
|
||||
int keep_alive_max; // KA number of requests
|
||||
char *adr; // adresse du bloc de mémoire, NULL=vide
|
||||
char *headers; // adresse des en têtes si présents
|
||||
FILE *out; // écriture directe sur disque (si is_write=1)
|
||||
LLint size; // taille fichier
|
||||
char msg[80]; // message éventuel si échec ("\0"=non précisé)
|
||||
char contenttype[64]; // content-type ("text/html" par exemple)
|
||||
char charset[64]; // charset ("iso-8859-1" par exemple)
|
||||
char contentencoding[64]; // content-encoding ("gzip" par exemple)
|
||||
char *location; // on copie dedans éventuellement la véritable 'location'
|
||||
LLint totalsize; // taille totale à télécharger (-1=inconnue)
|
||||
short int is_file; // ce n'est pas une socket mais un descripteur de fichier si 1
|
||||
T_SOC soc; // ID socket
|
||||
SOCaddr address; // IP address
|
||||
int address_size; // IP address structure length (unused internally)
|
||||
FILE *fp; // fichier pour file://
|
||||
#if HTS_USEOPENSSL
|
||||
short int ssl; // is this connection a SSL one? (https)
|
||||
// BIO* ssl_soc; // SSL structure
|
||||
SSL *ssl_con; // connection structure
|
||||
#endif
|
||||
char lastmodified[64]; // Last-Modified
|
||||
char etag[256]; // Etag
|
||||
char cdispo[256]; // Content-Disposition coupé
|
||||
LLint crange; // Content-Range
|
||||
LLint crange_start; // Content-Range
|
||||
LLint crange_end; // Content-Range
|
||||
int debugid; // debug connection
|
||||
/* */
|
||||
htsrequest req; // paramètres pour la requête
|
||||
/*char digest[32+2]; // digest md5 généré par le moteur ("" si non généré) */
|
||||
};
|
||||
|
||||
// structure d'un lien
|
||||
#ifndef HTS_DEF_FWSTRUCT_lien_url
|
||||
#define HTS_DEF_FWSTRUCT_lien_url
|
||||
typedef struct lien_url lien_url;
|
||||
#endif
|
||||
struct lien_url {
|
||||
char *adr; // adresse
|
||||
char *fil; // nom du fichier distant
|
||||
char *sav; // nom à sauver sur disque (avec chemin éventuel)
|
||||
char *cod; // chemin codebase éventuel si classe java
|
||||
char *former_adr; // adresse initiale (avant éventuel moved), peut être nulle
|
||||
char *former_fil; // nom du fichier distant initial (avant éventuel moved), peut être nul
|
||||
|
||||
int premier; // pointeur sur le premier lien qui a donné lieu aux autres liens du domaine
|
||||
int precedent; // pointeur sur le lien qui a donné lieu à ce lien précis
|
||||
int depth; // profondeur autorisée lien ; >0 forte 0=faible
|
||||
int pass2; // traiter après les autres, seconde passe. si == -1, lien traité en background
|
||||
char link_import; // lien importé à la suite d'un moved - ne pas appliquer les règles classiques up/down
|
||||
//int moved; // pointeur sur moved
|
||||
int retry; // nombre de retry restants
|
||||
int testmode; // mode test uniquement, envoyer juste un head!
|
||||
};
|
||||
|
||||
// chargement de fichiers en 'arrière plan'
|
||||
#ifndef HTS_DEF_FWSTRUCT_lien_back
|
||||
#define HTS_DEF_FWSTRUCT_lien_back
|
||||
typedef struct lien_back lien_back;
|
||||
#endif
|
||||
struct lien_back {
|
||||
#if DEBUG_CHECKINT
|
||||
char magic;
|
||||
#endif
|
||||
char url_adr[HTS_URLMAXSIZE * 2]; // adresse
|
||||
char url_fil[HTS_URLMAXSIZE * 2]; // nom du fichier distant
|
||||
char url_sav[HTS_URLMAXSIZE * 2]; // nom à sauver sur disque (avec chemin éventuel)
|
||||
char referer_adr[HTS_URLMAXSIZE * 2]; // adresse host page referer
|
||||
char referer_fil[HTS_URLMAXSIZE * 2]; // fichier page referer
|
||||
char location_buffer[HTS_URLMAXSIZE * 2]; // "location" en cas de "moved" (302,..)
|
||||
char *tmpfile; // nom à sauver temporairement (compressé)
|
||||
char tmpfile_buffer[HTS_URLMAXSIZE * 2]; // buffer pour le nom à sauver temporairement
|
||||
char send_too[1024]; // données à envoyer en même temps que le header
|
||||
int status; // status (-1=non utilisé, 0: prêt, >0: opération en cours)
|
||||
int locked; // locked (to be used soon)
|
||||
int testmode; // mode de test
|
||||
int timeout; // gérer des timeouts? (!=0 : nombre de secondes)
|
||||
TStamp timeout_refresh; // si oui, time refresh
|
||||
int rateout; // timeout refresh? (!=0 : taux minimum toléré en octets/s)
|
||||
TStamp rateout_time; // si oui, date de départ
|
||||
LLint maxfile_nonhtml; // taille max d'un fichier non html
|
||||
LLint maxfile_html; // idem pour un ficheir html
|
||||
htsblk r; // structure htsblk de chaque objet en background
|
||||
int is_update; // mode update
|
||||
int head_request; // requète HEAD?
|
||||
LLint range_req_size; // range utilisé
|
||||
TStamp ka_time_start; // refresh time for KA
|
||||
//
|
||||
int http11; // L'en tête doit être signé HTTP/1.1 et non HTTP/1.0
|
||||
int is_chunk; // chunk?
|
||||
char *chunk_adr; // adresse chunk en cours de chargement
|
||||
LLint chunk_size; // taille chunk en cours de chargement
|
||||
LLint chunk_blocksize; // taille data declaree par le chunk
|
||||
LLint compressed_size; // taille compressés (stats uniquement)
|
||||
//
|
||||
//int links_index; // to access liens[links_index]
|
||||
//
|
||||
char info[256]; // éventuel status pour le ftp
|
||||
int stop_ftp; // flag stop pour ftp
|
||||
int finalized; // finalized (optim memory)
|
||||
int early_add; // was added before link heap saw it
|
||||
#if DEBUG_CHECKINT
|
||||
char magic2;
|
||||
#endif
|
||||
};
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
1496
src/htsparse.c
1496
src/htsparse.c
File diff suppressed because it is too large
Load Diff
@@ -66,7 +66,7 @@ struct htsmoduleStructExtended {
|
||||
char ***filters_;
|
||||
robots_wizard *robots_;
|
||||
hash_struct *hash_;
|
||||
int *lien_max_;
|
||||
//int *lien_max_;
|
||||
|
||||
/* Base & codebase */
|
||||
char *base;
|
||||
@@ -135,14 +135,13 @@ int hts_mirror_wait_for_next_file(htsmoduleStruct * str,
|
||||
to be ready for naming, having its header MIME type
|
||||
If the final URL is to be forbidden, sets 'forbidden_url' to the corresponding value
|
||||
*/
|
||||
int hts_wait_delayed(htsmoduleStruct * str, char *adr, char *fil, char *save,
|
||||
char *parent_adr, char *parent_fil, char *former_adr,
|
||||
char *former_fil, int *forbidden_url);
|
||||
int hts_wait_delayed(htsmoduleStruct * str, lien_adrfilsave *afs,
|
||||
char *parent_adr, char *parent_fil, lien_adrfil *former,
|
||||
int *forbidden_url);
|
||||
|
||||
/* Context state */
|
||||
|
||||
#define ENGINE_DEFINE_CONTEXT_BASE() \
|
||||
lien_url** const liens HTS_UNUSED = (lien_url**) str->liens; \
|
||||
httrackp* const opt HTS_UNUSED = (httrackp*) str->opt; \
|
||||
struct_back* const sback HTS_UNUSED = (struct_back*) str->sback; \
|
||||
lien_back* const back HTS_UNUSED = sback->lnk; \
|
||||
@@ -150,28 +149,18 @@ int hts_wait_delayed(htsmoduleStruct * str, char *adr, char *fil, char *save,
|
||||
cache_back* const cache HTS_UNUSED = (cache_back*) str->cache; \
|
||||
hash_struct* const hashptr HTS_UNUSED = (hash_struct*) str->hashptr; \
|
||||
const int numero_passe HTS_UNUSED = str->numero_passe; \
|
||||
const int add_tab_alloc HTS_UNUSED = str->add_tab_alloc; \
|
||||
/* variable */ \
|
||||
int lien_tot = *str->lien_tot_; \
|
||||
int ptr = *str->ptr_; \
|
||||
size_t lien_size = *str->lien_size_; \
|
||||
char* lien_buffer = *str->lien_buffer_
|
||||
int ptr = *str->ptr_
|
||||
|
||||
#define ENGINE_SET_CONTEXT_BASE() \
|
||||
lien_tot = *str->lien_tot_; \
|
||||
ptr = *str->ptr_; \
|
||||
lien_size = *str->lien_size_; \
|
||||
lien_buffer = *str->lien_buffer_
|
||||
ptr = *str->ptr_
|
||||
|
||||
#define ENGINE_LOAD_CONTEXT_BASE() \
|
||||
ENGINE_DEFINE_CONTEXT_BASE()
|
||||
|
||||
#define ENGINE_SAVE_CONTEXT_BASE() \
|
||||
/* Apply changes */ \
|
||||
* str->lien_tot_ = lien_tot; \
|
||||
* str->ptr_ = ptr; \
|
||||
* str->lien_size_ = lien_size; \
|
||||
* str->lien_buffer_ = lien_buffer
|
||||
* str->ptr_ = ptr
|
||||
|
||||
#define WAIT_FOR_AVAILABLE_SOCKET() do { \
|
||||
int prev = opt->state._hts_in_html_parsing; \
|
||||
@@ -186,10 +175,10 @@ int hts_wait_delayed(htsmoduleStruct * str, char *adr, char *fil, char *save,
|
||||
HTS_STAT.stat_errors=fspc(opt,NULL,"error"); \
|
||||
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.nbk=backlinks_done(sback,opt->liens,opt->lien_tot,ptr); \
|
||||
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)) { \
|
||||
if (!RUN_CALLBACK7(opt, loop, sback->lnk, sback->count, -1,ptr,opt->lien_tot,(int) (time_local()-HTS_STAT.stat_timestart),&HTS_STAT)) { \
|
||||
return -1; \
|
||||
} \
|
||||
} \
|
||||
|
||||
@@ -45,7 +45,7 @@ Please visit our Website: http://www.httrack.com
|
||||
// -- robots --
|
||||
|
||||
// fil="" : vérifier si règle déja enregistrée
|
||||
int checkrobots(robots_wizard * robots, char *adr, char *fil) {
|
||||
int checkrobots(robots_wizard * robots, const char *adr, const char *fil) {
|
||||
while(robots) {
|
||||
if (strfield2(robots->adr, adr)) {
|
||||
if (fil[0]) {
|
||||
@@ -60,7 +60,7 @@ int checkrobots(robots_wizard * robots, char *adr, char *fil) {
|
||||
return -1; // interdit
|
||||
}
|
||||
} else { // relatif
|
||||
if (strstrcase(fil, line)) {
|
||||
if (strstrcase((char*) fil, line)) {
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
@@ -74,7 +74,7 @@ int checkrobots(robots_wizard * robots, char *adr, char *fil) {
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
int checkrobots_set(robots_wizard * robots, char *adr, char *data) {
|
||||
int checkrobots_set(robots_wizard * robots, const char *adr, const char *data) {
|
||||
if (((int) strlen(adr)) >= sizeof(robots->adr) - 2)
|
||||
return 0;
|
||||
if (((int) strlen(data)) >= sizeof(robots->token) - 2)
|
||||
|
||||
@@ -47,9 +47,9 @@ struct robots_wizard {
|
||||
|
||||
/* Library internal definictions */
|
||||
#ifdef HTS_INTERNAL_BYTECODE
|
||||
int checkrobots(robots_wizard * robots, char *adr, char *fil);
|
||||
int checkrobots(robots_wizard * robots, const char *adr, const char *fil);
|
||||
void checkrobots_free(robots_wizard * robots);
|
||||
int checkrobots_set(robots_wizard * robots, char *adr, char *data);
|
||||
int checkrobots_set(robots_wizard * robots, const char *adr, const char *data);
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
@@ -33,19 +33,38 @@ Please visit our Website: http://www.httrack.com
|
||||
#ifndef HTSSAFE_DEFH
|
||||
#define HTSSAFE_DEFH
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "htsglobal.h"
|
||||
|
||||
/**
|
||||
* Optional user-defined callback upon fatal error.
|
||||
*/
|
||||
typedef void (*htsErrorCallback) (const char *msg, const char *file, int line);
|
||||
|
||||
/**
|
||||
* Emergency logging.
|
||||
* Default is to use libhttrack one.
|
||||
*/
|
||||
#ifndef HTSSAFE_ABORT_FUNCTION
|
||||
HTSEXT_API htsErrorCallback htsCallbackErr;
|
||||
#define HTSSAFE_ABORT_FUNCTION(A,B,C) do { if (htsCallbackErr != NULL) { htsCallbackErr(A,B,C); } } while(0)
|
||||
|
||||
/** Assert error callback. **/
|
||||
#ifndef HTS_DEF_FWSTRUCT_htsErrorCallback
|
||||
#define HTS_DEF_FWSTRUCT_htsErrorCallback
|
||||
typedef void (*htsErrorCallback) (const char *msg, const char *file, int line);
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
HTSEXT_API htsErrorCallback hts_get_error_callback(void);
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#define HTSSAFE_ABORT_FUNCTION(A,B,C) do { \
|
||||
htsErrorCallback callback = hts_get_error_callback(); \
|
||||
if (callback != NULL) { \
|
||||
callback(A,B,C); \
|
||||
} \
|
||||
} while(0)
|
||||
|
||||
#endif
|
||||
|
||||
/**
|
||||
@@ -61,7 +80,7 @@ HTSEXT_API htsErrorCallback htsCallbackErr;
|
||||
/**
|
||||
* Fatal assertion check.
|
||||
*/
|
||||
#define assertf_(exp, file, line) assertf__(exp, #exp, __FILE__, __LINE__)
|
||||
#define assertf_(exp, file, line) assertf__(exp, #exp, file, line)
|
||||
|
||||
/**
|
||||
* Fatal assertion check.
|
||||
@@ -82,7 +101,7 @@ static HTS_UNUSED void abortf_(const char *exp, const char *file, int line) {
|
||||
/**
|
||||
* Check wether 'VAR' is of type char[].
|
||||
*/
|
||||
#ifdef __GNUC__
|
||||
#if (defined(__GNUC__) && !defined(__cplusplus))
|
||||
/* Note: char[] and const char[] are compatible */
|
||||
#define HTS_IS_CHAR_BUFFER(VAR) ( __builtin_types_compatible_p ( typeof (VAR), char[] ) )
|
||||
#else
|
||||
@@ -91,6 +110,17 @@ static HTS_UNUSED void abortf_(const char *exp, const char *file, int line) {
|
||||
#endif
|
||||
#define HTS_IS_NOT_CHAR_BUFFER(VAR) ( ! HTS_IS_CHAR_BUFFER(VAR) )
|
||||
|
||||
/* Compile-time checks. */
|
||||
static HTS_UNUSED void htssafe_compile_time_check_(void) {
|
||||
char array[32];
|
||||
char *pointer = array;
|
||||
char check_array[HTS_IS_CHAR_BUFFER(array) ? 1 : -1];
|
||||
char check_pointer[HTS_IS_CHAR_BUFFER(pointer) ? -1 : 1];
|
||||
(void) pointer;
|
||||
(void) check_array;
|
||||
(void) check_pointer;
|
||||
}
|
||||
|
||||
/**
|
||||
* Append at most N characters from "B" to "A".
|
||||
* If "A" is a char[] variable whose size is not sizeof(char*), then the size
|
||||
@@ -130,13 +160,22 @@ static HTS_UNUSED void abortf_(const char *exp, const char *file, int line) {
|
||||
#define strlcatbuff(A, B, S) \
|
||||
strncat_safe_(A, S, B, \
|
||||
HTS_IS_NOT_CHAR_BUFFER(B) ? (size_t) -1 : sizeof(B), (size_t) -1, \
|
||||
"overflow while appending '" #B "' to '"#A"'", __FILE__, __LINE__)
|
||||
|
||||
/**
|
||||
* Copy characters of "B" to "A", "A" having a maximum capacity of "S".
|
||||
*/
|
||||
#define strlcpybuff(A, B, S) \
|
||||
strcpy_safe_(A, S, B, \
|
||||
HTS_IS_NOT_CHAR_BUFFER(B) ? (size_t) -1 : sizeof(B), \
|
||||
"overflow while copying '" #B "' to '"#A"'", __FILE__, __LINE__)
|
||||
|
||||
static HTS_INLINE HTS_UNUSED size_t strlen_safe_(const char *source, const size_t sizeof_source,
|
||||
const char *file, int line) {
|
||||
size_t size;
|
||||
assertf_( source != NULL, file, line );
|
||||
size = strnlen(source, sizeof_source);
|
||||
size = sizeof_source != (size_t) -1
|
||||
? strnlen(source, sizeof_source) : strlen(source);
|
||||
assertf_( size < sizeof_source, file, line );
|
||||
return size;
|
||||
}
|
||||
|
||||
220
src/htsserver.c
220
src/htsserver.c
@@ -81,7 +81,7 @@ inthash NewLangList = NULL;
|
||||
|
||||
#include "htsserver.h"
|
||||
|
||||
char *gethomedir(void);
|
||||
const char *gethomedir(void);
|
||||
int commandRunning = 0;
|
||||
int commandEndRequested = 0;
|
||||
int commandEnd = 0;
|
||||
@@ -97,13 +97,13 @@ extern void webhttrack_main(char *cmd);
|
||||
extern void webhttrack_lock(void);
|
||||
extern void webhttrack_release(void);
|
||||
|
||||
static int is_image(char *file) {
|
||||
static int is_image(const char *file) {
|
||||
return ((strstr(file, ".gif") != NULL));
|
||||
}
|
||||
static int is_text(char *file) {
|
||||
static int is_text(const char *file) {
|
||||
return ((strstr(file, ".txt") != NULL));
|
||||
}
|
||||
static int is_html(char *file) {
|
||||
static int is_html(const char *file) {
|
||||
return ((strstr(file, ".htm") != NULL));
|
||||
}
|
||||
|
||||
@@ -119,16 +119,16 @@ HTS_UNUSED static int linputsoc_t(T_SOC soc, char *s, int max, int timeout);
|
||||
HTS_UNUSED static int linput(FILE * fp, char *s, int max);
|
||||
|
||||
/* Language files */
|
||||
HTS_UNUSED static int htslang_load(char *limit_to, char *apppath);
|
||||
HTS_UNUSED static void conv_printf(char *from, char *to);
|
||||
HTS_UNUSED static int htslang_load(char *limit_to, const char *apppath);
|
||||
HTS_UNUSED static void conv_printf(const char *from, char *to);
|
||||
HTS_UNUSED static void LANG_DELETE(void);
|
||||
HTS_UNUSED static void LANG_INIT(char *path);
|
||||
HTS_UNUSED static int LANG_T(char *path, int l);
|
||||
HTS_UNUSED static void LANG_INIT(const char *path);
|
||||
HTS_UNUSED static int LANG_T(const char *path, int l);
|
||||
HTS_UNUSED static int QLANG_T(int l);
|
||||
HTS_UNUSED static char *LANGSEL(char *name);
|
||||
HTS_UNUSED static char *LANGINTKEY(char *name);
|
||||
HTS_UNUSED static int LANG_SEARCH(char *path, char *iso);
|
||||
HTS_UNUSED static int LANG_LIST(char *path, char *buffer);
|
||||
HTS_UNUSED static const char *LANGSEL(const char *name);
|
||||
HTS_UNUSED static const char *LANGINTKEY(const char *name);
|
||||
HTS_UNUSED static int LANG_SEARCH(const char *path, const char *iso);
|
||||
HTS_UNUSED static int LANG_LIST(const char *path, char *buffer, size_t size);
|
||||
|
||||
// URL Link catcher
|
||||
|
||||
@@ -162,16 +162,15 @@ T_SOC smallserver_init_std(int *port_prox, char *adr_prox, int defaultPort) {
|
||||
// 1- Init the URL catcher
|
||||
|
||||
// get hostname. return 1 upon success.
|
||||
static int gethost(const char *hostname, SOCaddr * server, size_t server_size) {
|
||||
static int gethost(const char *hostname, SOCaddr * server) {
|
||||
if (hostname != NULL && *hostname != '\0') {
|
||||
#if HTS_INET6==0
|
||||
/* ipV4 resolver */
|
||||
t_hostent *hp = gethostbyname(hostname);
|
||||
struct hostent *hp = gethostbyname(hostname);
|
||||
|
||||
if (hp != NULL) {
|
||||
if (hp->h_length) {
|
||||
SOCaddr_copyaddr(*server, server_size, hp->h_addr_list[0],
|
||||
hp->h_length);
|
||||
SOCaddr_copyaddr2(*server, hp->h_addr_list[0], hp->h_length);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
@@ -187,7 +186,7 @@ static int gethost(const char *hostname, SOCaddr * server, size_t server_size) {
|
||||
if (getaddrinfo(hostname, NULL, &hints, &res) == 0) {
|
||||
if (res) {
|
||||
if ((res->ai_addr) && (res->ai_addrlen)) {
|
||||
SOCaddr_copyaddr(*server, server_size, res->ai_addr, res->ai_addrlen);
|
||||
SOCaddr_copyaddr2(*server, res->ai_addr, res->ai_addrlen);
|
||||
freeaddrinfo(res);
|
||||
return 1;
|
||||
}
|
||||
@@ -204,7 +203,7 @@ static int gethost(const char *hostname, SOCaddr * server, size_t server_size) {
|
||||
static int my_getlocalhost(char *h_loc, size_t size) {
|
||||
SOCaddr addr;
|
||||
strcpy(h_loc, "localhost");
|
||||
if (gethost(h_loc, &addr, sizeof(addr)) == 1) {
|
||||
if (gethost(h_loc, &addr) == 1) {
|
||||
return 0;
|
||||
}
|
||||
// come on ...
|
||||
@@ -220,7 +219,7 @@ static int my_gethostname(char *h_loc, size_t size) {
|
||||
h_loc[0] = '\0';
|
||||
if (gethostname(h_loc, (int) size) == 0) { // host name
|
||||
SOCaddr addr;
|
||||
if (gethost(h_loc, &addr, sizeof(addr)) == 1) {
|
||||
if (gethost(h_loc, &addr) == 1) {
|
||||
return 0;
|
||||
} else {
|
||||
return my_getlocalhost(h_loc, size);
|
||||
@@ -247,54 +246,16 @@ T_SOC smallserver_init(int *port, char *adr) {
|
||||
|
||||
if (my_gethostname(h_loc, 256) == 0) { // host name
|
||||
SOCaddr server;
|
||||
int server_size = sizeof(server);
|
||||
|
||||
/*t_hostent* hp_loc;
|
||||
t_fullhostent buffer; */
|
||||
|
||||
// effacer structure
|
||||
memset(&server, 0, sizeof(server));
|
||||
|
||||
/*if ( (hp_loc=vxgethostbyname(h_loc, &buffer)) ) */
|
||||
{
|
||||
// copie adresse
|
||||
// NO (bind all)
|
||||
// SOCaddr_copyaddr(server, server_size, hp_loc->h_addr_list[0], hp_loc->h_length);
|
||||
|
||||
SOCaddr_initany(server, server_size);
|
||||
if ((soc =
|
||||
(T_SOC) socket(SOCaddr_sinfamily(server), SOCK_STREAM,
|
||||
0)) != INVALID_SOCKET) {
|
||||
SOCaddr_initport(server, *port);
|
||||
if (bind(soc, (struct sockaddr *) &server, server_size) == 0) {
|
||||
/*SOClen len;
|
||||
SOCaddr server2;
|
||||
len=sizeof(server2); */
|
||||
// effacer structure
|
||||
/*memset(&server2, 0, sizeof(server2));
|
||||
if (getsockname(soc,(struct sockaddr*) &server2,&len) == 0) {
|
||||
*port=ntohs(SOCaddr_sinport(server)); // récupérer port */
|
||||
if (listen(soc, 10) >= 0) { // au pif le 10
|
||||
// SOCaddr_inetntoa(adr, 128, server2, len);
|
||||
strcpy(adr, h_loc);
|
||||
} else {
|
||||
#ifdef _WIN32
|
||||
closesocket(soc);
|
||||
#else
|
||||
close(soc);
|
||||
#endif
|
||||
soc = INVALID_SOCKET;
|
||||
}
|
||||
|
||||
/*} else {
|
||||
#ifdef _WIN32
|
||||
closesocket(soc);
|
||||
#else
|
||||
close(soc);
|
||||
#endif
|
||||
soc=INVALID_SOCKET;
|
||||
} */
|
||||
|
||||
SOCaddr_initany(server);
|
||||
if ((soc =
|
||||
(T_SOC) socket(SOCaddr_sinfamily(server), SOCK_STREAM,
|
||||
0)) != INVALID_SOCKET) {
|
||||
SOCaddr_initport(server, *port);
|
||||
if (bind(soc, &SOCaddr_sockaddr(server), SOCaddr_size(server)) == 0) {
|
||||
if (listen(soc, 10) >= 0) {
|
||||
// SOCaddr_inetntoa(adr, 128, server2);
|
||||
strcpy(adr, h_loc);
|
||||
} else {
|
||||
#ifdef _WIN32
|
||||
closesocket(soc);
|
||||
@@ -303,6 +264,13 @@ T_SOC smallserver_init(int *port, char *adr) {
|
||||
#endif
|
||||
soc = INVALID_SOCKET;
|
||||
}
|
||||
} else {
|
||||
#ifdef _WIN32
|
||||
closesocket(soc);
|
||||
#else
|
||||
close(soc);
|
||||
#endif
|
||||
soc = INVALID_SOCKET;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -319,12 +287,12 @@ T_SOC smallserver_init(int *port, char *adr) {
|
||||
// data: 32Kb
|
||||
|
||||
typedef struct {
|
||||
char *name;
|
||||
const char *name;
|
||||
int value;
|
||||
} initIntElt;
|
||||
typedef struct {
|
||||
char *name;
|
||||
char *value;
|
||||
const char *name;
|
||||
const char *value;
|
||||
} initStrElt;
|
||||
|
||||
#define SET_ERROR(err) do { \
|
||||
@@ -358,10 +326,10 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) {
|
||||
{
|
||||
char pth[1024];
|
||||
|
||||
char *initOn[] = { "parseall", "Cache", "ka",
|
||||
const char *initOn[] = { "parseall", "Cache", "ka",
|
||||
"cookies", "parsejava", "testall", "updhack", "urlhack", "index", NULL
|
||||
};
|
||||
initIntElt initInt[] = {
|
||||
const initIntElt initInt[] = {
|
||||
{"filter", 4},
|
||||
{"travel", 2},
|
||||
{"travel2", 1},
|
||||
@@ -415,7 +383,7 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) {
|
||||
char line2[1024];
|
||||
T_SOC soc_c;
|
||||
LLint length = 0;
|
||||
char *error_redirect = NULL;
|
||||
const char *error_redirect = NULL;
|
||||
|
||||
line[0] = '\0';
|
||||
buffer[0] = '\0';
|
||||
@@ -530,7 +498,7 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) {
|
||||
|
||||
strcatbuff(buffer, "&");
|
||||
while(s && (e = strchr(s, '=')) && (f = strchr(s, '&'))) {
|
||||
char *ua;
|
||||
const char *ua;
|
||||
String sua = STRING_EMPTY;
|
||||
|
||||
*e = *f = '\0';
|
||||
@@ -818,7 +786,7 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) {
|
||||
|
||||
if (url && *++url == '/' && (pos = strchr(url, ' ')) && !(*pos = '\0')) {
|
||||
char fsfile[1024];
|
||||
char *file;
|
||||
const char *file;
|
||||
FILE *fp;
|
||||
char *qpos;
|
||||
|
||||
@@ -893,10 +861,10 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) {
|
||||
"HTTP/1.0 302 Redirect\r\n" "Connection: close\r\n"
|
||||
"Server: httrack-small-server\r\n";
|
||||
intptr_t adr = 0;
|
||||
char *newfile = file;
|
||||
const char *newfile = file;
|
||||
|
||||
if (inthash_readptr(NewLangList, "redirect", &adr) && adr != 0) {
|
||||
char *newadr = (char *) adr;
|
||||
const char *newadr = (char *) adr;
|
||||
|
||||
if (*newadr) {
|
||||
newfile = newadr;
|
||||
@@ -936,7 +904,7 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) {
|
||||
&& (n = (pos - str)) && n < 1024) {
|
||||
char name_[1024 + 2];
|
||||
char *name = name_;
|
||||
char *langstr = NULL;
|
||||
const char *langstr = NULL;
|
||||
int p;
|
||||
int format = 0;
|
||||
int listDefault = 0;
|
||||
@@ -971,6 +939,7 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) {
|
||||
}
|
||||
} else if ((p = strfield(name, "do:"))) {
|
||||
char *pos2;
|
||||
char empty[2] = "";
|
||||
|
||||
name += p;
|
||||
format = 1;
|
||||
@@ -980,7 +949,7 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) {
|
||||
*pos2 = '\0';
|
||||
pos2++;
|
||||
} else {
|
||||
pos2 = "";
|
||||
pos2 = empty;
|
||||
}
|
||||
if (strcmp(name, "output-mode") == 0) {
|
||||
if (strcmp(pos2, "html") == 0) {
|
||||
@@ -1095,7 +1064,7 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) {
|
||||
if (pos2 != NULL) {
|
||||
*pos2 = '\0';
|
||||
if (inthash_readptr(NewLangList, name, &adr) || ztest) {
|
||||
char *newadr = (char *) adr;
|
||||
const char *newadr = (char *) adr;
|
||||
|
||||
if (!newadr)
|
||||
newadr = "";
|
||||
@@ -1171,8 +1140,8 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) {
|
||||
if (langstr == NULL) {
|
||||
if (strfield2(name, "#iso")) {
|
||||
langstr = line2;
|
||||
langstr[0] = '\0';
|
||||
LANG_LIST(path, langstr);
|
||||
line2[0] = '\0';
|
||||
LANG_LIST(path, line2, sizeof(line2));
|
||||
assertf(strlen(langstr) < sizeof(line2) - 2);
|
||||
} else {
|
||||
langstr = LANGSEL(name);
|
||||
@@ -1191,7 +1160,7 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) {
|
||||
switch (format) {
|
||||
case 0:
|
||||
{
|
||||
char *a = langstr;
|
||||
const char *a = langstr;
|
||||
|
||||
while(*a) {
|
||||
if (a[0] == '\\' && isxdigit(a[1])
|
||||
@@ -1237,7 +1206,7 @@ int smallserver(T_SOC soc, char *url, char *method, char *data, char *path) {
|
||||
default:
|
||||
if (*langstr) {
|
||||
int id = 1;
|
||||
char *fstr = langstr;
|
||||
const char *fstr = langstr;
|
||||
|
||||
StringClear(tmpbuff);
|
||||
if (format == 2) {
|
||||
@@ -1460,24 +1429,25 @@ int htslang_uninit(void) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
int smallserver_setkey(char *key, char *value) {
|
||||
int smallserver_setkey(const char *key, const char *value) {
|
||||
return inthash_write(NewLangList, key, (intptr_t) strdup(value));
|
||||
}
|
||||
int smallserver_setkeyint(char *key, LLint value) {
|
||||
|
||||
int smallserver_setkeyint(const char *key, LLint value) {
|
||||
char tmp[256];
|
||||
|
||||
sprintf(tmp, LLintP, value);
|
||||
snprintf(tmp, sizeof(tmp), LLintP, value);
|
||||
return inthash_write(NewLangList, key, (intptr_t) strdup(tmp));
|
||||
}
|
||||
int smallserver_setkeyarr(char *key, int id, char *key2, char *value) {
|
||||
int smallserver_setkeyarr(const char *key, int id, const char *key2, const char *value) {
|
||||
char tmp[256];
|
||||
|
||||
sprintf(tmp, "%s%d%s", key, id, key2);
|
||||
snprintf(tmp, sizeof(tmp), "%s%d%s", key, id, key2);
|
||||
return inthash_write(NewLangList, tmp, (intptr_t) strdup(value));
|
||||
}
|
||||
|
||||
static int htslang_load(char *limit_to, char *path) {
|
||||
char *hashname;
|
||||
static int htslang_load(char *limit_to, const char *path) {
|
||||
const char *hashname;
|
||||
char catbuff[CATBUFF_SIZE];
|
||||
|
||||
//
|
||||
@@ -1500,7 +1470,7 @@ static int htslang_load(char *limit_to, char *path) {
|
||||
|
||||
/* Load master file (list of keys and internal keys) */
|
||||
if (!limit_to) {
|
||||
char *mname = "lang.def";
|
||||
const char *mname = "lang.def";
|
||||
FILE *fp = fopen(fconcat(catbuff, sizeof(catbuff), path, mname), "rb");
|
||||
|
||||
if (fp) {
|
||||
@@ -1511,7 +1481,7 @@ static int htslang_load(char *limit_to, char *path) {
|
||||
linput_cpp(fp, intkey, 8000);
|
||||
linput_cpp(fp, key, 8000);
|
||||
if (strnotempty(intkey) && strnotempty(key)) {
|
||||
char *test = LANGINTKEY(key);
|
||||
const char *test = LANGINTKEY(key);
|
||||
|
||||
/* Increment for multiple definitions */
|
||||
if (strnotempty(test)) {
|
||||
@@ -1527,11 +1497,9 @@ static int htslang_load(char *limit_to, char *path) {
|
||||
|
||||
if (!strnotempty(test)) { // éviter doublons
|
||||
// conv_printf(key,key);
|
||||
int len;
|
||||
char *buff;
|
||||
const size_t len = strlen(intkey);
|
||||
char *const buff = (char *) malloc(len + 1);
|
||||
|
||||
len = (int) strlen(intkey);
|
||||
buff = (char *) malloc(len + 2);
|
||||
if (buff) {
|
||||
strcpybuff(buff, intkey);
|
||||
inthash_add(NewLangStrKeys, key, (intptr_t) buff);
|
||||
@@ -1591,9 +1559,7 @@ static int htslang_load(char *limit_to, char *path) {
|
||||
linput_cpp(fp, extkey, 8000);
|
||||
linput_cpp(fp, value, 8000);
|
||||
if (strnotempty(extkey) && strnotempty(value)) {
|
||||
int len;
|
||||
char *buff;
|
||||
char *intkey;
|
||||
const char *intkey;
|
||||
|
||||
intkey = LANGINTKEY(extkey);
|
||||
|
||||
@@ -1601,7 +1567,7 @@ static int htslang_load(char *limit_to, char *path) {
|
||||
|
||||
/* Increment for multiple definitions */
|
||||
{
|
||||
char *test = LANGSEL(intkey);
|
||||
const char *test = LANGSEL(intkey);
|
||||
|
||||
if (strnotempty(test)) {
|
||||
if (loops == 0) {
|
||||
@@ -1629,8 +1595,8 @@ static int htslang_load(char *limit_to, char *path) {
|
||||
|
||||
/* Add key */
|
||||
if (strnotempty(intkey)) {
|
||||
len = (int) strlen(value);
|
||||
buff = (char *) malloc(len + 2);
|
||||
const size_t len = strlen(value);
|
||||
char *const buff = (char *) malloc(len + 1);
|
||||
if (buff) {
|
||||
conv_printf(value, buff);
|
||||
inthash_add(NewLangStr, intkey, (intptr_t) buff);
|
||||
@@ -1655,7 +1621,7 @@ static int htslang_load(char *limit_to, char *path) {
|
||||
}
|
||||
|
||||
/* NOTE : also contains the "webhttrack" hack */
|
||||
static void conv_printf(char *from, char *to) {
|
||||
static void conv_printf(const char *from, char *to) {
|
||||
int i = 0, j = 0, len;
|
||||
|
||||
len = (int) strlen(from);
|
||||
@@ -1729,7 +1695,7 @@ static void LANG_DELETE(void) {
|
||||
}
|
||||
|
||||
// sélection de la langue
|
||||
static void LANG_INIT(char *path) {
|
||||
static void LANG_INIT(const char *path) {
|
||||
//CWinApp* pApp = AfxGetApp();
|
||||
//if (pApp) {
|
||||
/* pApp->GetProfileInt("Language","IntId",0); */
|
||||
@@ -1737,7 +1703,7 @@ static void LANG_INIT(char *path) {
|
||||
//}
|
||||
}
|
||||
|
||||
static int LANG_T(char *path, int l) {
|
||||
static int LANG_T(const char *path, int l) {
|
||||
if (l >= 0) {
|
||||
QLANG_T(l);
|
||||
htslang_load(NULL, path);
|
||||
@@ -1745,7 +1711,7 @@ static int LANG_T(char *path, int l) {
|
||||
return QLANG_T(-1); // 0=default (english)
|
||||
}
|
||||
|
||||
static int LANG_SEARCH(char *path, char *iso) {
|
||||
static int LANG_SEARCH(const char *path, const char *iso) {
|
||||
char lang_str[1024];
|
||||
int i = 0;
|
||||
int curr_lng = LANG_T(path, -1);
|
||||
@@ -1764,7 +1730,7 @@ static int LANG_SEARCH(char *path, char *iso) {
|
||||
return found;
|
||||
}
|
||||
|
||||
static int LANG_LIST(char *path, char *buffer) {
|
||||
static int LANG_LIST(const char *path, char *buffer, size_t buffer_size) {
|
||||
char lang_str[1024];
|
||||
int i = 0;
|
||||
int curr_lng = LANG_T(path, -1);
|
||||
@@ -1772,12 +1738,12 @@ static int LANG_LIST(char *path, char *buffer) {
|
||||
buffer[0] = '\0';
|
||||
do {
|
||||
QLANG_T(i);
|
||||
strcpybuff(lang_str, "LANGUAGE_NAME");
|
||||
strlcpybuff(lang_str, "LANGUAGE_NAME", buffer_size);
|
||||
htslang_load(lang_str, path);
|
||||
if (strlen(lang_str) > 0) {
|
||||
if (buffer[0])
|
||||
strcatbuff(buffer, "\n");
|
||||
strcatbuff(buffer, lang_str);
|
||||
strlcatbuff(buffer, lang_str, buffer_size);
|
||||
}
|
||||
i++;
|
||||
} while(strlen(lang_str) > 0);
|
||||
@@ -1794,28 +1760,26 @@ static int QLANG_T(int l) {
|
||||
return lng; // 0=default (english)
|
||||
}
|
||||
|
||||
static char *LANGSEL(char *name) {
|
||||
intptr_t adr = 0;
|
||||
|
||||
if (NewLangStr)
|
||||
if (!inthash_read(NewLangStr, name, &adr))
|
||||
adr = 0;
|
||||
if (adr) {
|
||||
return (char *) adr;
|
||||
const char* LANGSEL(const char* name) {
|
||||
inthash_value value;
|
||||
if (NewLangStr != NULL
|
||||
&& inthash_read_value(NewLangStr, name, &value) != 0
|
||||
&& value.ptr != NULL) {
|
||||
return (char*) value.ptr;
|
||||
} else {
|
||||
return "";
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
static char *LANGINTKEY(char *name) {
|
||||
intptr_t adr = 0;
|
||||
|
||||
if (NewLangStrKeys)
|
||||
if (!inthash_read(NewLangStrKeys, name, &adr))
|
||||
adr = 0;
|
||||
if (adr) {
|
||||
return (char *) adr;
|
||||
const char* LANGINTKEY(const char* name) {
|
||||
inthash_value value;
|
||||
if (NewLangStrKeys != NULL
|
||||
&& inthash_read_value(NewLangStrKeys, name, &value) != 0
|
||||
&& value.ptr != NULL) {
|
||||
return (char*) value.ptr;
|
||||
} else {
|
||||
return "";
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
/* *** Various functions *** */
|
||||
@@ -1848,7 +1812,7 @@ static int check_readinput(htsblk * r) {
|
||||
FD_SET(r->soc, &fds);
|
||||
tv.tv_sec = 0;
|
||||
tv.tv_usec = 0;
|
||||
select(r->soc + 1, &fds, NULL, NULL, &tv);
|
||||
select((int) r->soc + 1, &fds, NULL, NULL, &tv);
|
||||
if (FD_ISSET(r->soc, &fds))
|
||||
return 1;
|
||||
else
|
||||
|
||||
@@ -91,16 +91,16 @@ extern httrackp *global_opt;
|
||||
#define min(a,b) ((a)>(b)?(b):(a))
|
||||
#define max(a,b) ((a)>(b)?(a):(b))
|
||||
|
||||
extern int smallserver_setkey(char *key, char *value);
|
||||
extern int smallserver_setkeyint(char *key, LLint value);
|
||||
extern int smallserver_setkeyarr(char *key, int id, char *key2, char *value);
|
||||
extern int smallserver_setkey(const char *key, const char *value);
|
||||
extern int smallserver_setkeyint(const char *key, LLint value);
|
||||
extern int smallserver_setkeyarr(const char *key, int id, const char *key2, const char *value);
|
||||
|
||||
int htslang_init(void);
|
||||
int htslang_uninit(void);
|
||||
|
||||
/* Static definitions */
|
||||
|
||||
HTS_UNUSED static char *gethomedir(void);
|
||||
HTS_UNUSED static const char *gethomedir(void);
|
||||
HTS_UNUSED static int linput_cpp(FILE * fp, char *s, int max);
|
||||
HTS_UNUSED static int linput_trim(FILE * fp, char *s, int max);
|
||||
HTS_UNUSED static int fexist(const char *s);
|
||||
@@ -147,7 +147,7 @@ HTS_UNUSED static int check_readinput_t(T_SOC soc, int timeout) {
|
||||
FD_SET(soc, &fds);
|
||||
tv.tv_sec = timeout;
|
||||
tv.tv_usec = 0;
|
||||
select(soc + 1, &fds, NULL, NULL, &tv);
|
||||
select((int) soc + 1, &fds, NULL, NULL, &tv);
|
||||
if (FD_ISSET(soc, &fds))
|
||||
return 1;
|
||||
else
|
||||
@@ -163,8 +163,8 @@ HTS_UNUSED static int linputsoc_t(T_SOC soc, char *s, int max, int timeout) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
static char *gethomedir(void) {
|
||||
char *home = getenv("HOME");
|
||||
static const char *gethomedir(void) {
|
||||
const char *home = getenv("HOME");
|
||||
|
||||
if (home)
|
||||
return home;
|
||||
@@ -228,7 +228,7 @@ static int linput(FILE * fp, char *s, int max) {
|
||||
}
|
||||
static int linput_trim(FILE * fp, char *s, int max) {
|
||||
int rlen = 0;
|
||||
char *ls = (char *) malloc(max + 2);
|
||||
char *ls = (char *) malloc(max + 1);
|
||||
|
||||
s[0] = '\0';
|
||||
if (ls) {
|
||||
@@ -267,11 +267,11 @@ static int ehexh(char c) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int ehex(char *s) {
|
||||
static int ehex(const char *s) {
|
||||
return 16 * ehexh(*s) + ehexh(*(s + 1));
|
||||
}
|
||||
|
||||
HTS_UNUSED static void unescapehttp(char *s, String * tempo) {
|
||||
HTS_UNUSED static void unescapehttp(const char *s, String * tempo) {
|
||||
size_t i;
|
||||
|
||||
for(i = 0; s[i] != '\0'; i++) {
|
||||
|
||||
198
src/htstools.c
198
src/htstools.c
@@ -91,11 +91,11 @@ static int ehexh(char c) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int ehex(char *s) {
|
||||
static int ehex(const char *s) {
|
||||
return 16 * ehexh(*s) + ehexh(*(s + 1));
|
||||
}
|
||||
|
||||
static void unescapehttp(char *s, String * tempo) {
|
||||
static void unescapehttp(const char *s, String * tempo) {
|
||||
size_t i;
|
||||
|
||||
for(i = 0; s[i] != '\0'; i++) {
|
||||
@@ -122,12 +122,15 @@ static void unescapehttp(char *s, String * tempo) {
|
||||
// -1 : erreur
|
||||
// -2 : protocole non supporté (ftp)
|
||||
int ident_url_relatif(const char *lien, const char *origin_adr,
|
||||
const char *origin_fil, char *adr, char *fil) {
|
||||
const char *origin_fil,
|
||||
lien_adrfil* const adrfil) {
|
||||
int ok = 0;
|
||||
int scheme = 0;
|
||||
|
||||
adr[0] = '\0';
|
||||
fil[0] = '\0'; //effacer buffers
|
||||
assertf(adrfil != NULL);
|
||||
|
||||
adrfil->adr[0] = '\0';
|
||||
adrfil->fil[0] = '\0'; //effacer buffers
|
||||
|
||||
// lien non vide!
|
||||
if (strnotempty(lien) == 0)
|
||||
@@ -149,13 +152,13 @@ int ident_url_relatif(const char *lien, const char *origin_adr,
|
||||
|| (strfield(lien, "file://")) // scheme+//
|
||||
|| (strncmp(lien, "//", 2) == 0) // // sans scheme (-> default)
|
||||
) {
|
||||
if (ident_url_absolute(lien, adr, fil) == -1) {
|
||||
if (ident_url_absolute(lien, adrfil) == -1) {
|
||||
ok = -1; // erreur URL
|
||||
}
|
||||
} else if (strfield(lien, "ftp://")) {
|
||||
// Note: ftp:foobar.gif is not valid
|
||||
if (ftp_available()) { // ftp supporté
|
||||
if (ident_url_absolute(lien, adr, fil) == -1) {
|
||||
if (ident_url_absolute(lien, adrfil) == -1) {
|
||||
ok = -1; // erreur URL
|
||||
}
|
||||
} else {
|
||||
@@ -164,7 +167,7 @@ int ident_url_relatif(const char *lien, const char *origin_adr,
|
||||
#if HTS_USEOPENSSL
|
||||
} else if (strfield(lien, "https://")) {
|
||||
// Note: ftp:foobar.gif is not valid
|
||||
if (ident_url_absolute(lien, adr, fil) == -1) {
|
||||
if (ident_url_absolute(lien, adrfil) == -1) {
|
||||
ok = -1; // erreur URL
|
||||
}
|
||||
#endif
|
||||
@@ -191,30 +194,30 @@ int ident_url_relatif(const char *lien, const char *origin_adr,
|
||||
/* patch scheme if necessary */
|
||||
if (strfield(lien, "http:")) {
|
||||
lien += 5;
|
||||
strcpybuff(adr, jump_protocol(origin_adr)); // même adresse ; protocole vide (http)
|
||||
strcpybuff(adrfil->adr, jump_protocol(origin_adr)); // même adresse ; protocole vide (http)
|
||||
} else if (strfield(lien, "https:")) {
|
||||
lien += 6;
|
||||
strcpybuff(adr, "https://"); // même adresse forcée en https
|
||||
strcatbuff(adr, jump_protocol(origin_adr));
|
||||
strcpybuff(adrfil->adr, "https://"); // même adresse forcée en https
|
||||
strcatbuff(adrfil->adr, jump_protocol(origin_adr));
|
||||
} else if (strfield(lien, "ftp:")) {
|
||||
lien += 4;
|
||||
strcpybuff(adr, "ftp://"); // même adresse forcée en ftp
|
||||
strcatbuff(adr, jump_protocol(origin_adr));
|
||||
strcpybuff(adrfil->adr, "ftp://"); // même adresse forcée en ftp
|
||||
strcatbuff(adrfil->adr, jump_protocol(origin_adr));
|
||||
} else {
|
||||
strcpybuff(adr, origin_adr); // même adresse ; et même éventuel protocole
|
||||
strcpybuff(adrfil->adr, origin_adr); // même adresse ; et même éventuel protocole
|
||||
}
|
||||
|
||||
if (*lien != '/') { // sinon c'est un lien absolu
|
||||
if (*lien == '\0') {
|
||||
strcpybuff(fil, origin_fil);
|
||||
strcpybuff(adrfil->fil, origin_fil);
|
||||
} else if (*lien == '?') { // example: a href="?page=2"
|
||||
char *a;
|
||||
|
||||
strcpybuff(fil, origin_fil);
|
||||
a = strchr(fil, '?');
|
||||
strcpybuff(adrfil->fil, origin_fil);
|
||||
a = strchr(adrfil->fil, '?');
|
||||
if (a)
|
||||
*a = '\0';
|
||||
strcatbuff(fil, lien);
|
||||
strcatbuff(adrfil->fil, lien);
|
||||
} else {
|
||||
const char *a = strchr(origin_fil, '?');
|
||||
|
||||
@@ -225,14 +228,14 @@ int ident_url_relatif(const char *lien, const char *origin_adr,
|
||||
if (*a == '/') { // ok on a un '/'
|
||||
if ((((int) (a - origin_fil)) + 1 + strlen(lien)) < HTS_URLMAXSIZE) {
|
||||
// copier chemin
|
||||
strncpy(fil, origin_fil, ((int) (a - origin_fil)) + 1);
|
||||
*(fil + ((int) (a - origin_fil)) + 1) = '\0';
|
||||
strncpy(adrfil->fil, origin_fil, ((int) (a - origin_fil)) + 1);
|
||||
*(adrfil->fil + ((int) (a - origin_fil)) + 1) = '\0';
|
||||
|
||||
// copier chemin relatif
|
||||
if (((int) strlen(fil) + (int) strlen(lien)) < HTS_URLMAXSIZE) {
|
||||
strcatbuff(fil, lien + ((*lien == '/') ? 1 : 0));
|
||||
if (((int) strlen(adrfil->fil) + (int) strlen(lien)) < HTS_URLMAXSIZE) {
|
||||
strcatbuff(adrfil->fil, lien + ((*lien == '/') ? 1 : 0));
|
||||
// simplifier url pour les ../
|
||||
fil_simplifie(fil);
|
||||
fil_simplifie(adrfil->fil);
|
||||
} else
|
||||
ok = -1; // erreur
|
||||
} else { // erreur
|
||||
@@ -244,8 +247,8 @@ int ident_url_relatif(const char *lien, const char *origin_adr,
|
||||
}
|
||||
} else { // chemin absolu
|
||||
// copier chemin directement
|
||||
strcatbuff(fil, lien);
|
||||
fil_simplifie(fil);
|
||||
strcatbuff(adrfil->fil, lien);
|
||||
fil_simplifie(adrfil->fil);
|
||||
} // *lien!='/'
|
||||
} else
|
||||
ok = -1;
|
||||
@@ -254,7 +257,7 @@ int ident_url_relatif(const char *lien, const char *origin_adr,
|
||||
|
||||
// case insensitive pour adresse
|
||||
{
|
||||
char *a = jump_identification(adr);
|
||||
char *a = jump_identification(adrfil->adr);
|
||||
|
||||
while(*a) {
|
||||
if ((*a >= 'A') && (*a <= 'Z'))
|
||||
@@ -264,8 +267,8 @@ int ident_url_relatif(const char *lien, const char *origin_adr,
|
||||
}
|
||||
|
||||
// IDNA / RFC 3492 (Punycode) handling for HTTP(s)
|
||||
if (!link_has_authority(adr) || strfield(adr, "https:")) {
|
||||
char *const a = jump_identification(adr);
|
||||
if (!link_has_authority(adrfil->adr) || strfield(adrfil->adr, "https:")) {
|
||||
char *const a = jump_identification(adrfil->adr);
|
||||
// Non-ASCII characters (theorically forbidden, but browsers are lenient)
|
||||
if (!hts_isStringAscii(a, strlen(a))) {
|
||||
char *const idna = hts_convertStringUTF8ToIDNA(a, strlen(a));
|
||||
@@ -708,19 +711,18 @@ HTS_INLINE int rech_sampletag(const char *adr, const char *s) {
|
||||
}
|
||||
|
||||
// teste si le tag contenu dans from est égal à "tag"
|
||||
HTS_INLINE int check_tag(char *from, const char *tag) {
|
||||
char *a = from + 1;
|
||||
HTS_INLINE int check_tag(const char *from, const char *tag) {
|
||||
const char *a = from + 1;
|
||||
int i = 0;
|
||||
char s[256];
|
||||
|
||||
while(is_space(*a))
|
||||
a++;
|
||||
while((isalnum((unsigned char) *a) || (*a == '/')) && (i < 250)) {
|
||||
s[i++] = *a;
|
||||
a++;
|
||||
for( ; (isalnum((unsigned char) *a) || (*a == '/')) && i + 1 < sizeof(s) ; i++, a++) {
|
||||
s[i] = *a;
|
||||
}
|
||||
s[i++] = '\0';
|
||||
return (strfield2(s, tag)); // comparer
|
||||
s[i] = '\0';
|
||||
return strfield2(s, tag); // comparer
|
||||
}
|
||||
|
||||
// teste si un fichier dépasse le quota
|
||||
@@ -758,7 +760,117 @@ static int sortTopIndexFnc(const void *a_, const void *b_) {
|
||||
return cmp;
|
||||
}
|
||||
|
||||
//HTSEXT_API char *hts_getcategory(const char *filename);
|
||||
typedef struct hts_template_format_buf {
|
||||
FILE *fp;
|
||||
char *buffer;
|
||||
size_t size;
|
||||
size_t offset;
|
||||
} hts_template_format_buf;
|
||||
|
||||
// note: upstream arg list MUST be NULL-terminated for safety
|
||||
// returns a negative value upon error
|
||||
static int hts_template_formatv(hts_template_format_buf *buf,
|
||||
const char *format, va_list args) {
|
||||
#undef FPUTC
|
||||
#undef FPUTS
|
||||
#define FPUTC(C) do { \
|
||||
if (buf->fp != NULL) { \
|
||||
assertf(buf->buffer == NULL); \
|
||||
if (fputc(C, buf->fp) < 0) { \
|
||||
return -1; \
|
||||
} \
|
||||
} else { \
|
||||
assertf(buf->buffer != NULL); \
|
||||
if (buf->offset + 1 < buf->size) { \
|
||||
buf->buffer[buf->offset++] = (C); \
|
||||
} else { \
|
||||
return -1; \
|
||||
} \
|
||||
} \
|
||||
} while(0)
|
||||
#define FPUTS(S) do { \
|
||||
size_t i; \
|
||||
const char *const str_ = (S); \
|
||||
assertf(str_ != NULL); \
|
||||
for(i = 0 ; str_[i] != '\0' ; i++) { \
|
||||
FPUTC(str_[i]); \
|
||||
} \
|
||||
} while(0)
|
||||
|
||||
if (buf != NULL && format != NULL) {
|
||||
const char *arg_expanded[32];
|
||||
size_t i, nbArgs, posArgs;
|
||||
/* Expand internal code args. */
|
||||
const char *str;
|
||||
for(nbArgs = 0 ; ( str = va_arg(args, const char*) ) != NULL ; nbArgs++) {
|
||||
assertf(nbArgs < sizeof(arg_expanded)/sizeof(arg_expanded[0]));
|
||||
arg_expanded[nbArgs] = str;
|
||||
}
|
||||
/* Expand user-injected format string. */
|
||||
for(posArgs = 0, i = 0 ; format[i] != '\0' ; i++) {
|
||||
const unsigned char c = format[i];
|
||||
if (c == '%') {
|
||||
const unsigned char cFormat = format[++i];
|
||||
switch(cFormat) {
|
||||
case '%':
|
||||
FPUTC('%');
|
||||
break;
|
||||
case 's':
|
||||
if (posArgs < nbArgs) {
|
||||
assertf(arg_expanded[posArgs] != NULL);
|
||||
FPUTS(arg_expanded[posArgs]);
|
||||
posArgs++;
|
||||
} else {
|
||||
FPUTS("???"); /* error (args overflow) */
|
||||
}
|
||||
break;
|
||||
default: /* ignored */
|
||||
FPUTC('%');
|
||||
FPUTC(cFormat);
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
FPUTC(c);
|
||||
}
|
||||
}
|
||||
/* Terminating NULL. */
|
||||
if (buf->buffer != NULL) {
|
||||
buf->buffer[buf->offset] = 0;
|
||||
}
|
||||
return 1;
|
||||
} else {
|
||||
return -1;
|
||||
}
|
||||
#undef FPUTC
|
||||
#undef FPUTS
|
||||
}
|
||||
|
||||
// note: upstream arg list MUST be NULL-terminated for safety
|
||||
// returns a negative value upon error
|
||||
int hts_template_format(FILE *const out, const char *format, ...) {
|
||||
int success;
|
||||
hts_template_format_buf buf = { NULL, NULL, 0, 0 };
|
||||
va_list args;
|
||||
buf.fp = out;
|
||||
va_start(args, format);
|
||||
success = hts_template_formatv(&buf, format, args);
|
||||
va_end(args);
|
||||
return success;
|
||||
}
|
||||
|
||||
// note: upstream arg list MUST be NULL-terminated for safety
|
||||
// returns a negative value upon error
|
||||
int hts_template_format_str(char *buffer, size_t size, const char *format, ...) {
|
||||
int success;
|
||||
hts_template_format_buf buf = { NULL, NULL, 0, 0 };
|
||||
va_list args;
|
||||
buf.buffer = buffer;
|
||||
buf.size = size;
|
||||
va_start(args, format);
|
||||
success = hts_template_formatv(&buf, format, args);
|
||||
va_end(args);
|
||||
return success;
|
||||
}
|
||||
|
||||
/* Note: NOT utf-8 */
|
||||
HTSEXT_API int hts_buildtopindex(httrackp * opt, const char *path,
|
||||
@@ -799,9 +911,9 @@ HTSEXT_API int hts_buildtopindex(httrackp * opt, const char *path,
|
||||
|
||||
verif_backblue(opt, concat(catbuff, sizeof(catbuff), rpath, "/")); // générer gif
|
||||
// Header
|
||||
fprintf(fpo, toptemplate_header,
|
||||
hts_template_format(fpo, toptemplate_header,
|
||||
"<!-- Mirror and index made by HTTrack Website Copier/"
|
||||
HTTRACK_VERSION " " HTTRACK_AFF_AUTHORS " -->");
|
||||
HTTRACK_VERSION " " HTTRACK_AFF_AUTHORS " -->", /* EOF */ NULL);
|
||||
|
||||
/* Find valid project names */
|
||||
h = hts_findfirst(rpath);
|
||||
@@ -870,7 +982,7 @@ HTSEXT_API int hts_buildtopindex(httrackp * opt, const char *path,
|
||||
assertf(sortedElts != NULL);
|
||||
if (sortedElts != NULL) {
|
||||
int i;
|
||||
char *category = "";
|
||||
const char *category = "";
|
||||
|
||||
/* Build array */
|
||||
struct topindex_chain *chain = startchain;
|
||||
@@ -892,9 +1004,9 @@ HTSEXT_API int hts_buildtopindex(httrackp * opt, const char *path,
|
||||
/* Changed category */
|
||||
if (strcmp(category, sortedElts[i]->category) != 0) {
|
||||
category = sortedElts[i]->category;
|
||||
fprintf(fpo, toptemplate_bodycat, category);
|
||||
hts_template_format(fpo, toptemplate_bodycat, category, /* EOF */ NULL);
|
||||
}
|
||||
fprintf(fpo, toptemplate_body, hname, sortedElts[i]->name);
|
||||
hts_template_format(fpo, toptemplate_body, hname, sortedElts[i]->name, /* EOF */ NULL);
|
||||
}
|
||||
|
||||
/* Wipe elements */
|
||||
@@ -912,9 +1024,9 @@ HTSEXT_API int hts_buildtopindex(httrackp * opt, const char *path,
|
||||
|
||||
}
|
||||
// Footer
|
||||
fprintf(fpo, toptemplate_footer,
|
||||
hts_template_format(fpo, toptemplate_footer,
|
||||
"<!-- Mirror and index made by HTTrack Website Copier/"
|
||||
HTTRACK_VERSION " " HTTRACK_AFF_AUTHORS " -->");
|
||||
HTTRACK_VERSION " " HTTRACK_AFF_AUTHORS " -->", /* EOF */ NULL);
|
||||
|
||||
fclose(fpo);
|
||||
|
||||
|
||||
@@ -47,11 +47,20 @@ typedef struct httrackp httrackp;
|
||||
typedef struct find_handle_struct find_handle_struct;
|
||||
typedef find_handle_struct *find_handle;
|
||||
#endif
|
||||
#ifndef HTS_DEF_FWSTRUCT_lien_adrfil
|
||||
#define HTS_DEF_FWSTRUCT_lien_adrfil
|
||||
typedef struct lien_adrfil lien_adrfil;
|
||||
#endif
|
||||
#ifndef HTS_DEF_FWSTRUCT_lien_adrfilsave
|
||||
#define HTS_DEF_FWSTRUCT_lien_adrfilsave
|
||||
typedef struct lien_adrfilsave lien_adrfilsave;
|
||||
#endif
|
||||
|
||||
/* Library internal definictions */
|
||||
#ifdef HTS_INTERNAL_BYTECODE
|
||||
int ident_url_relatif(const char *lien, const char *urladr, const char *urlfil,
|
||||
char *adr, char *fil);
|
||||
int ident_url_relatif(const char *lien, const char *origin_adr,
|
||||
const char *origin_fil,
|
||||
lien_adrfil* const adrfil);
|
||||
int lienrelatif(char *s, const char *link, const char *curr);
|
||||
int link_has_authority(const char *lien);
|
||||
int link_has_authorization(const char *lien);
|
||||
@@ -61,6 +70,9 @@ HTS_INLINE int __rech_tageq(const char *adr, const char *s);
|
||||
HTS_INLINE int __rech_tageqbegdigits(const char *adr, const char *s);
|
||||
HTS_INLINE int rech_tageq_all(const char *adr, const char *s);
|
||||
|
||||
int hts_template_format(FILE *const out, const char *format, ...);
|
||||
int hts_template_format_str(char *buffer, size_t size, const char *format, ...);
|
||||
|
||||
#define rech_tageq(adr,s) \
|
||||
( \
|
||||
( (*((adr)-1)=='<') || (is_space(*((adr)-1))) ) ? \
|
||||
@@ -84,7 +96,7 @@ HTS_INLINE int rech_tageq_all(const char *adr, const char *s);
|
||||
//HTS_INLINE int rech_tageq(const char* adr,const char* s);
|
||||
HTS_INLINE int rech_sampletag(const char *adr, const char *s);
|
||||
HTS_INLINE int rech_endtoken(const char *adr, const char **start);
|
||||
HTS_INLINE int check_tag(char *from, const char *tag);
|
||||
HTS_INLINE int check_tag(const char *from, const char *tag);
|
||||
int verif_backblue(httrackp * opt, const char *base);
|
||||
int verif_external(httrackp * opt, int nb, int test);
|
||||
|
||||
|
||||
11
src/htsweb.c
11
src/htsweb.c
@@ -178,6 +178,14 @@ int main(int argc, char *argv[]) {
|
||||
}
|
||||
smallserver_setkey("HTTRACK_WEB", HTTRACK_WEB);
|
||||
|
||||
/* Check version compatibility */
|
||||
if (hts_sizeof_opt() != sizeof(httrackp)) {
|
||||
fprintf(stderr,
|
||||
"** CRITICAL: incompatible current httrack library version %s, expected version %s",
|
||||
hts_version(), HTTRACK_VERSIONID);
|
||||
smallserver_setkey("HTTRACK_INCOMPATIBLE_VERSIONID", hts_version());
|
||||
}
|
||||
|
||||
/* protected session-id */
|
||||
{
|
||||
char buff[1024];
|
||||
@@ -238,7 +246,7 @@ static void back_launch_cmd(void *pP) {
|
||||
commandReturnCmdl = strdup(cmd);
|
||||
|
||||
/* split */
|
||||
argv[0] = "webhttrack";
|
||||
argv[0] = strdup("webhttrack");
|
||||
argv[1] = cmd;
|
||||
argc++;
|
||||
i = 0;
|
||||
@@ -264,6 +272,7 @@ static void back_launch_cmd(void *pP) {
|
||||
/* init */
|
||||
hts_init();
|
||||
global_opt = opt = hts_create_opt();
|
||||
assert(opt->size_httrackp == sizeof(httrackp));
|
||||
|
||||
/* run */
|
||||
commandReturn = webhttrack_runmain(opt, argc, argv);
|
||||
|
||||
118
src/htswizard.c
118
src/htswizard.c
@@ -42,10 +42,6 @@ Please visit our Website: http://www.httrack.com
|
||||
#include <ctype.h>
|
||||
/* END specific definitions */
|
||||
|
||||
// pour alléger la syntaxe, des raccourcis sont créés
|
||||
#define urladr (liens[ptr]->adr)
|
||||
#define urlfil (liens[ptr]->fil)
|
||||
|
||||
// libérer filters[0] pour insérer un élément dans filters[0]
|
||||
#define HT_INSERT_FILTERS0 do {\
|
||||
int i;\
|
||||
@@ -60,8 +56,8 @@ Please visit our Website: http://www.httrack.com
|
||||
} while(0)
|
||||
|
||||
typedef struct htspair_t {
|
||||
char *tag;
|
||||
char *attr;
|
||||
const char *tag;
|
||||
const char *attr;
|
||||
} htspair_t;
|
||||
|
||||
/* "embedded" */
|
||||
@@ -79,9 +75,9 @@ htspair_t hts_detect_embed[] = {
|
||||
};
|
||||
|
||||
/* Internal */
|
||||
static int hts_acceptlink_(httrackp * opt, int ptr, int lien_tot,
|
||||
lien_url ** liens, char *adr, char *fil, char *tag,
|
||||
char *attribute, int *set_prio_to,
|
||||
static int hts_acceptlink_(httrackp * opt, int ptr, const char *adr,
|
||||
const char *fil, const char *tag,
|
||||
const char *attribute, int *set_prio_to,
|
||||
int *just_test_it);
|
||||
|
||||
/*
|
||||
@@ -104,10 +100,11 @@ retour:
|
||||
-1 pas d'avis
|
||||
*/
|
||||
|
||||
int hts_acceptlink(httrackp * opt, int ptr, int lien_tot, lien_url ** liens,
|
||||
char *adr, char *fil, char *tag, char *attribute,
|
||||
int hts_acceptlink(httrackp * opt, int ptr,
|
||||
const char *adr, const char *fil,
|
||||
const char *tag, const char *attribute,
|
||||
int *set_prio_to, int *just_test_it) {
|
||||
int forbidden_url = hts_acceptlink_(opt, ptr, lien_tot, liens,
|
||||
int forbidden_url = hts_acceptlink_(opt, ptr,
|
||||
adr, fil, tag, attribute, set_prio_to,
|
||||
just_test_it);
|
||||
int prev_prio = set_prio_to ? *set_prio_to : 0;
|
||||
@@ -133,9 +130,9 @@ static int cmp_token(const char *tag, const char *cmp) {
|
||||
&& !isalnum((unsigned char) tag[p]));
|
||||
}
|
||||
|
||||
static int hts_acceptlink_(httrackp * opt, int ptr, int lien_tot,
|
||||
lien_url ** liens, char *adr, char *fil, char *tag,
|
||||
char *attribute, int *set_prio_to,
|
||||
static int hts_acceptlink_(httrackp * opt, int ptr,
|
||||
const char *adr, const char *fil, const char *tag,
|
||||
const char *attribute, int *set_prio_to,
|
||||
int *just_test_it) {
|
||||
int forbidden_url = -1;
|
||||
int meme_adresse;
|
||||
@@ -187,8 +184,8 @@ static int hts_acceptlink_(httrackp * opt, int ptr, int lien_tot,
|
||||
|
||||
/* Niveau 1: ne pas parser suivant! */
|
||||
if (ptr > 0) {
|
||||
if ((liens[ptr]->depth <= 0)
|
||||
|| (liens[ptr]->depth <= 1 && !embedded_triggered)) {
|
||||
if ((heap(ptr)->depth <= 0)
|
||||
|| (heap(ptr)->depth <= 1 && !embedded_triggered)) {
|
||||
forbidden_url = 1; // interdire récupération du lien
|
||||
hts_log_print(opt, LOG_DEBUG,
|
||||
"file from too far level ignored at %s : %s", adr, fil);
|
||||
@@ -203,11 +200,11 @@ static int hts_acceptlink_(httrackp * opt, int ptr, int lien_tot,
|
||||
|
||||
// ------------------------------------------------------
|
||||
// doit-on traiter ce lien?.. vérifier droits de déplacement
|
||||
meme_adresse = strfield2(adr, urladr);
|
||||
meme_adresse = strfield2(adr, urladr());
|
||||
if (meme_adresse)
|
||||
hts_log_print(opt, LOG_DEBUG, "Compare addresses: %s=%s", adr, urladr);
|
||||
hts_log_print(opt, LOG_DEBUG, "Compare addresses: %s=%s", adr, urladr());
|
||||
else
|
||||
hts_log_print(opt, LOG_DEBUG, "Compare addresses: %s!=%s", adr, urladr);
|
||||
hts_log_print(opt, LOG_DEBUG, "Compare addresses: %s!=%s", adr, urladr());
|
||||
if (meme_adresse) { // même adresse
|
||||
{ // tester interdiction de descendre
|
||||
// MODIFIE : en cas de remontée puis de redescente, il se pouvait qu'on ne puisse pas atteindre certains fichiers
|
||||
@@ -220,15 +217,15 @@ static int hts_acceptlink_(httrackp * opt, int ptr, int lien_tot,
|
||||
// note (up/down): on calcule à partir du lien primaire, ET du lien précédent.
|
||||
// ex: si on descend 2 fois on peut remonter 1 fois
|
||||
|
||||
if (lienrelatif(tempo, fil, liens[liens[ptr]->premier]->fil) == 0) {
|
||||
if (lienrelatif(tempo2, fil, liens[ptr]->fil) == 0) {
|
||||
if (lienrelatif(tempo, fil, heap(heap(ptr)->premier)->fil) == 0) {
|
||||
if (lienrelatif(tempo2, fil, heap(ptr)->fil) == 0) {
|
||||
hts_log_print(opt, LOG_DEBUG,
|
||||
"build relative links to test: %s %s (with %s and %s)",
|
||||
tempo, tempo2, liens[liens[ptr]->premier]->fil,
|
||||
liens[ptr]->fil);
|
||||
tempo, tempo2, heap(heap(ptr)->premier)->fil,
|
||||
heap(ptr)->fil);
|
||||
|
||||
// si vient de primary, ne pas tester lienrelatif avec (car host "différent")
|
||||
/*if (liens[liens[ptr]->premier] == 0) { // vient de primary
|
||||
/*if (heap(heap(ptr)->premier) == 0) { // vient de primary
|
||||
}
|
||||
*/
|
||||
|
||||
@@ -242,7 +239,7 @@ static int hts_acceptlink_(httrackp * opt, int ptr, int lien_tot,
|
||||
|| (tempo2[0] != '\0' && tempo2[1] != '\0'
|
||||
&& strchr(tempo2 + 1, '/') == 0)
|
||||
) {
|
||||
if (!liens[ptr]->link_import) { // ne résulte pas d'un 'moved'
|
||||
if (!heap(ptr)->link_import) { // ne résulte pas d'un 'moved'
|
||||
forbidden_url = 0;
|
||||
hts_log_print(opt, LOG_DEBUG, "same level link authorized: %s%s",
|
||||
adr, fil);
|
||||
@@ -267,7 +264,7 @@ static int hts_acceptlink_(httrackp * opt, int ptr, int lien_tot,
|
||||
hts_log_print(opt, LOG_DEBUG, "lower link canceled: %s%s", adr,
|
||||
fil);
|
||||
} else { // autorisé à priori - NEW
|
||||
if (!liens[ptr]->link_import) { // ne résulte pas d'un 'moved'
|
||||
if (!heap(ptr)->link_import) { // ne résulte pas d'un 'moved'
|
||||
forbidden_url = 0;
|
||||
hts_log_print(opt, LOG_DEBUG, "lower link authorized: %s%s",
|
||||
adr, fil);
|
||||
@@ -275,7 +272,7 @@ static int hts_acceptlink_(httrackp * opt, int ptr, int lien_tot,
|
||||
}
|
||||
} else if ((test1) || (test2)) { // on peut descendre pour accéder au lien
|
||||
if ((opt->seeker & 1) != 0) { // on peut descendre - NEW
|
||||
if (!liens[ptr]->link_import) { // ne résulte pas d'un 'moved'
|
||||
if (!heap(ptr)->link_import) { // ne résulte pas d'un 'moved'
|
||||
forbidden_url = 0;
|
||||
hts_log_print(opt, LOG_DEBUG, "lower link authorized: %s%s",
|
||||
adr, fil);
|
||||
@@ -291,7 +288,7 @@ static int hts_acceptlink_(httrackp * opt, int ptr, int lien_tot,
|
||||
hts_log_print(opt, LOG_DEBUG, "upper link canceled: %s%s", adr,
|
||||
fil);
|
||||
} else { // autorisé à monter - NEW
|
||||
if (!liens[ptr]->link_import) { // ne résulte pas d'un 'moved'
|
||||
if (!heap(ptr)->link_import) { // ne résulte pas d'un 'moved'
|
||||
forbidden_url = 0;
|
||||
hts_log_print(opt, LOG_DEBUG, "upper link authorized: %s%s",
|
||||
adr, fil);
|
||||
@@ -299,7 +296,7 @@ static int hts_acceptlink_(httrackp * opt, int ptr, int lien_tot,
|
||||
}
|
||||
} else if ((!strncmp(tempo, "../", 3)) || (!strncmp(tempo2, "../", 3))) { // Possible en montant
|
||||
if ((opt->seeker & 2) != 0) { // autorisé à monter - NEW
|
||||
if (!liens[ptr]->link_import) { // ne résulte pas d'un 'moved'
|
||||
if (!heap(ptr)->link_import) { // ne résulte pas d'un 'moved'
|
||||
forbidden_url = 0;
|
||||
hts_log_print(opt, LOG_DEBUG, "upper link authorized: %s%s",
|
||||
adr, fil);
|
||||
@@ -310,11 +307,11 @@ static int hts_acceptlink_(httrackp * opt, int ptr, int lien_tot,
|
||||
} else {
|
||||
hts_log_print(opt, LOG_ERROR,
|
||||
"Error building relative link %s and %s", fil,
|
||||
liens[ptr]->fil);
|
||||
heap(ptr)->fil);
|
||||
}
|
||||
} else {
|
||||
hts_log_print(opt, LOG_ERROR, "Error building relative link %s and %s",
|
||||
fil, liens[liens[ptr]->premier]->fil);
|
||||
fil, heap(heap(ptr)->premier)->fil);
|
||||
}
|
||||
|
||||
} // tester interdiction de descendre?
|
||||
@@ -323,16 +320,16 @@ static int hts_acceptlink_(httrackp * opt, int ptr, int lien_tot,
|
||||
char BIGSTK tempo[HTS_URLMAXSIZE * 2];
|
||||
char BIGSTK tempo2[HTS_URLMAXSIZE * 2];
|
||||
|
||||
if (lienrelatif(tempo, fil, liens[liens[ptr]->premier]->fil) == 0) {
|
||||
if (lienrelatif(tempo2, fil, liens[ptr]->fil) == 0) {
|
||||
if (lienrelatif(tempo, fil, heap(heap(ptr)->premier)->fil) == 0) {
|
||||
if (lienrelatif(tempo2, fil, heap(ptr)->fil) == 0) {
|
||||
} else {
|
||||
hts_log_print(opt, LOG_ERROR,
|
||||
"Error building relative link %s and %s", fil,
|
||||
liens[ptr]->fil);
|
||||
heap(ptr)->fil);
|
||||
}
|
||||
} else {
|
||||
hts_log_print(opt, LOG_ERROR, "Error building relative link %s and %s",
|
||||
fil, liens[liens[ptr]->premier]->fil);
|
||||
fil, heap(heap(ptr)->premier)->fil);
|
||||
|
||||
}
|
||||
} // fin tester interdiction de monter
|
||||
@@ -348,24 +345,24 @@ static int hts_acceptlink_(httrackp * opt, int ptr, int lien_tot,
|
||||
break; // interdicton de sortir au dela de l'adresse
|
||||
case 1:{ // sortie sur le même dom.xxx
|
||||
size_t i = strlen(adr) - 1;
|
||||
size_t j = strlen(urladr) - 1;
|
||||
size_t j = strlen(urladr()) - 1;
|
||||
|
||||
if ((i > 0) && (j > 0)) {
|
||||
while((i > 0) && (adr[i] != '.'))
|
||||
i--;
|
||||
while((j > 0) && (urladr[j] != '.'))
|
||||
while((j > 0) && (urladr()[j] != '.'))
|
||||
j--;
|
||||
if ((i > 0) && (j > 0)) {
|
||||
i--;
|
||||
j--;
|
||||
while((i > 0) && (adr[i] != '.'))
|
||||
i--;
|
||||
while((j > 0) && (urladr[j] != '.'))
|
||||
while((j > 0) && (urladr()[j] != '.'))
|
||||
j--;
|
||||
}
|
||||
}
|
||||
if ((i > 0) && (j > 0)) {
|
||||
if (!strfield2(adr + i, urladr + j)) { // !=
|
||||
if (!strfield2(adr + i, urladr() + j)) { // !=
|
||||
if (!opt->wizard) { // mode non wizard
|
||||
//printf("refused: %s\n",adr);
|
||||
forbidden_url = 1; // pas même domaine
|
||||
@@ -387,14 +384,14 @@ static int hts_acceptlink_(httrackp * opt, int ptr, int lien_tot,
|
||||
break;
|
||||
case 2:{ // sortie sur le même .xxx
|
||||
size_t i = strlen(adr) - 1;
|
||||
size_t j = strlen(urladr) - 1;
|
||||
size_t j = strlen(urladr()) - 1;
|
||||
|
||||
while((i > 0) && (adr[i] != '.'))
|
||||
i--;
|
||||
while((j > 0) && (urladr[j] != '.'))
|
||||
while((j > 0) && (urladr()[j] != '.'))
|
||||
j--;
|
||||
if ((i > 0) && (j > 0)) {
|
||||
if (!strfield2(adr + i, urladr + j)) { // !-
|
||||
if (!strfield2(adr + i, urladr() + j)) { // !-
|
||||
if (!opt->wizard) { // mode non wizard
|
||||
//printf("refused: %s\n",adr);
|
||||
forbidden_url = 1; // pas même .xx
|
||||
@@ -493,7 +490,7 @@ static int hts_acceptlink_(httrackp * opt, int ptr, int lien_tot,
|
||||
// there is no way yet to tag "external" links, and therefore links that are
|
||||
// "weak" (authorized depth < external depth) are just not considered for external
|
||||
// hack
|
||||
if (liens[ptr]->depth > opt->extdepth) {
|
||||
if (heap(ptr)->depth > opt->extdepth) {
|
||||
// *set_prio_to = opt->extdepth + 1;
|
||||
*set_prio_to = 1 + (opt->extdepth);
|
||||
may_set_prio_to = 0; // clear may-set flag
|
||||
@@ -502,11 +499,11 @@ static int hts_acceptlink_(httrackp * opt, int ptr, int lien_tot,
|
||||
if (question) {
|
||||
hts_log_print(opt, LOG_DEBUG,
|
||||
"(wizard) ambiguous link accepted (external depth): link %s at %s%s",
|
||||
l, urladr, urlfil);
|
||||
l, urladr(), urlfil());
|
||||
} else {
|
||||
hts_log_print(opt, LOG_DEBUG,
|
||||
"(wizard) forced to accept link (external depth): link %s at %s%s",
|
||||
l, urladr, urlfil);
|
||||
l, urladr(), urlfil());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -515,7 +512,7 @@ static int hts_acceptlink_(httrackp * opt, int ptr, int lien_tot,
|
||||
// filters
|
||||
{
|
||||
int jok;
|
||||
char *mdepth = "";
|
||||
const char *mdepth = "";
|
||||
|
||||
// filters, 0=sait pas 1=ok -1=interdit
|
||||
{
|
||||
@@ -550,14 +547,14 @@ static int hts_acceptlink_(httrackp * opt, int ptr, int lien_tot,
|
||||
may_set_prio_to = 0; // clear may-set flag
|
||||
hts_log_print(opt, LOG_DEBUG,
|
||||
"(wizard) explicit authorized (%s) link: link %s at %s%s",
|
||||
mdepth, l, urladr, urlfil);
|
||||
mdepth, l, urladr(), urlfil());
|
||||
} else if (jok == -1) { // forbidden
|
||||
filters_answer = 1; // décision prise par les filtres
|
||||
question = 0; // ne pas poser de question:
|
||||
forbidden_url = 1; // URL interdite
|
||||
hts_log_print(opt, LOG_DEBUG,
|
||||
"(wizard) explicit forbidden (%s) link: link %s at %s%s",
|
||||
mdepth, l, urladr, urlfil);
|
||||
mdepth, l, urladr(), urlfil());
|
||||
} // sinon on touche à rien
|
||||
}
|
||||
}
|
||||
@@ -565,14 +562,14 @@ static int hts_acceptlink_(httrackp * opt, int ptr, int lien_tot,
|
||||
// vérifier mode mirror links
|
||||
if (question) {
|
||||
if (opt->mirror_first_page) { // mode mirror links
|
||||
if (liens[ptr]->precedent == 0) { // parent=primary!
|
||||
if (heap(ptr)->precedent == 0) { // parent=primary!
|
||||
forbidden_url = 0; // autorisé
|
||||
may_set_prio_to = 0; // clear may-set flag
|
||||
question = 1; // résolution auto
|
||||
force_mirror = 5; // mirror (5)
|
||||
hts_log_print(opt, LOG_DEBUG,
|
||||
"(wizard) explicit mirror link: link %s at %s%s", l,
|
||||
urladr, urlfil);
|
||||
urladr(), urlfil());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -584,7 +581,7 @@ static int hts_acceptlink_(httrackp * opt, int ptr, int lien_tot,
|
||||
forbidden_url = 1;
|
||||
hts_log_print(opt, LOG_DEBUG,
|
||||
"(wizard) ambiguous forbidden link: link %s at %s%s", l,
|
||||
urladr, urlfil);
|
||||
urladr(), urlfil());
|
||||
}
|
||||
}
|
||||
// vérifier robots.txt
|
||||
@@ -619,14 +616,14 @@ static int hts_acceptlink_(httrackp * opt, int ptr, int lien_tot,
|
||||
if (!forbidden_url) {
|
||||
hts_log_print(opt, LOG_DEBUG,
|
||||
"(wizard) shared foreign domain link: link %s at %s%s", l,
|
||||
urladr, urlfil);
|
||||
urladr(), urlfil());
|
||||
} else {
|
||||
hts_log_print(opt, LOG_DEBUG,
|
||||
"(wizard) cancelled foreign domain link: link %s at %s%s",
|
||||
l, urladr, urlfil);
|
||||
l, urladr(), urlfil());
|
||||
}
|
||||
#if BDEBUG==3
|
||||
printf("at %s in %s, wizard says: url %s ", urladr, urlfil, l);
|
||||
printf("at %s in %s, wizard says: url %s ", urladr(), urlfil(), l);
|
||||
if (forbidden_url)
|
||||
printf("cancelled");
|
||||
else
|
||||
@@ -863,13 +860,13 @@ static int hts_acceptlink_(httrackp * opt, int ptr, int lien_tot,
|
||||
#undef _ROBOTS
|
||||
}
|
||||
|
||||
int hts_acceptmime(httrackp * opt, int ptr, int lien_tot, lien_url ** liens,
|
||||
char *adr, char *fil, char *mime) {
|
||||
int hts_acceptmime(httrackp * opt, int ptr,
|
||||
const char *adr, const char *fil, const char *mime) {
|
||||
#define _FILTERS (*opt->filters.filters)
|
||||
#define _FILTERS_PTR (opt->filters.filptr)
|
||||
#define _ROBOTS ((robots_wizard*)opt->robotsptr)
|
||||
int forbidden_url = -1;
|
||||
char *mdepth = "";
|
||||
const char *mdepth = "";
|
||||
int jokDepth = 0;
|
||||
int jok = 0;
|
||||
|
||||
@@ -906,7 +903,7 @@ int hts_acceptmime(httrackp * opt, int ptr, int lien_tot, lien_url ** liens,
|
||||
}
|
||||
|
||||
// tester taille
|
||||
int hts_testlinksize(httrackp * opt, char *adr, char *fil, LLint size) {
|
||||
int hts_testlinksize(httrackp * opt, const char *adr, const char *fil, LLint size) {
|
||||
int jok = 0;
|
||||
|
||||
if (size >= 0) {
|
||||
@@ -984,7 +981,4 @@ int hts_testlinksize(httrackp * opt, char *adr, char *fil, LLint size) {
|
||||
return jok;
|
||||
}
|
||||
|
||||
#undef urladr
|
||||
#undef urlfil
|
||||
|
||||
#undef HT_INSERT_FILTERS0
|
||||
|
||||
@@ -49,12 +49,13 @@ typedef struct httrackp httrackp;
|
||||
typedef struct lien_url lien_url;
|
||||
#endif
|
||||
|
||||
int hts_acceptlink(httrackp * opt, int ptr, int lien_tot, lien_url ** liens,
|
||||
char *adr, char *fil, char *tag, char *attribute,
|
||||
int hts_acceptlink(httrackp * opt, int ptr,
|
||||
const char *adr, const char *fil,
|
||||
const char *tag, const char *attribute,
|
||||
int *set_prio_to_0, int *just_test_it);
|
||||
int hts_testlinksize(httrackp * opt, char *adr, char *fil, LLint size);
|
||||
int hts_acceptmime(httrackp * opt, int ptr, int lien_tot, lien_url ** liens,
|
||||
char *adr, char *fil, char *mime);
|
||||
int hts_testlinksize(httrackp * opt, const char *adr, const char *fil, LLint size);
|
||||
int hts_acceptmime(httrackp * opt, int ptr,
|
||||
const char *adr, const char *fil, const char *mime);
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
@@ -46,9 +46,17 @@ Please visit our Website: http://www.httrack.com
|
||||
typedef struct httrackp httrackp;
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
HTSEXT_API int htswrap_init(void); // LEGACY
|
||||
HTSEXT_API int htswrap_free(void); // LEGACY
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
//HTSEXT_API int htswrap_add(httrackp * opt, const char *name, void *fct);
|
||||
//HTSEXT_API uintptr_t htswrap_read(httrackp * opt, const char *name);
|
||||
|
||||
|
||||
@@ -59,8 +59,9 @@ int hts_zunpack(char *filename, char *newfile) {
|
||||
char catbuff[CATBUFF_SIZE];
|
||||
FILE *const in = FOPEN(fconv(catbuff, sizeof(catbuff), filename), "rb");
|
||||
const int fd = in != NULL ? fileno(in) : -1;
|
||||
const int dup_fd = fd != -1 ? dup(fd) : -1;
|
||||
// Note: we must dup to be able to flose cleanly.
|
||||
gzFile gz = fd != -1 ? gzdopen(dup(fd), "rb") : NULL;
|
||||
const gzFile gz = dup_fd != -1 ? gzdopen(dup_fd, "rb") : NULL;
|
||||
|
||||
if (gz) {
|
||||
FILE *const fpout = FOPEN(fconv(catbuff, sizeof(catbuff), newfile), "wb");
|
||||
|
||||
@@ -5,7 +5,7 @@ Copyright (C) 1998-2014 Xavier Roche and other contributors
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
as published by the Free Software Foundation; either version 2
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
@@ -33,11 +33,16 @@ Please visit our Website: http://www.httrack.com
|
||||
#ifndef HTTRACK_DEFLIB
|
||||
#define HTTRACK_DEFLIB
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#include "htsglobal.h"
|
||||
|
||||
#ifndef _WIN32
|
||||
#include <inttypes.h>
|
||||
#endif
|
||||
#include <stdarg.h>
|
||||
|
||||
#ifndef HTS_DEF_FWSTRUCT_httrackp
|
||||
#define HTS_DEF_FWSTRUCT_httrackp
|
||||
@@ -65,6 +70,12 @@ typedef enum hts_log_type {
|
||||
typedef struct hts_stat_struct hts_stat_struct;
|
||||
#endif
|
||||
|
||||
/** Assert error callback. **/
|
||||
#ifndef HTS_DEF_FWSTRUCT_htsErrorCallback
|
||||
#define HTS_DEF_FWSTRUCT_htsErrorCallback
|
||||
typedef void (*htsErrorCallback) (const char *msg, const char *file, int line);
|
||||
#endif
|
||||
|
||||
/* Helpers for plugging callbacks
|
||||
requires: htsdefines.h */
|
||||
|
||||
@@ -107,10 +118,13 @@ HTSEXT_API int hts_main2(int argc, char **argv, httrackp * opt);
|
||||
/* Options handling */
|
||||
HTSEXT_API httrackp *hts_create_opt(void);
|
||||
HTSEXT_API void hts_free_opt(httrackp * opt);
|
||||
HTSEXT_API size_t hts_sizeof_opt(void);
|
||||
HTSEXT_API const hts_stat_struct* hts_get_stats(httrackp * opt);
|
||||
HTSEXT_API void set_wrappers(httrackp * opt); /* LEGACY */
|
||||
HTSEXT_API int plug_wrapper(httrackp * opt, const char *moduleName,
|
||||
const char *argv);
|
||||
HTSEXT_API void hts_set_error_callback(htsErrorCallback handler);
|
||||
HTSEXT_API htsErrorCallback hts_get_error_callback(void);
|
||||
|
||||
/* Logging */
|
||||
HTSEXT_API int hts_log(httrackp * opt, const char *prefix, const char *msg);
|
||||
@@ -118,6 +132,9 @@ HTSEXT_API void hts_log_print(httrackp * opt, int type, const char *format,
|
||||
...) HTS_PRINTF_FUN(3, 4);
|
||||
HTSEXT_API void hts_log_vprint(httrackp * opt, int type, const char *format,
|
||||
va_list args);
|
||||
HTSEXT_API void hts_set_log_vprint_callback(void (*callback)(httrackp * opt,
|
||||
int type,
|
||||
const char *format, va_list args));
|
||||
|
||||
/* Infos */
|
||||
HTSEXT_API const char *hts_get_version_info(httrackp * opt);
|
||||
@@ -186,7 +203,7 @@ HTSEXT_API char *jump_normalized(const char *);
|
||||
HTSEXT_API char *jump_toport(const char *);
|
||||
HTSEXT_API char *fil_normalized(const char *source, char *dest);
|
||||
HTSEXT_API char *adr_normalized(const char *source, char *dest);
|
||||
HTSEXT_API char *hts_rootdir(char *file);
|
||||
HTSEXT_API const char *hts_rootdir(char *file);
|
||||
|
||||
/* Escaping URLs */
|
||||
HTSEXT_API void unescape_amp(char *s);
|
||||
@@ -227,7 +244,9 @@ HTSEXT_API void get_httptype(httrackp * opt, char *s, const char *fil,
|
||||
HTSEXT_API int is_knowntype(httrackp * opt, const char *fil);
|
||||
HTSEXT_API int is_userknowntype(httrackp * opt, const char *fil);
|
||||
HTSEXT_API int is_dyntype(const char *fil);
|
||||
HTSEXT_API char *get_ext(char *catbuff, size_t size, const char *fil);
|
||||
HTSEXT_API const char *get_ext(char *catbuff, size_t size, const char *fil);
|
||||
HTSEXT_API int may_unknown(httrackp * opt, const char *st);
|
||||
HTSEXT_API void guess_httptype(httrackp * opt, char *s, const char *fil);
|
||||
|
||||
/* Ugly string tools */
|
||||
HTSEXT_API char *concat(char *catbuff, size_t size, const char *a, const char *b);
|
||||
@@ -318,4 +337,8 @@ typedef struct utimbuf STRUCT_UTIMBUF;
|
||||
#define fconcat(A,B,C,D) (COMPILE_TIME_CHECK_SIZE(B), fconcat(A,B,C,D))
|
||||
#define fslash(A,B,C) (COMPILE_TIME_CHECK_SIZE(B), fslash(A,B,C))
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
@@ -223,7 +223,17 @@ int main(int argc, char **argv) {
|
||||
|
||||
signal_handlers();
|
||||
hts_init();
|
||||
|
||||
// Check version compatibility
|
||||
if (hts_sizeof_opt() != sizeof(httrackp)) {
|
||||
fprintf(stderr,
|
||||
"incompatible current httrack library version %s, expected version %s",
|
||||
hts_version(), HTTRACK_VERSIONID);
|
||||
abortLog("incompatible httrack library version, please update both httrack and its library");
|
||||
}
|
||||
|
||||
opt = global_opt = hts_create_opt();
|
||||
assert(opt->size_httrackp == sizeof(httrackp));
|
||||
|
||||
CHAIN_FUNCTION(opt, init, htsshow_init, NULL);
|
||||
CHAIN_FUNCTION(opt, uninit, htsshow_uninit, NULL);
|
||||
|
||||
@@ -53,7 +53,7 @@
|
||||
EnableIntrinsicFunctions="true"
|
||||
FavorSizeOrSpeed="1"
|
||||
OmitFramePointers="true"
|
||||
AdditionalIncludeDirectories=""C:\Dev\zlib-1.2.3\";"C:\Dev\openssl-1.0.1e\include";C:\Dev\Winhttrack"
|
||||
AdditionalIncludeDirectories=""C:\Dev\zlib-1.2.8\";"C:\Dev\openssl-1.0.1e\include";C:\Dev\Winhttrack"
|
||||
PreprocessorDefinitions="WIN32;_CONSOLE;HTS_ANALYSTE_CONSOLE;_CRT_SECURE_NO_WARNINGS"
|
||||
RuntimeLibrary="2"
|
||||
UsePrecompiledHeader="0"
|
||||
@@ -152,7 +152,7 @@
|
||||
EnableIntrinsicFunctions="true"
|
||||
FavorSizeOrSpeed="1"
|
||||
OmitFramePointers="true"
|
||||
AdditionalIncludeDirectories=""C:\Dev\zlib-1.2.3\";"C:\Dev\openssl-1.0.1e\include";C:\Dev\Winhttrack"
|
||||
AdditionalIncludeDirectories=""C:\Dev\zlib-1.2.8\";"C:\Dev\openssl-1.0.1e\include";C:\Dev\Winhttrack"
|
||||
PreprocessorDefinitions="WIN32;_CONSOLE;HTS_ANALYSTE_CONSOLE"
|
||||
RuntimeLibrary="2"
|
||||
UsePrecompiledHeader="0"
|
||||
@@ -246,7 +246,7 @@
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/Zm200 "
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""C:\Dev\zlib-1.2.3\";"C:\Dev\openssl-1.0.1e\include";C:\Dev\Winhttrack"
|
||||
AdditionalIncludeDirectories=""C:\Dev\zlib-1.2.8\";"C:\Dev\openssl-1.0.1e\include";C:\Dev\Winhttrack"
|
||||
PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;HTS_ANALYSTE_CONSOLE;_CRT_SECURE_NO_WARNINGS"
|
||||
RuntimeLibrary="3"
|
||||
BufferSecurityCheck="true"
|
||||
@@ -343,7 +343,7 @@
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/Zm200 "
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""C:\Dev\zlib-1.2.3\";"C:\Dev\openssl-1.0.1e\include";C:\Dev\Winhttrack"
|
||||
AdditionalIncludeDirectories=""C:\Dev\zlib-1.2.8\";"C:\Dev\openssl-1.0.1e\include";C:\Dev\Winhttrack"
|
||||
PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;HTS_ANALYSTE_CONSOLE;_CRT_SECURE_NO_WARNINGS"
|
||||
RuntimeLibrary="3"
|
||||
BufferSecurityCheck="true"
|
||||
@@ -440,7 +440,7 @@
|
||||
AdditionalOptions="/Zm200 "
|
||||
Optimization="3"
|
||||
InlineFunctionExpansion="2"
|
||||
AdditionalIncludeDirectories=""C:\Dev\zlib-1.2.3\";"C:\Dev\openssl-1.0.1e\include";C:\Dev\Winhttrack"
|
||||
AdditionalIncludeDirectories=""C:\Dev\zlib-1.2.8\";"C:\Dev\openssl-1.0.1e\include";C:\Dev\Winhttrack"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;HTS_ANALYSTE_CONSOLE;_CRT_SECURE_NO_WARNINGS"
|
||||
StringPooling="true"
|
||||
RuntimeLibrary="2"
|
||||
@@ -535,7 +535,7 @@
|
||||
AdditionalOptions="/Zm200 "
|
||||
Optimization="3"
|
||||
InlineFunctionExpansion="2"
|
||||
AdditionalIncludeDirectories=""C:\Dev\zlib-1.2.3\";"C:\Dev\openssl-1.0.1e\include";C:\Dev\Winhttrack"
|
||||
AdditionalIncludeDirectories=""C:\Dev\zlib-1.2.8\";"C:\Dev\openssl-1.0.1e\include";C:\Dev\Winhttrack"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;HTS_ANALYSTE_CONSOLE;_CRT_SECURE_NO_WARNINGS"
|
||||
StringPooling="true"
|
||||
RuntimeLibrary="2"
|
||||
|
||||
29
src/md5.c
29
src/md5.c
@@ -88,7 +88,7 @@ void MD5Update(struct MD5Context *ctx, unsigned char const *buf, unsigned len) {
|
||||
/* Handle any leading odd-sized chunks */
|
||||
|
||||
if (t) {
|
||||
unsigned char *p = (unsigned char *) ctx->in + t;
|
||||
unsigned char *p = ctx->in.ui8 + t;
|
||||
|
||||
t = 64 - t;
|
||||
if (len < t) {
|
||||
@@ -97,25 +97,25 @@ void MD5Update(struct MD5Context *ctx, unsigned char const *buf, unsigned len) {
|
||||
}
|
||||
memcpy(p, buf, t);
|
||||
if (ctx->doByteReverse)
|
||||
byteReverse(ctx->in, 16);
|
||||
MD5Transform(ctx->buf, (uint32 *) ctx->in);
|
||||
byteReverse(ctx->in.ui8, 16);
|
||||
MD5Transform(ctx->buf, ctx->in.ui32);
|
||||
buf += t;
|
||||
len -= t;
|
||||
}
|
||||
/* Process data in 64-byte chunks */
|
||||
|
||||
while(len >= 64) {
|
||||
memcpy(ctx->in, buf, 64);
|
||||
memcpy(ctx->in.ui8, buf, 64);
|
||||
if (ctx->doByteReverse)
|
||||
byteReverse(ctx->in, 16);
|
||||
MD5Transform(ctx->buf, (uint32 *) ctx->in);
|
||||
byteReverse(ctx->in.ui8, 16);
|
||||
MD5Transform(ctx->buf, ctx->in.ui32);
|
||||
buf += 64;
|
||||
len -= 64;
|
||||
}
|
||||
|
||||
/* Handle any remaining bytes of data. */
|
||||
|
||||
memcpy(ctx->in, buf, len);
|
||||
memcpy(ctx->in.ui8, buf, len);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -131,7 +131,7 @@ void MD5Final(unsigned char digest[16], struct MD5Context *ctx) {
|
||||
|
||||
/* Set the first char of padding to 0x80. This is safe since there is
|
||||
always at least one byte free */
|
||||
p = ctx->in + count;
|
||||
p = ctx->in.ui8 + count;
|
||||
*p++ = 0x80;
|
||||
|
||||
/* Bytes of padding needed to make 64 bytes */
|
||||
@@ -142,26 +142,27 @@ void MD5Final(unsigned char digest[16], struct MD5Context *ctx) {
|
||||
/* Two lots of padding: Pad the first block to 64 bytes */
|
||||
memset(p, 0, count);
|
||||
if (ctx->doByteReverse)
|
||||
byteReverse(ctx->in, 16);
|
||||
MD5Transform(ctx->buf, (uint32 *) ctx->in);
|
||||
byteReverse(ctx->in.ui8, 16);
|
||||
MD5Transform(ctx->buf, ctx->in.ui32);
|
||||
|
||||
/* Now fill the next block with 56 bytes */
|
||||
memset(ctx->in, 0, 56);
|
||||
memset(ctx->in.ui8, 0, 56);
|
||||
} else {
|
||||
/* Pad block to 56 bytes */
|
||||
memset(p, 0, count - 8);
|
||||
}
|
||||
if (ctx->doByteReverse)
|
||||
byteReverse(ctx->in, 14);
|
||||
byteReverse(ctx->in.ui8, 14);
|
||||
|
||||
/* Append length in bits and transform */
|
||||
/* Note: see patch for PAM from Tomas Mraz */
|
||||
memcpy((uint32 *) ctx->in + 14, ctx->bits, 2 * sizeof(uint32));
|
||||
ctx->in.ui32[14] = ctx->bits[0];
|
||||
ctx->in.ui32[15] = ctx->bits[1];
|
||||
/*((uint32 *) ctx->in)[14] = ctx->bits[0];
|
||||
((uint32 *) ctx->in)[15] = ctx->bits[1];
|
||||
*/
|
||||
|
||||
MD5Transform(ctx->buf, (uint32 *) ctx->in);
|
||||
MD5Transform(ctx->buf, ctx->in.ui32);
|
||||
if (ctx->doByteReverse)
|
||||
byteReverse((unsigned char *) ctx->buf, 4);
|
||||
memcpy(digest, ctx->buf, 16);
|
||||
|
||||
@@ -18,7 +18,10 @@ typedef unsigned long uint32;
|
||||
#endif
|
||||
|
||||
struct MD5Context {
|
||||
unsigned char in[64];
|
||||
union {
|
||||
unsigned char ui8[64];
|
||||
uint32 ui32[16];
|
||||
} in;
|
||||
uint32 buf[4];
|
||||
uint32 bits[2];
|
||||
int doByteReverse;
|
||||
|
||||
@@ -1,55 +0,0 @@
|
||||
Change in 1.00: (10 sept 03)
|
||||
- rename to 1.00
|
||||
- cosmetic code change
|
||||
|
||||
Change in 0.22: (19 May 03)
|
||||
- crypting support (unless you define NOCRYPT)
|
||||
- append file in existing zipfile
|
||||
|
||||
Change in 0.21: (10 Mar 03)
|
||||
- bug fixes
|
||||
|
||||
Change in 0.17: (27 Jan 02)
|
||||
- bug fixes
|
||||
|
||||
Change in 0.16: (19 Jan 02)
|
||||
- Support of ioapi for virtualize zip file access
|
||||
|
||||
Change in 0.15: (19 Mar 98)
|
||||
- fix memory leak in minizip.c
|
||||
|
||||
Change in 0.14: (10 Mar 98)
|
||||
- fix bugs in minizip.c sample for zipping big file
|
||||
- fix problem in month in date handling
|
||||
- fix bug in unzlocal_GetCurrentFileInfoInternal in unzip.c for
|
||||
comment handling
|
||||
|
||||
Change in 0.13: (6 Mar 98)
|
||||
- fix bugs in zip.c
|
||||
- add real minizip sample
|
||||
|
||||
Change in 0.12: (4 Mar 98)
|
||||
- add zip.c and zip.h for creates .zip file
|
||||
- fix change_file_date in miniunz.c for Unix (Jean-loup Gailly)
|
||||
- fix miniunz.c for file without specific record for directory
|
||||
|
||||
Change in 0.11: (3 Mar 98)
|
||||
- fix bug in unzGetCurrentFileInfo for get extra field and comment
|
||||
- enhance miniunz sample, remove the bad unztst.c sample
|
||||
|
||||
Change in 0.10: (2 Mar 98)
|
||||
- fix bug in unzReadCurrentFile
|
||||
- rename unzip* to unz* function and structure
|
||||
- remove Windows-like hungary notation variable name
|
||||
- modify some structure in unzip.h
|
||||
- add somes comment in source
|
||||
- remove unzipGetcCurrentFile function
|
||||
- replace ZUNZEXPORT by ZEXPORT
|
||||
- add unzGetLocalExtrafield for get the local extrafield info
|
||||
- add a new sample, miniunz.c
|
||||
|
||||
Change in 0.4: (25 Feb 98)
|
||||
- suppress the type unzipFileInZip.
|
||||
Only on file in the zipfile can be open at the same time
|
||||
- fix somes typo in code
|
||||
- added tm_unz structure in unzip_file_info (date/time in readable format)
|
||||
6
src/minizip/MiniZip64_Changes.txt
Normal file
6
src/minizip/MiniZip64_Changes.txt
Normal file
@@ -0,0 +1,6 @@
|
||||
|
||||
MiniZip 1.1 was derrived from MiniZip at version 1.01f
|
||||
|
||||
Change in 1.0 (Okt 2009)
|
||||
- **TODO - Add history**
|
||||
|
||||
74
src/minizip/MiniZip64_info.txt
Normal file
74
src/minizip/MiniZip64_info.txt
Normal file
@@ -0,0 +1,74 @@
|
||||
MiniZip - Copyright (c) 1998-2010 - by Gilles Vollant - version 1.1 64 bits from Mathias Svensson
|
||||
|
||||
Introduction
|
||||
---------------------
|
||||
MiniZip 1.1 is built from MiniZip 1.0 by Gilles Vollant ( http://www.winimage.com/zLibDll/minizip.html )
|
||||
|
||||
When adding ZIP64 support into minizip it would result into risk of breaking compatibility with minizip 1.0.
|
||||
All possible work was done for compatibility.
|
||||
|
||||
|
||||
Background
|
||||
---------------------
|
||||
When adding ZIP64 support Mathias Svensson found that Even Rouault have added ZIP64
|
||||
support for unzip.c into minizip for a open source project called gdal ( http://www.gdal.org/ )
|
||||
|
||||
That was used as a starting point. And after that ZIP64 support was added to zip.c
|
||||
some refactoring and code cleanup was also done.
|
||||
|
||||
|
||||
Changed from MiniZip 1.0 to MiniZip 1.1
|
||||
---------------------------------------
|
||||
* Added ZIP64 support for unzip ( by Even Rouault )
|
||||
* Added ZIP64 support for zip ( by Mathias Svensson )
|
||||
* Reverted some changed that Even Rouault did.
|
||||
* Bunch of patches received from Gulles Vollant that he received for MiniZip from various users.
|
||||
* Added unzip patch for BZIP Compression method (patch create by Daniel Borca)
|
||||
* Added BZIP Compress method for zip
|
||||
* Did some refactoring and code cleanup
|
||||
|
||||
|
||||
Credits
|
||||
|
||||
Gilles Vollant - Original MiniZip author
|
||||
Even Rouault - ZIP64 unzip Support
|
||||
Daniel Borca - BZip Compression method support in unzip
|
||||
Mathias Svensson - ZIP64 zip support
|
||||
Mathias Svensson - BZip Compression method support in zip
|
||||
|
||||
Resources
|
||||
|
||||
ZipLayout http://result42.com/projects/ZipFileLayout
|
||||
Command line tool for Windows that shows the layout and information of the headers in a zip archive.
|
||||
Used when debugging and validating the creation of zip files using MiniZip64
|
||||
|
||||
|
||||
ZIP App Note http://www.pkware.com/documents/casestudies/APPNOTE.TXT
|
||||
Zip File specification
|
||||
|
||||
|
||||
Notes.
|
||||
* To be able to use BZip compression method in zip64.c or unzip64.c the BZIP2 lib is needed and HAVE_BZIP2 need to be defined.
|
||||
|
||||
License
|
||||
----------------------------------------------------------
|
||||
Condition of use and distribution are the same than zlib :
|
||||
|
||||
This software is provided 'as-is', without any express or implied
|
||||
warranty. In no event will the authors be held liable for any damages
|
||||
arising from the use of this software.
|
||||
|
||||
Permission is granted to anyone to use this software for any purpose,
|
||||
including commercial applications, and to alter it and redistribute it
|
||||
freely, subject to the following restrictions:
|
||||
|
||||
1. The origin of this software must not be misrepresented; you must not
|
||||
claim that you wrote the original software. If you use this software
|
||||
in a product, an acknowledgment in the product documentation would be
|
||||
appreciated but is not required.
|
||||
2. Altered source versions must be plainly marked as such, and must not be
|
||||
misrepresented as being the original software.
|
||||
3. This notice may not be removed or altered from any source distribution.
|
||||
|
||||
----------------------------------------------------------
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
/* crypt.h -- base code for crypt/uncrypt ZIPfile
|
||||
|
||||
|
||||
Version 1.00, September 10th, 2003
|
||||
Version 1.01e, February 12th, 2005
|
||||
|
||||
Copyright (C) 1998-2003 Gilles Vollant
|
||||
Copyright (C) 1998-2005 Gilles Vollant
|
||||
|
||||
This code is a modified version of crypting code in Infozip distribution
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
/***********************************************************************
|
||||
* Return the next byte in the pseudo-random sequence
|
||||
*/
|
||||
static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab)
|
||||
static int decrypt_byte(unsigned long* pkeys, const z_crc_t* pcrc_32_tab)
|
||||
{
|
||||
unsigned temp; /* POTENTIAL BUG: temp*(temp^1) may overflow in an
|
||||
* unpredictable manner on 16-bit systems; not a problem
|
||||
@@ -45,7 +45,7 @@ static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab)
|
||||
/***********************************************************************
|
||||
* Update the encryption keys with the next byte of plain text
|
||||
*/
|
||||
static int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int c)
|
||||
static int update_keys(unsigned long* pkeys,const z_crc_t* pcrc_32_tab,int c)
|
||||
{
|
||||
(*(pkeys+0)) = CRC32((*(pkeys+0)), c);
|
||||
(*(pkeys+1)) += (*(pkeys+0)) & 0xff;
|
||||
@@ -62,7 +62,7 @@ static int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int
|
||||
* Initialize the encryption keys and the random header according to
|
||||
* the given password.
|
||||
*/
|
||||
static void init_keys(const char* passwd,unsigned long* pkeys,const unsigned long* pcrc_32_tab)
|
||||
static void init_keys(const char* passwd,unsigned long* pkeys,const z_crc_t* pcrc_32_tab)
|
||||
{
|
||||
*(pkeys+0) = 305419896L;
|
||||
*(pkeys+1) = 591751049L;
|
||||
@@ -87,13 +87,12 @@ static void init_keys(const char* passwd,unsigned long* pkeys,const unsigned lon
|
||||
# define ZCR_SEED2 3141592654UL /* use PI as default pattern */
|
||||
# endif
|
||||
|
||||
static int crypthead(passwd, buf, bufSize, pkeys, pcrc_32_tab, crcForCrypting)
|
||||
const char *passwd; /* password string */
|
||||
unsigned char *buf; /* where to write header */
|
||||
int bufSize;
|
||||
unsigned long* pkeys;
|
||||
const unsigned long* pcrc_32_tab;
|
||||
unsigned long crcForCrypting;
|
||||
static int crypthead(const char* passwd, /* password string */
|
||||
unsigned char* buf, /* where to write header */
|
||||
int bufSize,
|
||||
unsigned long* pkeys,
|
||||
const z_crc_t* pcrc_32_tab,
|
||||
unsigned long crcForCrypting)
|
||||
{
|
||||
int n; /* index in random header */
|
||||
int t; /* temporary */
|
||||
@@ -124,8 +123,8 @@ static int crypthead(passwd, buf, bufSize, pkeys, pcrc_32_tab, crcForCrypting)
|
||||
{
|
||||
buf[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, header[n], t);
|
||||
}
|
||||
buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 16) & 0xff, t);
|
||||
buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 24) & 0xff, t);
|
||||
buf[n++] = (unsigned char)zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 16) & 0xff, t);
|
||||
buf[n++] = (unsigned char)zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 24) & 0xff, t);
|
||||
return n;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,83 +1,101 @@
|
||||
/* ioapi.c -- IO base function header for compress/uncompress .zip
|
||||
files using zlib + zip or unzip API
|
||||
/* ioapi.h -- IO base function header for compress/uncompress .zip
|
||||
part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
|
||||
|
||||
Version 1.00, September 10th, 2003
|
||||
Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
|
||||
|
||||
Modifications for Zip64 support
|
||||
Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
|
||||
|
||||
For more info read MiniZip_info.txt
|
||||
|
||||
Copyright (C) 1998-2003 Gilles Vollant
|
||||
*/
|
||||
|
||||
#ifndef _WIN32_WCE
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#else
|
||||
#include <stdio.h>
|
||||
//#include "celib.h"
|
||||
#if defined(_WIN32) && (!(defined(_CRT_SECURE_NO_WARNINGS)))
|
||||
#define _CRT_SECURE_NO_WARNINGS
|
||||
#endif
|
||||
#include <string.h>
|
||||
|
||||
#include "zlib.h"
|
||||
#if defined(__APPLE__) || defined(IOAPI_NO_64)
|
||||
// In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
|
||||
#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
|
||||
#define FTELLO_FUNC(stream) ftello(stream)
|
||||
#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
|
||||
#else
|
||||
#define FOPEN_FUNC(filename, mode) fopen64(filename, mode)
|
||||
#define FTELLO_FUNC(stream) ftello64(stream)
|
||||
#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)
|
||||
#endif
|
||||
|
||||
|
||||
#include "ioapi.h"
|
||||
|
||||
voidpf call_zopen64 (const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode)
|
||||
{
|
||||
if (pfilefunc->zfile_func64.zopen64_file != NULL)
|
||||
return (*(pfilefunc->zfile_func64.zopen64_file)) (pfilefunc->zfile_func64.opaque,filename,mode);
|
||||
else
|
||||
{
|
||||
return (*(pfilefunc->zopen32_file))(pfilefunc->zfile_func64.opaque,(const char*)filename,mode);
|
||||
}
|
||||
}
|
||||
|
||||
long call_zseek64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin)
|
||||
{
|
||||
if (pfilefunc->zfile_func64.zseek64_file != NULL)
|
||||
return (*(pfilefunc->zfile_func64.zseek64_file)) (pfilefunc->zfile_func64.opaque,filestream,offset,origin);
|
||||
else
|
||||
{
|
||||
uLong offsetTruncated = (uLong)offset;
|
||||
if (offsetTruncated != offset)
|
||||
return -1;
|
||||
else
|
||||
return (*(pfilefunc->zseek32_file))(pfilefunc->zfile_func64.opaque,filestream,offsetTruncated,origin);
|
||||
}
|
||||
}
|
||||
|
||||
ZPOS64_T call_ztell64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream)
|
||||
{
|
||||
if (pfilefunc->zfile_func64.zseek64_file != NULL)
|
||||
return (*(pfilefunc->zfile_func64.ztell64_file)) (pfilefunc->zfile_func64.opaque,filestream);
|
||||
else
|
||||
{
|
||||
uLong tell_uLong = (*(pfilefunc->ztell32_file))(pfilefunc->zfile_func64.opaque,filestream);
|
||||
if ((tell_uLong) == MAXU32)
|
||||
return (ZPOS64_T)-1;
|
||||
else
|
||||
return tell_uLong;
|
||||
}
|
||||
}
|
||||
|
||||
void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32)
|
||||
{
|
||||
p_filefunc64_32->zfile_func64.zopen64_file = NULL;
|
||||
p_filefunc64_32->zopen32_file = p_filefunc32->zopen_file;
|
||||
p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file;
|
||||
p_filefunc64_32->zfile_func64.zread_file = p_filefunc32->zread_file;
|
||||
p_filefunc64_32->zfile_func64.zwrite_file = p_filefunc32->zwrite_file;
|
||||
p_filefunc64_32->zfile_func64.zflush_file = p_filefunc32->zflush_file;
|
||||
p_filefunc64_32->zfile_func64.ztell64_file = NULL;
|
||||
p_filefunc64_32->zfile_func64.zseek64_file = NULL;
|
||||
p_filefunc64_32->zfile_func64.zclose_file = p_filefunc32->zclose_file;
|
||||
p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file;
|
||||
p_filefunc64_32->zfile_func64.opaque = p_filefunc32->opaque;
|
||||
p_filefunc64_32->zseek32_file = p_filefunc32->zseek_file;
|
||||
p_filefunc64_32->ztell32_file = p_filefunc32->ztell_file;
|
||||
}
|
||||
|
||||
|
||||
/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
|
||||
|
||||
#ifndef SEEK_CUR
|
||||
#define SEEK_CUR 1
|
||||
#endif
|
||||
static voidpf ZCALLBACK fopen_file_func OF((voidpf opaque, const char* filename, int mode));
|
||||
static uLong ZCALLBACK fread_file_func OF((voidpf opaque, voidpf stream, void* buf, uLong size));
|
||||
static uLong ZCALLBACK fwrite_file_func OF((voidpf opaque, voidpf stream, const void* buf,uLong size));
|
||||
static ZPOS64_T ZCALLBACK ftell64_file_func OF((voidpf opaque, voidpf stream));
|
||||
static long ZCALLBACK fseek64_file_func OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
|
||||
static int ZCALLBACK fflush_file_func OF((voidpf opaque, voidpf stream));
|
||||
|
||||
#ifndef SEEK_END
|
||||
#define SEEK_END 2
|
||||
#endif
|
||||
static int ZCALLBACK fclose_file_func OF((voidpf opaque, voidpf stream));
|
||||
static int ZCALLBACK ferror_file_func OF((voidpf opaque, voidpf stream));
|
||||
|
||||
#ifndef SEEK_SET
|
||||
#define SEEK_SET 0
|
||||
#endif
|
||||
|
||||
voidpf ZCALLBACK fopen_file_func OF((
|
||||
voidpf opaque,
|
||||
const char* filename,
|
||||
int mode));
|
||||
|
||||
uLong ZCALLBACK fread_file_func OF((
|
||||
voidpf opaque,
|
||||
voidpf stream,
|
||||
void* buf,
|
||||
uLong size));
|
||||
|
||||
uLong ZCALLBACK fwrite_file_func OF((
|
||||
voidpf opaque,
|
||||
voidpf stream,
|
||||
const void* buf,
|
||||
uLong size));
|
||||
|
||||
long ZCALLBACK ftell_file_func OF((
|
||||
voidpf opaque,
|
||||
voidpf stream));
|
||||
|
||||
long ZCALLBACK fseek_file_func OF((
|
||||
voidpf opaque,
|
||||
voidpf stream,
|
||||
uLong offset,
|
||||
int origin));
|
||||
|
||||
int ZCALLBACK fflush_file_func OF((
|
||||
voidpf opaque,
|
||||
voidpf stream));
|
||||
|
||||
int ZCALLBACK fclose_file_func OF((
|
||||
voidpf opaque,
|
||||
voidpf stream));
|
||||
|
||||
int ZCALLBACK ferror_file_func OF((
|
||||
voidpf opaque,
|
||||
voidpf stream));
|
||||
|
||||
|
||||
voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)
|
||||
voidpf opaque;
|
||||
const char* filename;
|
||||
int mode;
|
||||
static voidpf ZCALLBACK fopen_file_func (voidpf opaque, const char* filename, int mode)
|
||||
{
|
||||
FILE* file = NULL;
|
||||
const char* mode_fopen = NULL;
|
||||
@@ -95,44 +113,55 @@ voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)
|
||||
return file;
|
||||
}
|
||||
|
||||
|
||||
uLong ZCALLBACK fread_file_func (opaque, stream, buf, size)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
void* buf;
|
||||
uLong size;
|
||||
static voidpf ZCALLBACK fopen64_file_func (voidpf opaque, const void* filename, int mode)
|
||||
{
|
||||
uLong ret;
|
||||
ret = fread(buf, 1, (size_t)size, (FILE *)stream);
|
||||
return ret;
|
||||
FILE* file = NULL;
|
||||
const char* mode_fopen = NULL;
|
||||
if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
|
||||
mode_fopen = "rb";
|
||||
else
|
||||
if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
|
||||
mode_fopen = "r+b";
|
||||
else
|
||||
if (mode & ZLIB_FILEFUNC_MODE_CREATE)
|
||||
mode_fopen = "wb";
|
||||
|
||||
if ((filename!=NULL) && (mode_fopen != NULL))
|
||||
file = FOPEN_FUNC((const char*)filename, mode_fopen);
|
||||
return file;
|
||||
}
|
||||
|
||||
|
||||
uLong ZCALLBACK fwrite_file_func (opaque, stream, buf, size)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
const void* buf;
|
||||
uLong size;
|
||||
static uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf, uLong size)
|
||||
{
|
||||
uLong ret;
|
||||
ret = fwrite(buf, 1, (size_t)size, (FILE *)stream);
|
||||
ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
|
||||
return ret;
|
||||
}
|
||||
|
||||
long ZCALLBACK ftell_file_func (opaque, stream)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
static uLong ZCALLBACK fwrite_file_func (voidpf opaque, voidpf stream, const void* buf, uLong size)
|
||||
{
|
||||
uLong ret;
|
||||
ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream)
|
||||
{
|
||||
long ret;
|
||||
ret = ftell((FILE *)stream);
|
||||
return ret;
|
||||
}
|
||||
|
||||
long ZCALLBACK fseek_file_func (opaque, stream, offset, origin)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
uLong offset;
|
||||
int origin;
|
||||
|
||||
static ZPOS64_T ZCALLBACK ftell64_file_func (voidpf opaque, voidpf stream)
|
||||
{
|
||||
ZPOS64_T ret;
|
||||
ret = FTELLO_FUNC((FILE *)stream);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static long ZCALLBACK fseek_file_func (voidpf opaque, voidpf stream, uLong offset, int origin)
|
||||
{
|
||||
int fseek_origin=0;
|
||||
long ret;
|
||||
@@ -150,31 +179,51 @@ long ZCALLBACK fseek_file_func (opaque, stream, offset, origin)
|
||||
default: return -1;
|
||||
}
|
||||
ret = 0;
|
||||
fseek((FILE *)stream, offset, fseek_origin);
|
||||
if (fseek((FILE *)stream, offset, fseek_origin) != 0)
|
||||
ret = -1;
|
||||
return ret;
|
||||
}
|
||||
|
||||
int ZCALLBACK fflush_file_func (opaque, stream)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
static long ZCALLBACK fseek64_file_func (voidpf opaque, voidpf stream, ZPOS64_T offset, int origin)
|
||||
{
|
||||
int fseek_origin=0;
|
||||
long ret;
|
||||
switch (origin)
|
||||
{
|
||||
case ZLIB_FILEFUNC_SEEK_CUR :
|
||||
fseek_origin = SEEK_CUR;
|
||||
break;
|
||||
case ZLIB_FILEFUNC_SEEK_END :
|
||||
fseek_origin = SEEK_END;
|
||||
break;
|
||||
case ZLIB_FILEFUNC_SEEK_SET :
|
||||
fseek_origin = SEEK_SET;
|
||||
break;
|
||||
default: return -1;
|
||||
}
|
||||
ret = 0;
|
||||
|
||||
if(FSEEKO_FUNC((FILE *)stream, offset, fseek_origin) != 0)
|
||||
ret = -1;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int ZCALLBACK fflush_file_func (voidpf opaque, voidpf stream)
|
||||
{
|
||||
int ret;
|
||||
ret = fflush((FILE *)stream);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int ZCALLBACK fclose_file_func (opaque, stream)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
static int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream)
|
||||
{
|
||||
int ret;
|
||||
ret = fclose((FILE *)stream);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int ZCALLBACK ferror_file_func (opaque, stream)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
static int ZCALLBACK ferror_file_func (voidpf opaque, voidpf stream)
|
||||
{
|
||||
int ret;
|
||||
ret = ferror((FILE *)stream);
|
||||
@@ -194,3 +243,16 @@ void fill_fopen_filefunc (pzlib_filefunc_def)
|
||||
pzlib_filefunc_def->zerror_file = ferror_file_func;
|
||||
pzlib_filefunc_def->opaque = NULL;
|
||||
}
|
||||
|
||||
void fill_fopen64_filefunc (zlib_filefunc64_def* pzlib_filefunc_def)
|
||||
{
|
||||
pzlib_filefunc_def->zopen64_file = fopen64_file_func;
|
||||
pzlib_filefunc_def->zread_file = fread_file_func;
|
||||
pzlib_filefunc_def->zwrite_file = fwrite_file_func;
|
||||
pzlib_filefunc_def->ztell64_file = ftell64_file_func;
|
||||
pzlib_filefunc_def->zseek64_file = fseek64_file_func;
|
||||
pzlib_filefunc_def->zflush_file = fflush_file_func;
|
||||
pzlib_filefunc_def->zclose_file = fclose_file_func;
|
||||
pzlib_filefunc_def->zerror_file = ferror_file_func;
|
||||
pzlib_filefunc_def->opaque = NULL;
|
||||
}
|
||||
|
||||
48
src/minizip/ioapi.c.diff
Normal file
48
src/minizip/ioapi.c.diff
Normal file
@@ -0,0 +1,48 @@
|
||||
--- ioapi.c.orig 2012-01-21 20:58:45.000000000 +0100
|
||||
+++ ioapi.c 2014-05-24 13:27:22.516230485 +0200
|
||||
@@ -73,6 +73,7 @@
|
||||
p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file;
|
||||
p_filefunc64_32->zfile_func64.zread_file = p_filefunc32->zread_file;
|
||||
p_filefunc64_32->zfile_func64.zwrite_file = p_filefunc32->zwrite_file;
|
||||
+ p_filefunc64_32->zfile_func64.zflush_file = p_filefunc32->zflush_file;
|
||||
p_filefunc64_32->zfile_func64.ztell64_file = NULL;
|
||||
p_filefunc64_32->zfile_func64.zseek64_file = NULL;
|
||||
p_filefunc64_32->zfile_func64.zclose_file = p_filefunc32->zclose_file;
|
||||
@@ -89,6 +90,8 @@
|
||||
static uLong ZCALLBACK fwrite_file_func OF((voidpf opaque, voidpf stream, const void* buf,uLong size));
|
||||
static ZPOS64_T ZCALLBACK ftell64_file_func OF((voidpf opaque, voidpf stream));
|
||||
static long ZCALLBACK fseek64_file_func OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
|
||||
+static int ZCALLBACK fflush_file_func OF((voidpf opaque, voidpf stream));
|
||||
+
|
||||
static int ZCALLBACK fclose_file_func OF((voidpf opaque, voidpf stream));
|
||||
static int ZCALLBACK ferror_file_func OF((voidpf opaque, voidpf stream));
|
||||
|
||||
@@ -206,6 +209,12 @@
|
||||
return ret;
|
||||
}
|
||||
|
||||
+static int ZCALLBACK fflush_file_func (voidpf opaque, voidpf stream)
|
||||
+{
|
||||
+ int ret;
|
||||
+ ret = fflush((FILE *)stream);
|
||||
+ return ret;
|
||||
+}
|
||||
|
||||
static int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream)
|
||||
{
|
||||
@@ -229,6 +238,7 @@
|
||||
pzlib_filefunc_def->zwrite_file = fwrite_file_func;
|
||||
pzlib_filefunc_def->ztell_file = ftell_file_func;
|
||||
pzlib_filefunc_def->zseek_file = fseek_file_func;
|
||||
+ pzlib_filefunc_def->zflush_file = fflush_file_func;
|
||||
pzlib_filefunc_def->zclose_file = fclose_file_func;
|
||||
pzlib_filefunc_def->zerror_file = ferror_file_func;
|
||||
pzlib_filefunc_def->opaque = NULL;
|
||||
@@ -241,6 +251,7 @@
|
||||
pzlib_filefunc_def->zwrite_file = fwrite_file_func;
|
||||
pzlib_filefunc_def->ztell64_file = ftell64_file_func;
|
||||
pzlib_filefunc_def->zseek64_file = fseek64_file_func;
|
||||
+ pzlib_filefunc_def->zflush_file = fflush_file_func;
|
||||
pzlib_filefunc_def->zclose_file = fclose_file_func;
|
||||
pzlib_filefunc_def->zerror_file = ferror_file_func;
|
||||
pzlib_filefunc_def->opaque = NULL;
|
||||
@@ -1,177 +0,0 @@
|
||||
/* ioapi.c -- IO base function header for compress/uncompress .zip
|
||||
files using zlib + zip or unzip API
|
||||
|
||||
Version 1.00, September 10th, 2003
|
||||
|
||||
Copyright (C) 1998-2003 Gilles Vollant
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "zlib.h"
|
||||
#include "ioapi.h"
|
||||
|
||||
|
||||
|
||||
/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
|
||||
|
||||
#ifndef SEEK_CUR
|
||||
#define SEEK_CUR 1
|
||||
#endif
|
||||
|
||||
#ifndef SEEK_END
|
||||
#define SEEK_END 2
|
||||
#endif
|
||||
|
||||
#ifndef SEEK_SET
|
||||
#define SEEK_SET 0
|
||||
#endif
|
||||
|
||||
voidpf ZCALLBACK fopen_file_func OF((
|
||||
voidpf opaque,
|
||||
const char* filename,
|
||||
int mode));
|
||||
|
||||
uLong ZCALLBACK fread_file_func OF((
|
||||
voidpf opaque,
|
||||
voidpf stream,
|
||||
void* buf,
|
||||
uLong size));
|
||||
|
||||
uLong ZCALLBACK fwrite_file_func OF((
|
||||
voidpf opaque,
|
||||
voidpf stream,
|
||||
const void* buf,
|
||||
uLong size));
|
||||
|
||||
long ZCALLBACK ftell_file_func OF((
|
||||
voidpf opaque,
|
||||
voidpf stream));
|
||||
|
||||
long ZCALLBACK fseek_file_func OF((
|
||||
voidpf opaque,
|
||||
voidpf stream,
|
||||
uLong offset,
|
||||
int origin));
|
||||
|
||||
int ZCALLBACK fclose_file_func OF((
|
||||
voidpf opaque,
|
||||
voidpf stream));
|
||||
|
||||
int ZCALLBACK ferror_file_func OF((
|
||||
voidpf opaque,
|
||||
voidpf stream));
|
||||
|
||||
|
||||
voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)
|
||||
voidpf opaque;
|
||||
const char* filename;
|
||||
int mode;
|
||||
{
|
||||
FILE* file = NULL;
|
||||
const char* mode_fopen = NULL;
|
||||
if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
|
||||
mode_fopen = "rb";
|
||||
else
|
||||
if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
|
||||
mode_fopen = "r+b";
|
||||
else
|
||||
if (mode & ZLIB_FILEFUNC_MODE_CREATE)
|
||||
mode_fopen = "wb";
|
||||
|
||||
if ((filename!=NULL) && (mode_fopen != NULL))
|
||||
file = fopen(filename, mode_fopen);
|
||||
return file;
|
||||
}
|
||||
|
||||
|
||||
uLong ZCALLBACK fread_file_func (opaque, stream, buf, size)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
void* buf;
|
||||
uLong size;
|
||||
{
|
||||
uLong ret;
|
||||
ret = fread(buf, 1, (size_t)size, (FILE *)stream);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
uLong ZCALLBACK fwrite_file_func (opaque, stream, buf, size)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
const void* buf;
|
||||
uLong size;
|
||||
{
|
||||
uLong ret;
|
||||
ret = fwrite(buf, 1, (size_t)size, (FILE *)stream);
|
||||
return ret;
|
||||
}
|
||||
|
||||
long ZCALLBACK ftell_file_func (opaque, stream)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
{
|
||||
long ret;
|
||||
ret = ftell((FILE *)stream);
|
||||
return ret;
|
||||
}
|
||||
|
||||
long ZCALLBACK fseek_file_func (opaque, stream, offset, origin)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
uLong offset;
|
||||
int origin;
|
||||
{
|
||||
int fseek_origin=0;
|
||||
long ret;
|
||||
switch (origin)
|
||||
{
|
||||
case ZLIB_FILEFUNC_SEEK_CUR :
|
||||
fseek_origin = SEEK_CUR;
|
||||
break;
|
||||
case ZLIB_FILEFUNC_SEEK_END :
|
||||
fseek_origin = SEEK_END;
|
||||
break;
|
||||
case ZLIB_FILEFUNC_SEEK_SET :
|
||||
fseek_origin = SEEK_SET;
|
||||
break;
|
||||
default: return -1;
|
||||
}
|
||||
ret = 0;
|
||||
fseek((FILE *)stream, offset, fseek_origin);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int ZCALLBACK fclose_file_func (opaque, stream)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
{
|
||||
int ret;
|
||||
ret = fclose((FILE *)stream);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int ZCALLBACK ferror_file_func (opaque, stream)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
{
|
||||
int ret;
|
||||
ret = ferror((FILE *)stream);
|
||||
return ret;
|
||||
}
|
||||
|
||||
void fill_fopen_filefunc (pzlib_filefunc_def)
|
||||
zlib_filefunc_def* pzlib_filefunc_def;
|
||||
{
|
||||
pzlib_filefunc_def->zopen_file = fopen_file_func;
|
||||
pzlib_filefunc_def->zread_file = fread_file_func;
|
||||
pzlib_filefunc_def->zwrite_file = fwrite_file_func;
|
||||
pzlib_filefunc_def->ztell_file = ftell_file_func;
|
||||
pzlib_filefunc_def->zseek_file = fseek_file_func;
|
||||
pzlib_filefunc_def->zclose_file = fclose_file_func;
|
||||
pzlib_filefunc_def->zerror_file = ferror_file_func;
|
||||
pzlib_filefunc_def->opaque = NULL;
|
||||
}
|
||||
@@ -1,13 +1,112 @@
|
||||
/* ioapi.h -- IO base function header for compress/uncompress .zip
|
||||
files using zlib + zip or unzip API
|
||||
part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
|
||||
|
||||
Version 1.00, September 10th, 2003
|
||||
Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
|
||||
|
||||
Modifications for Zip64 support
|
||||
Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
|
||||
|
||||
For more info read MiniZip_info.txt
|
||||
|
||||
Changes
|
||||
|
||||
Oct-2009 - Defined ZPOS64_T to fpos_t on windows and u_int64_t on linux. (might need to find a better why for this)
|
||||
Oct-2009 - Change to fseeko64, ftello64 and fopen64 so large files would work on linux.
|
||||
More if/def section may be needed to support other platforms
|
||||
Oct-2009 - Defined fxxxx64 calls to normal fopen/ftell/fseek so they would compile on windows.
|
||||
(but you should use iowin32.c for windows instead)
|
||||
|
||||
Copyright (C) 1998-2003 Gilles Vollant
|
||||
*/
|
||||
|
||||
#ifndef _ZLIBIOAPI_H
|
||||
#define _ZLIBIOAPI_H
|
||||
#ifndef _ZLIBIOAPI64_H
|
||||
#define _ZLIBIOAPI64_H
|
||||
|
||||
#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
|
||||
|
||||
// Linux needs this to support file operation on files larger then 4+GB
|
||||
// But might need better if/def to select just the platforms that needs them.
|
||||
|
||||
#ifndef __USE_FILE_OFFSET64
|
||||
#define __USE_FILE_OFFSET64
|
||||
#endif
|
||||
#ifndef __USE_LARGEFILE64
|
||||
#define __USE_LARGEFILE64
|
||||
#endif
|
||||
#ifndef _LARGEFILE64_SOURCE
|
||||
#define _LARGEFILE64_SOURCE
|
||||
#endif
|
||||
#ifndef _FILE_OFFSET_BIT
|
||||
#define _FILE_OFFSET_BIT 64
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include "zlib.h"
|
||||
|
||||
#if defined(USE_FILE32API)
|
||||
#define fopen64 fopen
|
||||
#define ftello64 ftell
|
||||
#define fseeko64 fseek
|
||||
#else
|
||||
#ifdef __FreeBSD__
|
||||
#define fopen64 fopen
|
||||
#define ftello64 ftello
|
||||
#define fseeko64 fseeko
|
||||
#endif
|
||||
#ifdef _MSC_VER
|
||||
#define fopen64 fopen
|
||||
#if (_MSC_VER >= 1400) && (!(defined(NO_MSCVER_FILE64_FUNC)))
|
||||
#define ftello64 _ftelli64
|
||||
#define fseeko64 _fseeki64
|
||||
#else // old MSC
|
||||
#define ftello64 ftell
|
||||
#define fseeko64 fseek
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
#ifndef ZPOS64_T
|
||||
#ifdef _WIN32
|
||||
#define ZPOS64_T fpos_t
|
||||
#else
|
||||
#include <stdint.h>
|
||||
#define ZPOS64_T uint64_t
|
||||
#endif
|
||||
#endif
|
||||
*/
|
||||
|
||||
#ifdef HAVE_MINIZIP64_CONF_H
|
||||
#include "mz64conf.h"
|
||||
#endif
|
||||
|
||||
/* a type choosen by DEFINE */
|
||||
#ifdef HAVE_64BIT_INT_CUSTOM
|
||||
typedef 64BIT_INT_CUSTOM_TYPE ZPOS64_T;
|
||||
#else
|
||||
#ifdef HAS_STDINT_H
|
||||
#include "stdint.h"
|
||||
typedef uint64_t ZPOS64_T;
|
||||
#else
|
||||
|
||||
/* Maximum unsigned 32-bit value used as placeholder for zip64 */
|
||||
#define MAXU32 0xffffffff
|
||||
|
||||
#if defined(_MSC_VER) || defined(__BORLANDC__)
|
||||
typedef unsigned __int64 ZPOS64_T;
|
||||
#else
|
||||
typedef unsigned long long int ZPOS64_T;
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
|
||||
#define ZLIB_FILEFUNC_SEEK_CUR (1)
|
||||
@@ -23,61 +122,91 @@
|
||||
|
||||
|
||||
#ifndef ZCALLBACK
|
||||
|
||||
#if (defined(WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
|
||||
#define ZCALLBACK CALLBACK
|
||||
#else
|
||||
#define ZCALLBACK
|
||||
#endif
|
||||
#if (defined(WIN32) || defined(_WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
|
||||
#define ZCALLBACK CALLBACK
|
||||
#else
|
||||
#define ZCALLBACK
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/* fixed missing define on some zlib (Lars Wendler) */
|
||||
#ifndef OF
|
||||
#define OF(args) args
|
||||
#endif
|
||||
|
||||
typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
|
||||
typedef uLong (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
|
||||
typedef uLong (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
|
||||
typedef long (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream));
|
||||
typedef long (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin));
|
||||
typedef int (ZCALLBACK *flush_file_func) OF((voidpf opaque, voidpf stream));
|
||||
typedef int (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream));
|
||||
typedef int (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
|
||||
|
||||
typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
|
||||
typedef uLong (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
|
||||
typedef uLong (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
|
||||
typedef int (ZCALLBACK *flush_file_func) OF((voidpf opaque, voidpf stream));
|
||||
typedef int (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream));
|
||||
typedef int (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
|
||||
|
||||
typedef long (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream));
|
||||
typedef long (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin));
|
||||
|
||||
|
||||
/* here is the "old" 32 bits structure structure */
|
||||
typedef struct zlib_filefunc_def_s
|
||||
{
|
||||
open_file_func zopen_file;
|
||||
read_file_func zread_file;
|
||||
write_file_func zwrite_file;
|
||||
flush_file_func zflush_file;
|
||||
tell_file_func ztell_file;
|
||||
seek_file_func zseek_file;
|
||||
flush_file_func zflush_file;
|
||||
close_file_func zclose_file;
|
||||
testerror_file_func zerror_file;
|
||||
voidpf opaque;
|
||||
} zlib_filefunc_def;
|
||||
|
||||
typedef ZPOS64_T (ZCALLBACK *tell64_file_func) OF((voidpf opaque, voidpf stream));
|
||||
typedef long (ZCALLBACK *seek64_file_func) OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
|
||||
typedef voidpf (ZCALLBACK *open64_file_func) OF((voidpf opaque, const void* filename, int mode));
|
||||
|
||||
typedef struct zlib_filefunc64_def_s
|
||||
{
|
||||
open64_file_func zopen64_file;
|
||||
read_file_func zread_file;
|
||||
write_file_func zwrite_file;
|
||||
flush_file_func zflush_file;
|
||||
tell64_file_func ztell64_file;
|
||||
seek64_file_func zseek64_file;
|
||||
close_file_func zclose_file;
|
||||
testerror_file_func zerror_file;
|
||||
voidpf opaque;
|
||||
} zlib_filefunc64_def;
|
||||
|
||||
void fill_fopen64_filefunc OF((zlib_filefunc64_def* pzlib_filefunc_def));
|
||||
void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
|
||||
|
||||
#define ZREAD(filefunc,filestream,buf,size) ((*((filefunc).zread_file))((filefunc).opaque,filestream,buf,size))
|
||||
#define ZWRITE(filefunc,filestream,buf,size) ((*((filefunc).zwrite_file))((filefunc).opaque,filestream,buf,size))
|
||||
#define ZTELL(filefunc,filestream) ((*((filefunc).ztell_file))((filefunc).opaque,filestream))
|
||||
#define ZSEEK(filefunc,filestream,pos,mode) ((*((filefunc).zseek_file))((filefunc).opaque,filestream,pos,mode))
|
||||
#define ZFLUSH(filefunc,filestream) ((*((filefunc).zflush_file))((filefunc).opaque,filestream))
|
||||
#define ZCLOSE(filefunc,filestream) ((*((filefunc).zclose_file))((filefunc).opaque,filestream))
|
||||
#define ZERROR(filefunc,filestream) ((*((filefunc).zerror_file))((filefunc).opaque,filestream))
|
||||
/* now internal definition, only for zip.c and unzip.h */
|
||||
typedef struct zlib_filefunc64_32_def_s
|
||||
{
|
||||
zlib_filefunc64_def zfile_func64;
|
||||
open_file_func zopen32_file;
|
||||
tell_file_func ztell32_file;
|
||||
seek_file_func zseek32_file;
|
||||
} zlib_filefunc64_32_def;
|
||||
|
||||
|
||||
#define ZREAD64(filefunc,filestream,buf,size) ((*((filefunc).zfile_func64.zread_file)) ((filefunc).zfile_func64.opaque,filestream,buf,size))
|
||||
#define ZWRITE64(filefunc,filestream,buf,size) ((*((filefunc).zfile_func64.zwrite_file)) ((filefunc).zfile_func64.opaque,filestream,buf,size))
|
||||
#define ZFLUSH64(filefunc,filestream) ((*((filefunc).zfile_func64.zflush_file)) ((filefunc).zfile_func64.opaque,filestream))
|
||||
//#define ZTELL64(filefunc,filestream) ((*((filefunc).ztell64_file)) ((filefunc).opaque,filestream))
|
||||
//#define ZSEEK64(filefunc,filestream,pos,mode) ((*((filefunc).zseek64_file)) ((filefunc).opaque,filestream,pos,mode))
|
||||
#define ZCLOSE64(filefunc,filestream) ((*((filefunc).zfile_func64.zclose_file)) ((filefunc).zfile_func64.opaque,filestream))
|
||||
#define ZERROR64(filefunc,filestream) ((*((filefunc).zfile_func64.zerror_file)) ((filefunc).zfile_func64.opaque,filestream))
|
||||
|
||||
voidpf call_zopen64 OF((const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode));
|
||||
long call_zseek64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin));
|
||||
ZPOS64_T call_ztell64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream));
|
||||
|
||||
void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32);
|
||||
|
||||
#define ZOPEN64(filefunc,filename,mode) (call_zopen64((&(filefunc)),(filename),(mode)))
|
||||
#define ZTELL64(filefunc,filestream) (call_ztell64((&(filefunc)),(filestream)))
|
||||
#define ZSEEK64(filefunc,filestream,pos,mode) (call_zseek64((&(filefunc)),(filestream),(pos),(mode)))
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
34
src/minizip/ioapi.h.diff
Normal file
34
src/minizip/ioapi.h.diff
Normal file
@@ -0,0 +1,34 @@
|
||||
--- ioapi.h.orig 2012-01-17 03:51:31.000000000 +0100
|
||||
+++ ioapi.h 2014-05-24 13:27:22.516230485 +0200
|
||||
@@ -135,6 +135,7 @@
|
||||
typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
|
||||
typedef uLong (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
|
||||
typedef uLong (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
|
||||
+typedef int (ZCALLBACK *flush_file_func) OF((voidpf opaque, voidpf stream));
|
||||
typedef int (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream));
|
||||
typedef int (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
|
||||
|
||||
@@ -148,6 +149,7 @@
|
||||
open_file_func zopen_file;
|
||||
read_file_func zread_file;
|
||||
write_file_func zwrite_file;
|
||||
+ flush_file_func zflush_file;
|
||||
tell_file_func ztell_file;
|
||||
seek_file_func zseek_file;
|
||||
close_file_func zclose_file;
|
||||
@@ -164,6 +166,7 @@
|
||||
open64_file_func zopen64_file;
|
||||
read_file_func zread_file;
|
||||
write_file_func zwrite_file;
|
||||
+ flush_file_func zflush_file;
|
||||
tell64_file_func ztell64_file;
|
||||
seek64_file_func zseek64_file;
|
||||
close_file_func zclose_file;
|
||||
@@ -186,6 +189,7 @@
|
||||
|
||||
#define ZREAD64(filefunc,filestream,buf,size) ((*((filefunc).zfile_func64.zread_file)) ((filefunc).zfile_func64.opaque,filestream,buf,size))
|
||||
#define ZWRITE64(filefunc,filestream,buf,size) ((*((filefunc).zfile_func64.zwrite_file)) ((filefunc).zfile_func64.opaque,filestream,buf,size))
|
||||
+#define ZFLUSH64(filefunc,filestream) ((*((filefunc).zfile_func64.zflush_file)) ((filefunc).zfile_func64.opaque,filestream))
|
||||
//#define ZTELL64(filefunc,filestream) ((*((filefunc).ztell64_file)) ((filefunc).opaque,filestream))
|
||||
//#define ZSEEK64(filefunc,filestream,pos,mode) ((*((filefunc).zseek64_file)) ((filefunc).opaque,filestream,pos,mode))
|
||||
#define ZCLOSE64(filefunc,filestream) ((*((filefunc).zfile_func64.zclose_file)) ((filefunc).zfile_func64.opaque,filestream))
|
||||
@@ -1,75 +0,0 @@
|
||||
/* ioapi.h -- IO base function header for compress/uncompress .zip
|
||||
files using zlib + zip or unzip API
|
||||
|
||||
Version 1.00, September 10th, 2003
|
||||
|
||||
Copyright (C) 1998-2003 Gilles Vollant
|
||||
*/
|
||||
|
||||
#ifndef _ZLIBIOAPI_H
|
||||
#define _ZLIBIOAPI_H
|
||||
|
||||
|
||||
#define ZLIB_FILEFUNC_SEEK_CUR (1)
|
||||
#define ZLIB_FILEFUNC_SEEK_END (2)
|
||||
#define ZLIB_FILEFUNC_SEEK_SET (0)
|
||||
|
||||
#define ZLIB_FILEFUNC_MODE_READ (1)
|
||||
#define ZLIB_FILEFUNC_MODE_WRITE (2)
|
||||
#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3)
|
||||
|
||||
#define ZLIB_FILEFUNC_MODE_EXISTING (4)
|
||||
#define ZLIB_FILEFUNC_MODE_CREATE (8)
|
||||
|
||||
|
||||
#ifndef ZCALLBACK
|
||||
|
||||
#if (defined(WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
|
||||
#define ZCALLBACK CALLBACK
|
||||
#else
|
||||
#define ZCALLBACK
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
|
||||
typedef uLong (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
|
||||
typedef uLong (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
|
||||
typedef long (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream));
|
||||
typedef long (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin));
|
||||
typedef int (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream));
|
||||
typedef int (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
|
||||
|
||||
typedef struct zlib_filefunc_def_s
|
||||
{
|
||||
open_file_func zopen_file;
|
||||
read_file_func zread_file;
|
||||
write_file_func zwrite_file;
|
||||
tell_file_func ztell_file;
|
||||
seek_file_func zseek_file;
|
||||
close_file_func zclose_file;
|
||||
testerror_file_func zerror_file;
|
||||
voidpf opaque;
|
||||
} zlib_filefunc_def;
|
||||
|
||||
|
||||
|
||||
void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
|
||||
|
||||
#define ZREAD(filefunc,filestream,buf,size) ((*((filefunc).zread_file))((filefunc).opaque,filestream,buf,size))
|
||||
#define ZWRITE(filefunc,filestream,buf,size) ((*((filefunc).zwrite_file))((filefunc).opaque,filestream,buf,size))
|
||||
#define ZTELL(filefunc,filestream) ((*((filefunc).ztell_file))((filefunc).opaque,filestream))
|
||||
#define ZSEEK(filefunc,filestream,pos,mode) ((*((filefunc).zseek_file))((filefunc).opaque,filestream,pos,mode))
|
||||
#define ZCLOSE(filefunc,filestream) ((*((filefunc).zclose_file))((filefunc).opaque,filestream))
|
||||
#define ZERROR(filefunc,filestream) ((*((filefunc).zerror_file))((filefunc).opaque,filestream))
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
@@ -1,18 +1,17 @@
|
||||
/* iowin32.c -- IO base function header for compress/uncompress .zip
|
||||
files using zlib + zip or unzip API
|
||||
This IO API version uses the Win32 API (for Microsoft Windows)
|
||||
Version 1.1, February 14h, 2010
|
||||
part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
|
||||
|
||||
Version 1.00, September 10th, 2003
|
||||
Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
|
||||
|
||||
Modifications for Zip64 support
|
||||
Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
|
||||
|
||||
For more info read MiniZip_info.txt
|
||||
|
||||
Copyright (C) 1998-2003 Gilles Vollant
|
||||
*/
|
||||
|
||||
#include <stdlib.h>
|
||||
#ifndef _WIN32_WCE
|
||||
#include <stdlib.h>
|
||||
#else
|
||||
//#include "celib.h"
|
||||
#endif
|
||||
|
||||
#include "zlib.h"
|
||||
#include "ioapi.h"
|
||||
@@ -26,40 +25,20 @@
|
||||
#define INVALID_SET_FILE_POINTER ((DWORD)-1)
|
||||
#endif
|
||||
|
||||
voidpf ZCALLBACK win32_open_file_func OF((
|
||||
voidpf opaque,
|
||||
const char* filename,
|
||||
int mode));
|
||||
|
||||
uLong ZCALLBACK win32_read_file_func OF((
|
||||
voidpf opaque,
|
||||
voidpf stream,
|
||||
void* buf,
|
||||
uLong size));
|
||||
#if defined(WINAPI_FAMILY_PARTITION) && (!(defined(IOWIN32_USING_WINRT_API)))
|
||||
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
|
||||
#define IOWIN32_USING_WINRT_API 1
|
||||
#endif
|
||||
#endif
|
||||
|
||||
uLong ZCALLBACK win32_write_file_func OF((
|
||||
voidpf opaque,
|
||||
voidpf stream,
|
||||
const void* buf,
|
||||
uLong size));
|
||||
|
||||
long ZCALLBACK win32_tell_file_func OF((
|
||||
voidpf opaque,
|
||||
voidpf stream));
|
||||
|
||||
long ZCALLBACK win32_seek_file_func OF((
|
||||
voidpf opaque,
|
||||
voidpf stream,
|
||||
uLong offset,
|
||||
int origin));
|
||||
|
||||
int ZCALLBACK win32_close_file_func OF((
|
||||
voidpf opaque,
|
||||
voidpf stream));
|
||||
|
||||
int ZCALLBACK win32_error_file_func OF((
|
||||
voidpf opaque,
|
||||
voidpf stream));
|
||||
voidpf ZCALLBACK win32_open_file_func OF((voidpf opaque, const char* filename, int mode));
|
||||
uLong ZCALLBACK win32_read_file_func OF((voidpf opaque, voidpf stream, void* buf, uLong size));
|
||||
uLong ZCALLBACK win32_write_file_func OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
|
||||
ZPOS64_T ZCALLBACK win32_tell64_file_func OF((voidpf opaque, voidpf stream));
|
||||
long ZCALLBACK win32_seek64_file_func OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
|
||||
int ZCALLBACK win32_close_file_func OF((voidpf opaque, voidpf stream));
|
||||
int ZCALLBACK win32_error_file_func OF((voidpf opaque, voidpf stream));
|
||||
|
||||
typedef struct
|
||||
{
|
||||
@@ -67,69 +46,163 @@ typedef struct
|
||||
int error;
|
||||
} WIN32FILE_IOWIN;
|
||||
|
||||
voidpf ZCALLBACK win32_open_file_func (opaque, filename, mode)
|
||||
voidpf opaque;
|
||||
const char* filename;
|
||||
int mode;
|
||||
{
|
||||
const char* mode_fopen = NULL;
|
||||
DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
|
||||
HANDLE hFile = 0;
|
||||
voidpf ret=NULL;
|
||||
|
||||
dwDesiredAccess = dwShareMode = dwFlagsAndAttributes = 0;
|
||||
static void win32_translate_open_mode(int mode,
|
||||
DWORD* lpdwDesiredAccess,
|
||||
DWORD* lpdwCreationDisposition,
|
||||
DWORD* lpdwShareMode,
|
||||
DWORD* lpdwFlagsAndAttributes)
|
||||
{
|
||||
*lpdwDesiredAccess = *lpdwShareMode = *lpdwFlagsAndAttributes = *lpdwCreationDisposition = 0;
|
||||
|
||||
if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
|
||||
{
|
||||
dwDesiredAccess = GENERIC_READ;
|
||||
dwCreationDisposition = OPEN_EXISTING;
|
||||
dwShareMode = FILE_SHARE_READ;
|
||||
*lpdwDesiredAccess = GENERIC_READ;
|
||||
*lpdwCreationDisposition = OPEN_EXISTING;
|
||||
*lpdwShareMode = FILE_SHARE_READ;
|
||||
}
|
||||
else
|
||||
if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
|
||||
else if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
|
||||
{
|
||||
dwDesiredAccess = GENERIC_WRITE | GENERIC_READ;
|
||||
dwCreationDisposition = OPEN_EXISTING;
|
||||
*lpdwDesiredAccess = GENERIC_WRITE | GENERIC_READ;
|
||||
*lpdwCreationDisposition = OPEN_EXISTING;
|
||||
}
|
||||
else
|
||||
if (mode & ZLIB_FILEFUNC_MODE_CREATE)
|
||||
else if (mode & ZLIB_FILEFUNC_MODE_CREATE)
|
||||
{
|
||||
dwDesiredAccess = GENERIC_WRITE | GENERIC_READ;
|
||||
dwCreationDisposition = CREATE_ALWAYS;
|
||||
*lpdwDesiredAccess = GENERIC_WRITE | GENERIC_READ;
|
||||
*lpdwCreationDisposition = CREATE_ALWAYS;
|
||||
}
|
||||
}
|
||||
|
||||
if ((filename!=NULL) && (dwDesiredAccess != 0))
|
||||
hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL,
|
||||
dwCreationDisposition, dwFlagsAndAttributes, NULL);
|
||||
static voidpf win32_build_iowin(HANDLE hFile)
|
||||
{
|
||||
voidpf ret=NULL;
|
||||
|
||||
if (hFile == INVALID_HANDLE_VALUE)
|
||||
hFile = NULL;
|
||||
|
||||
if (hFile != NULL)
|
||||
if ((hFile != NULL) && (hFile != INVALID_HANDLE_VALUE))
|
||||
{
|
||||
WIN32FILE_IOWIN w32fiow;
|
||||
w32fiow.hf = hFile;
|
||||
w32fiow.error = 0;
|
||||
ret = malloc(sizeof(WIN32FILE_IOWIN));
|
||||
|
||||
if (ret==NULL)
|
||||
CloseHandle(hFile);
|
||||
else *((WIN32FILE_IOWIN*)ret) = w32fiow;
|
||||
else
|
||||
*((WIN32FILE_IOWIN*)ret) = w32fiow;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
voidpf ZCALLBACK win32_open64_file_func (voidpf opaque,const void* filename,int mode)
|
||||
{
|
||||
const char* mode_fopen = NULL;
|
||||
DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
|
||||
HANDLE hFile = NULL;
|
||||
|
||||
uLong ZCALLBACK win32_read_file_func (opaque, stream, buf, size)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
void* buf;
|
||||
uLong size;
|
||||
win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
|
||||
|
||||
#ifdef IOWIN32_USING_WINRT_API
|
||||
#ifdef UNICODE
|
||||
if ((filename!=NULL) && (dwDesiredAccess != 0))
|
||||
hFile = CreateFile2((LPCTSTR)filename, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
|
||||
#else
|
||||
if ((filename!=NULL) && (dwDesiredAccess != 0))
|
||||
{
|
||||
WCHAR filenameW[FILENAME_MAX + 0x200 + 1];
|
||||
MultiByteToWideChar(CP_ACP,0,(const char*)filename,-1,filenameW,FILENAME_MAX + 0x200);
|
||||
hFile = CreateFile2(filenameW, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
|
||||
}
|
||||
#endif
|
||||
#else
|
||||
if ((filename!=NULL) && (dwDesiredAccess != 0))
|
||||
hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
|
||||
#endif
|
||||
|
||||
return win32_build_iowin(hFile);
|
||||
}
|
||||
|
||||
|
||||
voidpf ZCALLBACK win32_open64_file_funcA (voidpf opaque,const void* filename,int mode)
|
||||
{
|
||||
const char* mode_fopen = NULL;
|
||||
DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
|
||||
HANDLE hFile = NULL;
|
||||
|
||||
win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
|
||||
|
||||
#ifdef IOWIN32_USING_WINRT_API
|
||||
if ((filename!=NULL) && (dwDesiredAccess != 0))
|
||||
{
|
||||
WCHAR filenameW[FILENAME_MAX + 0x200 + 1];
|
||||
MultiByteToWideChar(CP_ACP,0,(const char*)filename,-1,filenameW,FILENAME_MAX + 0x200);
|
||||
hFile = CreateFile2(filenameW, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
|
||||
}
|
||||
#else
|
||||
if ((filename!=NULL) && (dwDesiredAccess != 0))
|
||||
hFile = CreateFileA((LPCSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
|
||||
#endif
|
||||
|
||||
return win32_build_iowin(hFile);
|
||||
}
|
||||
|
||||
|
||||
voidpf ZCALLBACK win32_open64_file_funcW (voidpf opaque,const void* filename,int mode)
|
||||
{
|
||||
const char* mode_fopen = NULL;
|
||||
DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
|
||||
HANDLE hFile = NULL;
|
||||
|
||||
win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
|
||||
|
||||
#ifdef IOWIN32_USING_WINRT_API
|
||||
if ((filename!=NULL) && (dwDesiredAccess != 0))
|
||||
hFile = CreateFile2((LPCWSTR)filename, dwDesiredAccess, dwShareMode, dwCreationDisposition,NULL);
|
||||
#else
|
||||
if ((filename!=NULL) && (dwDesiredAccess != 0))
|
||||
hFile = CreateFileW((LPCWSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
|
||||
#endif
|
||||
|
||||
return win32_build_iowin(hFile);
|
||||
}
|
||||
|
||||
|
||||
voidpf ZCALLBACK win32_open_file_func (voidpf opaque,const char* filename,int mode)
|
||||
{
|
||||
const char* mode_fopen = NULL;
|
||||
DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
|
||||
HANDLE hFile = NULL;
|
||||
|
||||
win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
|
||||
|
||||
#ifdef IOWIN32_USING_WINRT_API
|
||||
#ifdef UNICODE
|
||||
if ((filename!=NULL) && (dwDesiredAccess != 0))
|
||||
hFile = CreateFile2((LPCTSTR)filename, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
|
||||
#else
|
||||
if ((filename!=NULL) && (dwDesiredAccess != 0))
|
||||
{
|
||||
WCHAR filenameW[FILENAME_MAX + 0x200 + 1];
|
||||
MultiByteToWideChar(CP_ACP,0,(const char*)filename,-1,filenameW,FILENAME_MAX + 0x200);
|
||||
hFile = CreateFile2(filenameW, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
|
||||
}
|
||||
#endif
|
||||
#else
|
||||
if ((filename!=NULL) && (dwDesiredAccess != 0))
|
||||
hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
|
||||
#endif
|
||||
|
||||
return win32_build_iowin(hFile);
|
||||
}
|
||||
|
||||
|
||||
uLong ZCALLBACK win32_read_file_func (voidpf opaque, voidpf stream, void* buf,uLong size)
|
||||
{
|
||||
uLong ret=0;
|
||||
HANDLE hFile = NULL;
|
||||
if (stream!=NULL)
|
||||
hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
|
||||
|
||||
if (hFile != NULL)
|
||||
{
|
||||
if (!ReadFile(hFile, buf, size, &ret, NULL))
|
||||
{
|
||||
DWORD dwErr = GetLastError();
|
||||
@@ -137,23 +210,21 @@ uLong ZCALLBACK win32_read_file_func (opaque, stream, buf, size)
|
||||
dwErr = 0;
|
||||
((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
|
||||
}
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
uLong ZCALLBACK win32_write_file_func (opaque, stream, buf, size)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
const void* buf;
|
||||
uLong size;
|
||||
uLong ZCALLBACK win32_write_file_func (voidpf opaque,voidpf stream,const void* buf,uLong size)
|
||||
{
|
||||
uLong ret=0;
|
||||
HANDLE hFile = NULL;
|
||||
if (stream!=NULL)
|
||||
hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
|
||||
|
||||
if (hFile !=NULL)
|
||||
if (hFile != NULL)
|
||||
{
|
||||
if (!WriteFile(hFile, buf, size, &ret, NULL))
|
||||
{
|
||||
DWORD dwErr = GetLastError();
|
||||
@@ -161,13 +232,32 @@ uLong ZCALLBACK win32_write_file_func (opaque, stream, buf, size)
|
||||
dwErr = 0;
|
||||
((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
|
||||
}
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
long ZCALLBACK win32_tell_file_func (opaque, stream)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
static BOOL MySetFilePointerEx(HANDLE hFile, LARGE_INTEGER pos, LARGE_INTEGER *newPos, DWORD dwMoveMethod)
|
||||
{
|
||||
#ifdef IOWIN32_USING_WINRT_API
|
||||
return SetFilePointerEx(hFile, pos, newPos, dwMoveMethod);
|
||||
#else
|
||||
LONG lHigh = pos.HighPart;
|
||||
DWORD dwNewPos = SetFilePointer(hFile, pos.LowPart, &lHigh, FILE_CURRENT);
|
||||
BOOL fOk = TRUE;
|
||||
if (dwNewPos == 0xFFFFFFFF)
|
||||
if (GetLastError() != NO_ERROR)
|
||||
fOk = FALSE;
|
||||
if ((newPos != NULL) && (fOk))
|
||||
{
|
||||
newPos->LowPart = dwNewPos;
|
||||
newPos->HighPart = lHigh;
|
||||
}
|
||||
return fOk;
|
||||
#endif
|
||||
}
|
||||
|
||||
long ZCALLBACK win32_tell_file_func (voidpf opaque,voidpf stream)
|
||||
{
|
||||
long ret=-1;
|
||||
HANDLE hFile = NULL;
|
||||
@@ -175,24 +265,47 @@ long ZCALLBACK win32_tell_file_func (opaque, stream)
|
||||
hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
|
||||
if (hFile != NULL)
|
||||
{
|
||||
DWORD dwSet = SetFilePointer(hFile, 0, NULL, FILE_CURRENT);
|
||||
if (dwSet == INVALID_SET_FILE_POINTER)
|
||||
LARGE_INTEGER pos;
|
||||
pos.QuadPart = 0;
|
||||
|
||||
if (!MySetFilePointerEx(hFile, pos, &pos, FILE_CURRENT))
|
||||
{
|
||||
DWORD dwErr = GetLastError();
|
||||
((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
|
||||
ret = -1;
|
||||
}
|
||||
else
|
||||
ret=(long)dwSet;
|
||||
ret=(long)pos.LowPart;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
long ZCALLBACK win32_seek_file_func (opaque, stream, offset, origin)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
uLong offset;
|
||||
int origin;
|
||||
ZPOS64_T ZCALLBACK win32_tell64_file_func (voidpf opaque, voidpf stream)
|
||||
{
|
||||
ZPOS64_T ret= (ZPOS64_T)-1;
|
||||
HANDLE hFile = NULL;
|
||||
if (stream!=NULL)
|
||||
hFile = ((WIN32FILE_IOWIN*)stream)->hf;
|
||||
|
||||
if (hFile)
|
||||
{
|
||||
LARGE_INTEGER pos;
|
||||
pos.QuadPart = 0;
|
||||
|
||||
if (!MySetFilePointerEx(hFile, pos, &pos, FILE_CURRENT))
|
||||
{
|
||||
DWORD dwErr = GetLastError();
|
||||
((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
|
||||
ret = (ZPOS64_T)-1;
|
||||
}
|
||||
else
|
||||
ret=pos.QuadPart;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
long ZCALLBACK win32_seek_file_func (voidpf opaque,voidpf stream,uLong offset,int origin)
|
||||
{
|
||||
DWORD dwMoveMethod=0xFFFFFFFF;
|
||||
HANDLE hFile = NULL;
|
||||
@@ -216,8 +329,9 @@ long ZCALLBACK win32_seek_file_func (opaque, stream, offset, origin)
|
||||
|
||||
if (hFile != NULL)
|
||||
{
|
||||
DWORD dwSet = SetFilePointer(hFile, offset, NULL, dwMoveMethod);
|
||||
if (dwSet == INVALID_SET_FILE_POINTER)
|
||||
LARGE_INTEGER pos;
|
||||
pos.QuadPart = offset;
|
||||
if (!MySetFilePointerEx(hFile, pos, NULL, dwMoveMethod))
|
||||
{
|
||||
DWORD dwErr = GetLastError();
|
||||
((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
|
||||
@@ -229,9 +343,46 @@ long ZCALLBACK win32_seek_file_func (opaque, stream, offset, origin)
|
||||
return ret;
|
||||
}
|
||||
|
||||
int ZCALLBACK win32_close_file_func (opaque, stream)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
long ZCALLBACK win32_seek64_file_func (voidpf opaque, voidpf stream,ZPOS64_T offset,int origin)
|
||||
{
|
||||
DWORD dwMoveMethod=0xFFFFFFFF;
|
||||
HANDLE hFile = NULL;
|
||||
long ret=-1;
|
||||
|
||||
if (stream!=NULL)
|
||||
hFile = ((WIN32FILE_IOWIN*)stream)->hf;
|
||||
|
||||
switch (origin)
|
||||
{
|
||||
case ZLIB_FILEFUNC_SEEK_CUR :
|
||||
dwMoveMethod = FILE_CURRENT;
|
||||
break;
|
||||
case ZLIB_FILEFUNC_SEEK_END :
|
||||
dwMoveMethod = FILE_END;
|
||||
break;
|
||||
case ZLIB_FILEFUNC_SEEK_SET :
|
||||
dwMoveMethod = FILE_BEGIN;
|
||||
break;
|
||||
default: return -1;
|
||||
}
|
||||
|
||||
if (hFile)
|
||||
{
|
||||
LARGE_INTEGER pos;
|
||||
pos.QuadPart = offset;
|
||||
if (!MySetFilePointerEx(hFile, pos, NULL, FILE_CURRENT))
|
||||
{
|
||||
DWORD dwErr = GetLastError();
|
||||
((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
|
||||
ret = -1;
|
||||
}
|
||||
else
|
||||
ret=0;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
int ZCALLBACK win32_close_file_func (voidpf opaque, voidpf stream)
|
||||
{
|
||||
int ret=-1;
|
||||
|
||||
@@ -249,9 +400,7 @@ int ZCALLBACK win32_close_file_func (opaque, stream)
|
||||
return ret;
|
||||
}
|
||||
|
||||
int ZCALLBACK win32_error_file_func (opaque, stream)
|
||||
voidpf opaque;
|
||||
voidpf stream;
|
||||
int ZCALLBACK win32_error_file_func (voidpf opaque,voidpf stream)
|
||||
{
|
||||
int ret=-1;
|
||||
if (stream!=NULL)
|
||||
@@ -261,8 +410,7 @@ int ZCALLBACK win32_error_file_func (opaque, stream)
|
||||
return ret;
|
||||
}
|
||||
|
||||
void fill_win32_filefunc (pzlib_filefunc_def)
|
||||
zlib_filefunc_def* pzlib_filefunc_def;
|
||||
void fill_win32_filefunc (zlib_filefunc_def* pzlib_filefunc_def)
|
||||
{
|
||||
pzlib_filefunc_def->zopen_file = win32_open_file_func;
|
||||
pzlib_filefunc_def->zread_file = win32_read_file_func;
|
||||
@@ -271,5 +419,43 @@ void fill_win32_filefunc (pzlib_filefunc_def)
|
||||
pzlib_filefunc_def->zseek_file = win32_seek_file_func;
|
||||
pzlib_filefunc_def->zclose_file = win32_close_file_func;
|
||||
pzlib_filefunc_def->zerror_file = win32_error_file_func;
|
||||
pzlib_filefunc_def->opaque=NULL;
|
||||
pzlib_filefunc_def->opaque = NULL;
|
||||
}
|
||||
|
||||
void fill_win32_filefunc64(zlib_filefunc64_def* pzlib_filefunc_def)
|
||||
{
|
||||
pzlib_filefunc_def->zopen64_file = win32_open64_file_func;
|
||||
pzlib_filefunc_def->zread_file = win32_read_file_func;
|
||||
pzlib_filefunc_def->zwrite_file = win32_write_file_func;
|
||||
pzlib_filefunc_def->ztell64_file = win32_tell64_file_func;
|
||||
pzlib_filefunc_def->zseek64_file = win32_seek64_file_func;
|
||||
pzlib_filefunc_def->zclose_file = win32_close_file_func;
|
||||
pzlib_filefunc_def->zerror_file = win32_error_file_func;
|
||||
pzlib_filefunc_def->opaque = NULL;
|
||||
}
|
||||
|
||||
|
||||
void fill_win32_filefunc64A(zlib_filefunc64_def* pzlib_filefunc_def)
|
||||
{
|
||||
pzlib_filefunc_def->zopen64_file = win32_open64_file_funcA;
|
||||
pzlib_filefunc_def->zread_file = win32_read_file_func;
|
||||
pzlib_filefunc_def->zwrite_file = win32_write_file_func;
|
||||
pzlib_filefunc_def->ztell64_file = win32_tell64_file_func;
|
||||
pzlib_filefunc_def->zseek64_file = win32_seek64_file_func;
|
||||
pzlib_filefunc_def->zclose_file = win32_close_file_func;
|
||||
pzlib_filefunc_def->zerror_file = win32_error_file_func;
|
||||
pzlib_filefunc_def->opaque = NULL;
|
||||
}
|
||||
|
||||
|
||||
void fill_win32_filefunc64W(zlib_filefunc64_def* pzlib_filefunc_def)
|
||||
{
|
||||
pzlib_filefunc_def->zopen64_file = win32_open64_file_funcW;
|
||||
pzlib_filefunc_def->zread_file = win32_read_file_func;
|
||||
pzlib_filefunc_def->zwrite_file = win32_write_file_func;
|
||||
pzlib_filefunc_def->ztell64_file = win32_tell64_file_func;
|
||||
pzlib_filefunc_def->zseek64_file = win32_seek64_file_func;
|
||||
pzlib_filefunc_def->zclose_file = win32_close_file_func;
|
||||
pzlib_filefunc_def->zerror_file = win32_error_file_func;
|
||||
pzlib_filefunc_def->opaque = NULL;
|
||||
}
|
||||
|
||||
@@ -1,10 +1,14 @@
|
||||
/* iowin32.h -- IO base function header for compress/uncompress .zip
|
||||
files using zlib + zip or unzip API
|
||||
This IO API version uses the Win32 API (for Microsoft Windows)
|
||||
Version 1.1, February 14h, 2010
|
||||
part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
|
||||
|
||||
Version 1.00, September 10th, 2003
|
||||
Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
|
||||
|
||||
Modifications for Zip64 support
|
||||
Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
|
||||
|
||||
For more info read MiniZip_info.txt
|
||||
|
||||
Copyright (C) 1998-2003 Gilles Vollant
|
||||
*/
|
||||
|
||||
#include <windows.h>
|
||||
@@ -15,6 +19,9 @@ extern "C" {
|
||||
#endif
|
||||
|
||||
void fill_win32_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
|
||||
void fill_win32_filefunc64 OF((zlib_filefunc64_def* pzlib_filefunc_def));
|
||||
void fill_win32_filefunc64A OF((zlib_filefunc64_def* pzlib_filefunc_def));
|
||||
void fill_win32_filefunc64W OF((zlib_filefunc64_def* pzlib_filefunc_def));
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
@@ -1,287 +1,289 @@
|
||||
/*
|
||||
Additional tools for Minizip
|
||||
Code: Xavier Roche '2004
|
||||
License: Same as ZLIB (www.gzip.org)
|
||||
*/
|
||||
|
||||
/* Code */
|
||||
#include <string.h>
|
||||
#ifndef _WIN32_WCE
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#else
|
||||
/*
|
||||
Additional tools for Minizip
|
||||
Code: Xavier Roche '2004
|
||||
License: Same as ZLIB (www.gzip.org)
|
||||
*/
|
||||
|
||||
/* Code */
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include "celib.h"
|
||||
#endif
|
||||
#include "zlib.h"
|
||||
#include "unzip.h"
|
||||
|
||||
#define READ_8(adr) ((unsigned char)*(adr))
|
||||
#define READ_16(adr) ( READ_8(adr) | (READ_8(adr+1) << 8) )
|
||||
#define READ_32(adr) ( READ_16(adr) | (READ_16((adr)+2) << 16) )
|
||||
|
||||
#define WRITE_8(buff, n) do { \
|
||||
*((unsigned char*)(buff)) = (unsigned char) ((n) & 0xff); \
|
||||
} while(0)
|
||||
#define WRITE_16(buff, n) do { \
|
||||
WRITE_8((unsigned char*)(buff), n); \
|
||||
WRITE_8(((unsigned char*)(buff)) + 1, (n) >> 8); \
|
||||
} while(0)
|
||||
#define WRITE_32(buff, n) do { \
|
||||
WRITE_16((unsigned char*)(buff), (n) & 0xffff); \
|
||||
WRITE_16((unsigned char*)(buff) + 2, (n) >> 16); \
|
||||
} while(0)
|
||||
|
||||
extern int ZEXPORT unzRepair(file, fileOut, fileOutTmp, nRecovered, bytesRecovered)
|
||||
const char* file;
|
||||
const char* fileOut;
|
||||
const char* fileOutTmp;
|
||||
uLong* nRecovered;
|
||||
uLong* bytesRecovered;
|
||||
{
|
||||
int err = Z_OK;
|
||||
FILE* fpZip = fopen(file, "rb");
|
||||
FILE* fpOut = fopen(fileOut, "wb");
|
||||
FILE* fpOutCD = fopen(fileOutTmp, "wb");
|
||||
if (fpZip != NULL && fpOut != NULL) {
|
||||
int entries = 0;
|
||||
uLong totalBytes = 0;
|
||||
char header[30];
|
||||
char filename[1024];
|
||||
char extra[1024];
|
||||
int offset = 0;
|
||||
int offsetCD = 0;
|
||||
while ( fread(header, 1, 30, fpZip) == 30 ) {
|
||||
int currentOffset = offset;
|
||||
|
||||
/* File entry */
|
||||
if (READ_32(header) == 0x04034b50) {
|
||||
unsigned int version = READ_16(header + 4);
|
||||
unsigned int gpflag = READ_16(header + 6);
|
||||
unsigned int method = READ_16(header + 8);
|
||||
unsigned int filetime = READ_16(header + 10);
|
||||
unsigned int filedate = READ_16(header + 12);
|
||||
unsigned int crc = READ_32(header + 14); /* crc */
|
||||
unsigned int cpsize = READ_32(header + 18); /* compressed size */
|
||||
unsigned int uncpsize = READ_32(header + 22); /* uncompressed sz */
|
||||
unsigned int fnsize = READ_16(header + 26); /* file name length */
|
||||
unsigned int extsize = READ_16(header + 28); /* extra field length */
|
||||
filename[0] = extra[0] = '\0';
|
||||
|
||||
/* Header */
|
||||
if (fwrite(header, 1, 30, fpOut) == 30) {
|
||||
offset += 30;
|
||||
} else {
|
||||
err = Z_ERRNO;
|
||||
break;
|
||||
}
|
||||
|
||||
/* Filename */
|
||||
if (fnsize > 0) {
|
||||
if (fnsize < sizeof(filename) && fread(filename, 1, fnsize, fpZip) == fnsize) {
|
||||
if (fwrite(filename, 1, fnsize, fpOut) == fnsize) {
|
||||
offset += fnsize;
|
||||
} else {
|
||||
err = Z_ERRNO;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
err = Z_ERRNO;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
err = Z_STREAM_ERROR;
|
||||
break;
|
||||
}
|
||||
|
||||
/* Extra field */
|
||||
if (extsize > 0) {
|
||||
if (extsize < sizeof(extra) && fread(extra, 1, extsize, fpZip) == extsize) {
|
||||
if (fwrite(extra, 1, extsize, fpOut) == extsize) {
|
||||
offset += extsize;
|
||||
} else {
|
||||
err = Z_ERRNO;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
err = Z_ERRNO;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* Data */
|
||||
{
|
||||
int dataSize = cpsize;
|
||||
if (dataSize == 0) {
|
||||
dataSize = uncpsize;
|
||||
}
|
||||
if (dataSize > 0) {
|
||||
char* data = malloc(dataSize);
|
||||
if (data != NULL) {
|
||||
if ((int)fread(data, 1, dataSize, fpZip) == dataSize) {
|
||||
if ((int)fwrite(data, 1, dataSize, fpOut) == dataSize) {
|
||||
offset += dataSize;
|
||||
totalBytes += dataSize;
|
||||
} else {
|
||||
err = Z_ERRNO;
|
||||
}
|
||||
} else {
|
||||
err = Z_ERRNO;
|
||||
}
|
||||
free(data);
|
||||
if (err != Z_OK) {
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
err = Z_MEM_ERROR;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Central directory entry */
|
||||
{
|
||||
char header[46];
|
||||
char* comment = "";
|
||||
int comsize = (int) strlen(comment);
|
||||
WRITE_32(header, 0x02014b50);
|
||||
WRITE_16(header + 4, version);
|
||||
WRITE_16(header + 6, version);
|
||||
WRITE_16(header + 8, gpflag);
|
||||
WRITE_16(header + 10, method);
|
||||
WRITE_16(header + 12, filetime);
|
||||
WRITE_16(header + 14, filedate);
|
||||
WRITE_32(header + 16, crc);
|
||||
WRITE_32(header + 20, cpsize);
|
||||
WRITE_32(header + 24, uncpsize);
|
||||
WRITE_16(header + 28, fnsize);
|
||||
WRITE_16(header + 30, extsize);
|
||||
WRITE_16(header + 32, comsize);
|
||||
WRITE_16(header + 34, 0); /* disk # */
|
||||
WRITE_16(header + 36, 0); /* int attrb */
|
||||
WRITE_32(header + 38, 0); /* ext attrb */
|
||||
WRITE_32(header + 42, currentOffset);
|
||||
/* Header */
|
||||
if (fwrite(header, 1, 46, fpOutCD) == 46) {
|
||||
offsetCD += 46;
|
||||
|
||||
/* Filename */
|
||||
if (fnsize > 0) {
|
||||
if (fwrite(filename, 1, fnsize, fpOutCD) == fnsize) {
|
||||
offsetCD += fnsize;
|
||||
} else {
|
||||
err = Z_ERRNO;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
err = Z_STREAM_ERROR;
|
||||
break;
|
||||
}
|
||||
|
||||
/* Extra field */
|
||||
if (extsize > 0) {
|
||||
if (fwrite(extra, 1, extsize, fpOutCD) == extsize) {
|
||||
offsetCD += extsize;
|
||||
} else {
|
||||
err = Z_ERRNO;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* Comment field */
|
||||
if (comsize > 0) {
|
||||
if ((int)fwrite(comment, 1, comsize, fpOutCD) == comsize) {
|
||||
offsetCD += comsize;
|
||||
} else {
|
||||
err = Z_ERRNO;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
} else {
|
||||
err = Z_ERRNO;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* Success */
|
||||
entries++;
|
||||
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* Final central directory */
|
||||
{
|
||||
int entriesZip = entries;
|
||||
char header[22];
|
||||
char* comment = ""; // "ZIP File recovered by zlib/minizip/mztools";
|
||||
int comsize = (int) strlen(comment);
|
||||
if (entriesZip > 0xffff) {
|
||||
entriesZip = 0xffff;
|
||||
}
|
||||
WRITE_32(header, 0x06054b50);
|
||||
WRITE_16(header + 4, 0); /* disk # */
|
||||
WRITE_16(header + 6, 0); /* disk # */
|
||||
WRITE_16(header + 8, entriesZip); /* hack */
|
||||
WRITE_16(header + 10, entriesZip); /* hack */
|
||||
WRITE_32(header + 12, offsetCD); /* size of CD */
|
||||
WRITE_32(header + 16, offset); /* offset to CD */
|
||||
WRITE_16(header + 20, comsize); /* comment */
|
||||
|
||||
/* Header */
|
||||
if (fwrite(header, 1, 22, fpOutCD) == 22) {
|
||||
|
||||
/* Comment field */
|
||||
if (comsize > 0) {
|
||||
if ((int)fwrite(comment, 1, comsize, fpOutCD) != comsize) {
|
||||
err = Z_ERRNO;
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
err = Z_ERRNO;
|
||||
}
|
||||
}
|
||||
|
||||
/* Final merge (file + central directory) */
|
||||
fclose(fpOutCD);
|
||||
if (err == Z_OK) {
|
||||
fpOutCD = fopen(fileOutTmp, "rb");
|
||||
if (fpOutCD != NULL) {
|
||||
int nRead;
|
||||
char buffer[8192];
|
||||
while ( (nRead = fread(buffer, 1, sizeof(buffer), fpOutCD)) > 0) {
|
||||
if ((int)fwrite(buffer, 1, nRead, fpOut) != nRead) {
|
||||
err = Z_ERRNO;
|
||||
break;
|
||||
}
|
||||
}
|
||||
fclose(fpOutCD);
|
||||
}
|
||||
}
|
||||
|
||||
/* Close */
|
||||
fclose(fpZip);
|
||||
fclose(fpOut);
|
||||
|
||||
/* Wipe temporary file */
|
||||
(void)remove(fileOutTmp);
|
||||
|
||||
/* Number of recovered entries */
|
||||
if (err == Z_OK) {
|
||||
if (nRecovered != NULL) {
|
||||
*nRecovered = entries;
|
||||
}
|
||||
if (bytesRecovered != NULL) {
|
||||
*bytesRecovered = totalBytes;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
err = Z_STREAM_ERROR;
|
||||
}
|
||||
return err;
|
||||
}
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include "zlib.h"
|
||||
#include "unzip.h"
|
||||
#include "mztools.h"
|
||||
|
||||
#define READ_8(adr) ((unsigned char)*(adr))
|
||||
#define READ_16(adr) ( READ_8(adr) | (READ_8(adr+1) << 8) )
|
||||
#define READ_32(adr) ( READ_16(adr) | (READ_16((adr)+2) << 16) )
|
||||
|
||||
#define WRITE_8(buff, n) do { \
|
||||
*((unsigned char*)(buff)) = (unsigned char) ((n) & 0xff); \
|
||||
} while(0)
|
||||
#define WRITE_16(buff, n) do { \
|
||||
WRITE_8((unsigned char*)(buff), n); \
|
||||
WRITE_8(((unsigned char*)(buff)) + 1, (n) >> 8); \
|
||||
} while(0)
|
||||
#define WRITE_32(buff, n) do { \
|
||||
WRITE_16((unsigned char*)(buff), (n) & 0xffff); \
|
||||
WRITE_16((unsigned char*)(buff) + 2, (n) >> 16); \
|
||||
} while(0)
|
||||
|
||||
int ZEXPORT unzRepair(const char* file, const char* fileOut,
|
||||
const char* fileOutTmp, uLong* nRecovered,
|
||||
uLong* bytesRecovered)
|
||||
{
|
||||
int err = Z_OK;
|
||||
FILE* fpZip = fopen(file, "rb");
|
||||
FILE* fpOut = fopen(fileOut, "wb");
|
||||
FILE* fpOutCD = fopen(fileOutTmp, "wb");
|
||||
if (fpZip != NULL && fpOut != NULL) {
|
||||
int entries = 0;
|
||||
uLong totalBytes = 0;
|
||||
char header[30];
|
||||
char filename[1024];
|
||||
char extra[1024];
|
||||
int offset = 0;
|
||||
int offsetCD = 0;
|
||||
while ( fread(header, 1, 30, fpZip) == 30 ) {
|
||||
int currentOffset = offset;
|
||||
|
||||
/* File entry */
|
||||
if (READ_32(header) == 0x04034b50) {
|
||||
unsigned int version = READ_16(header + 4);
|
||||
unsigned int gpflag = READ_16(header + 6);
|
||||
unsigned int method = READ_16(header + 8);
|
||||
unsigned int filetime = READ_16(header + 10);
|
||||
unsigned int filedate = READ_16(header + 12);
|
||||
unsigned int crc = READ_32(header + 14); /* crc */
|
||||
unsigned int cpsize = READ_32(header + 18); /* compressed size */
|
||||
unsigned int uncpsize = READ_32(header + 22); /* uncompressed sz */
|
||||
unsigned int fnsize = READ_16(header + 26); /* file name length */
|
||||
unsigned int extsize = READ_16(header + 28); /* extra field length */
|
||||
filename[0] = extra[0] = '\0';
|
||||
|
||||
/* Header */
|
||||
if (fwrite(header, 1, 30, fpOut) == 30) {
|
||||
offset += 30;
|
||||
} else {
|
||||
err = Z_ERRNO;
|
||||
break;
|
||||
}
|
||||
|
||||
/* Filename */
|
||||
if (fnsize > 0) {
|
||||
if (fnsize < sizeof(filename)) {
|
||||
if (fread(filename, 1, fnsize, fpZip) == fnsize) {
|
||||
if (fwrite(filename, 1, fnsize, fpOut) == fnsize) {
|
||||
offset += fnsize;
|
||||
} else {
|
||||
err = Z_ERRNO;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
err = Z_ERRNO;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
err = Z_ERRNO;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
err = Z_STREAM_ERROR;
|
||||
break;
|
||||
}
|
||||
|
||||
/* Extra field */
|
||||
if (extsize > 0) {
|
||||
if (extsize < sizeof(extra)) {
|
||||
if (fread(extra, 1, extsize, fpZip) == extsize) {
|
||||
if (fwrite(extra, 1, extsize, fpOut) == extsize) {
|
||||
offset += extsize;
|
||||
} else {
|
||||
err = Z_ERRNO;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
err = Z_ERRNO;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
err = Z_ERRNO;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* Data */
|
||||
{
|
||||
int dataSize = cpsize;
|
||||
if (dataSize == 0) {
|
||||
dataSize = uncpsize;
|
||||
}
|
||||
if (dataSize > 0) {
|
||||
char* data = malloc(dataSize);
|
||||
if (data != NULL) {
|
||||
if ((int)fread(data, 1, dataSize, fpZip) == dataSize) {
|
||||
if ((int)fwrite(data, 1, dataSize, fpOut) == dataSize) {
|
||||
offset += dataSize;
|
||||
totalBytes += dataSize;
|
||||
} else {
|
||||
err = Z_ERRNO;
|
||||
}
|
||||
} else {
|
||||
err = Z_ERRNO;
|
||||
}
|
||||
free(data);
|
||||
if (err != Z_OK) {
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
err = Z_MEM_ERROR;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Central directory entry */
|
||||
{
|
||||
char header[46];
|
||||
const char* comment = "";
|
||||
const size_t comsize = strlen(comment);
|
||||
WRITE_32(header, 0x02014b50);
|
||||
WRITE_16(header + 4, version);
|
||||
WRITE_16(header + 6, version);
|
||||
WRITE_16(header + 8, gpflag);
|
||||
WRITE_16(header + 10, method);
|
||||
WRITE_16(header + 12, filetime);
|
||||
WRITE_16(header + 14, filedate);
|
||||
WRITE_32(header + 16, crc);
|
||||
WRITE_32(header + 20, cpsize);
|
||||
WRITE_32(header + 24, uncpsize);
|
||||
WRITE_16(header + 28, fnsize);
|
||||
WRITE_16(header + 30, extsize);
|
||||
WRITE_16(header + 32, comsize);
|
||||
WRITE_16(header + 34, 0); /* disk # */
|
||||
WRITE_16(header + 36, 0); /* int attrb */
|
||||
WRITE_32(header + 38, 0); /* ext attrb */
|
||||
WRITE_32(header + 42, currentOffset);
|
||||
/* Header */
|
||||
if (fwrite(header, 1, 46, fpOutCD) == 46) {
|
||||
offsetCD += 46;
|
||||
|
||||
/* Filename */
|
||||
if (fnsize > 0) {
|
||||
if (fwrite(filename, 1, fnsize, fpOutCD) == fnsize) {
|
||||
offsetCD += fnsize;
|
||||
} else {
|
||||
err = Z_ERRNO;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
err = Z_STREAM_ERROR;
|
||||
break;
|
||||
}
|
||||
|
||||
/* Extra field */
|
||||
if (extsize > 0) {
|
||||
if (fwrite(extra, 1, extsize, fpOutCD) == extsize) {
|
||||
offsetCD += extsize;
|
||||
} else {
|
||||
err = Z_ERRNO;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* Comment field */
|
||||
if (comsize > 0) {
|
||||
if (fwrite(comment, 1, comsize, fpOutCD) == comsize) {
|
||||
offsetCD += comsize;
|
||||
} else {
|
||||
err = Z_ERRNO;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
} else {
|
||||
err = Z_ERRNO;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* Success */
|
||||
entries++;
|
||||
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* Final central directory */
|
||||
{
|
||||
int entriesZip = entries;
|
||||
char header[22];
|
||||
const char* comment = ""; // "ZIP File recovered by zlib/minizip/mztools";
|
||||
const size_t comsize = strlen(comment);
|
||||
if (entriesZip > 0xffff) {
|
||||
entriesZip = 0xffff;
|
||||
}
|
||||
WRITE_32(header, 0x06054b50);
|
||||
WRITE_16(header + 4, 0); /* disk # */
|
||||
WRITE_16(header + 6, 0); /* disk # */
|
||||
WRITE_16(header + 8, entriesZip); /* hack */
|
||||
WRITE_16(header + 10, entriesZip); /* hack */
|
||||
WRITE_32(header + 12, offsetCD); /* size of CD */
|
||||
WRITE_32(header + 16, offset); /* offset to CD */
|
||||
WRITE_16(header + 20, comsize); /* comment */
|
||||
|
||||
/* Header */
|
||||
if (fwrite(header, 1, 22, fpOutCD) == 22) {
|
||||
|
||||
/* Comment field */
|
||||
if (comsize > 0) {
|
||||
if (fwrite(comment, 1, comsize, fpOutCD) != comsize) {
|
||||
err = Z_ERRNO;
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
err = Z_ERRNO;
|
||||
}
|
||||
}
|
||||
|
||||
/* Final merge (file + central directory) */
|
||||
fclose(fpOutCD);
|
||||
if (err == Z_OK) {
|
||||
fpOutCD = fopen(fileOutTmp, "rb");
|
||||
if (fpOutCD != NULL) {
|
||||
int nRead;
|
||||
char buffer[8192];
|
||||
while ( (nRead = (int)fread(buffer, 1, sizeof(buffer), fpOutCD)) > 0) {
|
||||
if ((int)fwrite(buffer, 1, nRead, fpOut) != nRead) {
|
||||
err = Z_ERRNO;
|
||||
break;
|
||||
}
|
||||
}
|
||||
fclose(fpOutCD);
|
||||
}
|
||||
}
|
||||
|
||||
/* Close */
|
||||
fclose(fpZip);
|
||||
fclose(fpOut);
|
||||
|
||||
/* Wipe temporary file */
|
||||
(void)remove(fileOutTmp);
|
||||
|
||||
/* Number of recovered entries */
|
||||
if (err == Z_OK) {
|
||||
if (nRecovered != NULL) {
|
||||
*nRecovered = entries;
|
||||
}
|
||||
if (bytesRecovered != NULL) {
|
||||
*bytesRecovered = totalBytes;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
err = Z_STREAM_ERROR;
|
||||
}
|
||||
return err;
|
||||
}
|
||||
|
||||
@@ -17,15 +17,21 @@ extern "C" {
|
||||
|
||||
#include "unzip.h"
|
||||
|
||||
/* Repair a ZIP file (missing central directory)
|
||||
/* Repair a ZIP file (missing central directory)
|
||||
file: file to recover
|
||||
fileOut: output file after recovery
|
||||
fileOutTmp: temporary file name used for recovery
|
||||
*/
|
||||
extern int ZEXPORT unzRepair(const char* file,
|
||||
const char* fileOut,
|
||||
const char* fileOutTmp,
|
||||
extern int ZEXPORT unzRepair(const char* file,
|
||||
const char* fileOut,
|
||||
const char* fileOutTmp,
|
||||
uLong* nRecovered,
|
||||
uLong* bytesRecovered);
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
1364
src/minizip/unzip.c
1364
src/minizip/unzip.c
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,18 +1,20 @@
|
||||
/* unzip.h -- IO for uncompress .zip files using zlib
|
||||
Version 1.00, September 10th, 2003
|
||||
Version 1.1, February 14h, 2010
|
||||
part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
|
||||
|
||||
Copyright (C) 1998-2003 Gilles Vollant
|
||||
Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
|
||||
|
||||
This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g
|
||||
WinZip, InfoZip tools and compatible.
|
||||
Encryption and multi volume ZipFile (span) are not supported.
|
||||
Old compressions used by old PKZip 1.x are not supported
|
||||
Modifications of Unzip for Zip64
|
||||
Copyright (C) 2007-2008 Even Rouault
|
||||
|
||||
Modifications for Zip64 support on both zip and unzip
|
||||
Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
|
||||
|
||||
I WAIT FEEDBACK at mail info@winimage.com
|
||||
Visit also http://www.winimage.com/zLibDll/unzip.htm for evolution
|
||||
For more info read MiniZip_info.txt
|
||||
|
||||
Condition of use and distribution are the same than zlib :
|
||||
---------------------------------------------------------------------------------
|
||||
|
||||
Condition of use and distribution are the same than zlib :
|
||||
|
||||
This software is provided 'as-is', without any express or implied
|
||||
warranty. In no event will the authors be held liable for any damages
|
||||
@@ -30,18 +32,16 @@
|
||||
misrepresented as being the original software.
|
||||
3. This notice may not be removed or altered from any source distribution.
|
||||
|
||||
---------------------------------------------------------------------------------
|
||||
|
||||
Changes
|
||||
|
||||
See header of unzip64.c
|
||||
|
||||
*/
|
||||
|
||||
/* for more info about .ZIP format, see
|
||||
http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip
|
||||
http://www.info-zip.org/pub/infozip/doc/
|
||||
PkWare has also a specification at :
|
||||
ftp://ftp.pkware.com/probdesc.zip
|
||||
*/
|
||||
|
||||
#ifndef _unz_H
|
||||
#define _unz_H
|
||||
#ifndef _unz64_H
|
||||
#define _unz64_H
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
@@ -51,10 +51,16 @@ extern "C" {
|
||||
#include "zlib.h"
|
||||
#endif
|
||||
|
||||
#ifndef _ZLIBIOAPI_H
|
||||
#ifndef _ZLIBIOAPI_H
|
||||
#include "ioapi.h"
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_BZIP2
|
||||
#include "bzlib.h"
|
||||
#endif
|
||||
|
||||
#define Z_BZIP2ED 12
|
||||
|
||||
#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
|
||||
/* like the STRICT of WIN32, we define a pointer that cannot be converted
|
||||
from (void*) without cast */
|
||||
@@ -87,15 +93,42 @@ typedef struct tm_unz_s
|
||||
|
||||
/* unz_global_info structure contain global data about the ZIPfile
|
||||
These data comes from the end of central dir */
|
||||
typedef struct unz_global_info64_s
|
||||
{
|
||||
ZPOS64_T number_entry; /* total number of entries in
|
||||
the central dir on this disk */
|
||||
uLong size_comment; /* size of the global comment of the zipfile */
|
||||
} unz_global_info64;
|
||||
|
||||
typedef struct unz_global_info_s
|
||||
{
|
||||
uLong number_entry; /* total number of entries in
|
||||
the central dir on this disk */
|
||||
the central dir on this disk */
|
||||
uLong size_comment; /* size of the global comment of the zipfile */
|
||||
} unz_global_info;
|
||||
|
||||
|
||||
/* unz_file_info contain information about a file in the zipfile */
|
||||
typedef struct unz_file_info64_s
|
||||
{
|
||||
uLong version; /* version made by 2 bytes */
|
||||
uLong version_needed; /* version needed to extract 2 bytes */
|
||||
uLong flag; /* general purpose bit flag 2 bytes */
|
||||
uLong compression_method; /* compression method 2 bytes */
|
||||
uLong dosDate; /* last mod file date in Dos fmt 4 bytes */
|
||||
uLong crc; /* crc-32 4 bytes */
|
||||
ZPOS64_T compressed_size; /* compressed size 8 bytes */
|
||||
ZPOS64_T uncompressed_size; /* uncompressed size 8 bytes */
|
||||
uLong size_filename; /* filename length 2 bytes */
|
||||
uLong size_file_extra; /* extra field length 2 bytes */
|
||||
uLong size_file_comment; /* file comment length 2 bytes */
|
||||
|
||||
uLong disk_num_start; /* disk number start 2 bytes */
|
||||
uLong internal_fa; /* internal file attributes 2 bytes */
|
||||
uLong external_fa; /* external file attributes 4 bytes */
|
||||
|
||||
tm_unz tmu_date;
|
||||
} unz_file_info64;
|
||||
|
||||
typedef struct unz_file_info_s
|
||||
{
|
||||
uLong version; /* version made by 2 bytes */
|
||||
@@ -131,6 +164,7 @@ extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
|
||||
|
||||
|
||||
extern unzFile ZEXPORT unzOpen OF((const char *path));
|
||||
extern unzFile ZEXPORT unzOpen64 OF((const void *path));
|
||||
/*
|
||||
Open a Zip file. path contain the full pathname (by example,
|
||||
on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer
|
||||
@@ -139,8 +173,14 @@ extern unzFile ZEXPORT unzOpen OF((const char *path));
|
||||
return value is NULL.
|
||||
Else, the return value is a unzFile Handle, usable with other function
|
||||
of this unzip package.
|
||||
the "64" function take a const void* pointer, because the path is just the
|
||||
value passed to the open64_file_func callback.
|
||||
Under Windows, if UNICODE is defined, using fill_fopen64_filefunc, the path
|
||||
is a pointer to a wide unicode string (LPCTSTR is LPCWSTR), so const char*
|
||||
does not describe the reality
|
||||
*/
|
||||
|
||||
|
||||
extern unzFile ZEXPORT unzOpen2 OF((const char *path,
|
||||
zlib_filefunc_def* pzlib_filefunc_def));
|
||||
/*
|
||||
@@ -148,15 +188,25 @@ extern unzFile ZEXPORT unzOpen2 OF((const char *path,
|
||||
for read/write the zip file (see ioapi.h)
|
||||
*/
|
||||
|
||||
extern unzFile ZEXPORT unzOpen2_64 OF((const void *path,
|
||||
zlib_filefunc64_def* pzlib_filefunc_def));
|
||||
/*
|
||||
Open a Zip file, like unz64Open, but provide a set of file low level API
|
||||
for read/write the zip file (see ioapi.h)
|
||||
*/
|
||||
|
||||
extern int ZEXPORT unzClose OF((unzFile file));
|
||||
/*
|
||||
Close a ZipFile opened with unzipOpen.
|
||||
Close a ZipFile opened with unzOpen.
|
||||
If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
|
||||
these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
|
||||
these files MUST be closed with unzCloseCurrentFile before call unzClose.
|
||||
return UNZ_OK if there is no problem. */
|
||||
|
||||
extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
|
||||
unz_global_info *pglobal_info));
|
||||
|
||||
extern int ZEXPORT unzGetGlobalInfo64 OF((unzFile file,
|
||||
unz_global_info64 *pglobal_info));
|
||||
/*
|
||||
Write info about the ZipFile in the *pglobal_info structure.
|
||||
No preparation of the structure is needed
|
||||
@@ -219,8 +269,31 @@ extern int ZEXPORT unzGoToFilePos(
|
||||
unzFile file,
|
||||
unz_file_pos* file_pos);
|
||||
|
||||
typedef struct unz64_file_pos_s
|
||||
{
|
||||
ZPOS64_T pos_in_zip_directory; /* offset in zip file directory */
|
||||
ZPOS64_T num_of_file; /* # of file */
|
||||
} unz64_file_pos;
|
||||
|
||||
extern int ZEXPORT unzGetFilePos64(
|
||||
unzFile file,
|
||||
unz64_file_pos* file_pos);
|
||||
|
||||
extern int ZEXPORT unzGoToFilePos64(
|
||||
unzFile file,
|
||||
const unz64_file_pos* file_pos);
|
||||
|
||||
/* ****************************************** */
|
||||
|
||||
extern int ZEXPORT unzGetCurrentFileInfo64 OF((unzFile file,
|
||||
unz_file_info64 *pfile_info,
|
||||
char *szFileName,
|
||||
uLong fileNameBufferSize,
|
||||
void *extraField,
|
||||
uLong extraFieldBufferSize,
|
||||
char *szComment,
|
||||
uLong commentBufferSize));
|
||||
|
||||
extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
|
||||
unz_file_info *pfile_info,
|
||||
char *szFileName,
|
||||
@@ -242,6 +315,14 @@ extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
|
||||
(commentBufferSize is the size of the buffer)
|
||||
*/
|
||||
|
||||
|
||||
/** Addition for GDAL : START */
|
||||
|
||||
extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64 OF((unzFile file));
|
||||
|
||||
/** Addition for GDAL : END */
|
||||
|
||||
|
||||
/***************************************************************************/
|
||||
/* for reading the content of the current zipfile, you can open it, read data
|
||||
from it, and close it (you can close it before reading all the file)
|
||||
@@ -310,6 +391,8 @@ extern int ZEXPORT unzReadCurrentFile OF((unzFile file,
|
||||
*/
|
||||
|
||||
extern z_off_t ZEXPORT unztell OF((unzFile file));
|
||||
|
||||
extern ZPOS64_T ZEXPORT unztell64 OF((unzFile file));
|
||||
/*
|
||||
Give the current position in uncompressed data
|
||||
*/
|
||||
@@ -338,9 +421,11 @@ extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
|
||||
/***************************************************************************/
|
||||
|
||||
/* Get the current file offset */
|
||||
extern ZPOS64_T ZEXPORT unzGetOffset64 (unzFile file);
|
||||
extern uLong ZEXPORT unzGetOffset (unzFile file);
|
||||
|
||||
/* Set the current file offset */
|
||||
extern int ZEXPORT unzSetOffset64 (unzFile file, ZPOS64_T pos);
|
||||
extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);
|
||||
|
||||
|
||||
@@ -349,4 +434,4 @@ extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* _unz_H */
|
||||
#endif /* _unz64_H */
|
||||
|
||||
@@ -1,352 +0,0 @@
|
||||
/* unzip.h -- IO for uncompress .zip files using zlib
|
||||
Version 1.00, September 10th, 2003
|
||||
|
||||
Copyright (C) 1998-2003 Gilles Vollant
|
||||
|
||||
This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g
|
||||
WinZip, InfoZip tools and compatible.
|
||||
Encryption and multi volume ZipFile (span) are not supported.
|
||||
Old compressions used by old PKZip 1.x are not supported
|
||||
|
||||
|
||||
I WAIT FEEDBACK at mail info@winimage.com
|
||||
Visit also http://www.winimage.com/zLibDll/unzip.htm for evolution
|
||||
|
||||
Condition of use and distribution are the same than zlib :
|
||||
|
||||
This software is provided 'as-is', without any express or implied
|
||||
warranty. In no event will the authors be held liable for any damages
|
||||
arising from the use of this software.
|
||||
|
||||
Permission is granted to anyone to use this software for any purpose,
|
||||
including commercial applications, and to alter it and redistribute it
|
||||
freely, subject to the following restrictions:
|
||||
|
||||
1. The origin of this software must not be misrepresented; you must not
|
||||
claim that you wrote the original software. If you use this software
|
||||
in a product, an acknowledgment in the product documentation would be
|
||||
appreciated but is not required.
|
||||
2. Altered source versions must be plainly marked as such, and must not be
|
||||
misrepresented as being the original software.
|
||||
3. This notice may not be removed or altered from any source distribution.
|
||||
|
||||
|
||||
*/
|
||||
|
||||
/* for more info about .ZIP format, see
|
||||
http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip
|
||||
http://www.info-zip.org/pub/infozip/doc/
|
||||
PkWare has also a specification at :
|
||||
ftp://ftp.pkware.com/probdesc.zip
|
||||
*/
|
||||
|
||||
#ifndef _unz_H
|
||||
#define _unz_H
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#ifndef _ZLIB_H
|
||||
#include "zlib.h"
|
||||
#endif
|
||||
|
||||
#ifndef _ZLIBIOAPI_H
|
||||
#include "ioapi.h"
|
||||
#endif
|
||||
|
||||
#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
|
||||
/* like the STRICT of WIN32, we define a pointer that cannot be converted
|
||||
from (void*) without cast */
|
||||
typedef struct TagunzFile__ { int unused; } unzFile__;
|
||||
typedef unzFile__ *unzFile;
|
||||
#else
|
||||
typedef voidp unzFile;
|
||||
#endif
|
||||
|
||||
|
||||
#define UNZ_OK (0)
|
||||
#define UNZ_END_OF_LIST_OF_FILE (-100)
|
||||
#define UNZ_ERRNO (Z_ERRNO)
|
||||
#define UNZ_EOF (0)
|
||||
#define UNZ_PARAMERROR (-102)
|
||||
#define UNZ_BADZIPFILE (-103)
|
||||
#define UNZ_INTERNALERROR (-104)
|
||||
#define UNZ_CRCERROR (-105)
|
||||
|
||||
/* tm_unz contain date/time info */
|
||||
typedef struct tm_unz_s
|
||||
{
|
||||
uInt tm_sec; /* seconds after the minute - [0,59] */
|
||||
uInt tm_min; /* minutes after the hour - [0,59] */
|
||||
uInt tm_hour; /* hours since midnight - [0,23] */
|
||||
uInt tm_mday; /* day of the month - [1,31] */
|
||||
uInt tm_mon; /* months since January - [0,11] */
|
||||
uInt tm_year; /* years - [1980..2044] */
|
||||
} tm_unz;
|
||||
|
||||
/* unz_global_info structure contain global data about the ZIPfile
|
||||
These data comes from the end of central dir */
|
||||
typedef struct unz_global_info_s
|
||||
{
|
||||
uLong number_entry; /* total number of entries in
|
||||
the central dir on this disk */
|
||||
uLong size_comment; /* size of the global comment of the zipfile */
|
||||
} unz_global_info;
|
||||
|
||||
|
||||
/* unz_file_info contain information about a file in the zipfile */
|
||||
typedef struct unz_file_info_s
|
||||
{
|
||||
uLong version; /* version made by 2 bytes */
|
||||
uLong version_needed; /* version needed to extract 2 bytes */
|
||||
uLong flag; /* general purpose bit flag 2 bytes */
|
||||
uLong compression_method; /* compression method 2 bytes */
|
||||
uLong dosDate; /* last mod file date in Dos fmt 4 bytes */
|
||||
uLong crc; /* crc-32 4 bytes */
|
||||
uLong compressed_size; /* compressed size 4 bytes */
|
||||
uLong uncompressed_size; /* uncompressed size 4 bytes */
|
||||
uLong size_filename; /* filename length 2 bytes */
|
||||
uLong size_file_extra; /* extra field length 2 bytes */
|
||||
uLong size_file_comment; /* file comment length 2 bytes */
|
||||
|
||||
uLong disk_num_start; /* disk number start 2 bytes */
|
||||
uLong internal_fa; /* internal file attributes 2 bytes */
|
||||
uLong external_fa; /* external file attributes 4 bytes */
|
||||
|
||||
tm_unz tmu_date;
|
||||
} unz_file_info;
|
||||
|
||||
extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
|
||||
const char* fileName2,
|
||||
int iCaseSensitivity));
|
||||
/*
|
||||
Compare two filename (fileName1,fileName2).
|
||||
If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
|
||||
If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
|
||||
or strcasecmp)
|
||||
If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
|
||||
(like 1 on Unix, 2 on Windows)
|
||||
*/
|
||||
|
||||
|
||||
extern unzFile ZEXPORT unzOpen OF((const char *path));
|
||||
/*
|
||||
Open a Zip file. path contain the full pathname (by example,
|
||||
on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer
|
||||
"zlib/zlib113.zip".
|
||||
If the zipfile cannot be opened (file don't exist or in not valid), the
|
||||
return value is NULL.
|
||||
Else, the return value is a unzFile Handle, usable with other function
|
||||
of this unzip package.
|
||||
*/
|
||||
|
||||
extern unzFile ZEXPORT unzOpen2 OF((const char *path,
|
||||
zlib_filefunc_def* pzlib_filefunc_def));
|
||||
/*
|
||||
Open a Zip file, like unzOpen, but provide a set of file low level API
|
||||
for read/write the zip file (see ioapi.h)
|
||||
*/
|
||||
|
||||
extern int ZEXPORT unzClose OF((unzFile file));
|
||||
/*
|
||||
Close a ZipFile opened with unzipOpen.
|
||||
If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
|
||||
these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
|
||||
return UNZ_OK if there is no problem. */
|
||||
|
||||
extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
|
||||
unz_global_info *pglobal_info));
|
||||
/*
|
||||
Write info about the ZipFile in the *pglobal_info structure.
|
||||
No preparation of the structure is needed
|
||||
return UNZ_OK if there is no problem. */
|
||||
|
||||
|
||||
extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
|
||||
char *szComment,
|
||||
uLong uSizeBuf));
|
||||
/*
|
||||
Get the global comment string of the ZipFile, in the szComment buffer.
|
||||
uSizeBuf is the size of the szComment buffer.
|
||||
return the number of byte copied or an error code <0
|
||||
*/
|
||||
|
||||
|
||||
/***************************************************************************/
|
||||
/* Unzip package allow you browse the directory of the zipfile */
|
||||
|
||||
extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
|
||||
/*
|
||||
Set the current file of the zipfile to the first file.
|
||||
return UNZ_OK if there is no problem
|
||||
*/
|
||||
|
||||
extern int ZEXPORT unzGoToNextFile OF((unzFile file));
|
||||
/*
|
||||
Set the current file of the zipfile to the next file.
|
||||
return UNZ_OK if there is no problem
|
||||
return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
|
||||
*/
|
||||
|
||||
extern int ZEXPORT unzLocateFile OF((unzFile file,
|
||||
const char *szFileName,
|
||||
int iCaseSensitivity));
|
||||
/*
|
||||
Try locate the file szFileName in the zipfile.
|
||||
For the iCaseSensitivity signification, see unzStringFileNameCompare
|
||||
|
||||
return value :
|
||||
UNZ_OK if the file is found. It becomes the current file.
|
||||
UNZ_END_OF_LIST_OF_FILE if the file is not found
|
||||
*/
|
||||
|
||||
|
||||
/* ****************************************** */
|
||||
/* Ryan supplied functions */
|
||||
/* unz_file_info contain information about a file in the zipfile */
|
||||
typedef struct unz_file_pos_s
|
||||
{
|
||||
uLong pos_in_zip_directory; /* offset in zip file directory */
|
||||
uLong num_of_file; /* # of file */
|
||||
} unz_file_pos;
|
||||
|
||||
extern int ZEXPORT unzGetFilePos(
|
||||
unzFile file,
|
||||
unz_file_pos* file_pos);
|
||||
|
||||
extern int ZEXPORT unzGoToFilePos(
|
||||
unzFile file,
|
||||
unz_file_pos* file_pos);
|
||||
|
||||
/* ****************************************** */
|
||||
|
||||
extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
|
||||
unz_file_info *pfile_info,
|
||||
char *szFileName,
|
||||
uLong fileNameBufferSize,
|
||||
void *extraField,
|
||||
uLong extraFieldBufferSize,
|
||||
char *szComment,
|
||||
uLong commentBufferSize));
|
||||
/*
|
||||
Get Info about the current file
|
||||
if pfile_info!=NULL, the *pfile_info structure will contain somes info about
|
||||
the current file
|
||||
if szFileName!=NULL, the filemane string will be copied in szFileName
|
||||
(fileNameBufferSize is the size of the buffer)
|
||||
if extraField!=NULL, the extra field information will be copied in extraField
|
||||
(extraFieldBufferSize is the size of the buffer).
|
||||
This is the Central-header version of the extra field
|
||||
if szComment!=NULL, the comment string of the file will be copied in szComment
|
||||
(commentBufferSize is the size of the buffer)
|
||||
*/
|
||||
|
||||
/***************************************************************************/
|
||||
/* for reading the content of the current zipfile, you can open it, read data
|
||||
from it, and close it (you can close it before reading all the file)
|
||||
*/
|
||||
|
||||
extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
|
||||
/*
|
||||
Open for reading data the current file in the zipfile.
|
||||
If there is no error, the return value is UNZ_OK.
|
||||
*/
|
||||
|
||||
extern int ZEXPORT unzOpenCurrentFilePassword OF((unzFile file,
|
||||
const char* password));
|
||||
/*
|
||||
Open for reading data the current file in the zipfile.
|
||||
password is a crypting password
|
||||
If there is no error, the return value is UNZ_OK.
|
||||
*/
|
||||
|
||||
extern int ZEXPORT unzOpenCurrentFile2 OF((unzFile file,
|
||||
int* method,
|
||||
int* level,
|
||||
int raw));
|
||||
/*
|
||||
Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
|
||||
if raw==1
|
||||
*method will receive method of compression, *level will receive level of
|
||||
compression
|
||||
note : you can set level parameter as NULL (if you did not want known level,
|
||||
but you CANNOT set method parameter as NULL
|
||||
*/
|
||||
|
||||
extern int ZEXPORT unzOpenCurrentFile3 OF((unzFile file,
|
||||
int* method,
|
||||
int* level,
|
||||
int raw,
|
||||
const char* password));
|
||||
/*
|
||||
Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
|
||||
if raw==1
|
||||
*method will receive method of compression, *level will receive level of
|
||||
compression
|
||||
note : you can set level parameter as NULL (if you did not want known level,
|
||||
but you CANNOT set method parameter as NULL
|
||||
*/
|
||||
|
||||
|
||||
extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));
|
||||
/*
|
||||
Close the file in zip opened with unzOpenCurrentFile
|
||||
Return UNZ_CRCERROR if all the file was read but the CRC is not good
|
||||
*/
|
||||
|
||||
extern int ZEXPORT unzReadCurrentFile OF((unzFile file,
|
||||
voidp buf,
|
||||
unsigned len));
|
||||
/*
|
||||
Read bytes from the current file (opened by unzOpenCurrentFile)
|
||||
buf contain buffer where data must be copied
|
||||
len the size of buf.
|
||||
|
||||
return the number of byte copied if somes bytes are copied
|
||||
return 0 if the end of file was reached
|
||||
return <0 with error code if there is an error
|
||||
(UNZ_ERRNO for IO error, or zLib error for uncompress error)
|
||||
*/
|
||||
|
||||
extern z_off_t ZEXPORT unztell OF((unzFile file));
|
||||
/*
|
||||
Give the current position in uncompressed data
|
||||
*/
|
||||
|
||||
extern int ZEXPORT unzeof OF((unzFile file));
|
||||
/*
|
||||
return 1 if the end of file was reached, 0 elsewhere
|
||||
*/
|
||||
|
||||
extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
|
||||
voidp buf,
|
||||
unsigned len));
|
||||
/*
|
||||
Read extra field from the current file (opened by unzOpenCurrentFile)
|
||||
This is the local-header version of the extra field (sometimes, there is
|
||||
more info in the local-header version than in the central-header)
|
||||
|
||||
if buf==NULL, it return the size of the local extra field
|
||||
|
||||
if buf!=NULL, len is the size of the buffer, the extra header is copied in
|
||||
buf.
|
||||
the return value is the number of bytes copied in buf, or (if <0)
|
||||
the error code
|
||||
*/
|
||||
|
||||
/***************************************************************************/
|
||||
|
||||
/* Get the current file offset */
|
||||
extern uLong ZEXPORT unzGetOffset (unzFile file);
|
||||
|
||||
/* Set the current file offset */
|
||||
extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);
|
||||
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* _unz_H */
|
||||
1899
src/minizip/zip.c
1899
src/minizip/zip.c
File diff suppressed because it is too large
Load Diff
85
src/minizip/zip.c.diff
Normal file
85
src/minizip/zip.c.diff
Normal file
@@ -0,0 +1,85 @@
|
||||
--- zip.c.orig 2013-02-24 08:32:30.000000000 +0100
|
||||
+++ zip.c 2014-05-24 13:52:45.570151611 +0200
|
||||
@@ -186,7 +186,7 @@
|
||||
#include "crypt.h"
|
||||
#endif
|
||||
|
||||
-local linkedlist_datablock_internal* allocate_new_datablock()
|
||||
+local linkedlist_datablock_internal* allocate_new_datablock(void)
|
||||
{
|
||||
linkedlist_datablock_internal* ldi;
|
||||
ldi = (linkedlist_datablock_internal*)
|
||||
@@ -637,7 +637,7 @@
|
||||
return relativeOffset;
|
||||
}
|
||||
|
||||
-int LoadCentralDirectoryRecord(zip64_internal* pziinit)
|
||||
+local int LoadCentralDirectoryRecord(zip64_internal* pziinit)
|
||||
{
|
||||
int err=ZIP_OK;
|
||||
ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
|
||||
@@ -955,7 +955,7 @@
|
||||
return zipOpen3(pathname,append,NULL,NULL);
|
||||
}
|
||||
|
||||
-int Write_LocalFileHeader(zip64_internal* zi, const char* filename, uInt size_extrafield_local, const void* extrafield_local)
|
||||
+local int Write_LocalFileHeader(zip64_internal* zi, const char* filename, uInt size_extrafield_local, const void* extrafield_local)
|
||||
{
|
||||
/* write the local header */
|
||||
int err;
|
||||
@@ -1752,7 +1752,7 @@
|
||||
return zipCloseFileInZipRaw (file,0,0);
|
||||
}
|
||||
|
||||
-int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip)
|
||||
+local int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip)
|
||||
{
|
||||
int err = ZIP_OK;
|
||||
ZPOS64_T pos = zip64eocd_pos_inzip - zi->add_position_when_writting_offset;
|
||||
@@ -1774,7 +1774,7 @@
|
||||
return err;
|
||||
}
|
||||
|
||||
-int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
|
||||
+local int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
|
||||
{
|
||||
int err = ZIP_OK;
|
||||
|
||||
@@ -1813,7 +1813,8 @@
|
||||
}
|
||||
return err;
|
||||
}
|
||||
-int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
|
||||
+
|
||||
+local int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
|
||||
{
|
||||
int err = ZIP_OK;
|
||||
|
||||
@@ -1861,7 +1862,7 @@
|
||||
return err;
|
||||
}
|
||||
|
||||
-int Write_GlobalComment(zip64_internal* zi, const char* global_comment)
|
||||
+local int Write_GlobalComment(zip64_internal* zi, const char* global_comment)
|
||||
{
|
||||
int err = ZIP_OK;
|
||||
uInt size_global_comment = 0;
|
||||
@@ -1879,6 +1880,18 @@
|
||||
return err;
|
||||
}
|
||||
|
||||
+extern int ZEXPORT zipFlush (zipFile file)
|
||||
+{
|
||||
+ zip64_internal* zi;
|
||||
+
|
||||
+ if (file == NULL)
|
||||
+ return ZIP_PARAMERROR;
|
||||
+
|
||||
+ zi = (zip64_internal*)file;
|
||||
+
|
||||
+ return ZFLUSH64(zi->z_filefunc,zi->filestream);
|
||||
+}
|
||||
+
|
||||
extern int ZEXPORT zipClose (zipFile file, const char* global_comment)
|
||||
{
|
||||
zip64_internal* zi;
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,18 +1,15 @@
|
||||
/* zip.h -- IO for compress .zip files using zlib
|
||||
Version 1.00, September 10th, 2003
|
||||
/* zip.h -- IO on .zip files using zlib
|
||||
Version 1.1, February 14h, 2010
|
||||
part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
|
||||
|
||||
Copyright (C) 1998-2003 Gilles Vollant
|
||||
Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
|
||||
|
||||
This unzip package allow creates .ZIP file, compatible with PKZip 2.04g
|
||||
WinZip, InfoZip tools and compatible.
|
||||
Encryption and multi volume ZipFile (span) are not supported.
|
||||
Old compressions used by old PKZip 1.x are not supported
|
||||
Modifications for Zip64 support
|
||||
Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
|
||||
|
||||
For uncompress .zip file, look at unzip.h
|
||||
For more info read MiniZip_info.txt
|
||||
|
||||
|
||||
I WAIT FEEDBACK at mail info@winimage.com
|
||||
Visit also http://www.winimage.com/zLibDll/unzip.html for evolution
|
||||
---------------------------------------------------------------------------
|
||||
|
||||
Condition of use and distribution are the same than zlib :
|
||||
|
||||
@@ -32,23 +29,23 @@
|
||||
misrepresented as being the original software.
|
||||
3. This notice may not be removed or altered from any source distribution.
|
||||
|
||||
---------------------------------------------------------------------------
|
||||
|
||||
Changes
|
||||
|
||||
See header of zip.h
|
||||
|
||||
*/
|
||||
|
||||
/* for more info about .ZIP format, see
|
||||
http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip
|
||||
http://www.info-zip.org/pub/infozip/doc/
|
||||
PkWare has also a specification at :
|
||||
ftp://ftp.pkware.com/probdesc.zip
|
||||
*/
|
||||
|
||||
#ifndef _zip_H
|
||||
#define _zip_H
|
||||
#ifndef _zip12_H
|
||||
#define _zip12_H
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
//#define HAVE_BZIP2
|
||||
|
||||
#ifndef _ZLIB_H
|
||||
#include "zlib.h"
|
||||
#endif
|
||||
@@ -57,6 +54,12 @@ extern "C" {
|
||||
#include "ioapi.h"
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_BZIP2
|
||||
#include "bzlib.h"
|
||||
#endif
|
||||
|
||||
#define Z_BZIP2ED 12
|
||||
|
||||
#if defined(STRICTZIP) || defined(STRICTZIPUNZIP)
|
||||
/* like the STRICT of WIN32, we define a pointer that cannot be converted
|
||||
from (void*) without cast */
|
||||
@@ -111,6 +114,7 @@ typedef const char* zipcharpc;
|
||||
#define APPEND_STATUS_ADDINZIP (2)
|
||||
|
||||
extern zipFile ZEXPORT zipOpen OF((const char *pathname, int append));
|
||||
extern zipFile ZEXPORT zipOpen64 OF((const void *pathname, int append));
|
||||
/*
|
||||
Create a zipfile.
|
||||
pathname contain on Windows XP a filename like "c:\\zlib\\zlib113.zip" or on
|
||||
@@ -135,6 +139,16 @@ extern zipFile ZEXPORT zipOpen2 OF((const char *pathname,
|
||||
zipcharpc* globalcomment,
|
||||
zlib_filefunc_def* pzlib_filefunc_def));
|
||||
|
||||
extern zipFile ZEXPORT zipOpen2_64 OF((const void *pathname,
|
||||
int append,
|
||||
zipcharpc* globalcomment,
|
||||
zlib_filefunc64_def* pzlib_filefunc_def));
|
||||
|
||||
extern zipFile ZEXPORT zipOpen3 OF((const void *pathname,
|
||||
int append,
|
||||
zipcharpc* globalcomment,
|
||||
zlib_filefunc64_32_def* pzlib_filefunc64_32_def));
|
||||
|
||||
extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,
|
||||
const char* filename,
|
||||
const zip_fileinfo* zipfi,
|
||||
@@ -145,6 +159,19 @@ extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,
|
||||
const char* comment,
|
||||
int method,
|
||||
int level));
|
||||
|
||||
extern int ZEXPORT zipOpenNewFileInZip64 OF((zipFile file,
|
||||
const char* filename,
|
||||
const zip_fileinfo* zipfi,
|
||||
const void* extrafield_local,
|
||||
uInt size_extrafield_local,
|
||||
const void* extrafield_global,
|
||||
uInt size_extrafield_global,
|
||||
const char* comment,
|
||||
int method,
|
||||
int level,
|
||||
int zip64));
|
||||
|
||||
/*
|
||||
Open a file in the ZIP for writing.
|
||||
filename : the filename in zip (if NULL, '-' without quote will be used
|
||||
@@ -156,6 +183,9 @@ extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,
|
||||
if comment != NULL, comment contain the comment string
|
||||
method contain the compression method (0 for store, Z_DEFLATED for deflate)
|
||||
level contain the level of compression (can be Z_DEFAULT_COMPRESSION)
|
||||
zip64 is set to 1 if a zip64 extended information block should be added to the local file header.
|
||||
this MUST be '1' if the uncompressed size is >= 0xffffffff.
|
||||
|
||||
*/
|
||||
|
||||
|
||||
@@ -171,6 +201,19 @@ extern int ZEXPORT zipOpenNewFileInZip2 OF((zipFile file,
|
||||
int level,
|
||||
int raw));
|
||||
|
||||
|
||||
extern int ZEXPORT zipOpenNewFileInZip2_64 OF((zipFile file,
|
||||
const char* filename,
|
||||
const zip_fileinfo* zipfi,
|
||||
const void* extrafield_local,
|
||||
uInt size_extrafield_local,
|
||||
const void* extrafield_global,
|
||||
uInt size_extrafield_global,
|
||||
const char* comment,
|
||||
int method,
|
||||
int level,
|
||||
int raw,
|
||||
int zip64));
|
||||
/*
|
||||
Same than zipOpenNewFileInZip, except if raw=1, we write raw file
|
||||
*/
|
||||
@@ -190,13 +233,79 @@ extern int ZEXPORT zipOpenNewFileInZip3 OF((zipFile file,
|
||||
int memLevel,
|
||||
int strategy,
|
||||
const char* password,
|
||||
uLong crcForCtypting));
|
||||
uLong crcForCrypting));
|
||||
|
||||
extern int ZEXPORT zipOpenNewFileInZip3_64 OF((zipFile file,
|
||||
const char* filename,
|
||||
const zip_fileinfo* zipfi,
|
||||
const void* extrafield_local,
|
||||
uInt size_extrafield_local,
|
||||
const void* extrafield_global,
|
||||
uInt size_extrafield_global,
|
||||
const char* comment,
|
||||
int method,
|
||||
int level,
|
||||
int raw,
|
||||
int windowBits,
|
||||
int memLevel,
|
||||
int strategy,
|
||||
const char* password,
|
||||
uLong crcForCrypting,
|
||||
int zip64
|
||||
));
|
||||
|
||||
/*
|
||||
Same than zipOpenNewFileInZip2, except
|
||||
windowBits,memLevel,,strategy : see parameter strategy in deflateInit2
|
||||
password : crypting password (NULL for no crypting)
|
||||
crcForCtypting : crc of file to compress (needed for crypting)
|
||||
crcForCrypting : crc of file to compress (needed for crypting)
|
||||
*/
|
||||
|
||||
extern int ZEXPORT zipOpenNewFileInZip4 OF((zipFile file,
|
||||
const char* filename,
|
||||
const zip_fileinfo* zipfi,
|
||||
const void* extrafield_local,
|
||||
uInt size_extrafield_local,
|
||||
const void* extrafield_global,
|
||||
uInt size_extrafield_global,
|
||||
const char* comment,
|
||||
int method,
|
||||
int level,
|
||||
int raw,
|
||||
int windowBits,
|
||||
int memLevel,
|
||||
int strategy,
|
||||
const char* password,
|
||||
uLong crcForCrypting,
|
||||
uLong versionMadeBy,
|
||||
uLong flagBase
|
||||
));
|
||||
|
||||
|
||||
extern int ZEXPORT zipOpenNewFileInZip4_64 OF((zipFile file,
|
||||
const char* filename,
|
||||
const zip_fileinfo* zipfi,
|
||||
const void* extrafield_local,
|
||||
uInt size_extrafield_local,
|
||||
const void* extrafield_global,
|
||||
uInt size_extrafield_global,
|
||||
const char* comment,
|
||||
int method,
|
||||
int level,
|
||||
int raw,
|
||||
int windowBits,
|
||||
int memLevel,
|
||||
int strategy,
|
||||
const char* password,
|
||||
uLong crcForCrypting,
|
||||
uLong versionMadeBy,
|
||||
uLong flagBase,
|
||||
int zip64
|
||||
));
|
||||
/*
|
||||
Same than zipOpenNewFileInZip4, except
|
||||
versionMadeBy : value for Version made by field
|
||||
flag : value for flag field (compression level info will be added)
|
||||
*/
|
||||
|
||||
|
||||
@@ -207,6 +316,11 @@ extern int ZEXPORT zipWriteInFileInZip OF((zipFile file,
|
||||
Write data in the zipfile
|
||||
*/
|
||||
|
||||
extern int ZEXPORT zipFlush OF((zipFile file));
|
||||
/*
|
||||
Flush the zipfile output
|
||||
*/
|
||||
|
||||
extern int ZEXPORT zipCloseFileInZip OF((zipFile file));
|
||||
/*
|
||||
Close the current file in the zipfile
|
||||
@@ -215,8 +329,13 @@ extern int ZEXPORT zipCloseFileInZip OF((zipFile file));
|
||||
extern int ZEXPORT zipCloseFileInZipRaw OF((zipFile file,
|
||||
uLong uncompressed_size,
|
||||
uLong crc32));
|
||||
|
||||
extern int ZEXPORT zipCloseFileInZipRaw64 OF((zipFile file,
|
||||
ZPOS64_T uncompressed_size,
|
||||
uLong crc32));
|
||||
|
||||
/*
|
||||
Close the current file in the zipfile, for fiel opened with
|
||||
Close the current file in the zipfile, for file opened with
|
||||
parameter raw=1 in zipOpenNewFileInZip2
|
||||
uncompressed_size and crc32 are value for the uncompressed size
|
||||
*/
|
||||
@@ -227,13 +346,27 @@ extern int ZEXPORT zipClose OF((zipFile file,
|
||||
Close the zipfile
|
||||
*/
|
||||
|
||||
extern int ZEXPORT zipFlush OF((zipFile file));
|
||||
|
||||
extern int ZEXPORT zipRemoveExtraInfoBlock OF((char* pData, int* dataLen, short sHeader));
|
||||
/*
|
||||
Flush the zipfile output
|
||||
zipRemoveExtraInfoBlock - Added by Mathias Svensson
|
||||
|
||||
Remove extra information block from a extra information data for the local file header or central directory header
|
||||
|
||||
It is needed to remove ZIP64 extra information blocks when before data is written if using RAW mode.
|
||||
|
||||
0x0001 is the signature header for the ZIP64 extra information blocks
|
||||
|
||||
usage.
|
||||
Remove ZIP64 Extra information from a central director extra field data
|
||||
zipRemoveExtraInfoBlock(pCenDirExtraFieldData, &nCenDirExtraFieldDataLen, 0x0001);
|
||||
|
||||
Remove ZIP64 Extra information from a Local File Header extra field data
|
||||
zipRemoveExtraInfoBlock(pLocalHeaderExtraFieldData, &nLocalHeaderExtraFieldDataLen, 0x0001);
|
||||
*/
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* _zip_H */
|
||||
#endif /* _zip64_H */
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user