aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog15
-rw-r--r--NEWS2
-rw-r--r--THANKS8
-rw-r--r--configure.ac2
-rw-r--r--doc/cpio.texi2
-rw-r--r--src/extern.h2
-rw-r--r--src/tar.c2
-rw-r--r--src/util.c6
8 files changed, 30 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 6604144..2d211ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2008-02-09 Sergey Poznyakoff <gray@gnu.org.ua>
+
+ * NEWS, configure.ac: Raise the patchlevel number.
+ * THANKS: Update
+
+ * doc/cpio.texi: Fix a typo.
+ * src/extern.h (warn_if_file_changed): Fix type of the 2nd
+ argument.
+ * src/tar.c (write_out_tar_header): Stylistic change.
+ * src/util.c (copy_files_disk_to_disk): Fix types of automatic
+ variables.
+ (warn_if_file_changed): Fix type of the 2nd argument.
+
+ Patches supplied by Ladislav Michnovic.
+
2008-02-08 Sergey Poznyakoff <gray@gnu.org.ua>
* po/POTFILES.in: Add missing files.
diff --git a/NEWS b/NEWS
index 6f13deb..05626e8 100644
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,7 @@ See the end of file for copying conditions.
Please send cpio bug reports to <bug-cpio@gnu.org>.
-Version 2.9.90 (CVS)
+Version 2.9.91 (CVS)
* Support MinGW builds (thanks to Robert Millan)
diff --git a/THANKS b/THANKS
index 3807e10..d7aeff2 100644
--- a/THANKS
+++ b/THANKS
@@ -14,8 +14,14 @@ Brian Mays <brian@debian.org>
Dmitry V. Levin <ldv@altlinux.org>
Jim Castleberry <bhg9aha02@sneakemail.com>
Holger Fleischmann <holger_fleischmann@mra.man.de>
+Ladislav Michnovič <ladislav.michnovic@gmail.com>
Matthew Braithwaite <mab@cnet.com>
Mike Frysinger <vapier@gentoo.org>
Mitsuru Chinen <mchinen@yamato.ibm.com>
Peter Vrabec <pvrabec@redhat.com>
-Robert Millan <rmh@aybabtu.com> \ No newline at end of file
+Robert Millan <rmh@aybabtu.com>
+
+Local Variables:
+mode: Fundamental
+coding: utf-8
+End:
diff --git a/configure.ac b/configure.ac
index 8a13110..7d621ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software Foundation,
dnl Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-AC_INIT([GNU cpio], [2.9.90], [bug-cpio@gnu.org])
+AC_INIT([GNU cpio], [2.9.91], [bug-cpio@gnu.org])
AC_CONFIG_SRCDIR(src/cpio.h)
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE
diff --git a/doc/cpio.texi b/doc/cpio.texi
index 02aff47..ae6c4b7 100644
--- a/doc/cpio.texi
+++ b/doc/cpio.texi
@@ -234,7 +234,7 @@ unreadable.
cpio @{-o|--create@} [-0acvABLV] [-C bytes] [-H format]
[-M message] [-O [[user@@]host:]archive] [-F [[user@@]host:]archive]
[--file=[[user@@]host:]archive] [--format=format]
-[--message=message][--null] [--reset-access-time] [--verbose]
+[--message=message] [--null] [--reset-access-time] [--verbose]
[--dot] [--append] [--block-size=blocks] [--dereference]
[--io-size=bytes] [--rsh-command=command] [--help] [--version]
< name-list [> archive]
diff --git a/src/extern.h b/src/extern.h
index 6f0072c..4c4bf5c 100644
--- a/src/extern.h
+++ b/src/extern.h
@@ -166,7 +166,7 @@ void tape_toss_input (int in_des, off_t num_bytes);
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,
+void warn_if_file_changed (char *file_name, off_t old_file_size,
time_t old_file_mtime);
void create_all_directories (char *name);
void prepare_append (int out_file_des);
diff --git a/src/tar.c b/src/tar.c
index 3c26967..97d74bc 100644
--- a/src/tar.c
+++ b/src/tar.c
@@ -217,7 +217,7 @@ write_out_tar_header (struct cpio_file_stat *file_hdr, int out_des)
char *name;
strncpy (tar_hdr->magic, TMAGIC, TMAGLEN);
- strncpy (tar_hdr->magic + TMAGLEN, TVERSION, TVERSLEN);
+ strncpy (tar_hdr->version, TVERSION, TVERSLEN);
name = getuser (file_hdr->c_uid);
if (name)
diff --git a/src/util.c b/src/util.c
index 2d75403..2b765d9 100644
--- a/src/util.c
+++ b/src/util.c
@@ -527,8 +527,8 @@ void
copy_files_disk_to_disk (int in_des, int out_des, off_t num_bytes,
char *filename)
{
- long size;
- long k;
+ off_t size;
+ off_t k;
off_t original_num_bytes;
int rc;
@@ -569,7 +569,7 @@ copy_files_disk_to_disk (int in_des, int out_des, off_t num_bytes,
/* Warn if file changed while it was being copied. */
void
-warn_if_file_changed (char *file_name, unsigned long old_file_size,
+warn_if_file_changed (char *file_name, off_t old_file_size,
time_t old_file_mtime)
{
struct stat new_file_stat;

Return to:

Send suggestions and report system problems to the System administrator.