X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbuffer.c;h=71843a436972b257970fe5e24d005adc2e4a8568;hb=a9d934b73444ac20502265ee2c4a72d72fb6592e;hp=1ad48f0657e9adf549333d75f7745cf9f4b819fa;hpb=aa985330d59a033156b0d793f880de952eafa4e5;p=chaz%2Ftar

diff --git a/src/buffer.c b/src/buffer.c
index 1ad48f0..71843a4 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -383,7 +383,7 @@ child_open_for_compress (void)
       /* We don't need a grandchild tar.  Open the archive and launch the
 	 compressor.  */
 
-      archive = creat (archive_name_array[0], 0666);
+      archive = creat (archive_name_array[0], MODE_RW);
       if (archive < 0)
 	{
 	  int saved_errno = errno;
@@ -434,7 +434,7 @@ child_open_for_compress (void)
   if (strcmp (archive_name_array[0], "-") == 0)
     archive = STDOUT_FILENO;
   else
-    archive = rmtcreat (archive_name_array[0], 0666, rsh_command_option);
+    archive = rmtcreat (archive_name_array[0], MODE_RW, rsh_command_option);
   if (archive < 0)
     FATAL_ERROR ((0, errno, _("Cannot open archive %s"),
 		  archive_name_array[0]));
@@ -543,7 +543,7 @@ child_open_for_uncompress (void)
       /* We don't need a grandchild tar.  Open the archive and lauch the
 	 uncompressor.  */
 
-      archive = open (archive_name_array[0], O_RDONLY | O_BINARY, 0666);
+      archive = open (archive_name_array[0], O_RDONLY | O_BINARY, MODE_RW);
       if (archive < 0)
 	FATAL_ERROR ((0, errno, _("Cannot open archive %s"),
 		      archive_name_array[0]));
@@ -588,7 +588,7 @@ child_open_for_uncompress (void)
     archive = STDIN_FILENO;
   else
     archive = rmtopen (archive_name_array[0], O_RDONLY | O_BINARY,
-		       0666, rsh_command_option);
+		       MODE_RW, rsh_command_option);
   if (archive < 0)
     FATAL_ERROR ((0, errno, _("Cannot open archive %s"),
 		  archive_name_array[0]));
@@ -776,13 +776,13 @@ open_archive (enum access_mode access)
     }
   else if (verify_option)
     archive = rmtopen (archive_name_array[0], O_RDWR | O_CREAT | O_BINARY,
-		       0666, rsh_command_option);
+		       MODE_RW, rsh_command_option);
   else
     switch (access)
       {
       case ACCESS_READ:
-	archive = rmtopen (archive_name_array[0], O_RDONLY | O_BINARY, 0666,
-			   rsh_command_option);
+	archive = rmtopen (archive_name_array[0], O_RDONLY | O_BINARY,
+			   MODE_RW, rsh_command_option);
 	break;
 
       case ACCESS_WRITE:
@@ -791,12 +791,13 @@ open_archive (enum access_mode access)
 	    maybe_backup_file (archive_name_array[0], 1);
 	    backed_up_flag = 1;
 	  }
-	archive = rmtcreat (archive_name_array[0], 0666, rsh_command_option);
+	archive = rmtcreat (archive_name_array[0], MODE_RW,
+			    rsh_command_option);
 	break;
 
       case ACCESS_UPDATE:
 	archive = rmtopen (archive_name_array[0], O_RDWR | O_CREAT | O_BINARY,
-			   0666, rsh_command_option);
+			   MODE_RW, rsh_command_option);
 	break;
       }
 
@@ -1115,27 +1116,29 @@ flush_read (void)
 	write_error (status);
     }
   if (multi_volume_option)
-    if (save_name)
-      {
-	char *cursor = save_name;
+    {
+      if (save_name)
+	{
+	  char *cursor = save_name;
 
 #if MSDOS
-	if (cursor[1] == ':')
-	  cursor += 2;
+	  if (cursor[1] == ':')
+	    cursor += 2;
 #endif
-	while (*cursor == '/')
-	  cursor++;
+	  while (*cursor == '/')
+	    cursor++;
 
-	strcpy (real_s_name, cursor);
-	real_s_sizeleft = save_sizeleft;
-	real_s_totsize = save_totsize;
-      }
-    else
-      {
-	real_s_name[0] = '\0';
-	real_s_totsize = 0;
-	real_s_sizeleft = 0;
-      }
+	  strcpy (real_s_name, cursor);
+	  real_s_sizeleft = save_sizeleft;
+	  real_s_totsize = save_totsize;
+	}
+      else
+	{
+	  real_s_name[0] = '\0';
+	  real_s_totsize = 0;
+	  real_s_sizeleft = 0;
+	}
+    }
 
 error_loop:
   status = rmtread (archive, record_start->buffer, record_size);
