mirror of
https://git.savannah.gnu.org/git/tar.git
synced 2026-07-28 05:42:37 +00:00
Port to latest gnulib. There were a lot of changes, so the
simplest way to get this up and running was to switch to coreutils bootstrap procedure. I noticed one feature missing after this merge: the ability to update a single .po file. I can add that later if need be. * README-cvs, bootstrap.conf: New files. * lib/.cvsignore: Remove Makefile.am, printf-parse.c, vasnprintf.c. * lib/printf-parse.c, lib/vasnprintf.c: New files, from coreutils, to override gnulib, so that we don't need xsize.h. * bootstrap: Replace with coreutils bootstrap, except add support for paxutils. * configure.ac (gl_USE_SYSTEM_EXTENSIONS): Remove, as gl_EARLY now does this. (gl_EARLY, gl_INIT): Add. (tar_GNULIB): Remove. * gnulib.modules: Add configmake. * lib/Makefile.tmpl: Remove, replacing with.... * lib/Makefile.am: New file. * src/Makefile.am (tar.o): Remove dependency: Automake does this for us. * src/tar.c: Include <configmake.h> and <rmt-command.h>, not <localedir.h>.
This commit is contained in:
+2
-4
@@ -1,7 +1,7 @@
|
||||
# Makefile for GNU tar sources.
|
||||
|
||||
# Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2003 Free
|
||||
# Software Foundation, Inc.
|
||||
# Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2003, 2006
|
||||
# Free Software Foundation, Inc.
|
||||
|
||||
## 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
|
||||
@@ -42,8 +42,6 @@ tar_SOURCES = \
|
||||
|
||||
INCLUDES = -I$(top_srcdir)/lib -I../ -I../lib
|
||||
|
||||
tar.o: ../lib/localedir.h
|
||||
|
||||
LDADD = ../lib/libtar.a $(LIBINTL) $(LIBICONV)
|
||||
|
||||
tar_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
|
||||
|
||||
@@ -41,10 +41,11 @@
|
||||
|
||||
#include <argmatch.h>
|
||||
#include <closeout.h>
|
||||
#include <configmake.h>
|
||||
#include <exitfail.h>
|
||||
#include <getdate.h>
|
||||
#include <localedir.h>
|
||||
#include <rmt.h>
|
||||
#include <rmt-command.h>
|
||||
#include <prepargs.h>
|
||||
#include <quotearg.h>
|
||||
#include <version-etc.h>
|
||||
@@ -980,7 +981,7 @@ read_name_from_file (FILE *fp, struct obstack *stk)
|
||||
|
||||
if (counter == 0 && c != EOF)
|
||||
return file_list_skip;
|
||||
|
||||
|
||||
obstack_1grow (stk, 0);
|
||||
|
||||
return (counter == 0 && c == EOF) ? file_list_end : file_list_success;
|
||||
@@ -1068,7 +1069,7 @@ update_argv (const char *filename, struct argp_state *state)
|
||||
case file_list_success:
|
||||
count++;
|
||||
break;
|
||||
|
||||
|
||||
case file_list_end: /* won't happen, just to pacify gcc */
|
||||
break;
|
||||
|
||||
@@ -1093,7 +1094,7 @@ update_argv (const char *filename, struct argp_state *state)
|
||||
filename_terminator = 0;
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
case file_list_skip:
|
||||
break;
|
||||
}
|
||||
@@ -2346,7 +2347,7 @@ main (int argc, char **argv)
|
||||
|
||||
if (stdlis == stdout)
|
||||
close_stdout ();
|
||||
else if (ferror (stderr) || fclose (stderr) != 0)
|
||||
else if (ferror (stderr) || fclose (stderr) != 0)
|
||||
exit_status = TAREXIT_FAILURE;
|
||||
|
||||
return exit_status;
|
||||
|
||||
Reference in New Issue
Block a user