X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fcreate.c;h=7be10d27e69c460d88478864c1aa01e6b4d89dd2;hb=5bfb6c5f9d105850ca9628dae7ef8d4d27687f70;hp=a9cf981df748827ae5033bf813db1d9f81eb691b;hpb=a0fb51e136d3df620eb3189683aae90b25bd8dd7;p=chaz%2Ftar

diff --git a/src/create.c b/src/create.c
index a9cf981..7be10d2 100644
--- a/src/create.c
+++ b/src/create.c
@@ -58,7 +58,7 @@ add_exclusion_tag (const char *name, enum exclusion_tag_type type,
   exclusion_tags = tag;
 }
 
-static void
+void
 exclusion_tag_warning (const char *dirname, const char *tagname,
 		       const char *message)
 {
@@ -70,19 +70,19 @@ exclusion_tag_warning (const char *dirname, const char *tagname,
 	   message));
 }
 
-static enum exclusion_tag_type 
+enum exclusion_tag_type 
 check_exclusion_tags (char *dirname, const char **tag_file_name)
 {
   static char *tagname;
   static size_t tagsize;
   struct exclusion_tag *tag;
   size_t dlen = strlen (dirname);
+  int addslash = dirname[dlen-1] != '/';
   char *nptr = NULL;
-  char *ret = NULL;
   
   for (tag = exclusion_tags; tag; tag = tag->next)
     {
-      size_t size = dlen + tag->length + 1;
+      size_t size = dlen + addslash + tag->length + 1;
       if (size > tagsize)
 	{
 	  tagsize = size;
@@ -93,6 +93,8 @@ check_exclusion_tags (char *dirname, const char **tag_file_name)
 	{
 	  strcpy (tagname, dirname);
 	  nptr = tagname + dlen;
+	  if (addslash)
+	    *nptr++ = '/';
 	}
       strcpy (nptr, tag->name);
       if (access (tagname, F_OK) == 0
@@ -1064,8 +1066,7 @@ dump_regular_file (int fd, struct tar_stat_info *st)
 	  return dump_status_short;
 	}
       size_left -= count;
-      if (count)
-	set_next_block_after (blk + (bufsize - 1) / BLOCKSIZE);
+      set_next_block_after (blk + (bufsize - 1) / BLOCKSIZE);
 
       if (count != bufsize)
 	{
@@ -1079,7 +1080,7 @@ dump_regular_file (int fd, struct tar_stat_info *st)
 		 STRINGIFY_BIGINT (size_left, buf)));
 	  if (! ignore_failed_read_option) 
 	    exit_status = TAREXIT_DIFFERS;
-	  pad_archive (size_left - (bufsize-count));
+	  pad_archive (size_left - (bufsize - count));
 	  return dump_status_short;
 	}
     }
@@ -1183,8 +1184,11 @@ dump_dir0 (char *directory,
       
       switch (check_exclusion_tags (st->orig_file_name, &tag_file_name))
 	{
-	case exclusion_tag_none:
 	case exclusion_tag_all:
+	  /* Handled in dump_file0 */
+	  break;
+	  
+	case exclusion_tag_none:
 	  {
 	    char const *entry;
 	    size_t entry_len;