X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fcreate.c;h=1b84fc860557bd7fee61e0888ccf98381485fdd3;hb=5addfdcb03a710d220d0d38262b106b99268b2ec;hp=7955e6b118bc9bb97e5648cc5da25ff1938618df;hpb=a169d65b94722c55b0daa20997a1cb02307159cf;p=chaz%2Ftar

diff --git a/src/create.c b/src/create.c
index 7955e6b..1b84fc8 100644
--- a/src/create.c
+++ b/src/create.c
@@ -1,7 +1,7 @@
 /* Create a tar archive.
 
    Copyright (C) 1985, 1992, 1993, 1994, 1996, 1997, 1999, 2000, 2001,
-   2003, 2004, 2005 Free Software Foundation, Inc.
+   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
    Written by John Gilmore, on 1985-08-25.
 
@@ -128,7 +128,6 @@ to_chars_subst (int negative, int gnu_format, uintmax_t value, size_t valsize,
   char const *minval_string;
   char const *maxval_string = STRINGIFY_BIGINT (maxval, maxbuf);
   char const *value_string;
-  char *p;
     
   if (gnu_format)
     {
@@ -163,11 +162,12 @@ to_chars_subst (int negative, int gnu_format, uintmax_t value, size_t valsize,
       WARN ((0, 0, _("value %s out of %s range %s..%s; substituting %s"),
 	     value_string, type, minval_string, maxval_string,
 	     sub_string));
-      to_chars (negsub, s, valsize, 0, where, size, type);
+      return to_chars (negsub, s, valsize, 0, where, size, type);
     }
   else
     ERROR ((0, 0, _("value %s out of %s range %s..%s"),
 	    value_string, type, minval_string, maxval_string));
+  return false;
 }
 
 /* Convert NEGATIVE VALUE (which was originally of size VALSIZE) to
@@ -380,7 +380,7 @@ bool
 file_dumpable_p (struct tar_stat_info *st)
 {
   if (dev_null_output)
-    return totals_option && sparse_option && sparse_file_p (st);
+    return totals_option && sparse_option && ST_IS_SPARSE (st->stat);
   return !(st->archive_file_size == 0
 	   && (st->stat.st_mode & MODE_R) == MODE_R);
 }
@@ -494,7 +494,7 @@ split_long_name (const char *name, size_t length)
   size_t i;
 
   if (length > PREFIX_FIELD_SIZE)
-    length = PREFIX_FIELD_SIZE+2;
+    length = PREFIX_FIELD_SIZE + 1;
   for (i = length - 1; i > 0; i--)
     if (ISSLASH (name[i]))
       break;
@@ -730,7 +730,7 @@ start_header (struct tar_stat_info *st)
   }
 
   {
-    struct timespec mtime = st->mtime;
+    struct timespec mtime = set_mtime_option ? mtime_option : st->mtime;
     if (archive_format == POSIX_FORMAT)
       {
 	if (MAX_OCTAL_VAL (header->header.mtime) < mtime.tv_sec
@@ -1182,7 +1182,7 @@ dump_dir (int fd, struct tar_stat_info *st, int top_level, dev_t parent_device)
 void
 create_archive (void)
 {
-  char *p;
+  const char *p;
 
   open_archive (ACCESS_WRITE);
   xheader_write_global ();
@@ -1387,7 +1387,7 @@ check_links (void)
    exit_status to failure, a clear diagnostic has been issued.  */
 
 static void
-dump_file0 (struct tar_stat_info *st, char const *p,
+dump_file0 (struct tar_stat_info *st, const char *p,
 	    int top_level, dev_t parent_device)
 {
   union block *header;
@@ -1404,6 +1404,8 @@ dump_file0 (struct tar_stat_info *st, char const *p,
   assign_string (&st->file_name,
                  safer_name_suffix (p, false, absolute_names_option));
 
+  transform_name (&st->file_name);
+
   if (deref_stat (dereference_option, p, &st->stat) != 0)
     {
       stat_diag (p);
@@ -1497,7 +1499,7 @@ dump_file0 (struct tar_stat_info *st, char const *p,
 	{
 	  enum dump_status status;
 
-	  if (fd != -1 && sparse_option && sparse_file_p (st))
+	  if (fd != -1 && sparse_option && ST_IS_SPARSE (st->stat))
 	    {
 	      status = sparse_dump_file (fd, st);
 	      if (status == dump_status_not_implemented)
@@ -1520,6 +1522,8 @@ dump_file0 (struct tar_stat_info *st, char const *p,
 	      abort ();
 	    }
 
+	  file_count_links (st);
+	  
 	  ok = status == dump_status_ok;
 	}
 
@@ -1665,7 +1669,7 @@ dump_file0 (struct tar_stat_info *st, char const *p,
 }
 
 void
-dump_file (char *p, int top_level, dev_t parent_device)
+dump_file (const char *p, int top_level, dev_t parent_device)
 {
   struct tar_stat_info st;
   tar_stat_init (&st);