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

warc: Fix some portability issues on VMS.

Browse Source
This commit is contained in:
Steven M. Schweda 2013-07-13 12:00:30 +02:00 committed by Giuseppe Scrivano
parent c52bbad9e4
commit 72b2c58983
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2013-07-13 Steven M. Schweda <sms@antinode.info>
* warc.c (warc_tempfile): Fix a portability issue on VMS.
2013-07-10 Giuseppe Scrivano <gscrivano@gnu.org> 2013-07-10 Giuseppe Scrivano <gscrivano@gnu.org>
* http.c (read_response_body) [ALLOW_CLOBBER]: Move definition to.. * http.c (read_response_body) [ALLOW_CLOBBER]: Move definition to..

25
src/warc.c
View File

@ -738,8 +738,14 @@ warc_start_new_file (bool meta)
char *new_filename = malloc (base_filename_length + 1 + 5 + 8 + 1); char *new_filename = malloc (base_filename_length + 1 + 5 + 8 + 1);
warc_current_filename = new_filename; warc_current_filename = new_filename;
#ifdef __VMS
# define WARC_GZ "warc-gz"
#else /* def __VMS */
# define WARC_GZ "warc.gz"
#endif /* def __VMS [else] */
#ifdef HAVE_LIBZ #ifdef HAVE_LIBZ
const char *extension = (opt.warc_compression_enabled ? "warc.gz" : "warc"); const char *extension = (opt.warc_compression_enabled ? WARC_GZ : "warc");
#else #else
const char *extension = "warc"; const char *extension = "warc";
#endif #endif
@ -1153,6 +1159,21 @@ warc_tempfile (void)
if (path_search (filename, 100, opt.warc_tempdir, "wget", true) == -1) if (path_search (filename, 100, opt.warc_tempdir, "wget", true) == -1)
return NULL; return NULL;
#ifdef __VMS
/* 2013-07-12 SMS.
* mkostemp()+unlink()+fdopen() scheme causes trouble on VMS, so use
* mktemp() to uniquify the (VMS-style) name, and then use a normal
* fopen() with a "create temp file marked for delete" option.
*/
{
char *tfn;
tfn = mktemp (filename); /* Get unique name from template. */
if (tfn == NULL)
return NULL;
return fopen (tfn, "w+", "fop=tmd"); /* Create auto-delete temp file. */
}
#else /* def __VMS */
int fd = mkostemp (filename, O_TEMPORARY); int fd = mkostemp (filename, O_TEMPORARY);
if (fd < 0) if (fd < 0)
return NULL; return NULL;
@ -1162,8 +1183,8 @@ warc_tempfile (void)
return NULL; return NULL;
#endif #endif
return fdopen (fd, "wb+"); return fdopen (fd, "wb+");
#endif /* def __VMS [else] */
} }