diff options
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | NEWS | 5 | ||||
-rw-r--r-- | configure.ac | 17 | ||||
-rw-r--r-- | po/POTFILES.in | 44 | ||||
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/extern.h | 2 | ||||
-rw-r--r-- | src/util.c | 10 |
7 files changed, 61 insertions, 29 deletions
@@ -1,3 +1,13 @@ +2008-02-08 Sergey Poznyakoff <gray@gnu.org.ua> + + * po/POTFILES.in: Add missing files. + * src/Makefile.am (INCLUDES): Add -I$(top_builddir)/lxib + * src/extern.h (warn_if_file_changed): Fix type of the 3rd + argument. + * src/util.c (copy_files_tape_to_disk) + (copy_files_disk_to_tape): Fix types of size and k. + (warn_if_file_changed): Fix type of the 3rd argument. + 2007-12-05 Sergey Poznyakoff <gray@gnu.org.ua> Fix mingw build. Thanks to Robert Millan. @@ -1,14 +1,13 @@ -GNU cpio NEWS -- history of user-visible changes. 2007-12-05 +GNU cpio NEWS -- history of user-visible changes. 2008-02-08 Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. See the end of file for copying conditions. Please send cpio bug reports to <bug-cpio@gnu.org>. -Version 2.9.90 +Version 2.9.90 (CVS) * Support MinGW builds (thanks to Robert Millan) - Version 2.9 - Sergey Poznyakoff, 2007-06-28 diff --git a/configure.ac b/configure.ac index 33f0f51..8a13110 100644 --- a/configure.ac +++ b/configure.ac @@ -44,7 +44,9 @@ AC_CHECK_TYPE(gid_t, int) AC_HEADER_STDC AC_HEADER_DIRENT -AC_CHECK_FUNCS([fchmod fchown setmode]) +AC_CHECK_FUNCS([fchmod fchown]) +# This is needed for mingw build +AC_CHECK_FUNCS([setmode getpwuid getpwnam getgrgid getgrnam pipe fork getuid geteuid]) # gnulib modules gl_INIT @@ -62,18 +64,7 @@ AC_ARG_ENABLE(mt, no) ;; esac]) -AC_CHECK_HEADERS(unistd.h stdlib.h string.h fcntl.h sys/io/trioctl.h utmp.h getopt.h locale.h libintl.h sys/wait.h utime.h locale.h process.h sys/ioctl.h) - -AC_MSG_CHECKING(for sys_errlist and sys_nerr) -AC_TRY_RUN( -extern char *sys_errlist[[]]; -extern int sys_nerr; -main() { char *s = sys_errlist[[0]]; return 0; }, - AC_DEFINE(HAVE_SYS_ERRLIST,1, - [Define if your system has sys_errlist global variable]) - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no), - AC_MSG_RESULT(don't know)) +AC_CHECK_HEADERS([unistd.h stdlib.h string.h fcntl.h pwd.h grp.h sys/io/trioctl.h utmp.h getopt.h locale.h libintl.h sys/wait.h utime.h locale.h process.h sys/ioctl.h]) AC_CHECK_DECLS([errno, getpwnam, getgrnam, getgrgid, strdup, strerror, getenv, atoi, exit], , , [ #include <stdio.h> diff --git a/po/POTFILES.in b/po/POTFILES.in index 2b6afca..1ab8e95 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,7 +1,41 @@ +# List of files which contain translatable strings. + +# Copyright (C) 2008 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 +# the Free Software Foundation; either version 3, 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/>. + +lib/argmatch.c +lib/argp-help.c +lib/argp-parse.c +lib/closeout.c +lib/error.c +lib/getopt.c +lib/obstack.c +lib/openat-die.c +lib/paxerror.c +lib/paxexit.c +lib/paxnames.c +lib/quotearg.c +lib/rtapelib.c +lib/version-etc.c +lib/xalloc-die.c + +rmt/rmt.c + src/copyin.c src/copyout.c src/copypass.c -src/dstring.c src/main.c src/makepath.c src/mt.c @@ -9,8 +43,6 @@ src/tar.c src/userspec.c src/util.c -lib/getopt.c -lib/rtapelib.c -lib/paxerror.c -lib/paxexit.c -lib/paxnames.c +tests/genfile.c + + diff --git a/src/Makefile.am b/src/Makefile.am index b52527f..f83981f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,7 +16,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301 USA. -INCLUDES=-I. -I.. -I$(top_srcdir)/lib +INCLUDES=-I. -I.. -I$(top_srcdir)/lib -I$(top_builddir)/lib bin_PROGRAMS=cpio @CPIO_MT_PROG@ EXTRA_PROGRAMS=mt diff --git a/src/extern.h b/src/extern.h index ddbe0ef..6f0072c 100644 --- a/src/extern.h +++ b/src/extern.h @@ -167,7 +167,7 @@ void copy_files_tape_to_disk (int in_des, int out_des, off_t num_bytes); void copy_files_disk_to_tape (int in_des, int out_des, off_t num_bytes, char *filename); void copy_files_disk_to_disk (int in_des, int out_des, off_t num_bytes, char *filename); void warn_if_file_changed (char *file_name, unsigned long old_file_size, - off_t old_file_mtime); + time_t old_file_mtime); void create_all_directories (char *name); void prepare_append (int out_file_des); char *find_inode_file (unsigned long node_num, @@ -443,8 +443,8 @@ write_nuls_to_file (off_t num_bytes, int out_des, void copy_files_tape_to_disk (int in_des, int out_des, off_t num_bytes) { - long size; - long k; + off_t size; + off_t k; while (num_bytes > 0) { @@ -474,8 +474,8 @@ void copy_files_disk_to_tape (int in_des, int out_des, off_t num_bytes, char *filename) { - long size; - long k; + off_t size; + off_t k; int rc; off_t original_num_bytes; @@ -570,7 +570,7 @@ copy_files_disk_to_disk (int in_des, int out_des, off_t num_bytes, void warn_if_file_changed (char *file_name, unsigned long old_file_size, - off_t old_file_mtime) + time_t old_file_mtime) { struct stat new_file_stat; if ((*xstat) (file_name, &new_file_stat) < 0) |