moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

Add size of buffer to warc_timestamp()

Browse Source
This commit is contained in:
Tim Rühsen 2014-11-24 10:41:08 +01:00
parent 9217b864d8
commit 0c18773308
4 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2014-11-24 Tim Ruehsen <tim.ruehsen@gmx.de>
* warc.c, warc.h, http.c: Add size of buffer to warc_timestamp()
2014-11-24 Tim Ruehsen <tim.ruehsen@gmx.de> 2014-11-24 Tim Ruehsen <tim.ruehsen@gmx.de>
* wget.h, test.c, main.c: Make program_name and program_argstring const * wget.h, test.c, main.c: Make program_name and program_argstring const

3
src/http.c
View File

@ -2191,8 +2191,9 @@ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy,
if (warc_enabled) if (warc_enabled)
{ {
bool warc_result; bool warc_result;
/* Generate a timestamp and uuid for this request. */ /* Generate a timestamp and uuid for this request. */
warc_timestamp (warc_timestamp_str); warc_timestamp (warc_timestamp_str, sizeof(warc_timestamp_str));
warc_uuid_str (warc_request_uuid); warc_uuid_str (warc_request_uuid);
/* Create a request record and store it in the WARC file. */ /* Create a request record and store it in the WARC file. */

27
src/warc.c
View File

@ -391,12 +391,9 @@ static bool
warc_write_date_header (const char *timestamp) warc_write_date_header (const char *timestamp)
{ {
char current_timestamp[21]; char current_timestamp[21];
if (timestamp == NULL)
{ return warc_write_header ("WARC-Date", timestamp ? timestamp :
warc_timestamp (current_timestamp); warc_timestamp (current_timestamp, sizeof(current_timestamp)));
timestamp = current_timestamp;
}
return warc_write_header ("WARC-Date", timestamp);
} }
/* Writes the WARC-IP-Address header for the given IP to /* Writes the WARC-IP-Address header for the given IP to
@ -591,14 +588,16 @@ warc_write_digest_headers (FILE *file, long payload_offset)
The UTC time is formatted following ISO 8601, as required The UTC time is formatted following ISO 8601, as required
for use in the WARC-Date header. for use in the WARC-Date header.
The timestamp will be 21 characters long. */ The timestamp will be 21 characters long. */
void char *
warc_timestamp (char *timestamp) warc_timestamp (char *timestamp, size_t timestamp_size)
{ {
time_t rawtime; time_t rawtime = time (NULL);
struct tm * timeinfo; struct tm * timeinfo = gmtime (&rawtime);
time ( &rawtime );
timeinfo = gmtime (&rawtime); if (strftime (timestamp, timestamp_size, "%Y-%m-%dT%H:%M:%SZ", timeinfo) == 0 && timestamp_size > 0)
strftime (timestamp, 21, "%Y-%m-%dT%H:%M:%SZ", timeinfo); *timestamp = 0;
return timestamp;
} }
#if HAVE_LIBUUID || HAVE_UUID_CREATE #if HAVE_LIBUUID || HAVE_UUID_CREATE
@ -672,7 +671,7 @@ warc_write_warcinfo_record (char *filename)
warc_current_warcinfo_uuid_str = (char *) malloc (48); warc_current_warcinfo_uuid_str = (char *) malloc (48);
warc_uuid_str (warc_current_warcinfo_uuid_str); warc_uuid_str (warc_current_warcinfo_uuid_str);
warc_timestamp (timestamp); warc_timestamp (timestamp, sizeof(timestamp));
filename_copy = strdup (filename); filename_copy = strdup (filename);
filename_basename = strdup (basename (filename_copy)); filename_basename = strdup (basename (filename_copy));

3
src/warc.h
View File

@ -6,9 +6,10 @@
void warc_init (void); void warc_init (void);
void warc_close (void); void warc_close (void);
void warc_timestamp (char *timestamp);
void warc_uuid_str (char *id_str); void warc_uuid_str (char *id_str);
char * warc_timestamp (char *timestamp, size_t timestamp_size);
FILE * warc_tempfile (void); FILE * warc_tempfile (void);
bool warc_write_request_record (char *url, char *timestamp_str, bool warc_write_request_record (char *url, char *timestamp_str,