This commit is contained in:
Paul Smith 2004-02-21 17:10:41 +00:00
parent 1f16ee5c2d
commit fafeb87027
2 changed files with 12 additions and 24 deletions

View File

@ -1,3 +1,9 @@
2004-02-04 Paul D. Smith <psmith@gnu.org>
* job.c (vms_handle_apos) [VMS]: Fix various string handling
situations in VMS DCL. Fixes Savannah bug #5533. Fix provided by
Hartmut Becker <Hartmut.Becker@hp.com>.
2004-01-21 Paul D. Smith <psmith@gnu.org> 2004-01-21 Paul D. Smith <psmith@gnu.org>
* job.c (load_too_high): Implement an algorithm to control the * job.c (load_too_high): Implement an algorithm to control the

26
job.c
View File

@ -370,44 +370,26 @@ static char *
vms_handle_apos (char *p) vms_handle_apos (char *p)
{ {
int alast; int alast;
int inside;
#define SEPCHARS ",/()= " #define SEPCHARS ",/()= "
inside = 0; alast = 0;
while (*p != 0) while (*p != 0)
{ {
if (*p == '"') if (*p == '"')
{ {
if (inside) if (alast)
{
while ((alast > 0)
&& (*p == '"'))
{ {
alast = 0;
p++; p++;
alast--;
}
if (alast == 0)
inside = 0;
else
{
fprintf (stderr, _("Syntax error, still inside '\"'\n"));
exit (3);
}
} }
else else
{ {
p++; p++;
if (strchr (SEPCHARS, *p)) if (strchr (SEPCHARS, *p))
break; break;
inside = 1;
alast = 1; alast = 1;
while (*p == '"')
{
alast++;
p++;
}
} }
} }
else else
@ -2232,7 +2214,7 @@ child_execute_job (char *argv, struct child *child)
/* Nice places for line breaks are after strings, after /* Nice places for line breaks are after strings, after
comma or space and before slash. */ comma or space and before slash. */
case '"': case '"':
q = vms_handle_apos (q + 1); q = vms_handle_apos (q);
sep = q; sep = q;
break; break;
case ',': case ',':