X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fmisc.c;h=bead6800c9113a2062bd3233f053b1b3c0d777b1;hb=75bf036edc1425eb66dcc9623846c7204f943ce6;hp=73cb2c3deeea8432c2f7a77beaa897f3d0b30c12;hpb=f3da0c26b8fdfdd5db39e5fde8757ded273c2b51;p=chaz%2Ftar diff --git a/src/misc.c b/src/misc.c index 73cb2c3..bead680 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 +#include #include "common.h" #include #include @@ -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);