X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fmisc.c;h=0ade2000d4352fb46484f9b1d02d9dec2e722177;hb=5cf84df777c8c9d069ee2d83e71f04c53586a3b2;hp=73cb2c3deeea8432c2f7a77beaa897f3d0b30c12;hpb=f3da0c26b8fdfdd5db39e5fde8757ded273c2b51;p=chaz%2Ftar

diff --git a/src/misc.c b/src/misc.c
index 73cb2c3..0ade200 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -17,8 +17,8 @@
    with this program; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#include "system.h"
-#include "rmt.h"
+#include <system.h>
+#include <rmt.h>
 #include "common.h"
 #include <quotearg.h>
 #include <save-cwd.h>
@@ -123,13 +123,13 @@ unquote_string (char *string)
 	  source++;
 	  break;
 
-	case 'n':
-	  *destination++ = '\n';
+	case 'a':
+	  *destination++ = '\a';
 	  source++;
 	  break;
-
-	case 't':
-	  *destination++ = '\t';
+	  
+	case 'b':
+	  *destination++ = '\b';
 	  source++;
 	  break;
 
@@ -138,8 +138,8 @@ unquote_string (char *string)
 	  source++;
 	  break;
 
-	case 'b':
-	  *destination++ = '\b';
+	case 'n':
+	  *destination++ = '\n';
 	  source++;
 	  break;
 
@@ -148,6 +148,16 @@ unquote_string (char *string)
 	  source++;
 	  break;
 
+	case 't':
+	  *destination++ = '\t';
+	  source++;
+	  break;
+
+	case 'v':
+	  *destination++ = '\v';
+	  source++;
+	  break;
+	  
 	case '?':
 	  *destination++ = 0177;
 	  source++;
@@ -207,7 +217,7 @@ static char *after_backup_name;
 static bool
 must_be_dot_or_slash (char const *file_name)
 {
-  file_name += FILESYSTEM_PREFIX_LEN (file_name);
+  file_name += FILE_SYSTEM_PREFIX_LEN (file_name);
 
   if (ISSLASH (file_name[0]))
     {
@@ -307,7 +317,8 @@ remove_any_file (const char *file_name, enum remove_option option)
 		 entry += entrylen + 1)
 	      {
 		char *file_name_buffer = new_name (file_name, entry);
-		int r = remove_any_file (file_name_buffer, 1);
+		int r = remove_any_file (file_name_buffer, 
+                                         RECURSIVE_REMOVE_OPTION);
 		int e = errno;
 		free (file_name_buffer);
 
@@ -538,6 +549,10 @@ static void
 call_arg_error (char const *call, char const *name)
 {
   int e = errno;
+  /* TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'.
+     Directly translating this to another language will not work, first because
+     %s itself is not translated.
+     Translate it as `%s: Function %s failed'. */
   ERROR ((0, e, _("%s: Cannot %s"), quotearg_colon (name), call));
 }
 
@@ -547,6 +562,10 @@ static void
 call_arg_fatal (char const *call, char const *name)
 {
   int e = errno;
+  /* TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'.
+     Directly translating this to another language will not work, first because
+     %s itself is not translated.
+     Translate it as `%s: Function %s failed'. */
   FATAL_ERROR ((0, e, _("%s: Cannot %s"), quotearg_colon (name),  call));
 }
 
@@ -556,6 +575,10 @@ static void
 call_arg_warn (char const *call, char const *name)
 {
   int e = errno;
+  /* TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'.
+     Directly translating this to another language will not work, first because
+     %s itself is not translated.
+     Translate it as `%s: Function %s failed'. */
   WARN ((0, e, _("%s: Warning: Cannot %s"), quotearg_colon (name), call));
 }
 
@@ -675,8 +698,8 @@ read_error_details (char const *name, off_t offset, size_t size)
   char buf[UINTMAX_STRSIZE_BOUND];
   int e = errno;
   ERROR ((0, e,
-	  ngettext ("%s: Read error at byte %s, reading %lu byte",
-		    "%s: Read error at byte %s, reading %lu bytes",
+	  ngettext ("%s: Read error at byte %s, while reading %lu byte",
+		    "%s: Read error at byte %s, while reading %lu bytes",
 		    size),
 	  quotearg_colon (name), STRINGIFY_BIGINT (offset, buf),
 	  (unsigned long) size));
@@ -688,8 +711,8 @@ read_warn_details (char const *name, off_t offset, size_t size)
   char buf[UINTMAX_STRSIZE_BOUND];
   int e = errno;
   WARN ((0, e,
-	 ngettext ("%s: Warning: Read error at byte %s, reading %lu byte",
-		   "%s: Warning: Read error at byte %s, reading %lu bytes",
+	 ngettext ("%s: Warning: Read error at byte %s, while reading %lu byte",
+		   "%s: Warning: Read error at byte %s, while reading %lu bytes",
 		   size),
 	 quotearg_colon (name), STRINGIFY_BIGINT (offset, buf),
 	 (unsigned long) size));
@@ -814,6 +837,12 @@ symlink_error (char const *contents, char const *name)
 	  quotearg_colon (name), quote_n (1, contents)));
 }
 
+void
+stat_fatal (char const *name)
+{
+  call_arg_fatal ("stat", name);
+}
+
 void
 stat_error (char const *name)
 {