OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

server.c (load_data): Return NULL if the marker line is not found. 

* fixinc/server.c (load_data): Return NULL if the marker line is
not found.
(run_shell): If load_data returns NULL, retry the command once, in
a new shell.

From-SVN: r31894
This commit is contained in:
Alexandre Oliva 2000-02-10 16:29:21 +00:00 committed by Alexandre Oliva
parent 139cfaa75e
commit d1922b4899
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ChangeLog
View File

@ -1,5 +1,10 @@
2000-02-10 Alexandre Oliva <oliva@lsd.ic.unicamp.br>
* fixinc/server.c (load_data): Return NULL if the marker line is
not found.
(run_shell): If load_data returns NULL, retry the command once, in
a new shell.
* configure: Rebuilt.
2000-02-09 Bruce Korb <bkorb@gnu.org>

20
gcc/fixinc/server.c
View File

@ -114,6 +114,7 @@ load_data (fp)
size_t text_size;
char *pz_scan;
char z_line[1024];
t_bool got_done = BOOL_FALSE;
text_size = sizeof (z_line) * 2;
pz_scan = pz_text = malloc (text_size);
@ -131,7 +132,10 @@ load_data (fp)
break;
if (strncmp (z_line, z_done, sizeof (z_done) - 1) == 0)
break;
{
got_done = BOOL_TRUE;
break;
}
strcpy (pz_scan, z_line);
pz_scan += strlen (z_line);
@ -157,7 +161,7 @@ load_data (fp)
}
alarm (0);
if (read_pipe_timeout)
if (read_pipe_timeout || ! got_done)
{
free ((void *) pz_text);
return (char *) NULL;
@ -255,6 +259,9 @@ char *
run_shell (pz_cmd)
const char *pz_cmd;
{
t_bool retry = BOOL_TRUE;
do_retry:
/* IF the shell server process is not running yet,
THEN try to start it. */
if (server_id == NULLPROCESS)
@ -299,9 +306,16 @@ run_shell (pz_cmd)
if (pz == (char *) NULL)
{
close_server ();
if (retry)
{
retry = BOOL_FALSE;
goto do_retry;
}
fprintf (stderr, "CLOSING SHELL SERVER - command failure:\n\t%s\n",
pz_cmd);
close_server ();
pz = (char *) malloc (1);
if (pz != (char *) NULL)
*pz = '\0';