@@ -1358,12 +1361,12 @@ backspace_output (void)
 #endif
 
   {
-    off_t position = rmtlseek (archive, (off_t) 0, 1);
+    off_t position = rmtlseek (archive, (off_t) 0, SEEK_CUR);
 
     /* Seek back to the beginning of this record and start writing there.  */
 
     position -= record_size;
-    if (rmtlseek (archive, position, 0) != position)
+    if (rmtlseek (archive, position, SEEK_SET) != position)
       {
 	/* Lseek failed.  Try a different method.  */
 
@@ -1398,8 +1401,7 @@ close_archive (void)
 
   if (access_mode == ACCESS_READ
       && ! _isrmt (archive)
-      && S_ISFIFO (archive_stat.st_mode)
-      && ! ending_file_option)
+      && S_ISFIFO (archive_stat.st_mode))
     while (rmtread (archive, record_start->buffer, record_size) > 0)
       continue;
 #endif
@@ -1409,8 +1411,8 @@ close_archive (void)
 #if MSDOS
       int status = write (archive, "", 0);
 #else
-      off_t pos = lseek (archive, (off_t) 0, 1);
-      int status = pos == -1 ? -1 : ftruncate (archive, pos);
+      off_t pos = lseek (archive, (off_t) 0, SEEK_CUR);
+      int status = pos < 0 ? -1 : ftruncate (archive, pos);
 #endif
       if (status != 0)
 	WARN ((0, errno, _("WARNING: Cannot truncate %s"),
@@ -1441,29 +1443,31 @@ close_archive (void)
 	continue;
 
       if (child != -1)
-	if (WIFSIGNALED (wait_status)
+	{
+	  if (WIFSIGNALED (wait_status)
 #if 0
-	    && !WIFSTOPPED (wait_status)
+	      && !WIFSTOPPED (wait_status)
 #endif
-	    )
-	  {
-	    /* SIGPIPE is OK, everything else is a problem.  */
+	      )
+	    {
+	      /* SIGPIPE is OK, everything else is a problem.  */
 
-	    if (WTERMSIG (wait_status) != SIGPIPE)
-	      ERROR ((0, 0, _("Child died with signal %d%s"),
-		      WTERMSIG (wait_status),
-		      WCOREDUMP (wait_status) ? _(" (core dumped)") : ""));
-	  }
-	else
-	  {
-	    /* Child voluntarily terminated -- but why?  /bin/sh returns
-	       SIGPIPE + 128 if its child, then do nothing.  */
+	      if (WTERMSIG (wait_status) != SIGPIPE)
+		ERROR ((0, 0, _("Child died with signal %d%s"),
+			WTERMSIG (wait_status),
+			WCOREDUMP (wait_status) ? _(" (core dumped)") : ""));
+	    }
+	  else
+	    {
+	      /* Child voluntarily terminated -- but why?  /bin/sh returns
+		 SIGPIPE + 128 if its child, then do nothing.  */
 
-	    if (WEXITSTATUS (wait_status) != (SIGPIPE + 128)
-		&& WEXITSTATUS (wait_status))
-	      ERROR ((0, 0, _("Child returned status %d"),
-		      WEXITSTATUS (wait_status)));
-	  }
+	      if (WEXITSTATUS (wait_status) != (SIGPIPE + 128)
+		  && WEXITSTATUS (wait_status))
+		ERROR ((0, 0, _("Child returned status %d"),
+			WEXITSTATUS (wait_status)));
+	    }
+	}
     }
 #endif /* !MSDOS */
 
@@ -1670,24 +1674,25 @@ tryagain:
     }
 
   if (verify_option)
-    archive = rmtopen (*archive_name_cursor, O_RDWR | O_CREAT, 0666,
+    archive = rmtopen (*archive_name_cursor, O_RDWR | O_CREAT, MODE_RW,
 		       rsh_command_option);
   else
     switch (access)
       {
       case ACCESS_READ:
-	archive = rmtopen (*archive_name_cursor, O_RDONLY, 0666,
+	archive = rmtopen (*archive_name_cursor, O_RDONLY, MODE_RW,
 			   rsh_command_option);
 	break;
 
       case ACCESS_WRITE:
 	if (backup_option)
 	  maybe_backup_file (*archive_name_cursor, 1);
-	archive = rmtcreat (*archive_name_cursor, 0666, rsh_command_option);
+	archive = rmtcreat (*archive_name_cursor, MODE_RW,
+			    rsh_command_option);
 	break;
 
       case ACCESS_UPDATE:
-	archive = rmtopen (*archive_name_cursor, O_RDWR | O_CREAT, 0666,
+	archive = rmtopen (*archive_name_cursor, O_RDWR | O_CREAT, MODE_RW,
 			   rsh_command_option);
 	break;
       }