projects
/
debian
/
tar
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'dfsg-orig' into dfsg-debian
[debian/tar]
/
src
/
transform.c
diff --git
a/src/transform.c
b/src/transform.c
index 2e0de318618bf2236d0bc624c5d6be863079b5cc..cd9e27ccf4f6fe624d9f401a58ffd4304bc9794b 100644
(file)
--- a/
src/transform.c
+++ b/
src/transform.c
@@
-1,5
+1,5
@@
-/* This file is part of GNU tar.
- Copyright
(C) 2006, 2007, 2008
Free Software Foundation, Inc.
+/* This file is part of GNU tar.
+ Copyright
2006-2008, 2013-2014
Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
@@
-12,8
+12,7
@@
Public License for more details.
You should have received a copy of the GNU General Public License along
Public License for more details.
You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <system.h>
#include <regex.h>
#include <system.h>
#include <regex.h>
@@
-34,8
+33,8
@@
enum replace_segm_type
enum case_ctl_type
{
enum case_ctl_type
{
- ctl_stop, /* Stop case conversion */
- ctl_upcase_next,/* Turn the next character to uppercase */
+ ctl_stop, /* Stop case conversion */
+ ctl_upcase_next,/* Turn the next character to uppercase */
ctl_locase_next,/* Turn the next character to lowercase */
ctl_upcase, /* Turn the replacement to uppercase until ctl_stop */
ctl_locase /* Turn the replacement to lowercase until ctl_stop */
ctl_locase_next,/* Turn the next character to lowercase */
ctl_upcase, /* Turn the replacement to uppercase until ctl_stop */
ctl_locase /* Turn the replacement to lowercase until ctl_stop */
@@
-51,9
+50,9
@@
struct replace_segm
{
char *ptr;
size_t size;
{
char *ptr;
size_t size;
- } literal; /* type == segm_literal */
+ } literal; /* type == segm_literal */
size_t ref; /* type == segm_backref */
size_t ref; /* type == segm_backref */
- enum case_ctl_type ctl; /* type == segm_case_ctl */
+ enum case_ctl_type ctl; /* type == segm_case_ctl */
} v;
};
} v;
};
@@
-71,11
+70,11
@@
struct transform
\f
\f
-int transform_flags = XFORM_ALL;
+
static
int transform_flags = XFORM_ALL;
static struct transform *transform_head, *transform_tail;
static struct transform *
static struct transform *transform_head, *transform_tail;
static struct transform *
-new_transform ()
+new_transform (
void
)
{
struct transform *p = xzalloc (sizeof *p);
if (transform_tail)
{
struct transform *p = xzalloc (sizeof *p);
if (transform_tail)
@@
-146,7
+145,7
@@
parse_xform_flags (int *pflags, int c)
case 'R':
*pflags &= ~XFORM_REGFILE;
break;
case 'R':
*pflags &= ~XFORM_REGFILE;
break;
-
+
case 'h':
*pflags |= XFORM_LINK;
break;
case 'h':
*pflags |= XFORM_LINK;
break;
@@
-154,7
+153,7
@@
parse_xform_flags (int *pflags, int c)
case 'H':
*pflags &= ~XFORM_LINK;
break;
case 'H':
*pflags &= ~XFORM_LINK;
break;
-
+
case 's':
*pflags |= XFORM_SYMLINK;
break;
case 's':
*pflags |= XFORM_SYMLINK;
break;
@@
-204,10
+203,10
@@
parse_transform_expr (const char *expr)
*expr));
}
return expr;
*expr));
}
return expr;
- }
+ }
USAGE_ERROR ((0, 0, _("Invalid transform expression")));
}
USAGE_ERROR ((0, 0, _("Invalid transform expression")));
}
-
+
delim = expr[1];
/* Scan regular expression */
delim = expr[1];
/* Scan regular expression */
@@
-258,14
+257,14
@@
parse_transform_expr (const char *expr)
if (*p == ';')
p++;
if (*p == ';')
p++;
-
+
/* Extract and compile regex */
str = xmalloc (i - 1);
memcpy (str, expr + 2, i - 2);
str[i - 2] = 0;
rc = regcomp (&tf->regex, str, cflags);
/* Extract and compile regex */
str = xmalloc (i - 1);
memcpy (str, expr + 2, i - 2);
str[i - 2] = 0;
rc = regcomp (&tf->regex, str, cflags);
-
+
if (rc)
{
char errbuf[512];
if (rc)
{
char errbuf[512];
@@
-275,7
+274,7
@@
parse_transform_expr (const char *expr)
if (str[0] == '^' || str[strlen (str) - 1] == '$')
tf->transform_type = transform_first;
if (str[0] == '^' || str[strlen (str) - 1] == '$')
tf->transform_type = transform_first;
-
+
free (str);
/* Extract and compile replacement expr */
free (str);
/* Extract and compile replacement expr */
@@
-289,7
+288,7
@@
parse_transform_expr (const char *expr)
if (*cur == '\\')
{
size_t n;
if (*cur == '\\')
{
size_t n;
-
+
add_literal_segment (tf, beg, cur);
switch (*++cur)
{
add_literal_segment (tf, beg, cur);
switch (*++cur)
{
@@
-310,32
+309,32
@@
parse_transform_expr (const char *expr)
add_char_segment (tf, '\a');
cur++;
break;
add_char_segment (tf, '\a');
cur++;
break;
-
+
case 'b':
add_char_segment (tf, '\b');
cur++;
break;
case 'b':
add_char_segment (tf, '\b');
cur++;
break;
-
+
case 'f':
add_char_segment (tf, '\f');
cur++;
break;
case 'f':
add_char_segment (tf, '\f');
cur++;
break;
-
+
case 'n':
add_char_segment (tf, '\n');
cur++;
break;
case 'n':
add_char_segment (tf, '\n');
cur++;
break;
-
+
case 'r':
add_char_segment (tf, '\r');
cur++;
break;
case 'r':
add_char_segment (tf, '\r');
cur++;
break;
-
+
case 't':
add_char_segment (tf, '\t');
cur++;
break;
case 't':
add_char_segment (tf, '\t');
cur++;
break;
-
+
case 'v':
add_char_segment (tf, '\v');
cur++;
case 'v':
add_char_segment (tf, '\v');
cur++;
@@
-345,39
+344,39
@@
parse_transform_expr (const char *expr)
add_char_segment (tf, '&');
cur++;
break;
add_char_segment (tf, '&');
cur++;
break;
-
+
case 'L':
case 'L':
- /* Turn the replacement to lowercase until a
`\U' or `
\E'
+ /* Turn the replacement to lowercase until a
'\U' or '
\E'
is found, */
add_case_ctl_segment (tf, ctl_locase);
cur++;
break;
is found, */
add_case_ctl_segment (tf, ctl_locase);
cur++;
break;
-
+
case 'l':
/* Turn the next character to lowercase, */
add_case_ctl_segment (tf, ctl_locase_next);
cur++;
break;
case 'l':
/* Turn the next character to lowercase, */
add_case_ctl_segment (tf, ctl_locase_next);
cur++;
break;
-
+
case 'U':
case 'U':
- /* Turn the replacement to uppercase until a
`\L' or `
\E'
+ /* Turn the replacement to uppercase until a
'\L' or '
\E'
is found, */
add_case_ctl_segment (tf, ctl_upcase);
cur++;
break;
is found, */
add_case_ctl_segment (tf, ctl_upcase);
cur++;
break;
-
+
case 'u':
/* Turn the next character to uppercase, */
add_case_ctl_segment (tf, ctl_upcase_next);
cur++;
break;
case 'u':
/* Turn the next character to uppercase, */
add_case_ctl_segment (tf, ctl_upcase_next);
cur++;
break;
-
+
case 'E':
case 'E':
- /* Stop case conversion started by
`\L' or `
\U'. */
+ /* Stop case conversion started by
'\L' or '
\U'. */
add_case_ctl_segment (tf, ctl_stop);
cur++;
break;
add_case_ctl_segment (tf, ctl_stop);
cur++;
break;
-
+
default:
/* Try to be nice */
{
default:
/* Try to be nice */
{
@@
-420,7
+419,7
@@
run_case_conv (enum case_ctl_type case_ctl, char *ptr, size_t size)
static char *case_ctl_buffer;
static size_t case_ctl_bufsize;
char *p;
static char *case_ctl_buffer;
static size_t case_ctl_bufsize;
char *p;
-
+
if (case_ctl_bufsize < size)
{
case_ctl_bufsize = size;
if (case_ctl_bufsize < size)
{
case_ctl_bufsize = size;
@@
-430,21
+429,21
@@
run_case_conv (enum case_ctl_type case_ctl, char *ptr, size_t size)
switch (case_ctl)
{
case ctl_upcase_next:
switch (case_ctl)
{
case ctl_upcase_next:
- case_ctl_buffer[0] = toupper (case_ctl_buffer[0]);
+ case_ctl_buffer[0] = toupper (
(unsigned char)
case_ctl_buffer[0]);
break;
break;
-
+
case ctl_locase_next:
case ctl_locase_next:
- case_ctl_buffer[0] = tolower (case_ctl_buffer[0]);
+ case_ctl_buffer[0] = tolower (
(unsigned char)
case_ctl_buffer[0]);
break;
break;
-
+
case ctl_upcase:
for (p = case_ctl_buffer; p < case_ctl_buffer + size; p++)
case ctl_upcase:
for (p = case_ctl_buffer; p < case_ctl_buffer + size; p++)
- *p = toupper (*p);
+ *p = toupper (
(unsigned char)
*p);
break;
break;
-
+
case ctl_locase:
for (p = case_ctl_buffer; p < case_ctl_buffer + size; p++)
case ctl_locase:
for (p = case_ctl_buffer; p < case_ctl_buffer + size; p++)
- *p = tolower (*p);
+ *p = tolower (
(unsigned char)
*p);
break;
case ctl_stop:
break;
case ctl_stop:
@@
-457,7
+456,7
@@
run_case_conv (enum case_ctl_type case_ctl, char *ptr, size_t size)
static struct obstack stk;
static bool stk_init;
static struct obstack stk;
static bool stk_init;
-void
+
static
void
_single_transform_name_to_obstack (struct transform *tf, char *input)
{
regmatch_t *rmp;
_single_transform_name_to_obstack (struct transform *tf, char *input)
{
regmatch_t *rmp;
@@
-465,7
+464,7
@@
_single_transform_name_to_obstack (struct transform *tf, char *input)
size_t nmatches = 0;
enum case_ctl_type case_ctl = ctl_stop, /* Current case conversion op */
save_ctl = ctl_stop; /* Saved case_ctl for \u and \l */
size_t nmatches = 0;
enum case_ctl_type case_ctl = ctl_stop, /* Current case conversion op */
save_ctl = ctl_stop; /* Saved case_ctl for \u and \l */
-
+
/* Reset case conversion after a single-char operation */
#define CASE_CTL_RESET() if (case_ctl == ctl_upcase_next \
|| case_ctl == ctl_locase_next) \
/* Reset case conversion after a single-char operation */
#define CASE_CTL_RESET() if (case_ctl == ctl_upcase_next \
|| case_ctl == ctl_locase_next) \
@@
-473,20
+472,20
@@
_single_transform_name_to_obstack (struct transform *tf, char *input)
case_ctl = save_ctl; \
save_ctl = ctl_stop; \
}
case_ctl = save_ctl; \
save_ctl = ctl_stop; \
}
-
+
rmp = xmalloc ((tf->regex.re_nsub + 1) * sizeof (*rmp));
while (*input)
{
size_t disp;
char *ptr;
rmp = xmalloc ((tf->regex.re_nsub + 1) * sizeof (*rmp));
while (*input)
{
size_t disp;
char *ptr;
-
+
rc = regexec (&tf->regex, input, tf->regex.re_nsub + 1, rmp, 0);
rc = regexec (&tf->regex, input, tf->regex.re_nsub + 1, rmp, 0);
-
+
if (rc == 0)
{
struct replace_segm *segm;
if (rc == 0)
{
struct replace_segm *segm;
-
+
disp = rmp[0].rm_eo;
if (rmp[0].rm_so)
disp = rmp[0].rm_eo;
if (rmp[0].rm_so)
@@
-516,7
+515,7
@@
_single_transform_name_to_obstack (struct transform *tf, char *input)
}
obstack_grow (&stk, ptr, segm->v.literal.size);
break;
}
obstack_grow (&stk, ptr, segm->v.literal.size);
break;
-
+
case segm_backref: /* Back-reference segment */
if (rmp[segm->v.ref].rm_so != -1
&& rmp[segm->v.ref].rm_eo != -1)
case segm_backref: /* Back-reference segment */
if (rmp[segm->v.ref].rm_so != -1
&& rmp[segm->v.ref].rm_eo != -1)
@@
-529,7
+528,7
@@
_single_transform_name_to_obstack (struct transform *tf, char *input)
ptr = run_case_conv (case_ctl, ptr, size);
CASE_CTL_RESET();
}
ptr = run_case_conv (case_ctl, ptr, size);
CASE_CTL_RESET();
}
-
+
obstack_grow (&stk, ptr, size);
}
break;
obstack_grow (&stk, ptr, size);
}
break;
@@
-549,7
+548,7
@@
_single_transform_name_to_obstack (struct transform *tf, char *input)
break;
}
/*FALL THROUGH*/
break;
}
/*FALL THROUGH*/
-
+
case ctl_upcase:
case ctl_locase:
case ctl_stop:
case ctl_upcase:
case ctl_locase:
case ctl_stop:
@@
-577,18
+576,18
@@
_single_transform_name_to_obstack (struct transform *tf, char *input)
free (rmp);
}
free (rmp);
}
-bool
+
static
bool
_transform_name_to_obstack (int flags, char *input, char **output)
{
struct transform *tf;
bool alloced = false;
_transform_name_to_obstack (int flags, char *input, char **output)
{
struct transform *tf;
bool alloced = false;
-
+
if (!stk_init)
{
obstack_init (&stk);
stk_init = true;
}
if (!stk_init)
{
obstack_init (&stk);
stk_init = true;
}
-
+
for (tf = transform_head; tf; tf = tf->next)
{
if (tf->flags & flags)
for (tf = transform_head; tf; tf = tf->next)
{
if (tf->flags & flags)
@@
-601,7
+600,7
@@
_transform_name_to_obstack (int flags, char *input, char **output)
*output = input;
return alloced;
}
*output = input;
return alloced;
}
-
+
bool
transform_name_fp (char **pinput, int flags,
char *(*fun)(char *, void *), void *dat)
bool
transform_name_fp (char **pinput, int flags,
char *(*fun)(char *, void *), void *dat)
@@
-629,3
+628,8
@@
transform_name (char **pinput, int type)
return transform_name_fp (pinput, type, NULL, NULL);
}
return transform_name_fp (pinput, type, NULL, NULL);
}
+bool
+transform_program_p (void)
+{
+ return transform_head != NULL;
+}