summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2011-09-18 21:22:54 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2011-09-18 21:22:54 (GMT)
commita279052b65a53d228f0d2cd188114f4cf398cc82 (patch) (side-by-side diff)
tree02600610bb547ef1badd5de4d706cc0888252cc3
parent27991c48996e8022c4b5dc306f3920ce4249d6f0 (diff)
downloadcpio-a279052b65a53d228f0d2cd188114f4cf398cc82.tar.gz
cpio-a279052b65a53d228f0d2cd188114f4cf398cc82.tar.bz2
Minor fixes.
* configure.ac: Use gettext 0.18 * doc/.gitignore: Add parse-datetime.texi. * lib/Makefile.am (libpax_a_SOURCES): Add exit-status.c * src/copyin.c (read_pattern_file): Use open_fatal if opening pattern file failed. * src/util.c (set_file_times): Use fdutimens.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--configure.ac2
-rw-r--r--doc/.gitignore1
-rw-r--r--lib/Makefile.am1
-rw-r--r--src/copyin.c2
-rw-r--r--src/util.c2
5 files changed, 5 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index b4507eb..e55c25e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,7 +84,7 @@ AC_CHECK_DECLS([errno, getpwnam, getgrnam, getgrgid, strdup, strerror, getenv, a
# Gettext.
AM_ICONV
AM_GNU_GETTEXT([external], [need-formatstring-macros])
-AM_GNU_GETTEXT_VERSION(0.17)
+AM_GNU_GETTEXT_VERSION(0.18)
LIBS="$LIBS $LIB_CLOCK_GETTIME"
diff --git a/doc/.gitignore b/doc/.gitignore
index 3f8fe69..2dd81c0 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -21,5 +21,6 @@ cpio.vr
genfile.texi
getdate.texi
manual
+parse-datetime.texi
stamp-vti
version.texi
diff --git a/lib/Makefile.am b/lib/Makefile.am
index d9a42a0..74e25c4 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -31,6 +31,7 @@ INCLUDES = -I$(top_srcdir)/gnu -I../ -I../gnu
noinst_HEADERS = system.h system-ioctl.h rmt.h paxlib.h
libpax_a_SOURCES = \
exit.c\
+ exit-status.c\
paxlib.h\
rtapelib.c\
sysdep.h\
diff --git a/src/copyin.c b/src/copyin.c
index d41b17f..22e33dc 100644
--- a/src/copyin.c
+++ b/src/copyin.c
@@ -866,7 +866,7 @@ read_pattern_file ()
pattern_fp = fopen (pattern_file_name, "r");
if (pattern_fp == NULL)
- open_error (pattern_file_name);
+ open_fatal (pattern_file_name);
while (ds_fgetstr (pattern_fp, &pattern_name, '\n') != NULL)
{
if (new_num_patterns >= max_new_patterns)
diff --git a/src/util.c b/src/util.c
index c56ecf5..7c6db52 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1372,7 +1372,7 @@ set_file_times (int fd,
/* Silently ignore EROFS because reading the file won't have upset its
timestamp if it's on a read-only filesystem. */
- if (gl_futimens (fd, name, ts) < 0 && errno != EROFS)
+ if (fdutimens (fd, name, ts) < 0 && errno != EROFS)
utime_error (name);
}

Return to:

Send suggestions and report system problems to the System administrator.