hans/advcpmv
1
0
Fork 0
mirror of https://github.com/jarun/advcpmv.git synced 2026-02-01 13:17:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

escape grave accents, they break the double quoted system commands

Browse Source
This commit is contained in:
Michael Wehr
2021-12-24 20:11:32 +01:00
parent 04bae585e6
commit a620f86965
1 changed files with 25 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
advcpmv-0.9-9.0.patch
View File

@@ -1,7 +1,7 @@
diff -aur coreutils-9.0/src/copy.c coreutils-9.0-patched/src/copy.c diff -aur coreutils-9.0/src/copy.c coreutils-9.0-patched/src/copy.c
--- coreutils-9.0/src/copy.c 2021-09-24 13:31:05.000000000 +0200 --- coreutils-9.0/src/copy.c 2021-09-24 13:31:05.000000000 +0200
+++ coreutils-9.0-patched/src/copy.c 2021-12-23 19:13:54.313100934 +0100 +++ coreutils-9.0-patched/src/copy.c 2021-12-24 20:07:37.109671577 +0100
@@ -129,6 +129,101 @@ @@ -129,6 +129,95 @@
dev_t dev; dev_t dev;
}; };
@@ -16,32 +16,26 @@ diff -aur coreutils-9.0/src/copy.c coreutils-9.0-patched/src/copy.c
+ +
+char * escape_double_quotes ( char * _cUnescapedString ) +char * escape_double_quotes ( char * _cUnescapedString )
+{ +{
+ int pos = 0;
+ int count = 0;
+ for(pos = 0; _cUnescapedString[pos] != '\0'; pos++)
+ {
+ if(_cUnescapedString[pos] == '"')
+ ++count;
+ }
+
+ char * _cEscapedString; + char * _cEscapedString;
+ _cEscapedString = calloc( sizeof(char) * ( pos + 1 + count * 2 ), sizeof(char) ); + _cEscapedString = (char *) malloc( sizeof(char) * strlen(_cUnescapedString) * 2 );
+ + size_t ipos = 0;
+ int epos = 0; + size_t rpos = 0;
+ for(pos = 0; _cUnescapedString[pos] != '\0'; pos++) + for(rpos = 0, ipos = 0; _cUnescapedString[rpos] != '\0'; rpos++, ipos++)
+ { + {
+ if(_cUnescapedString[pos] == '"') + if(_cUnescapedString[rpos] == '"')
+ { + {
+ _cEscapedString[epos] = '\\'; + _cEscapedString[ipos] = '\\';
+ epos++; + ipos++;
+ _cEscapedString[epos] = _cUnescapedString[pos];
+ } + }
+ else + if(_cUnescapedString[rpos] == '`')
+ _cEscapedString[epos] = _cUnescapedString[pos]; + {
+ epos++; + _cEscapedString[ipos] = '\\';
+ ipos++;
+ } + }
+ epos++; + _cEscapedString[ipos] = _cUnescapedString[rpos];
+ _cEscapedString[epos] = '\0'; + }
+ ipos++;
+ _cEscapedString[ipos] = '\0';
+ return _cEscapedString; + return _cEscapedString;
+} +}
+ +
@@ -103,7 +97,7 @@ diff -aur coreutils-9.0/src/copy.c coreutils-9.0-patched/src/copy.c
/* Initial size of the cp.dest_info hash table. */ /* Initial size of the cp.dest_info hash table. */
#define DEST_INFO_INITIAL_CAPACITY 61 #define DEST_INFO_INITIAL_CAPACITY 61
@@ -300,9 +395,16 @@ @@ -300,9 +389,16 @@
static bool static bool
sparse_copy (int src_fd, int dest_fd, char *buf, size_t buf_size, sparse_copy (int src_fd, int dest_fd, char *buf, size_t buf_size,
size_t hole_size, bool punch_holes, bool allow_reflink, size_t hole_size, bool punch_holes, bool allow_reflink,
@@ -121,7 +115,7 @@ diff -aur coreutils-9.0/src/copy.c coreutils-9.0-patched/src/copy.c
{ {
*last_write_made_hole = false; *last_write_made_hole = false;
*total_n_read = 0; *total_n_read = 0;
@@ -362,6 +464,85 @@ @@ -362,6 +458,85 @@
while (max_n_read) while (max_n_read)
{ {
@@ -207,7 +201,7 @@ diff -aur coreutils-9.0/src/copy.c coreutils-9.0-patched/src/copy.c
ssize_t n_read = read (src_fd, buf, MIN (max_n_read, buf_size)); ssize_t n_read = read (src_fd, buf, MIN (max_n_read, buf_size));
if (n_read < 0) if (n_read < 0)
{ {
@@ -446,6 +627,14 @@ @@ -446,6 +621,14 @@
certain files in /proc or /sys with linux kernels. */ certain files in /proc or /sys with linux kernels. */
} }
@@ -222,7 +216,7 @@ diff -aur coreutils-9.0/src/copy.c coreutils-9.0-patched/src/copy.c
/* Ensure a trailing hole is created, so that subsequent /* Ensure a trailing hole is created, so that subsequent
calls of sparse_copy() start at the correct offset. */ calls of sparse_copy() start at the correct offset. */
if (make_hole && ! create_hole (dest_fd, dst_name, punch_holes, psize)) if (make_hole && ! create_hole (dest_fd, dst_name, punch_holes, psize))
@@ -517,8 +706,16 @@ @@ -517,8 +700,16 @@
lseek_copy (int src_fd, int dest_fd, char *buf, size_t buf_size, lseek_copy (int src_fd, int dest_fd, char *buf, size_t buf_size,
size_t hole_size, off_t ext_start, off_t src_total_size, size_t hole_size, off_t ext_start, off_t src_total_size,
enum Sparse_type sparse_mode, enum Sparse_type sparse_mode,
@@ -240,7 +234,7 @@ diff -aur coreutils-9.0/src/copy.c coreutils-9.0-patched/src/copy.c
{ {
off_t last_ext_start = 0; off_t last_ext_start = 0;
off_t last_ext_len = 0; off_t last_ext_len = 0;
@@ -590,10 +787,26 @@ @@ -590,10 +781,26 @@
is conservative and may miss some holes. */ is conservative and may miss some holes. */
off_t n_read; off_t n_read;
bool read_hole; bool read_hole;
@@ -269,7 +263,7 @@ diff -aur coreutils-9.0/src/copy.c coreutils-9.0-patched/src/copy.c
return false; return false;
dest_pos = ext_start + n_read; dest_pos = ext_start + n_read;
@@ -1374,8 +1587,82 @@ @@ -1374,8 +1581,82 @@
buf_alloc = xmalloc (buf_size + buf_alignment); buf_alloc = xmalloc (buf_size + buf_alignment);
buf = ptr_align (buf_alloc, buf_alignment); buf = ptr_align (buf_alloc, buf_alignment);
@@ -352,7 +346,7 @@ diff -aur coreutils-9.0/src/copy.c coreutils-9.0-patched/src/copy.c
if (! ( if (! (
#ifdef SEEK_HOLE #ifdef SEEK_HOLE
scantype == LSEEK_SCANTYPE scantype == LSEEK_SCANTYPE
@@ -1383,15 +1670,30 @@ @@ -1383,15 +1664,30 @@
scan_inference.ext_start, src_open_sb.st_size, scan_inference.ext_start, src_open_sb.st_size,
make_holes ? x->sparse_mode : SPARSE_NEVER, make_holes ? x->sparse_mode : SPARSE_NEVER,
x->reflink_mode != REFLINK_NEVER, x->reflink_mode != REFLINK_NEVER,
@@ -385,7 +379,7 @@ diff -aur coreutils-9.0/src/copy.c coreutils-9.0-patched/src/copy.c
{ {
return_val = false; return_val = false;
goto close_src_and_dst_desc; goto close_src_and_dst_desc;
@@ -1402,6 +1704,14 @@ @@ -1402,6 +1698,14 @@
return_val = false; return_val = false;
goto close_src_and_dst_desc; goto close_src_and_dst_desc;
} }