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

gnulib: Use basename() from gnulib module 'dirname'

Browse Source 
Avoid basename incompatibilities between POSIX and GNU implementations.
Also, libgen.h isn't needed any more which increases compatibility.
This commit is contained in:
Tim Rühsen 2014-12-19 16:07:38 +01:00 committed by Tim Ruehsen
parent 15f18e7606
commit cfe7589397
3 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bootstrap.conf
View File

@ -36,6 +36,7 @@ c-strcasestr
clock-time
close
connect
dirname
fcntl
fnmatch
futimens

7
src/main.c
View File

@ -56,6 +56,7 @@ as that of the covered work. */
#include "warc.h"
#include "version.h"
#include "c-strcase.h"
#include "dirname.h"
#include <getopt.h>
#include <getpass.h>
#include <quote.h>
@ -1033,11 +1034,7 @@ main (int argc, char **argv)
/* On VMS, lose the "dev:[dir]" prefix and the ".EXE;nnn" suffix. */
exec_name = vms_basename (argv[0]);
#else /* def __VMS */
exec_name = strrchr (argv[0], PATH_SEPARATOR);
if (!exec_name)
exec_name = argv[0];
else
++exec_name;
exec_name = basename (argv[0]);
#endif /* def __VMS [else] */
#ifdef WINDOWS

24
src/warc.c
View File

@ -35,6 +35,7 @@ as that of the covered work. */
#include "hash.h"
#include "utils.h"
#include "version.h"
#include "dirname.h"
#include <stdio.h>
#include <stdlib.h>
@ -54,19 +55,21 @@ as that of the covered work. */
#include <uuid.h>
#endif
#ifndef WINDOWS
#include <libgen.h>
#else
#include <fcntl.h>
#endif
#include "warc.h"
#include "exits.h"
#ifdef WINDOWS
/* we need this on Windows to have O_TEMPORARY defined */
#include <fcntl.h>
#endif
#ifndef O_TEMPORARY
#define O_TEMPORARY 0
#endif
#include "warc.h"
#include "exits.h"
/* The log file (a temporary file that contains a copy
of the wget log). */
@ -671,7 +674,7 @@ warc_write_warcinfo_record (char *filename)
{
FILE *warc_tmp;
char timestamp[22];
char *filename_copy, *filename_basename;
char *filename_basename;
/* Write warc-info record as the first record of the file. */
/* We add the record id of this info record to the other records in the
@ -681,8 +684,7 @@ warc_write_warcinfo_record (char *filename)
warc_timestamp (timestamp, sizeof(timestamp));
filename_copy = strdup (filename);
filename_basename = strdup (basename (filename_copy));
filename_basename = basename (filename);
warc_write_start_record ();
warc_write_header ("WARC-Type", "warcinfo");
@ -695,8 +697,6 @@ warc_write_warcinfo_record (char *filename)
warc_tmp = warc_tempfile ();
if (warc_tmp == NULL)
{
xfree (filename_copy);
xfree (filename_basename);
return false;
}
@ -722,8 +722,6 @@ warc_write_warcinfo_record (char *filename)
if (! warc_write_ok)
logprintf (LOG_NOTQUIET, _("Error writing warcinfo record to WARC file.\n"));
xfree (filename_copy);
xfree (filename_basename);
fclose (warc_tmp);
return warc_write_ok;
}